scenri 0.7.5 → 0.8.0

package/dist/serve.js

@@ -806,6 +806,16 @@ function createStore(db) {
         id
       );
     },
+    /**
+     * The run's money, written once it is known. A batch's first sibling used
+     * to be charged inside completeNode, at the end of the whole call; a
+     * sibling now completes the moment its own image lands, and the cost is
+     * only known when the call resolves, so it is written afterwards, onto a
+     * node that finished. A failed or running node keeps 0, as before.
+     */
+    chargeNode(id, costUsd) {
+      db.prepare("UPDATE nodes SET cost_usd=? WHERE id=? AND status='done'").run(costUsd, id);
+    },
     failNode(id, error) {
       db.prepare("UPDATE nodes SET status='error', error=? WHERE id=?").run(error, id);
     },
@@ -1630,7 +1640,7 @@ function createOpenRouterEngine(opts) {
       const count = "count" in req ? req.count : 1;
       return count * perImageUsd;
     },
-    async generate(req, signal) {
+    async generate(req, signal, onImage) {
       const key = requireKey();
       const roles = req.referenceRoles ?? [];
       const refs = req.referenceImages ?? [];
@@ -1666,7 +1676,9 @@ function createOpenRouterEngine(opts) {
           signal
         );
         raws.push(json);
-        for (const buf of extractImages(json)) hashes.push(opts.saveImage(buf));
+        const own = extractImages(json).map((buf) => opts.saveImage(buf));
+        hashes.push(...own);
+        if (own[0]) onImage?.(i, own[0]);
         if (typeof json?.usage?.cost === "number") {
           reportedCost += json.usage.cost;
           sawReportedCost = true;
@@ -2863,7 +2875,7 @@ function createCodexEngine(opts) {
     async costEstimate() {
       return 0;
     },
-    async generate(req, signal) {
+    async generate(req, signal, onImage) {
       const count = Math.max(1, req.count);
       const refs = req.referenceImages ?? [];
       const roles = req.referenceRoles ?? refs.map(() => "reference");
@@ -2902,6 +2914,7 @@ function createCodexEngine(opts) {
             const i = next++;
             try {
               results[i] = await jobs[i]();
+              if (results[i][0]) onImage?.(i, results[i][0]);
             } catch (err) {
               if (signal?.aborted && signal.reason !== BUDGET_EXHAUSTED) throw err;
               results[i] = [];
@@ -3041,7 +3054,30 @@ function createEngineRegistry(core, extra = []) {
     codexRunner
   };
 }
-function createDemoEngine(saveImage) {
+function demoOptionsFromEnv(env) {
+  const out = {};
+  const stagger = Number(env.SCENRI_DEMO_STAGGER_MS);
+  if (env.SCENRI_DEMO_STAGGER_MS && Number.isFinite(stagger) && stagger > 0) out.staggerMs = stagger;
+  if (env.SCENRI_DEMO_ORDER === "reverse") out.order = "reverse";
+  const fail = Number(env.SCENRI_DEMO_FAIL_SLOT);
+  if (env.SCENRI_DEMO_FAIL_SLOT && Number.isInteger(fail) && fail >= 0) out.failSlot = fail;
+  return out;
+}
+function sleep2(ms, signal) {
+  return new Promise((resolve) => {
+    if (signal?.aborted) return resolve();
+    const onAbort = () => {
+      clearTimeout(timer);
+      resolve();
+    };
+    const timer = setTimeout(() => {
+      signal?.removeEventListener("abort", onAbort);
+      resolve();
+    }, ms);
+    signal?.addEventListener("abort", onAbort, { once: true });
+  });
+}
+function createDemoEngine(saveImage, opts = {}) {
   const paletteOf = (req) => {
     const p = req.brand?.brand?.palette;
     const hexes = [p?.primary?.hex, p?.secondary?.hex, ...(p?.accent ?? []).map((a) => a?.hex)].filter(
@@ -3087,13 +3123,31 @@ function createDemoEngine(saveImage) {
     async costEstimate() {
       return 0;
     },
-    async generate(req) {
+    async generate(req, signal, onImage) {
       const colors = paletteOf(req);
-      const images = [];
-      for (let i = 0; i < Math.max(1, req.count); i++) {
-        images.push(saveImage(await render(colors, req.prompt, req.width, req.height, i + req.prompt.length)));
-      }
-      return { images, costUsd: 0 };
+      const count = Math.max(1, req.count);
+      const slots = Array.from({ length: count }, (_, i) => i);
+      if (opts.order === "reverse") slots.reverse();
+      const landed = /* @__PURE__ */ new Map();
+      const failures = [];
+      for (const [position, slot] of slots.entries()) {
+        if (position > 0 && opts.staggerMs) await sleep2(opts.staggerMs, signal);
+        if (signal?.aborted) {
+          if (signal.reason === BUDGET_EXHAUSTED) break;
+          throw Object.assign(new Error("generation cancelled"), { name: "AbortError" });
+        }
+        if (slot === opts.failSlot) {
+          failures.push(`demo: slot ${slot + 1} refused`);
+          continue;
+        }
+        const hash = saveImage(await render(colors, req.prompt, req.width, req.height, slot + req.prompt.length));
+        landed.set(slot, hash);
+        onImage?.(slot, hash);
+      }
+      const done = [...landed.keys()].sort((a, b) => a - b);
+      const images = done.map((slot) => landed.get(slot));
+      if (done.length === count) return { images, costUsd: 0 };
+      return { images, costUsd: 0, raw: { requested: count, variantIndexes: done, partialFailures: failures } };
     },
     async edit(req) {
       const colors = paletteOf(req);
@@ -3398,6 +3452,15 @@ function defaultDemoProductsDir() {
 }
 
 // src/attachmentBudget.ts
+var SEAT_TIER = {
+  brand: 0,
+  reference: 0,
+  product: 0,
+  character: 0,
+  scene: 0,
+  composition: 1,
+  style: 2
+};
 var ROLE_PRIORITY = {
   product: 0,
   character: 1,
@@ -3420,11 +3483,8 @@ function allocateAttachments(attachments, cap2) {
     kept.add(x.i);
     keptGroups.add(groupOf(x.a));
   };
-  for (const x of legacyOrder) {
-    if (kept.size >= max) break;
-    if (x.a.essential) admit(x);
-  }
-  for (const x of legacyOrder) {
+  const seatOrder = [...indexed].sort((x, y) => SEAT_TIER[x.a.role] - SEAT_TIER[y.a.role] || x.i - y.i);
+  for (const x of seatOrder) {
     if (kept.size >= max) break;
     if (!kept.has(x.i) && !keptGroups.has(groupOf(x.a))) admit(x);
   }
@@ -3449,7 +3509,13 @@ function allocateAttachments(attachments, cap2) {
   }
   return {
     kept: legacyOrder.filter((x) => kept.has(x.i)).map((x) => x.a),
-    dropped: legacyOrder.filter((x) => !kept.has(x.i)).map((x) => x.a)
+    dropped: legacyOrder.filter((x) => !kept.has(x.i)).map((x) => x.a),
+    // The same images in the order the brief placed them, for a caller that
+    // will allocate again: `kept` is re-sorted by role for the consumers
+    // below, and feeding that back into a second, tighter allocation put
+    // every product ahead of every face on a refinement whatever the line
+    // said.
+    seated: seatOrder.filter((x) => kept.has(x.i)).map((x) => x.a)
   };
 }
 function mergeEditAttachments(own, inherited, cap2) {
@@ -3614,12 +3680,19 @@ function shotSpecifiesCamera(text) {
     text
   );
 }
+function namesAreNotLetteringDirective() {
+  return "The names in this brief identify what to show and are never text to render: no caption, label, signage, engraving or lettering spells a product name or a person's name, in any language or script, anywhere in the picture. Printing that is part of a product's own packaging stays exactly as photographed, and nothing else spells a name unless the direction above explicitly asks for it to be written.";
+}
 function sceneFigureDirectives(opts) {
   const figure = opts.figure.trim().replace(/[.\s]+$/, "");
   if (!figure) return [];
   const treatment = (opts.treatment ?? "").trim().replace(/[.\s]+$/, "");
   const out = [];
-  if (opts.hasPerson) {
+  if (opts.hasPerson && (opts.people ?? 1) > 1) {
+    out.push(
+      `This world is built around one figure: ${figure}. The attached presenters share that role: the first named presenter takes the figure position and the others stand with them in the same frame, every one of them clearly visible. Any person the scene direction describes IS one of the attached presenters and never an extra person, and each identity comes from their own attached photograph alone, never from anything the scene direction says about a body.`
+    );
+  } else if (opts.hasPerson) {
     out.push(
       `This world is built around one figure: ${figure}. The attached presenter is that figure. Any person the scene direction describes IS the presenter and never a second person, and their identity comes from their own attached photograph alone, never from anything the scene direction says about a body.`
     );
@@ -3740,6 +3813,8 @@ function validateBrief(brief) {
       case "ref":
       case "mark":
         if (!str4(t.imageHash)) errors.push(`${at}.imageHash must be a non-empty string`);
+        if (t.t === "ref" && t.label !== void 0 && typeof t.label !== "string")
+          errors.push(`${at}.label must be a string when present`);
         break;
       case "format":
         if (!Number.isFinite(t.w) || !Number.isFinite(t.h) || Number(t.w) <= 0 || Number(t.h) <= 0)
@@ -3766,6 +3841,7 @@ function compileBrief(brief, ctx) {
   const characters = ctx.brand?.characters ?? [];
   const inlineTemplates = [];
   let hasPerson = false;
+  let people = 0;
   let sentence = "";
   const append = (s) => {
     sentence += (sentence && !sentence.endsWith(" ") ? " " : "") + s;
@@ -3825,6 +3901,7 @@ function compileBrief(brief, ctx) {
           break;
         }
         hasPerson = true;
+        people += 1;
         append(c.promptName ?? c.name);
         const cshots = (c.shots ?? []).slice(0, CHARACTER_REF_MAX).map((s) => ({ h: assetHash2(s?.file), angle: s?.angle ? String(s.angle) : void 0 })).filter((x) => !!x.h && ctx.images.has(x.h));
         if (cshots.length) {
@@ -3869,8 +3946,10 @@ function compileBrief(brief, ctx) {
       }
       case "color": {
         const hex = tok.hex.toUpperCase();
-        append(tok.name ? `${tok.name} (${hex})` : hex);
-        otherDirectives.push(`Use ${hex} as a defining color in the composition.`);
+        append(tok.name ? `(brand color ${tok.name} ${hex})` : `(brand color ${hex})`);
+        otherDirectives.push(
+          `Use ${hex} as a defining color in the composition, in surfaces, materials and light, never as lettering.`
+        );
         break;
       }
       case "ref": {
@@ -4007,7 +4086,7 @@ function compileBrief(brief, ctx) {
     }
   }
   const max = ctx.engineCaps.maxReferenceImages;
-  const { kept, dropped: budgetDropped } = allocateAttachments(attachments, max);
+  const { kept, dropped: budgetDropped, seated } = allocateAttachments(attachments, max);
   const presentKeys = new Set((ctx.presentAttachments ?? kept).map((a) => `${a.role}:${a.hash}`));
   const resolveDirective = (d) => {
     if (typeof d === "string") return d;
@@ -4019,6 +4098,24 @@ function compileBrief(brief, ctx) {
     }
     return presentKeys.has(`${d.role}:${d.hash}`) ? d.text : null;
   };
+  const absentDirectives = [];
+  const absentSeen = /* @__PURE__ */ new Set();
+  for (const a of attachments) {
+    const key = `${a.role}:${a.hash}`;
+    if (presentKeys.has(key) || absentSeen.has(key)) continue;
+    if (a.role === "reference") {
+      absentSeen.add(key);
+      const words = ctx.wordsFor?.(a.hash) ?? null;
+      absentDirectives.push(
+        words ? `A reference shot was not attached this time; it showed ${words}. Match that composition, lighting and treatment.` : "A reference image was attached but not sent this time."
+      );
+    } else if (a.role === "brand") {
+      absentSeen.add(key);
+      absentDirectives.push(
+        `The brand mark "${a.label}" was not attached this time; keep every branded surface plain and do not invent a logo.`
+      );
+    }
+  }
   const guard = scene ? sceneGuardDirectives({
     hasProduct: !!productId,
     hasPerson,
@@ -4035,10 +4132,12 @@ function compileBrief(brief, ctx) {
     "Any earlier instruction that bans props, hands, people, or a presenter from the frame is a solo-packshot rule for this product and does not apply to this shot: the attached presenter is deliberate and must appear as directed.",
     productHandlingDirective()
   ] : [];
+  const nameDirectives = productId || hasPerson ? [namesAreNotLetteringDirective()] : [];
   const figureDirectives = scene?.figure ? sceneFigureDirectives({
     figure: scene.figure,
     treatment: scene.figureTreatment,
     hasPerson,
+    people,
     // The treatment's fictional-brands rule needs to know a real mark is
     // deliberately in play - and only one that actually rides counts,
     // same honesty rule as the photo guard above.
@@ -4067,12 +4166,16 @@ function compileBrief(brief, ctx) {
   }) ? [garmentDisplayDirective()] : [];
   const refGuard = ctx.mode !== "edit" && hasPerson && kept.some((a) => a.role === "reference") ? [referenceIdentityGuard()] : [];
   const allDirectives = [
+    // First, beside the sentence that names things: the model reads the names
+    // and this line in one breath, before any spec repeats them.
+    ...nameDirectives,
     ...productDirectives,
     ...personDirectives,
     ...pairDirectives,
     ...figureDirectives,
     ...closeUpDirectives,
     ...otherDirectives,
+    ...absentDirectives,
     ...cameraDirectives,
     ...apparelUnworn,
     ...brandLines,
@@ -4082,15 +4185,14 @@ function compileBrief(brief, ctx) {
   ];
   const spoken = dedupe(allDirectives.map(resolveDirective).filter((s) => s !== null));
   if (spoken.length) prompt = `${prompt}${prompt.endsWith(".") ? "" : "."} ${spoken.join(" ")}`;
-  if (budgetDropped.some((d) => d.role !== "scene")) {
+  if (max === 0 && budgetDropped.some((d) => d.role !== "scene")) {
     const keptLabels = new Set(kept.map((a) => a.label));
     const names = [...new Set(budgetDropped.filter((d) => d.role !== "scene").map((d) => d.label))].filter(
       (l) => !keptLabels.has(l)
     );
     if (names.length) {
-      const reads = max === 0 ? "reads no reference images" : `reads ${max} reference image${max === 1 ? "" : "s"}`;
       warnings.push(
-        `${names.join(" and ")} ${names.length === 1 ? "was" : "were"} left out \u2014 ${ctx.engineCaps.displayName} ${reads}.`
+        `${names.join(" and ")} ${names.length === 1 ? "was" : "were"} left out \u2014 ${ctx.engineCaps.displayName} reads no reference images.`
       );
     }
   }
@@ -4103,11 +4205,37 @@ function compileBrief(brief, ctx) {
     width,
     height,
     attachments: kept,
+    seated,
     warnings,
     productId
   };
 }
 var dedupe = (xs) => [...new Set(xs)];
+
+// src/shotWords.ts
+function shotWords(prompt, max = 160) {
+  if (!prompt) return null;
+  const head = prompt.split(/\. (?=[A-Z])/)[0]?.trim() ?? "";
+  if (!head) return null;
+  const clipped = head.length > max ? `${head.slice(0, max).replace(/\s+\S*$/, "")}\u2026` : head;
+  return clipped.replace(/[.\s]+$/, "");
+}
+function shotWordsFor(core, brandId) {
+  let byHash = null;
+  return (hash) => {
+    if (!byHash) {
+      byHash = /* @__PURE__ */ new Map();
+      for (const p of core.store.listProjects(brandId)) {
+        for (const n of core.store.treeFor(p.id)) {
+          const words = shotWords(n.prompt);
+          if (!words) continue;
+          for (const h of n.images ?? []) if (!byHash.has(h)) byHash.set(h, words);
+        }
+      }
+    }
+    return byHash.get(hash) ?? null;
+  };
+}
 var DEFAULT_CONTENT_URL = "https://github.com/tonygorb/scenri/releases/download/content-latest/scenri-content.zip";
 var TIMEOUT_MS = 10 * 60 * 1e3;
 function resolveContentUrl(env = process.env, override) {
@@ -5034,7 +5162,7 @@ function dedupeProducts(products) {
 
 // ../catalog/src/http/fetch.ts
 var USER_AGENT = "scenri-catalog/0.1 (+https://scenri.co)";
-function sleep2(ms) {
+function sleep3(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
 async function httpGet(url, opts = {}) {
@@ -5058,7 +5186,7 @@ async function httpGet(url, opts = {}) {
         }
       });
       if ((res.status === 429 || res.status >= 500) && attempt < retries) {
-        await sleep2(400 * 2 ** attempt);
+        await sleep3(400 * 2 ** attempt);
         continue;
       }
       return res;
@@ -5066,7 +5194,7 @@ async function httpGet(url, opts = {}) {
       lastErr = err;
       if (opts.signal?.aborted) throw err;
       if (attempt < retries) {
-        await sleep2(400 * 2 ** attempt);
+        await sleep3(400 * 2 ** attempt);
         continue;
       }
       throw err;
@@ -8036,11 +8164,6 @@ function registerLogoRoutes(app, deps) {
     if (!v.valid) return reply.status(400).send({ error: "brand became invalid", details: v.errors });
     return core.store.updateBrand(brand.id, json);
   });
-  app.get("/api/brands/:id/directives", async (req, reply) => {
-    const brand = core.store.getBrand(req.params.id);
-    if (!brand) return reply.status(404).send({ error: "brand not found" });
-    return { directives: brandRuleDirectives(brand.json) };
-  });
   app.delete("/api/brands/:id/logos/:hash", async (req, reply) => {
     const brand = core.store.getBrand(req.params.id);
     if (!brand) return reply.status(404).send({ error: "brand not found" });
@@ -8966,6 +9089,29 @@ function registerImageRoutes(app, deps) {
 
 // src/release/notes.data.ts
 var RELEASES = [
+  {
+    version: "0.8.0",
+    date: "2026-09-02",
+    title: "The composer, rebuilt around what a shot is made of.",
+    sections: [
+      {
+        heading: "Create",
+        body: "Ingredients are compact chips now, each carrying the picture it stands for, and hovering one shows you what it is holding. A shot can hold twelve of them: the ones your engine can photograph are lit, and the rest ride along in words rather than being dropped, with every chip saying which it is. Photos go out in the order you wrote them, so the first thing you named is the first thing pictured. The asset panel beside the brief is a second door into it, so a tile ticks when its chip is in and clicking it again takes the chip out."
+      },
+      {
+        heading: "Refine",
+        body: "The panel beside an open shot has been redrawn, and its edge can be dragged to the width you want. Above the brief it shows what the picture is actually made of, resolved through the whole chain of refinements rather than just the last one, so nothing is repeated and nothing is lost at depth."
+      },
+      {
+        heading: "Brand",
+        body: "A product name is something to show in a shot, never lettering to paint into it, and a brand colour is now spoken as a note rather than an instruction, which keeps invented signage out of your pictures. Brand rules apply to every shot from Settings, so the composer no longer carries a row to say so."
+      },
+      {
+        heading: "Fixes",
+        body: "A finished shot appears the moment it lands instead of waiting for the rest of its batch, and a batch sent from a set files every shot in it. Typing around a chip behaves: the chip owns the space beside it, one press removes it, and two chips always keep the single space between them. Two presenters in a scene no longer compose one of them out."
+      }
+    ]
+  },
   {
     version: "0.7.5",
     date: "2026-09-01",
@@ -10128,6 +10274,7 @@ function buildServer(opts) {
     const compileCtx = {
       brand: brandJson,
       images: core.images,
+      wordsFor: shotWordsFor(core, brandId),
       engineCaps: uncapped,
       template: brief.templateId ? sceneById(String(brief.templateId)) : void 0,
       templateById: sceneById,
@@ -10164,25 +10311,19 @@ function buildServer(opts) {
       }).map((a) => ({ ...a, inherited: true }));
     }
     const cap2 = Math.max(0, engineCaps.maxReferenceImages - 1);
-    const merged = mergeEditAttachments(compiled2.attachments, inheritedAttachments, cap2);
+    const merged = mergeEditAttachments(compiled2.seated, inheritedAttachments, cap2);
     const prompt = compileBrief(brief, { ...compileCtx, presentAttachments: merged.kept }).prompt;
     const warnings = [...compiled2.warnings, ...identityWarnings.filter((w) => !compiled2.warnings.includes(w))];
     if (inherited.truncated)
       warnings.push("This thread is deeper than 64 steps, so identity attached before that could not be carried.");
-    if (merged.dropped.length) {
-      if (engineCaps.maxReferenceImages <= 1) {
-        warnings.push(`The identity rides on the shot itself \u2014 ${engineCaps.displayName} reads no other images.`);
-      } else {
-        const keptLabels = new Set(merged.kept.map((a) => a.label));
-        const names = [...new Set(merged.dropped.map((d) => d.label))].filter((l) => !keptLabels.has(l));
-        if (names.length)
-          warnings.push(`${names.join(" and ")} ${names.length === 1 ? "was" : "were"} left out of this refinement.`);
-      }
-    }
+    if (merged.dropped.length && engineCaps.maxReferenceImages <= 1)
+      warnings.push(`The identity rides on the shot itself \u2014 ${engineCaps.displayName} reads no other images.`);
     return {
       compiled: { ...compiled2, prompt },
       inheritedTokens,
       merged,
+      /** The seats this refinement had: the engine's, less the source frame. */
+      cap: cap2,
       warnings,
       editScope: verdict.scope,
       editRemoval: verdict.removal ?? false
@@ -10211,7 +10352,11 @@ function buildServer(opts) {
         // missing-photo identities; the budget losses live on the merge.
         dropped: [...edit.compiled.dropped, ...edit.merged.dropped],
         warnings: edit.warnings,
-        referenceCount: edit.merged.kept.length
+        referenceCount: edit.merged.kept.length,
+        // How many photo groups this refine can carry in total: the engine's
+        // slots less the one the source frame holds. The composer refuses a
+        // pick past it rather than warning after the fact.
+        cap: edit.cap
       };
     }
     const brandJson = await brandJsonWithIdentityCrops(
@@ -10235,12 +10380,13 @@ function buildServer(opts) {
     const compiled2 = compileBrief(brief, {
       brand: brandJson,
       images: core.images,
+      wordsFor: shotWordsFor(core, brand.id),
       engineCaps: engine.capabilities(),
       template: brief.templateId ? sceneById(String(brief.templateId)) : void 0,
       templateById: sceneById
     });
     const { referenceImages, ...rest } = compiled2;
-    return { ...rest, referenceCount: referenceImages.length };
+    return { ...rest, referenceCount: referenceImages.length, cap: engine.capabilities().maxReferenceImages };
   });
   registerProjectRoutes(app, { core });
   registerCodexSetupRoutes(app, { codexSetup: opts.codexSetup, codexRunner: engines.codexRunner });
@@ -10377,58 +10523,68 @@ function buildServer(opts) {
     }, bound);
     const startedAt = Date.now();
     const settled = /* @__PURE__ */ new Set();
+    const settleSlot = async (slot, hash) => {
+      const id = nodeIds[slot];
+      try {
+        let own = await normalizePngs([hash]);
+        const post = postFor?.(id);
+        if (post) own = await post(own);
+        if (expect) await assertAspect(own, expect);
+        try {
+          const meta2 = await sharp20(core.images.read(own[0])).metadata();
+          const node = core.store.getNode(id);
+          if (node && meta2.width && meta2.height) {
+            const brief = node.brief ?? {};
+            const asked = expect ? { requestedSize: [expect.width, expect.height] } : {};
+            core.store.setBrief(id, { ...brief, rendered: { sizes: [[meta2.width, meta2.height]], ...asked } });
+            if (node.kind === "generation" && engineId === "codex-cli" && expect && expect.width !== expect.height && meta2.width === expect.width && meta2.height === expect.height)
+              app.log.warn(
+                { nodeId: id },
+                "codex delivered exactly the requested pixels; its image tool cannot pin size - suggests a forbidden shell resize"
+              );
+          }
+        } catch {
+        }
+        core.store.completeNode(id, { images: own, costUsd: 0, durationMs: Date.now() - startedAt });
+      } catch (err) {
+        core.store.failNode(id, String(err?.message ?? err));
+      } finally {
+        settled.add(id);
+      }
+    };
+    const landing = /* @__PURE__ */ new Map();
+    let accepting = true;
+    const onImage = (slot, hash) => {
+      if (!accepting || !Number.isInteger(slot) || slot < 0 || slot >= nodeIds.length || landing.has(slot)) return;
+      landing.set(slot, settleSlot(slot, hash));
+    };
     try {
-      const result = await work(ctrl.signal);
+      const result = await work(ctrl.signal, onImage);
+      accepting = false;
       clearTimeout(watchdog);
-      const images = await normalizePngs(result.images);
+      await Promise.allSettled(landing.values());
       const raw = result.raw;
       const bySlot = new Array(nodeIds.length);
-      images.forEach((h, k) => {
+      result.images.forEach((h, k) => {
         const slot = raw?.variantIndexes?.[k] ?? k;
         if (slot < nodeIds.length && bySlot[slot] === void 0) bySlot[slot] = h;
       });
-      const wall = Date.now() - startedAt;
       const failures = [...raw?.partialFailures ?? []];
       for (let slot = 0; slot < nodeIds.length; slot++) {
-        const id = nodeIds[slot];
+        if (landing.has(slot)) continue;
         const hash = bySlot[slot];
         if (hash === void 0) {
-          core.store.failNode(id, failures.shift() ?? "the engine returned no image for this shot");
-          settled.add(id);
+          core.store.failNode(nodeIds[slot], failures.shift() ?? "the engine returned no image for this shot");
+          settled.add(nodeIds[slot]);
           continue;
         }
-        try {
-          let own = [hash];
-          const post = postFor?.(id);
-          if (post) own = await post(own);
-          if (expect) await assertAspect(own, expect);
-          try {
-            const meta2 = await sharp20(core.images.read(own[0])).metadata();
-            const node = core.store.getNode(id);
-            if (node && meta2.width && meta2.height) {
-              const brief = node.brief ?? {};
-              const asked = expect ? { requestedSize: [expect.width, expect.height] } : {};
-              core.store.setBrief(id, { ...brief, rendered: { sizes: [[meta2.width, meta2.height]], ...asked } });
-              if (node.kind === "generation" && engineId === "codex-cli" && expect && expect.width !== expect.height && meta2.width === expect.width && meta2.height === expect.height)
-                app.log.warn(
-                  { nodeId: id },
-                  "codex delivered exactly the requested pixels; its image tool cannot pin size - suggests a forbidden shell resize"
-                );
-            }
-          } catch {
-          }
-          core.store.completeNode(id, {
-            images: own,
-            costUsd: slot === 0 ? result.costUsd : 0,
-            durationMs: wall
-          });
-        } catch (err) {
-          core.store.failNode(id, String(err?.message ?? err));
-        }
-        settled.add(id);
+        await settleSlot(slot, hash);
       }
+      core.store.chargeNode(nodeIds[0], result.costUsd);
       core.ledger.recordCost(engineId, nodeIds[0], result.costUsd);
     } catch (err) {
+      accepting = false;
+      await Promise.allSettled(landing.values());
       for (const id of nodeIds) {
         if (settled.has(id)) continue;
         if (watchdogFired) core.store.failNode(id, `generation timed out after ${Math.round(bound / 6e4)} minutes`);
@@ -10580,6 +10736,7 @@ function buildServer(opts) {
         compiled2 = compileBrief(brief, {
           brand: brandJson,
           images: core.images,
+          wordsFor: shotWordsFor(core, project.brandId),
           engineCaps: engine.capabilities(),
           template: brief.templateId ? sceneById(String(brief.templateId)) : void 0,
           templateById: sceneById
@@ -10617,6 +10774,7 @@ function buildServer(opts) {
       compiled2 = compileBrief(legacyBrief, {
         brand: brandJson,
         images: core.images,
+        wordsFor: shotWordsFor(core, project.brandId),
         engineCaps: engine.capabilities(),
         templateById: sceneFor(brandJson)
       });
@@ -10641,7 +10799,8 @@ function buildServer(opts) {
     if (kind === "generation") {
       const cap2 = engine.capabilities().maxReferenceImages;
       const wantedCount = Math.min(Math.max(1, Number(count)), 8);
-      const lostIdentity = engine.capabilities().placeholder ? [] : (compiled2?.dropped ?? []).filter((d) => d.essential);
+      const blind = engine.capabilities().maxReferenceImages === 0;
+      const lostIdentity = engine.capabilities().placeholder ? [] : (compiled2?.dropped ?? []).filter((d) => d.essential && (d.reason === "missing" || blind));
       if (lostIdentity.length) {
         const missing = lostIdentity.filter((d) => d.reason === "missing");
         if (missing.length) {
@@ -10692,7 +10851,7 @@ function buildServer(opts) {
         ...variations.length ? { variations } : {}
       };
       estimate = await engine.costEstimate(genReq);
-      work = (signal) => engine.generate(genReq, signal);
+      work = (signal, onImage) => engine.generate(genReq, signal, onImage);
       expectShape = { width, height };
     } else {
       const parent = core.store.getNode(resolvedParentId);
@@ -10794,8 +10953,9 @@ function buildServer(opts) {
         expectShape = { width: expandPlan.width, height: expandPlan.height };
       }
       const editPixelBudget = runEngine.capabilities().editPixelBudget;
-      if (!expandPlan && editPixelBudget && srcMeta.width && srcMeta.height && srcMeta.width * srcMeta.height > editPixelBudget) {
-        sentSize = budgetSize(srcMeta.width, srcMeta.height, editPixelBudget);
+      const stepped = !expandPlan && editPixelBudget && srcMeta.width && srcMeta.height && srcMeta.width * srcMeta.height > editPixelBudget ? budgetSize(srcMeta.width, srcMeta.height, editPixelBudget) : null;
+      if (editPixelBudget && stepped && (stepped.width !== srcMeta.width || stepped.height !== srcMeta.height)) {
+        sentSize = stepped;
         budgetSourceHash = core.images.save(
           await sharp20(srcBuf).resize(sentSize.width, sentSize.height, { fit: "fill", kernel: "lanczos3" }).png().toBuffer()
         );
@@ -10930,7 +11090,7 @@ function buildServer(opts) {
           }
         } : {},
         // What the refinement carried, recorded apart from what it asked for:
-        // the detail view shows both, and remix reads tokens alone.
+        // the detail view shows both, and reuse setup merges both (mergeCarried).
         ...kind === "edit" && inheritedTokens.length ? { inherited: inheritedTokens } : {}
       });
     const plan = expandPlan;
@@ -11213,7 +11373,7 @@ async function serve() {
 }
 async function run() {
   const core = createCore();
-  const stubs = process.env.SCENRI_DEMO_ENGINE === "1" ? [createDemoEngine((b) => core.images.save(b))] : [];
+  const stubs = process.env.SCENRI_DEMO_ENGINE === "1" ? [createDemoEngine((b) => core.images.save(b), demoOptionsFromEnv(process.env))] : [];
   const engines = createEngineRegistry(core, stubs);
   const here = dirname(fileURLToPath(import.meta.url));
   const candidates = [join(here, "..", "..", "..", "apps", "studio", "dist"), join(here, "..", "studio-dist")];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scenri",
-  "version": "0.7.5",
+  "version": "0.8.0",
   "author": "Tony Gorb <hello@scenri.co>",
   "license": "AGPL-3.0-only",
   "type": "module",
@@ -28,7 +28,7 @@
     "open": "^10.1.0",
     "pixelmatch": "^7.1.0",
     "pngjs": "^7.0.0",
-    "sharp": "^0.35.3"
+    "sharp": "^0.35.4"
   },
   "devDependencies": {
     "@scenri/brand": "workspace:*",