scenri 0.6.12 → 0.7.0

package/dist/serve.js

@@ -10,7 +10,7 @@ import fs, { realpathSync, existsSync, readFileSync, mkdirSync, chmodSync, write
 import { fileURLToPath } from 'url';
 import { readFile, copyFile, stat, mkdtemp, rm, readdir, writeFile } from 'fs/promises';
 import { spawn } from 'child_process';
-import sharp7 from 'sharp';
+import sharp20 from 'sharp';
 import Fastify from 'fastify';
 import fastifyStatic from '@fastify/static';
 import fastifyMultipart from '@fastify/multipart';
@@ -1285,7 +1285,7 @@ function createCatalogStore(db) {
 var REFERENCE_ROLE_DIRECTIVE = {
   product: "the exact product \u2014 preserve its label, shape, colors and design faithfully; do not redesign it",
   character: "the exact person \u2014 match their face, facial structure, skin, hair and build exactly; their clothing, pose and background are capture context, not styling to reproduce",
-  brand: "the brand's own mark \u2014 if the direction calls for the mark to appear, reproduce it exactly as drawn, same colours, letterforms and proportions; otherwise take only its colour and treatment, and never its subject, geometry or composition",
+  brand: "the brand's own mark \u2014 if the direction calls for the mark to appear, reproduce it exactly as drawn, same colours, letterforms and proportions, every character down to the smallest secondary lettering, in its original script and reading direction, never translated, transliterated or re-spelled; otherwise take only its colour and treatment, and never its subject, geometry or composition",
   // Only a figure-led scene attaches one of these now, so this says what that
   // case actually needs. It used to read "environment and light only - take no
   // subject or person from it", which handed the model a photograph of a face
@@ -1295,7 +1295,13 @@ var REFERENCE_ROLE_DIRECTIVE = {
   // names staged objects as stand-ins rather than just "no product": a bare
   // prohibition still left the demo object in the frame, because the model had
   // nowhere to put what the photograph so vividly showed.
-  scene: "a reference for this world and for the treatment applied to the figure in it \u2014 match the environment, the light, and the material, density, scale, finish and spread of that treatment, including which parts of the form it covers and how far it reaches; take no identity from the person in it, and treat any product, garment or prop staged in it as a stand-in whose place the attached subject takes \u2014 never an object to reproduce",
+  //
+  // The carve-out leads. It used to sit forty words in, one subordinate
+  // clause after a paragraph of "match this" - and the tester case (a close
+  // portrait as the scene image beside a selected presenter) showed which
+  // half the model heard. Every treatment clause is retained word for word;
+  // only the order and the register of the identity refusal changed.
+  scene: "a reference for this world, never for a person: take no identity from the person in it \u2014 not their face, not their likeness \u2014 they are an anonymous stand-in whose place the attached subject takes. Match the environment, the light, and the material, density, scale, finish and spread of the treatment applied to the figure, including which parts of the form it covers and how far it reaches; treat any product, garment or prop staged in it as the same kind of stand-in, demonstrating placement and scale \u2014 never an object to reproduce",
   composition: "a reference for framing, camera angle and pose only \u2014 take no subject, color, material or branding from it",
   style: "a reference for overall treatment and mood only \u2014 take no composition, subject or product detail from it",
   reference: "a reference to match in composition, lighting and treatment"
@@ -1303,8 +1309,8 @@ var REFERENCE_ROLE_DIRECTIVE = {
 var EDIT_REFERENCE_ROLE_DIRECTIVE = {
   product: "the exact product: keep or restore its label, shape and design faithfully",
   character: "the exact person: keep their face, facial structure, skin, hair and build faithfully; take no clothing, pose or background from this reference, and keep the source image's existing outfit unless the instruction changes it",
-  brand: "the brand's own mark: reproduce it exactly as drawn wherever it appears, never redrawn or re-lettered",
-  scene: "a reference for environment and light only",
+  brand: "the brand's own mark: reproduce it exactly as drawn wherever it appears \u2014 every character down to the smallest secondary lettering, in its original script and reading direction \u2014 never redrawn, re-lettered, translated or transliterated",
+  scene: "a reference for environment, light and treatment only \u2014 take no identity from any person in it",
   composition: "a reference for framing and pose only",
   style: "a reference for treatment and mood only",
   reference: "a reference for composition, lighting and treatment only"
@@ -1332,6 +1338,14 @@ function ratioLabel(width, height) {
   const d = gcd(width, height) || 1;
   return `${Math.round(width / d)}:${Math.round(height / d)}`;
 }
+function budgetSize(width, height, pixelBudget) {
+  const ratio = width / height;
+  if (!(ratio > 0) || !Number.isFinite(ratio) || !(pixelBudget > 0)) return { width, height };
+  return {
+    width: Math.round(Math.sqrt(pixelBudget * ratio)),
+    height: Math.round(Math.sqrt(pixelBudget / ratio))
+  };
+}
 
 // ../core/src/index.ts
 function defaultHome() {
@@ -1458,12 +1472,14 @@ function createOpenRouterEngine(opts) {
         const role = roles[i] ?? "reference";
         return refs.length > 1 ? `Attached image ${i + 1} is ${roleDirective[role]}.` : `The attached image is ${roleDirective[role]}.`;
       }).join(" ");
+      const identityCoda = roles.includes("character") && roles.some((r) => r === "scene" || r === "reference") ? "Identity check: the person in this image comes only from the character reference image(s); the scene and reference images lend world, composition, lighting and treatment \u2014 take no face or likeness from them." : null;
       const content = [
         { type: "text", text: refDirectives ? `${req.prompt} ${refDirectives}` : req.prompt },
         ...refs.map((p) => ({
           type: "image_url",
           image_url: { url: dataUrl(p) }
-        }))
+        })),
+        ...identityCoda ? [{ type: "text", text: identityCoda }] : []
       ];
       const body = {
         model: opts.model ?? DEFAULT_MODEL,
@@ -2519,12 +2535,7 @@ function orientationOf(width, height) {
 }
 var CODEX_PIXEL_BUDGET = 1572864;
 function codexNativeSize(width, height) {
-  const ratio = width / height;
-  if (!(ratio > 0) || !Number.isFinite(ratio)) return { width, height };
-  return {
-    width: Math.round(Math.sqrt(CODEX_PIXEL_BUDGET * ratio)),
-    height: Math.round(Math.sqrt(CODEX_PIXEL_BUDGET / ratio))
-  };
+  return budgetSize(width, height, CODEX_PIXEL_BUDGET);
 }
 function refFileNames(roles, count) {
   const perRole = /* @__PURE__ */ new Map();
@@ -2597,6 +2608,10 @@ function createCodexEngine(opts) {
         // OSS-local only: the user's own session, on the user's own machine
         supportsEdit: true,
         supportsMask: false,
+        // The image tool draws at this fixed pixel count (measured, the
+        // native-size probe): an edit of a larger source steps down honestly
+        // instead of being upscaled back into pixels the tool never drew.
+        editPixelBudget: CODEX_PIXEL_BUDGET,
         /*
          * Five, and it is a hard constraint of the image tool, not a product
          * choice.
@@ -2831,7 +2846,7 @@ function createDemoEngine(saveImage) {
       <text x="24" y="${h - 48}" font-family="Helvetica, Arial" font-size="${Math.max(14, Math.round(w / 42))}" fill="#ffffff" opacity="0.92">${esc(label)}</text>
       <text x="24" y="${h - 22}" font-family="Helvetica, Arial" font-size="12" fill="#ffffff" opacity="0.6">Scenri demo engine</text>
     </svg>`;
-    return sharp7(Buffer.from(svg)).png().toBuffer();
+    return sharp20(Buffer.from(svg)).png().toBuffer();
   }
   return {
     capabilities() {
@@ -3005,7 +3020,7 @@ async function resolvePresenterImages(core, templatesRoot, presenter) {
   for (const [slot, angle] of PRESENTER_ANGLES) {
     const path = presenterRefPath(templatesRoot, presenter.id, slot);
     if (!existsSync(path)) continue;
-    const png = await sharp7(readFileSync(path)).png().toBuffer();
+    const png = await sharp20(readFileSync(path)).png().toBuffer();
     const hash = core.images.save(png);
     shots.push({ file: `asset:${hash}`, angle, locked: true });
   }
@@ -3100,7 +3115,7 @@ async function resolveDemoProductImages(core, templatesRoot, product) {
   for (const angle of angles) {
     const path = demoProductRefPath(templatesRoot, product.id, angle);
     if (!existsSync(path)) continue;
-    const png = await sharp7(readFileSync(path)).png().toBuffer();
+    const png = await sharp20(readFileSync(path)).png().toBuffer();
     const hash = core.images.save(png);
     shots.push({ file: `asset:${hash}`, angle, locked: true });
   }
@@ -3216,23 +3231,111 @@ function mergeEditAttachments(own, inherited, cap2) {
   const borrowed = inherited.filter((a) => !seen.has(a.hash)).map((a) => ({ ...a, inherited: true }));
   return allocateAttachments([...own, ...borrowed], cap2);
 }
+function joinNames(labels) {
+  const uniq = [...new Set(labels)];
+  if (uniq.length <= 1) return uniq[0] ?? "";
+  return `${uniq.slice(0, -1).join(", ")} and ${uniq[uniq.length - 1]}`;
+}
+function brandContext(core, brandId) {
+  const brand = core.store.getBrand(brandId);
+  if (!brand) throw new Error("brand not found");
+  const assetPaths = {};
+  const json = brand.json;
+  for (const logo of json.logos ?? []) {
+    const ref = String(logo.file ?? "");
+    if (ref.startsWith("asset:") && core.images.has(ref.slice(6))) assetPaths[ref] = core.images.pathFor(ref.slice(6));
+  }
+  return { brand: brand.json, assetPaths };
+}
+var PNG_SIG = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);
+var assetHash = (ref) => {
+  const s = String(ref ?? "");
+  return s.startsWith("asset:") ? s.slice(6) : null;
+};
+var LOGO_ROLES = ["primary", "mark", "wordmark", "monochrome", "alternate"];
+var LOGO_BACKGROUNDS = ["light", "dark", "any"];
+var toPng = (buf) => sharp20(buf).rotate().png().toBuffer();
+var COST_PROBE = {
+  prompt: "",
+  brand: { brand: {}, assetPaths: {} },
+  width: 1024,
+  height: 1024,
+  count: 1
+};
+var MARK_MAX_EDGE = 2048;
+var MARK_MIN_EDGE = 1024;
+var MARK_TINY_EDGE = 256;
+var MARK_WARN_EDGE = 512;
+var toMarkPng = async (buf) => {
+  const out = await sharp20(buf, { density: 384 }).rotate().resize({ width: MARK_MAX_EDGE, height: MARK_MAX_EDGE, fit: "inside", withoutEnlargement: true }).png().toBuffer();
+  const meta = await sharp20(out).metadata();
+  const edge = Math.max(meta.width ?? 0, meta.height ?? 0);
+  if (edge >= MARK_TINY_EDGE && edge < MARK_MIN_EDGE) {
+    return sharp20(out).resize({ width: MARK_MIN_EDGE, height: MARK_MIN_EDGE, fit: "inside", kernel: "lanczos3" }).png().toBuffer();
+  }
+  return out;
+};
+var cappedRefs = /* @__PURE__ */ new Map();
+async function capReferenceEdge(core, path, maxEdge) {
+  const key = `${path}#${maxEdge}`;
+  const hit = cappedRefs.get(key);
+  if (hit) return hit;
+  let out = path;
+  try {
+    const meta = await sharp20(path).metadata();
+    if ((meta.width ?? 0) > maxEdge || (meta.height ?? 0) > maxEdge) {
+      const buf = await sharp20(path).resize({ width: maxEdge, height: maxEdge, fit: "inside", withoutEnlargement: true }).png().toBuffer();
+      out = core.images.pathFor(core.images.save(buf));
+    }
+  } catch {
+  }
+  cappedRefs.set(key, out);
+  return out;
+}
+var readImagePart = async (core, req, normalize2) => {
+  const part = await req.file();
+  if (!part) return { error: "multipart file field required" };
+  const buf = await part.toBuffer();
+  if (buf.length === 0) return { error: "empty file" };
+  try {
+    return { hash: core.images.save(await normalize2(buf)), fields: part.fields ?? {}, filename: part.filename };
+  } catch {
+    return { error: "that file is not an image we can read" };
+  }
+};
+var mtimeQS = (path) => existsSync(path) ? `?v=${Math.round(statSync(path).mtimeMs)}` : "";
+var serveJpeg = (req, reply, path) => {
+  const etag = `"${statSync(path).mtimeMs}"`;
+  reply.header("cache-control", "public, max-age=31536000, immutable").header("etag", etag);
+  if (req.headers["if-none-match"] === etag) return reply.status(304).send();
+  return reply.header("content-type", "image/jpeg").send(readFileSync(path));
+};
 
 // src/briefDirectives.ts
 function productFidelityDirective(attached) {
   if (attached <= 1) {
     return "The attached product image is the exact product: preserve its label, shape, colors and proportions faithfully, and do not redesign it. It is also the only view of this product that exists. Any face, side or detail not visible in it is unknown \u2014 keep those plain and consistent with the visible materials and color, and do not invent hardware, text, seams, closures, ornament or branding on them. Prefer a composition that shows the product from the view the reference gives.";
   }
-  return "The attached product images all show the exact same product from different angles: preserve its label, shape and colors faithfully, do not redesign it, and do not treat the extra angles as additional products. Any face not visible in them is unknown \u2014 keep it plain and consistent with the visible materials, and do not invent detail on it.";
+  return "The attached product images all show the exact product to feature: preserve its label, shape and proportions faithfully, do not redesign it, and never treat an extra image as an additional product. The first product image is the authority for its color, finish and material. Where another image differs in color or finish, it shows the same product in another colorway \u2014 never blend colorways, and render the one the first image shows. Any face not visible in them is unknown \u2014 keep it plain and consistent with the materials the first image shows, and do not invent detail on it. If the direction above explicitly asks for more than one colorway, that explicit request wins.";
 }
 function editPreservationDirective(scope, opts) {
   if (scope === "local") {
     const removal = opts?.removal ? " What is removed leaves nothing behind: the surface and the scene continue as if it had never been there, with no outline, silhouette, residue or ghost of it." : "";
-    return "This is a change to a photograph that already exists, not a new photograph. Return the same image with one change made. Everything the instruction does not name comes back exactly as it is now: the same framing, the same crop, the same camera position, the same subject placement and pose, the same lighting, the same colours, the same background and the same dimensions. Do not re-render, re-stage, re-light or re-compose the picture. Change only what was asked for, together with the shadows, reflections and contact points that move with it." + removal;
+    return "This is a change to a photograph that already exists, not a new photograph. Return the same image with one change made. Everything the instruction does not name comes back exactly as it is now: the same framing, the same crop, the same camera position, the same subject placement and pose, the same lighting, the same colours, the same background and the same dimensions. Do not re-render, re-stage, re-light or re-compose the picture. Change only what was asked for, together with the shadows, reflections and contact points that move with it. Every surface keeps the texture it already has: no invented pattern, grain, weave or embossing on fabric, skin or walls that the photograph does not carry now." + removal;
   }
-  return "This is a change to a photograph that already exists, not a new photograph. Apply the instruction to the image you were given and keep what it does not name: the same subject and the same face, the same product with the same label, geometry and colour, and the same dimensions. Do not replace the subject and do not redesign the product.";
+  return "This is a change to a photograph that already exists, not a new photograph. Apply the instruction to the image you were given and keep what it does not name: the same subject and the same face, the same product with the same label, geometry and colour, and the same dimensions. Do not replace the subject and do not redesign the product. Every surface keeps the texture it already has: no invented pattern, grain, weave or embossing on fabric, skin or walls that the photograph does not carry now.";
+}
+function inheritedIdentityDirective(kinds) {
+  const product = kinds?.product ?? true;
+  const person = kinds?.person ?? true;
+  if (product && person)
+    return "The attached product and person references are the same product and the same person that are already in this picture. Use them to hold that identity exact while you make the change, not as a reason to re-stage the shot.";
+  if (product)
+    return "The attached product references show the same product that is already in this picture. Use them to hold its identity exact while you make the change, not as a reason to re-stage the shot.";
+  return "The attached person reference shows the same person who is already in this picture. Use it to hold their identity exact while you make the change, not as a reason to re-stage the shot.";
 }
-function inheritedIdentityDirective() {
-  return "The extra attached references are the same product and the same person that are already in this picture. Use them to hold that identity exact while you make the change, not as a reason to re-stage the shot.";
+function inheritedRefDirective() {
+  return "The carried reference is attached for composition, lighting and treatment only. Any person or product visible in it lends mood, never identity \u2014 nobody and nothing in this photograph takes a face, a body or a design from it.";
 }
 function productFactDirectives(p) {
   const out = [];
@@ -3241,6 +3344,10 @@ function productFactDirectives(p) {
   const materials = p.materials ?? p.material;
   if (materials) out.push(`Its materials and finish: ${materials}.`);
   if (p.primaryColors) out.push(`Its actual colors: ${p.primaryColors}.`);
+  if (Array.isArray(p.colorways) && p.colorways.length)
+    out.push(
+      `It is sold in these colorways: ${p.colorways.join(", ")}. The one in this shot is the colorway the first product image shows.`
+    );
   if (p.dimensions)
     out.push(`Its real-world size is ${p.dimensions} \u2014 keep it at true scale relative to everything else in frame.`);
   return out;
@@ -3257,8 +3364,11 @@ function productEditFidelityDirective(name) {
 function characterEditIdentityDirective(name) {
   return `${name} is the person in this photograph: keep them present and clearly visible. Match their face, facial structure, skin, hair and build to the attached person reference exactly. The reference's plain outfit and studio backdrop are capture conditions, not direction: keep the styling this photograph already has unless the instruction itself changes it, and never return them to the plain base layers they were photographed in.`;
 }
+function referenceIdentityGuard() {
+  return "A reference shot lends its composition, lighting and treatment, never its cast: the attached presenter is the only source of person identity in this shot, and any person visible in a reference shot is a stand-in whose place the presenter takes. This holds even where the direction asks to use someone from a reference \u2014 the attached presenter is that someone.";
+}
 function markEditDirective() {
-  return "The attached brand mark is this brand's own mark: wherever the logo appears or the instruction asks for it, reproduce it exactly as drawn \u2014 same colours, letterforms and proportions \u2014 never redrawn or re-lettered.";
+  return "The attached brand mark is this brand's own mark: wherever the logo appears or the instruction asks for it, reproduce it exactly as drawn \u2014 same colours, letterforms and proportions \u2014 never redrawn or re-lettered. Every character it carries stays intact, including the smallest secondary lettering, in its original script and reading direction \u2014 never translated, transliterated or re-spelled.";
 }
 function personSkinDirective() {
   return "Every person in this photograph has real photographed skin: fine natural texture at pore scale, faint lines and natural asymmetry left intact, true-to-life proportions, never airbrushed, waxy, plastic or synthetic-looking. Light behaves physically on it: a hard flash or a specular key may genuinely shine on skin, but the surface underneath stays living skin in a photograph, never gloss, never a render. Any retouch, clarity or sharpness language in the direction above is about finish and focus, never a licence to smooth skin beyond what a professional photograph holds; if the direction above explicitly asks for a stylised or non-photographic treatment of the person, that explicit request wins.";
@@ -3296,7 +3406,7 @@ function sceneFigureDirectives(opts) {
       // instruction to mutate the one real mark the user deliberately
       // attached. Same shape as pairDirectives' packshot override - name the
       // scope of the earlier rule, carry the exception in the same breath.
-      (opts.hasMark ? " The one exception is the attached brand mark: it is this brand's own real mark, deliberately attached, so the fictional-brands rule above does not apply to it. Where the direction asks for that mark to appear, it appears exactly as drawn - never redrawn, re-lettered or fictionalised." : "")
+      (opts.hasMark ? " The one exception is the attached brand mark: it is this brand's own real mark, deliberately attached, so the fictional-brands rule above does not apply to it. Where the direction asks for that mark to appear, it appears exactly as drawn - every character, including the smallest lettering, in its original script - never redrawn, re-lettered, translated or fictionalised." : "")
     );
   }
   return out;
@@ -3357,7 +3467,7 @@ function markLabel(brand, logo) {
 
 // src/brief.ts
 var PRODUCT_REF_MAX = 3;
-var CHARACTER_REF_MAX = 2;
+var CHARACTER_REF_MAX = 3;
 var SCENE_REF_MAX = 1;
 var FORMATS = [
   { id: "square", label: "Square 1:1", w: 1024, h: 1024 },
@@ -3365,7 +3475,7 @@ var FORMATS = [
   { id: "landscape", label: "Landscape 16:9", w: 1600, h: 900 },
   { id: "portrait", label: "Portrait 4:5", w: 1024, h: 1280 }
 ];
-var assetHash = (ref) => {
+var assetHash2 = (ref) => {
   const s = String(ref ?? "");
   return s.startsWith("asset:") ? s.slice(6) : null;
 };
@@ -3414,6 +3524,7 @@ function validateBrief(brief) {
 function compileBrief(brief, ctx) {
   const warnings = [];
   const attachments = [];
+  const rawSceneFallback = [];
   const productDirectives = [];
   const personDirectives = [];
   const otherDirectives = [];
@@ -3428,6 +3539,9 @@ function compileBrief(brief, ctx) {
   const append = (s) => {
     sentence += (sentence && !sentence.endsWith(" ") ? " " : "") + s;
   };
+  const attachingMarkHashes = new Set(
+    brief.tokens.filter((t) => t?.t === "mark").map((t) => t.imageHash).filter((h) => (ctx.brand?.logos ?? []).some((l) => assetHash2(l?.file) === h) && ctx.images.has(h))
+  );
   for (const tok of brief.tokens) {
     switch (tok.t) {
       case "text":
@@ -3446,7 +3560,7 @@ function compileBrief(brief, ctx) {
         const phashes = [];
         for (const s of orderedShots) {
           if (phashes.length >= PRODUCT_REF_MAX) break;
-          const h = assetHash(s?.file);
+          const h = assetHash2(s?.file);
           if (h && ctx.images.has(h) && !phashes.includes(h)) phashes.push(h);
         }
         if (phashes.length) {
@@ -3472,7 +3586,7 @@ function compileBrief(brief, ctx) {
         }
         hasPerson = true;
         append(c.promptName ?? c.name);
-        const chashes = (c.shots ?? []).slice(0, CHARACTER_REF_MAX).map((s) => assetHash(s?.file)).filter((h) => !!h && ctx.images.has(h));
+        const chashes = (c.shots ?? []).slice(0, CHARACTER_REF_MAX).map((s) => assetHash2(s?.file)).filter((h) => !!h && ctx.images.has(h));
         if (chashes.length) {
           chashes.forEach((chash, i) => {
             attachments.push({ role: "character", id: c.id, label: c.name, hash: chash, essential: i === 0 });
@@ -3500,6 +3614,10 @@ function compileBrief(brief, ctx) {
         break;
       }
       case "ref": {
+        if (attachingMarkHashes.has(tok.imageHash)) {
+          warnings.push("That reference is the same image as your brand mark, so it rides once, as the mark.");
+          break;
+        }
         if (!ctx.images.has(tok.imageHash)) {
           warnings.push("A reference shot is missing and was skipped.");
           break;
@@ -3510,14 +3628,23 @@ function compileBrief(brief, ctx) {
       }
       case "mark": {
         const logos = ctx.brand?.logos ?? [];
-        const logo = logos.find((l) => assetHash(l?.file) === tok.imageHash);
+        const logo = logos.find((l) => assetHash2(l?.file) === tok.imageHash);
         if (!logo || !ctx.images.has(tok.imageHash)) {
           warnings.push("A brand mark in this brief is no longer in the kit.");
           break;
         }
         attachments.push({ role: "brand", label: markLabel(ctx.brand, logo), hash: tok.imageHash });
+        try {
+          const head = ctx.images.read(tok.imageHash);
+          const edge = Math.max(head.readUInt32BE(16), head.readUInt32BE(20));
+          if (edge < MARK_WARN_EDGE)
+            warnings.push(
+              `${markLabel(ctx.brand, logo)} is only ${edge}px across, so fine lettering will not survive generation. Export it larger, or as SVG.`
+            );
+        } catch {
+        }
         otherDirectives.push(
-          "The attached brand mark is this brand's own mark. If the direction asks for the logo to appear, reproduce it exactly as drawn \u2014 same colours, letterforms and proportions, never redrawn or re-lettered. Otherwise take only its colour and treatment from it."
+          "The attached brand mark is this brand's own mark. If the direction asks for the logo to appear, reproduce it exactly as drawn \u2014 same colours, letterforms and proportions, never redrawn or re-lettered. Every character it carries appears intact, including the smallest secondary lettering, in its original script and reading direction \u2014 never translated, transliterated or re-spelled. Otherwise take only its colour and treatment from it."
         );
         break;
       }
@@ -3534,10 +3661,14 @@ function compileBrief(brief, ctx) {
         inlineTemplates.push(t);
         append(composePrompt(t, { fields: brief.templateFields ?? {}, notes: "" }));
         if (ctx.mode !== "edit" && t.figure) {
-          for (const r of (t.refs ?? []).slice(0, SCENE_REF_MAX)) {
-            const h = assetHash(r?.file);
+          const plate = assetHash2(t.preview);
+          const hasPlate = !!plate && ctx.images.has(plate);
+          const candidates = hasPlate ? [plate] : (t.refs ?? []).slice(0, SCENE_REF_MAX).map((r) => assetHash2(r?.file));
+          for (const h of candidates) {
             if (h && ctx.images.has(h)) {
-              attachments.push({ role: "scene", id: t.id, label: t.name, hash: h, essential: false });
+              const a = { role: "scene", id: t.id, label: t.name, hash: h, essential: false };
+              attachments.push(a);
+              if (!hasPlate) rawSceneFallback.push(a);
             }
           }
         }
@@ -3588,6 +3719,12 @@ function compileBrief(brief, ctx) {
   }
   const sceneCamera = inlineTemplates[0]?.camera?.trim() || ctx.template?.camera?.trim() || "";
   const cameraDirectives = sceneCamera && !shotSpecifiesCamera(sentence) ? [`Camera for this shot: ${sceneCamera}`] : [];
+  if (hasPerson && rawSceneFallback.length) {
+    for (const a of rawSceneFallback) {
+      const i = attachments.indexOf(a);
+      if (i !== -1) attachments.splice(i, 1);
+    }
+  }
   const max = ctx.engineCaps.maxReferenceImages;
   const { kept, dropped } = allocateAttachments(attachments, max);
   const guard = scene ? sceneGuardDirectives({
@@ -3621,7 +3758,7 @@ function compileBrief(brief, ctx) {
   const brandLines = brandRuleDirectives(ctx.brand);
   const preservation = ctx.mode === "edit" ? [
     ...ctx.editReshape === "extend" ? [] : [editPreservationDirective(ctx.editScope ?? "global", { removal: ctx.editRemoval })],
-    ...ctx.inheritedIdentity ? [inheritedIdentityDirective()] : [],
+    ...ctx.inheritedIdentity ? [inheritedIdentityDirective(ctx.inheritedIdentity === true ? void 0 : ctx.inheritedIdentity)] : [],
     ...ctx.inheritedDirectives ?? []
   ] : [];
   const apparelUnworn = ctx.mode !== "edit" && !hasPerson && attachments.some((a) => {
@@ -3629,6 +3766,7 @@ function compileBrief(brief, ctx) {
     const rec = (ctx.brand?.products ?? []).find((x) => x?.id === a.id);
     return String(rec?.category ?? "").toLowerCase() === "apparel";
   }) ? [garmentDisplayDirective()] : [];
+  const refGuard = ctx.mode !== "edit" && hasPerson && kept.some((a) => a.role === "reference") ? [referenceIdentityGuard()] : [];
   const allDirectives = [
     ...productDirectives,
     ...personDirectives,
@@ -3640,15 +3778,21 @@ function compileBrief(brief, ctx) {
     ...apparelUnworn,
     ...brandLines,
     ...guard,
+    ...refGuard,
     ...preservation
   ];
   if (allDirectives.length) prompt = `${prompt}${prompt.endsWith(".") ? "" : "."} ${dedupe(allDirectives).join(" ")}`;
   if (dropped.some((d) => d.role !== "scene")) {
-    const names = [...new Set(dropped.filter((d) => d.role !== "scene").map((d) => d.label))];
-    const reads = max === 0 ? "reads no reference images" : `reads ${max} reference image${max === 1 ? "" : "s"}`;
-    warnings.push(
-      `${ctx.engineCaps.displayName} ${reads}, so ${names.join(" and ")} ${names.length === 1 ? "was" : "were"} left out.`
+    const keptLabels = new Set(kept.map((a) => a.label));
+    const names = [...new Set(dropped.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(
+        `${ctx.engineCaps.displayName} ${reads}, so ${names.join(" and ")} ${names.length === 1 ? "was" : "were"} left out.`
+      );
+    }
   }
   return {
     prompt: prompt.trim(),
@@ -4334,6 +4478,7 @@ async function buildFromUrl(url, opts = {}) {
   if (!palette.primary) warnings.push("No confident palette found. Set colors manually.");
   let logoRef;
   let logoFromOg = false;
+  let logoTiny = false;
   let iconHref = $('link[rel="apple-touch-icon"]').attr("href") || $('link[rel~="icon"]').attr("href");
   if (!iconHref) {
     iconHref = $('meta[property="og:image"]').attr("content");
@@ -4344,7 +4489,18 @@ async function buildFromUrl(url, opts = {}) {
       const iconRes = await fetchImpl(new URL(iconHref, origin).toString(), { redirect: "follow" });
       if (iconRes.ok) {
         const buf = Buffer.from(await iconRes.arrayBuffer());
-        if (buf.length > 0) logoRef = await opts.saveAsset(buf, "logo");
+        if (buf.length > 0) {
+          logoRef = await opts.saveAsset(buf, "logo");
+          if (!logoFromOg && opts.probeLongEdge) {
+            const edge = await opts.probeLongEdge(buf).catch(() => null);
+            if (edge !== null && edge < 256) {
+              logoTiny = true;
+              warnings.push(
+                `The site icon is favicon-sized (${edge}px), so it was saved as an alternate mark, not the logo. Upload your real logo in Settings.`
+              );
+            }
+          }
+        }
       }
     } catch {
       warnings.push("Logo download failed.");
@@ -4373,7 +4529,7 @@ async function buildFromUrl(url, opts = {}) {
         ...palette.neutrals.length ? { neutrals: palette.neutrals.map((hex) => ({ hex })) } : {}
       }
     } : {},
-    ...logoRef ? { logos: [{ role: logoFromOg ? "alternate" : "primary", file: logoRef }] } : {}
+    ...logoRef ? { logos: [{ role: logoFromOg || logoTiny ? "alternate" : "primary", file: logoRef }] } : {}
   };
   return { brand, warnings };
 }
@@ -5645,8 +5801,8 @@ async function runJob(deps, jobId, brandId, url, signal) {
             errors.push({ code: "image_empty", message: "Empty image", url: img.sourceUrl });
             return;
           }
-          const png = await sharp7(buf).rotate().png().toBuffer();
-          const meta = await sharp7(png).metadata();
+          const png = await sharp20(buf).rotate().png().toBuffer();
+          const meta = await sharp20(png).metadata();
           const hash = core.images.save(png);
           core.catalog.setImageAsset(img.productId, img.sourceUrl, `asset:${hash}`, {
             width: meta.width,
@@ -5703,24 +5859,54 @@ function resolveLibraryProduct(core, brandId, productId) {
   const library = core.catalog.listLibraryProducts(brandId, brand.json);
   return library.find((p) => p.id === productId) ?? null;
 }
+function stripHtml(html) {
+  return html.replace(/<script[\s\S]*?<\/script>/gi, "").replace(/<style[\s\S]*?<\/style>/gi, "").replace(/<[^>]+>/g, " ").replace(/&nbsp;/g, " ").replace(/&amp;/g, "&").replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/\s+/g, " ").trim();
+}
+function firstSentence(text, max) {
+  if (text.length <= max) return text;
+  const stop = text.slice(0, max + 1).search(/[.!?](\s|$)/);
+  if (stop > 40) return text.slice(0, stop + 1);
+  const cut = text.lastIndexOf(" ", max);
+  return `${text.slice(0, cut > 40 ? cut : max).trimEnd()}\u2026`;
+}
+function colorwaysOf(variants) {
+  const seen = [];
+  for (const v of variants ?? []) {
+    const key = Object.keys(v.options ?? {}).find((k) => /colou?r/i.test(k));
+    const val = key ? String(v.options[key]).trim() : "";
+    if (val && !seen.includes(val)) seen.push(val);
+    if (seen.length >= 12) break;
+  }
+  return seen.length >= 2 ? seen : [];
+}
 function brandJsonWithCatalogProducts(core, brandId) {
   const brand = core.store.getBrand(brandId);
   if (!brand) return null;
   const json = { ...brand.json };
   const library = core.catalog.listLibraryProducts(brandId, brand.json);
-  json.products = library.map((p) => ({
-    id: p.id,
-    name: p.name,
-    shots: p.shots,
-    notes: p.url ?? void 0,
-    // Forwarded so the compiler can state real-world material and size. These
-    // were dropped here, which is part of why a watch could render plate-sized:
-    // nothing downstream ever knew how big the object actually is.
-    ...p.category ? { category: p.category } : {},
-    ...p.variant ? { variant: p.variant } : {},
-    ...p.material ? { material: p.material } : {},
-    ...p.dimensions ? { dimensions: p.dimensions } : {}
-  }));
+  json.products = library.map((p) => {
+    const colorways = colorwaysOf(p.variants);
+    return {
+      id: p.id,
+      name: p.name,
+      shots: p.shots,
+      notes: p.url ?? void 0,
+      // Forwarded so the compiler can state real-world material and size. These
+      // were dropped here, which is part of why a watch could render plate-sized:
+      // nothing downstream ever knew how big the object actually is.
+      ...p.category ? { category: p.category } : {},
+      ...p.variant ? { variant: p.variant } : {},
+      ...p.material ? { material: p.material } : {},
+      ...p.dimensions ? { dimensions: p.dimensions } : {},
+      // The store's own words, the way the 0.6.9 fix gave demo products
+      // theirs: the description is what anchors scale when dimensions are
+      // absent, and imported products shipped with neither.
+      ...p.descriptionHtml ? { description: firstSentence(stripHtml(String(p.descriptionHtml)), 300) } : {},
+      // The declared colorways, so the compiler can say a colour difference
+      // between references is a colorway rather than lighting.
+      ...colorways.length ? { colorways } : {}
+    };
+  });
   return json;
 }
 function runningImportCount() {
@@ -6065,7 +6251,7 @@ async function generateStudioSet(deps, job, who, sourcePaths, signal) {
   return STUDIO_FRAMES.map((f) => byAngle.get(f.angle)).filter((h) => !!h);
 }
 async function edgeBarGeometry(buf) {
-  const { data, info } = await sharp7(buf).greyscale().raw().toBuffer({ resolveWithObject: true });
+  const { data, info } = await sharp20(buf).greyscale().raw().toBuffer({ resolveWithObject: true });
   const W = info.width;
   const H = info.height;
   const scan = (len, cross, at) => {
@@ -6119,7 +6305,7 @@ async function trimEdgeBars(core, hash) {
     const width = g.right - g.left + 1;
     const height = g.bottom - g.top + 1;
     if (width < g.W * 0.6 || height < g.H * 0.6) return hash;
-    const png = await sharp7(buf).extract({ left: g.left, top: g.top, width, height }).png().toBuffer();
+    const png = await sharp20(buf).extract({ left: g.left, top: g.top, width, height }).png().toBuffer();
     return core.images.save(png);
   } catch {
     return hash;
@@ -6161,12 +6347,12 @@ async function avatarCrop(core, hash) {
   );
 }
 async function figureBox(buf) {
-  const meta = await sharp7(buf).metadata();
+  const meta = await sharp20(buf).metadata();
   const W = meta.width ?? 0;
   const H = meta.height ?? 0;
   if (!W || !H) return null;
   for (const threshold of FIGURE_TRIM_THRESHOLDS) {
-    const { info } = await sharp7(buf).trim({ threshold }).toBuffer({ resolveWithObject: true });
+    const { info } = await sharp20(buf).trim({ threshold }).toBuffer({ resolveWithObject: true });
     const left = Math.abs(info.trimOffsetLeft ?? 0);
     const top = Math.abs(info.trimOffsetTop ?? 0);
     const width = info.width ?? 0;
@@ -6199,13 +6385,13 @@ async function smartCover(core, hash, box) {
   if (!hash || !core.images.has(hash)) return void 0;
   try {
     const buf = core.images.read(hash);
-    const meta = await sharp7(buf).metadata();
+    const meta = await sharp20(buf).metadata();
     const w = meta.width ?? 0;
     const h = meta.height ?? 0;
     if (!w || !h) return void 0;
     const raw = box(w, h);
     const target = { width: Math.max(1, raw.width), height: Math.max(1, raw.height) };
-    const png = await sharp7(buf).resize(target.width, target.height, { fit: "cover", position: "attention" }).png().toBuffer();
+    const png = await sharp20(buf).resize(target.width, target.height, { fit: "cover", position: "attention" }).png().toBuffer();
     return core.images.save(png);
   } catch {
     return void 0;
@@ -6214,11 +6400,11 @@ async function smartCover(core, hash, box) {
 async function crop(core, hash, region, cap2) {
   if (!hash || !core.images.has(hash)) return void 0;
   try {
-    const meta = await sharp7(core.images.read(hash)).metadata();
+    const meta = await sharp20(core.images.read(hash)).metadata();
     const w = meta.width ?? 0;
     const h = meta.height ?? 0;
     if (!w || !h) return void 0;
-    let pipeline = sharp7(core.images.read(hash)).extract(region(w, h));
+    let pipeline = sharp20(core.images.read(hash)).extract(region(w, h));
     if (cap2) pipeline = pipeline.resize(cap2, cap2, { fit: "inside", withoutEnlargement: true });
     const png = await pipeline.png().toBuffer();
     return core.images.save(png);
@@ -6309,7 +6495,7 @@ async function runSceneBuild(deps, job, hashes, instruction, signal) {
   });
 }
 function scenePreviewPrompt(scene) {
-  const body = scene.figure ? `A figure is in this photograph: ${scene.figure.replace(/[.\s]+$/, "")}. ` + (scene.figureTreatment ? `The art direction is what has been done to them: ${scene.figureTreatment.replace(/[.\s]+$/, "")}, rendered as a real physical treatment that follows the shape it sits on. ` : "") + "They are nobody in particular: do not reproduce any person from the attached reference images, and give them no recognisable identity. No product, no logos, no watermarks, and no readable words anywhere in the frame." : "The set is empty: no product, no person, no hands, no text, no logos, no watermarks anywhere in the frame.";
+  const body = scene.figure ? `A figure is in this photograph: ${scene.figure.replace(/[.\s]+$/, "")}. ` + (scene.figureTreatment ? `The art direction is what has been done to them: ${scene.figureTreatment.replace(/[.\s]+$/, "")}, rendered as a real physical treatment that follows the shape it sits on. ` : "") + "They are nobody in particular: do not reproduce any person from the attached reference images, and give them no recognisable identity. " + (scene.figureTreatment ? "No product and no watermarks. Where the treatment itself carries printing, render it as genuinely designed print - real letterforms, readable words, numerals and label-quality artwork - belonging to companies that are plausible but fictional, resembling no existing brand, and borrowing, extending or re-spelling no name that appears in any attached reference. Everywhere outside the treatment, no logos and no readable words." : "No product, no logos, no watermarks, and no readable words anywhere in the frame.") : "The set is empty: no product, no person, no hands, no text, no logos, no watermarks anywhere in the frame.";
   return `Full-bleed photograph filling the entire frame edge to edge with no border, frame, letterbox band or matte of any kind. ${scene.prompt} ${scene.lighting ? `${scene.lighting}. ` : ""}` + body;
 }
 async function draw(deps, req) {
@@ -6402,6 +6588,7 @@ function registerAccessGuard(app, opts = {}) {
 var MAX_HOPS = 64;
 var IDENTITY_KINDS = /* @__PURE__ */ new Set(["product", "character", "mark", "ref"]);
 var identityOf = (list2) => Array.isArray(list2) ? list2.filter((t) => IDENTITY_KINDS.has(t?.t)) : [];
+var identityTokenKey = (t) => t?.t === "product" ? `p:${t.id}` : JSON.stringify(t);
 function inheritedIdentityTokens(parentId, getNode) {
   let id = parentId;
   const visited = /* @__PURE__ */ new Set();
@@ -6417,7 +6604,7 @@ function inheritedIdentityTokens(parentId, getNode) {
       const seen = /* @__PURE__ */ new Set();
       const tokens = [];
       for (const t of [...own, ...carried]) {
-        const key = JSON.stringify(t);
+        const key = identityTokenKey(t);
         if (seen.has(key)) continue;
         seen.add(key);
         tokens.push(t);
@@ -6479,6 +6666,119 @@ function scopeOfInstruction(text) {
   if (!matched.length) return { scope: "global", matched: ["no local cue"] };
   return { scope: "local", matched, removal: REMOVAL_VERB.test(s) };
 }
+var FIT_EDGE = 160;
+var GATE_EDGE = 32;
+var GRADE_GATE_MEAN_DELTA = 40;
+var SLOPE_CLAMP = 1.8;
+var TONAL_WORD = /^(warm(er)?|cool(er)?|bright(er)?|dark(er)?|deep(er)?|soft(er)?|hard(er)?|punch(ier|y)?|rich(er)?|flat(ter)?|mood(y|ier)?|golden|overcast|sun(ny|lit)?|cloudy|dusk|dawn|evening|morning|night|daylight|light|lighting|lit|glow(ing)?|exposure|contrast|saturation|desaturat(e|ed)|muted|vivid|tone[sd]?|tint(ed)?|grade[d]?|grading|temperature|white|balance|shadows?|highlights?|blacks?|whites?|filmic|cinematic|dramatic|airy|hazy|misty|crisp)$/i;
+var NEUTRAL_WORD = /^(a|an|the|it|its|this|that|make|makes|keep|slightly|slight|touch|bit|little|more|less|much|very|again|overall|whole|image|frame|shot|picture|photo|look|feel|and|of|in|with|to|too|just|please|now|even)$/i;
+function isGradeOnlyInstruction(text) {
+  const words = String(text ?? "").toLowerCase().replace(/[^a-z\s-]/g, " ").split(/\s+/).filter(Boolean);
+  if (!words.length) return false;
+  let tonal = 0;
+  for (const w of words) {
+    if (TONAL_WORD.test(w)) tonal++;
+    else if (!NEUTRAL_WORD.test(w)) return false;
+  }
+  return tonal > 0;
+}
+var srgbToLinear = (c) => c <= 0.04045 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4;
+var linearToSrgb = (c) => c <= 31308e-7 ? c * 12.92 : 1.055 * c ** (1 / 2.4) - 0.055;
+var EPS = 1e-6;
+var toLab = (r, g, b) => {
+  const R = srgbToLinear(r / 255);
+  const G = srgbToLinear(g / 255);
+  const B = srgbToLinear(b / 255);
+  const L = Math.log10(Math.max(EPS, 0.3811 * R + 0.5783 * G + 0.0402 * B));
+  const M = Math.log10(Math.max(EPS, 0.1967 * R + 0.7244 * G + 0.0782 * B));
+  const S = Math.log10(Math.max(EPS, 0.0241 * R + 0.1288 * G + 0.8444 * B));
+  return [(L + M + S) / Math.sqrt(3), (L + M - 2 * S) / Math.sqrt(6), (L - M) / Math.sqrt(2)];
+};
+var fromLab = (l, a, bb) => {
+  const L = l / Math.sqrt(3) + a / Math.sqrt(6) + bb / Math.sqrt(2);
+  const M = l / Math.sqrt(3) + a / Math.sqrt(6) - bb / Math.sqrt(2);
+  const S = l / Math.sqrt(3) - 2 * a / Math.sqrt(6);
+  const Rl = 10 ** L;
+  const Ml = 10 ** M;
+  const Sl = 10 ** S;
+  const R = 4.4679 * Rl - 3.5873 * Ml + 0.1193 * Sl;
+  const G = -1.2186 * Rl + 2.3809 * Ml - 0.1624 * Sl;
+  const B = 0.0497 * Rl - 0.2439 * Ml + 1.2045 * Sl;
+  const clamp = (x) => Math.max(0, Math.min(255, Math.round(linearToSrgb(Math.max(0, Math.min(1, x))) * 255)));
+  return [clamp(R), clamp(G), clamp(B)];
+};
+var rawAt = async (png, edge) => {
+  let img = sharp20(png);
+  if (edge) img = img.resize(edge, edge, { fit: "fill" });
+  const { data, info } = await img.removeAlpha().raw().toBuffer({ resolveWithObject: true });
+  return { data, width: info.width, height: info.height };
+};
+var labStats = (raw) => {
+  const n = raw.data.length / 3;
+  const mu = [0, 0, 0];
+  const sq = [0, 0, 0];
+  for (let i = 0; i < raw.data.length; i += 3) {
+    const lab = toLab(raw.data[i], raw.data[i + 1], raw.data[i + 2]);
+    for (let c = 0; c < 3; c++) {
+      mu[c] += lab[c];
+      sq[c] += lab[c] * lab[c];
+    }
+  }
+  for (let c = 0; c < 3; c++) {
+    mu[c] /= n;
+    sq[c] = Math.sqrt(Math.max(1e-9, sq[c] / n - mu[c] * mu[c]));
+  }
+  return { mu, sd: sq };
+};
+var fitAffine = (input, output) => {
+  const a = labStats(input);
+  const b = labStats(output);
+  return [0, 1, 2].map((c) => ({
+    k: Math.max(1 / SLOPE_CLAMP, Math.min(SLOPE_CLAMP, b.sd[c] / a.sd[c])),
+    mi: a.mu[c],
+    mo: b.mu[c]
+  }));
+};
+var applyAffine = (raw, T) => {
+  const d = raw.data;
+  for (let i = 0; i < d.length; i += 3) {
+    const peak = Math.max(d[i], d[i + 1], d[i + 2]);
+    const w = peak <= 225 ? 1 : Math.max(0, (255 - peak) / 30);
+    const lab = toLab(d[i], d[i + 1], d[i + 2]);
+    const out = fromLab(
+      (lab[0] - T[0].mi) * T[0].k + T[0].mo,
+      (lab[1] - T[1].mi) * T[1].k + T[1].mo,
+      (lab[2] - T[2].mi) * T[2].k + T[2].mo
+    );
+    d[i] = Math.round(d[i] * (1 - w) + out[0] * w);
+    d[i + 1] = Math.round(d[i + 1] * (1 - w) + out[1] * w);
+    d[i + 2] = Math.round(d[i + 2] * (1 - w) + out[2] * w);
+  }
+};
+var meanDelta = (a, b) => {
+  const n = Math.min(a.data.length, b.data.length);
+  let sum = 0;
+  for (let i = 0; i < n; i++) sum += Math.abs(a.data[i] - b.data[i]);
+  return n ? sum / n : 255;
+};
+async function gradeComposite(originalPng, modelInputPng, modelOutputPng) {
+  try {
+    const T = fitAffine(await rawAt(modelInputPng, FIT_EDGE), await rawAt(modelOutputPng, FIT_EDGE));
+    const gateIn = await rawAt(modelInputPng, GATE_EDGE);
+    const gateOut = await rawAt(modelOutputPng, GATE_EDGE);
+    applyAffine(gateIn, T);
+    const residual = meanDelta(gateIn, gateOut);
+    if (residual > GRADE_GATE_MEAN_DELTA) return null;
+    const full = await rawAt(originalPng);
+    applyAffine(full, T);
+    const image = await sharp20(full.data, {
+      raw: { width: full.width, height: full.height, channels: 3 }
+    }).png().toBuffer();
+    return { image, residual };
+  } catch {
+    return null;
+  }
+}
 
 // src/expandRules.ts
 var round8 = (n) => Math.max(8, Math.round(n / 8) * 8);
@@ -6545,13 +6845,20 @@ Avoid: new objects, products, people, text or watermarks; do not recompose, rece
 // src/editSizeRules.ts
 var SAME_SHAPE_TOL = 0.01;
 var SHRINK_FLOOR = 0.8;
-function judgeEditSize(src, got) {
+var BUDGET_TOL = 0.1;
+function judgeEditSize(src, got, opts) {
   if (!(src.width > 0 && src.height > 0 && got.width > 0 && got.height > 0)) return { action: "keep" };
   if (got.width === src.width && got.height === src.height) return { action: "keep" };
   const want = src.width / src.height;
   const have = got.width / got.height;
   if (Math.abs(have - want) / want > SAME_SHAPE_TOL) return { action: "keep" };
   const scale = Math.max(got.width, got.height) / Math.max(src.width, src.height);
+  const budget = opts?.pixelBudget;
+  if (budget && src.width * src.height > budget) {
+    const gotPx = got.width * got.height;
+    if (gotPx <= src.width * src.height && Math.abs(gotPx - budget) / budget <= BUDGET_TOL)
+      return { action: "accept", scale };
+  }
   if (scale < SHRINK_FLOOR) return { action: "reject", scale };
   return { action: "resize", scale };
 }
@@ -6570,7 +6877,7 @@ function planCrop(source, targetRatio) {
 }
 async function attentionCropOrigin(srcBuf, source, plan) {
   try {
-    const { info } = await sharp7(srcBuf).resize(plan.width, plan.height, { fit: "cover", position: "attention" }).toBuffer({ resolveWithObject: true });
+    const { info } = await sharp20(srcBuf).resize(plan.width, plan.height, { fit: "cover", position: "attention" }).toBuffer({ resolveWithObject: true });
     const attnLeft = typeof info.cropOffsetLeft === "number" ? Math.abs(info.cropOffsetLeft) : plan.left;
     const attnTop = typeof info.cropOffsetTop === "number" ? Math.abs(info.cropOffsetTop) : plan.top;
     const left = Math.round((attnLeft + plan.left) / 2);
@@ -6723,23 +7030,23 @@ function relax(grid, seam, fixedSweeps) {
 
 // src/expand.ts
 async function expandCanvas(source, plan) {
-  const bed = await sharp7(source).resize(plan.width, plan.height, { fit: "cover", position: "centre" }).blur(Math.max(8, Math.round(Math.max(plan.width, plan.height) / 40))).toBuffer();
-  return sharp7(bed).composite([{ input: source, left: plan.left, top: plan.top }]).png().toBuffer();
+  const bed = await sharp20(source).resize(plan.width, plan.height, { fit: "cover", position: "centre" }).blur(Math.max(8, Math.round(Math.max(plan.width, plan.height) / 40))).toBuffer();
+  return sharp20(bed).composite([{ input: source, left: plan.left, top: plan.top }]).png().toBuffer();
 }
 async function compositeExpand(engineImage, source, plan) {
-  const meta = await sharp7(engineImage).metadata();
+  const meta = await sharp20(engineImage).metadata();
   const want = plan.width / plan.height;
   const got = meta.width && meta.height ? meta.width / meta.height : 0;
   const sameOrientation = got > 0 && got >= 1 === want >= 1;
   const aligned = sameOrientation;
   const exact = meta.width === plan.width && meta.height === plan.height;
-  const surround = aligned ? exact ? engineImage : await sharp7(engineImage).resize(plan.width, plan.height, { fit: "cover", position: "centre" }).toBuffer() : await expandCanvasBedOnly(source, plan);
+  const surround = aligned ? exact ? engineImage : await sharp20(engineImage).resize(plan.width, plan.height, { fit: "cover", position: "centre" }).toBuffer() : await expandCanvasBedOnly(source, plan);
   const matched = aligned ? await matchMarginsToSeam(surround, source, plan) : surround;
-  const image = await sharp7(matched).composite([{ input: source, left: plan.left, top: plan.top }]).png().toBuffer();
+  const image = await sharp20(matched).composite([{ input: source, left: plan.left, top: plan.top }]).png().toBuffer();
   return { image, aligned };
 }
 async function matchMarginsToSeam(surround, source, plan) {
-  const src = await sharp7(source).metadata();
+  const src = await sharp20(source).metadata();
   if (!src.width || !src.height) return surround;
   const SW = src.width;
   const SH = src.height;
@@ -6786,8 +7093,8 @@ var MAX_CORRECTION = 60;
 async function reconcile(surround, source, side, axis) {
   const { margin } = side;
   if (margin.width < 1 || margin.height < 1) return surround;
-  const marginRaw = await sharp7(surround).extract(margin).removeAlpha().raw().toBuffer();
-  const edgeRaw = await sharp7(source).extract(side.srcEdge).removeAlpha().raw().toBuffer();
+  const marginRaw = await sharp20(surround).extract(margin).removeAlpha().raw().toBuffer();
+  const edgeRaw = await sharp20(source).extract(side.srcEdge).removeAlpha().raw().toBuffer();
   const W = margin.width;
   const H = margin.height;
   const along = axis === "width" ? H : W;
@@ -6841,11 +7148,11 @@ async function reconcile(surround, source, side, axis) {
       }
     }
   }
-  const patch2 = await sharp7(corrected, { raw: { width: W, height: H, channels: 3 } }).png().toBuffer();
-  return sharp7(surround).composite([{ input: patch2, left: margin.left, top: margin.top }]).toBuffer();
+  const patch2 = await sharp20(corrected, { raw: { width: W, height: H, channels: 3 } }).png().toBuffer();
+  return sharp20(surround).composite([{ input: patch2, left: margin.left, top: margin.top }]).toBuffer();
 }
 async function expandCanvasBedOnly(source, plan) {
-  return sharp7(source).resize(plan.width, plan.height, { fit: "cover", position: "centre" }).blur(Math.max(8, Math.round(Math.max(plan.width, plan.height) / 40))).toBuffer();
+  return sharp20(source).resize(plan.width, plan.height, { fit: "cover", position: "centre" }).blur(Math.max(8, Math.round(Math.max(plan.width, plan.height) / 40))).toBuffer();
 }
 function medianOf(rgb, channel, from, to) {
   const n = to - from;
@@ -6856,17 +7163,17 @@ function medianOf(rgb, channel, from, to) {
   return n % 2 ? values[(n - 1) / 2] : (values[n / 2 - 1] + values[n / 2]) / 2;
 }
 async function reframeExpand(engineImage, plan) {
-  const meta = await sharp7(engineImage).metadata();
+  const meta = await sharp20(engineImage).metadata();
   if (!(meta.width && meta.height)) return null;
   const want = plan.width / plan.height;
   const got = meta.width / meta.height;
   if (got >= 1 !== want >= 1) return null;
   if (meta.width === plan.width && meta.height === plan.height) return engineImage;
   const straight = Math.abs(got - want) / want <= 0.02;
-  return sharp7(engineImage).resize(plan.width, plan.height, { fit: straight ? "fill" : "cover", position: "centre" }).png().toBuffer();
+  return sharp20(engineImage).resize(plan.width, plan.height, { fit: straight ? "fill" : "cover", position: "centre" }).png().toBuffer();
 }
 async function seamScore(image, plan, source) {
-  const { data, info } = await sharp7(image).removeAlpha().greyscale().raw().toBuffer({ resolveWithObject: true });
+  const { data, info } = await sharp20(image).removeAlpha().greyscale().raw().toBuffer({ resolveWithObject: true });
   const W = info.width;
   const H = info.height;
   const horizontal = plan.axis === "width";
@@ -6899,7 +7206,7 @@ var SEAM_VISIBLE = 2.2;
 var OFFSET = 4;
 var RESIDUAL_VISIBLE = 15;
 async function seamResidual(image, plan, source) {
-  const { data, info } = await sharp7(image).removeAlpha().raw().toBuffer({ resolveWithObject: true });
+  const { data, info } = await sharp20(image).removeAlpha().raw().toBuffer({ resolveWithObject: true });
   const W = info.width;
   const H = info.height;
   const ch = info.channels;
@@ -6934,7 +7241,7 @@ var MAX_SHARE = 0.8;
 async function subjectFraction(src, source, axis) {
   try {
     const window = axis === "width" ? { width: Math.max(8, Math.round(source.width * 0.5)), height: source.height } : { width: source.width, height: Math.max(8, Math.round(source.height * 0.5)) };
-    const { info } = await sharp7(src).resize(window.width, window.height, { fit: "cover", position: "attention" }).toBuffer({ resolveWithObject: true });
+    const { info } = await sharp20(src).resize(window.width, window.height, { fit: "cover", position: "attention" }).toBuffer({ resolveWithObject: true });
     const offset = axis === "width" ? Math.abs(typeof info.cropOffsetLeft === "number" ? info.cropOffsetLeft : 0) : Math.abs(typeof info.cropOffsetTop === "number" ? info.cropOffsetTop : 0);
     const span = axis === "width" ? source.width : source.height;
     const extent = axis === "width" ? window.width : window.height;
@@ -6957,14 +7264,14 @@ function placeExpand(plan, source, fraction) {
 }
 var NEUTRAL = { r: 128, g: 128, b: 128 };
 async function conditioningCanvas(source, plan, fill = "edge") {
-  const meta = await sharp7(source).metadata();
+  const meta = await sharp20(source).metadata();
   const sw = meta.width ?? 0;
   const sh = meta.height ?? 0;
   if (!(sw > 0 && sh > 0)) throw new Error("conditioningCanvas: source has no dimensions");
   const layers = [];
   if (fill === "edge") layers.push(...await edgeMargins(source, plan, { width: sw, height: sh }));
   layers.push({ input: source, left: plan.left, top: plan.top });
-  const canvas = sharp7({
+  const canvas = sharp20({
     create: {
       width: plan.width,
       height: plan.height,
@@ -6976,7 +7283,7 @@ async function conditioningCanvas(source, plan, fill = "edge") {
 }
 async function edgeMargins(source, plan, size) {
   const out = [];
-  const strip = async (extract, width, height) => sharp7(source).extract(extract).resize(width, height, { fit: "fill" }).png().toBuffer();
+  const strip = async (extract, width, height) => sharp20(source).extract(extract).resize(width, height, { fit: "fill" }).png().toBuffer();
   if (plan.axis === "width") {
     const before = plan.left;
     const after = plan.width - plan.left - size.width;
@@ -7067,12 +7374,12 @@ async function resolveOutpaintRoute(all, shot) {
   return { engine: shot, method: "reframe", crossed: false };
 }
 async function driftDiff(a, b) {
-  const metaA = await sharp7(a).metadata();
-  const metaB = await sharp7(b).metadata();
+  const metaA = await sharp20(a).metadata();
+  const metaB = await sharp20(b).metadata();
   const width = Math.min(metaA.width ?? 1, metaB.width ?? 1, 1024);
   const height = Math.min(metaA.height ?? 1, metaB.height ?? 1, 1024);
   const [rawA, rawB] = await Promise.all(
-    [a, b].map((buf) => sharp7(buf).resize(width, height, { fit: "cover" }).ensureAlpha().raw().toBuffer())
+    [a, b].map((buf) => sharp20(buf).resize(width, height, { fit: "cover" }).ensureAlpha().raw().toBuffer())
   );
   const out = new PNG({ width, height });
   const changed = pixelmatch(rawA, rawB, out.data, width, height, { threshold: 0.1, diffColor: [255, 64, 64] });
@@ -7084,11 +7391,11 @@ async function driftDiff(a, b) {
   };
 }
 async function changeMask(a, b, cap2 = 1024) {
-  const metaA = await sharp7(a).metadata();
+  const metaA = await sharp20(a).metadata();
   const width = Math.min(metaA.width ?? 1, cap2);
   const height = Math.min(metaA.height ?? 1, cap2);
   const [rawA, rawB] = await Promise.all(
-    [a, b].map((buf) => sharp7(buf).resize(width, height, { fit: "fill" }).ensureAlpha().raw().toBuffer())
+    [a, b].map((buf) => sharp20(buf).resize(width, height, { fit: "fill" }).ensureAlpha().raw().toBuffer())
   );
   const out = new PNG({ width, height });
   pixelmatch(rawA, rawB, out.data, width, height, { threshold: 0.1, includeAA: true, diffMask: true });
@@ -7137,8 +7444,8 @@ function dilationFor(longEdge) {
 // src/localEdit.ts
 async function preserveOutsideChange(source, edited) {
   try {
-    const srcMeta = await sharp7(source).metadata();
-    const outMeta = await sharp7(edited).metadata();
+    const srcMeta = await sharp20(source).metadata();
+    const outMeta = await sharp20(edited).metadata();
     if (!srcMeta.width || !srcMeta.height || !outMeta.width || !outMeta.height)
       return { image: edited, outcome: "error", changed: 0 };
     const sameShape = Math.abs(outMeta.width / outMeta.height - srcMeta.width / srcMeta.height) / (srcMeta.width / srcMeta.height) <= 0.01;
@@ -7148,94 +7455,24 @@ async function preserveOutsideChange(source, edited) {
     if (outcome !== "composited") return { image: edited, outcome, changed: shape.changed };
     const r = dilationFor(Math.max(shape.width, shape.height));
     const rawShape = { raw: { width: shape.width, height: shape.height, channels: 1 } };
-    const spread = await sharp7(shape.mask, rawShape).blur(r).toColourspace("b-w").raw().toBuffer();
-    const dilated = await sharp7(spread, rawShape).threshold(8).toColourspace("b-w").raw().toBuffer();
-    const feathered = await sharp7(dilated, rawShape).blur(Math.max(2, r / 3)).toColourspace("b-w").raw().toBuffer();
-    const grown = await sharp7(feathered, rawShape).resize(srcMeta.width, srcMeta.height, { fit: "fill", kernel: "cubic" }).toColourspace("b-w").raw().toBuffer();
-    const editedRgb = await sharp7(edited).resize(srcMeta.width, srcMeta.height, { fit: "fill" }).removeAlpha().raw().toBuffer();
-    const masked = await sharp7(editedRgb, {
+    const spread = await sharp20(shape.mask, rawShape).blur(r).toColourspace("b-w").raw().toBuffer();
+    const dilated = await sharp20(spread, rawShape).threshold(8).toColourspace("b-w").raw().toBuffer();
+    const feathered = await sharp20(dilated, rawShape).blur(Math.max(2, r / 3)).toColourspace("b-w").raw().toBuffer();
+    const grown = await sharp20(feathered, rawShape).resize(srcMeta.width, srcMeta.height, { fit: "fill", kernel: "cubic" }).toColourspace("b-w").raw().toBuffer();
+    const editedRgb = await sharp20(edited).resize(srcMeta.width, srcMeta.height, { fit: "fill" }).removeAlpha().raw().toBuffer();
+    const masked = await sharp20(editedRgb, {
       raw: { width: srcMeta.width, height: srcMeta.height, channels: 3 }
     }).joinChannel(grown, { raw: { width: srcMeta.width, height: srcMeta.height, channels: 1 } }).png().toBuffer();
-    const image = await sharp7(source).removeAlpha().composite([{ input: masked }]).png().toBuffer();
+    const image = await sharp20(source).removeAlpha().composite([{ input: masked }]).png().toBuffer();
     return { image, outcome: "composited", changed: shape.changed };
   } catch {
     return { image: edited, outcome: "error", changed: 0 };
   }
 }
-function joinNames(labels) {
-  const uniq = [...new Set(labels)];
-  if (uniq.length <= 1) return uniq[0] ?? "";
-  return `${uniq.slice(0, -1).join(", ")} and ${uniq[uniq.length - 1]}`;
-}
-function brandContext(core, brandId) {
-  const brand = core.store.getBrand(brandId);
-  if (!brand) throw new Error("brand not found");
-  const assetPaths = {};
-  const json = brand.json;
-  for (const logo of json.logos ?? []) {
-    const ref = String(logo.file ?? "");
-    if (ref.startsWith("asset:") && core.images.has(ref.slice(6))) assetPaths[ref] = core.images.pathFor(ref.slice(6));
-  }
-  return { brand: brand.json, assetPaths };
-}
-var PNG_SIG = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);
-var assetHash2 = (ref) => {
-  const s = String(ref ?? "");
-  return s.startsWith("asset:") ? s.slice(6) : null;
-};
-var LOGO_ROLES = ["primary", "mark", "wordmark", "monochrome", "alternate"];
-var LOGO_BACKGROUNDS = ["light", "dark", "any"];
-var toPng = (buf) => sharp7(buf).rotate().png().toBuffer();
-var COST_PROBE = {
-  prompt: "",
-  brand: { brand: {}, assetPaths: {} },
-  width: 1024,
-  height: 1024,
-  count: 1
-};
-var MARK_MAX_EDGE = 2048;
-var toMarkPng = (buf) => sharp7(buf, { density: 384 }).rotate().resize({ width: MARK_MAX_EDGE, height: MARK_MAX_EDGE, fit: "inside", withoutEnlargement: true }).png().toBuffer();
-var cappedRefs = /* @__PURE__ */ new Map();
-async function capReferenceEdge(core, path, maxEdge) {
-  const key = `${path}#${maxEdge}`;
-  const hit = cappedRefs.get(key);
-  if (hit) return hit;
-  let out = path;
-  try {
-    const meta = await sharp7(path).metadata();
-    if ((meta.width ?? 0) > maxEdge || (meta.height ?? 0) > maxEdge) {
-      const buf = await sharp7(path).resize({ width: maxEdge, height: maxEdge, fit: "inside", withoutEnlargement: true }).png().toBuffer();
-      out = core.images.pathFor(core.images.save(buf));
-    }
-  } catch {
-  }
-  cappedRefs.set(key, out);
-  return out;
-}
-var readImagePart = async (core, req, normalize2) => {
-  const part = await req.file();
-  if (!part) return { error: "multipart file field required" };
-  const buf = await part.toBuffer();
-  if (buf.length === 0) return { error: "empty file" };
-  try {
-    return { hash: core.images.save(await normalize2(buf)), fields: part.fields ?? {}, filename: part.filename };
-  } catch {
-    return { error: "that file is not an image we can read" };
-  }
-};
-var mtimeQS = (path) => existsSync(path) ? `?v=${Math.round(statSync(path).mtimeMs)}` : "";
-var serveJpeg = (req, reply, path) => {
-  const etag = `"${statSync(path).mtimeMs}"`;
-  reply.header("cache-control", "public, max-age=31536000, immutable").header("etag", etag);
-  if (req.headers["if-none-match"] === etag) return reply.status(304).send();
-  return reply.header("content-type", "image/jpeg").send(readFileSync(path));
-};
-
-// src/routes/logos.ts
 function registerLogoRoutes(app, deps) {
   const { core } = deps;
   const readLogos = (json) => Array.isArray(json.logos) ? json.logos : [];
-  const findLogo = (json, hash) => readLogos(json).findIndex((l) => assetHash2(l?.file) === hash);
+  const findLogo = (json, hash) => readLogos(json).findIndex((l) => assetHash(l?.file) === hash);
   const enumField = (raw, allowed, fallback) => {
     const v = raw === void 0 || raw === null ? "" : String(raw);
     if (!v) return fallback ?? "";
@@ -7248,7 +7485,7 @@ function registerLogoRoutes(app, deps) {
     const logos = [...readLogos(json)];
     const part = await readImagePart(core, req, toMarkPng);
     if ("error" in part) return reply.status(400).send({ error: part.error });
-    const existing = logos.findIndex((l) => assetHash2(l?.file) === part.hash);
+    const existing = logos.findIndex((l) => assetHash(l?.file) === part.hash);
     const role = enumField(
       part.fields?.role?.value,
       LOGO_ROLES,
@@ -7263,7 +7500,10 @@ function registerLogoRoutes(app, deps) {
     json.logos = role === "primary" ? logos.map((l) => l !== entry && l?.role === "primary" ? { ...l, role: "alternate" } : l) : logos;
     const v = validateBrand(json);
     if (!v.valid) return reply.status(400).send({ error: "brand became invalid", details: v.errors });
-    return core.store.updateBrand(brand.id, json);
+    const row = core.store.updateBrand(brand.id, json);
+    const meta = await sharp20(core.images.read(part.hash)).metadata().catch(() => null);
+    const logoEdge = meta ? Math.max(meta.width ?? 0, meta.height ?? 0) || null : null;
+    return { ...row, logoHash: part.hash, logoEdge };
   });
   app.patch("/api/brands/:id/logos/:hash", async (req, reply) => {
     const brand = core.store.getBrand(req.params.id);
@@ -7388,7 +7628,7 @@ async function vibrantColor(input) {
   let data;
   let channels;
   try {
-    const out = await sharp7(input).resize(48, 48, { fit: "inside" }).raw().toBuffer({ resolveWithObject: true });
+    const out = await sharp20(input).resize(48, 48, { fit: "inside" }).raw().toBuffer({ resolveWithObject: true });
     data = out.data;
     channels = out.info.channels;
   } catch {
@@ -7411,7 +7651,7 @@ async function vibrantColor(input) {
   const best = buckets.reduce((a, b) => b.score > a.score ? b : a, buckets[0]);
   if (best.score <= 0) {
     try {
-      const { dominant } = await sharp7(input).stats();
+      const { dominant } = await sharp20(input).stats();
       return toHex(dominant.r, dominant.g, dominant.b);
     } catch {
       return null;
@@ -7795,10 +8035,11 @@ function registerAssetBuildRoutes(app, deps) {
     core.ledger.recordCost(engineId, null, result.costUsd);
     const hash = result.images[0];
     if (!hash) return reply.status(500).send({ error: "the engine returned no image" });
+    const trimmed = await trimEdgeBars(core, hash);
     commit(core, brand.id, (json) => {
-      json.scenes = brandScenes(json).map((s) => s.id === id ? { ...s, preview: `asset:${hash}` } : s);
+      json.scenes = brandScenes(json).map((s) => s.id === id ? { ...s, preview: `asset:${trimmed}` } : s);
     });
-    return { preview: `asset:${hash}`, brand: core.store.getBrand(brand.id) };
+    return { preview: `asset:${trimmed}`, brand: core.store.getBrand(brand.id) };
   });
 }
 async function withDerivedCrops(core, body, base) {
@@ -8029,7 +8270,7 @@ async function buildExportZip(image, baseName, presetIds) {
   const chosen = EXPORT_PRESETS.filter((p) => presetIds.includes(p.id));
   if (chosen.length === 0) throw new Error("No valid export presets selected");
   for (const p of chosen) {
-    const buf = p.width && p.height ? await sharp7(image).resize(p.width, p.height, { fit: "cover", position: "attention" }).png().toBuffer() : image;
+    const buf = p.width && p.height ? await sharp20(image).resize(p.width, p.height, { fit: "cover", position: "attention" }).png().toBuffer() : image;
     zip.file(`${baseName}-${p.id}.png`, buf);
   }
   return zip.generateAsync({ type: "nodebuffer" });
@@ -8190,7 +8431,8 @@ function registerImageRoutes(app, deps) {
     if (!part) return reply.status(400).send({ error: "multipart file field required" });
     const buf = await part.toBuffer();
     if (buf.length === 0) return reply.status(400).send({ error: "empty file" });
-    const png = await sharp7(buf).rotate().png().toBuffer();
+    const fmt = (await sharp20(buf).metadata().catch(() => null))?.format;
+    const png = fmt === "svg" ? await toMarkPng(buf) : await sharp20(buf).rotate().png().toBuffer();
     return { hash: core.images.save(png) };
   });
   app.post("/api/diff", async (req, reply) => {
@@ -8225,6 +8467,43 @@ function registerImageRoutes(app, deps) {
 
 // src/release/notes.data.ts
 var RELEASES = [
+  {
+    version: "0.7.0",
+    date: "2026-08-30",
+    title: "Your presenter stays your presenter.",
+    sections: [
+      {
+        heading: "Scenes",
+        body: "A scene lends its world, its light and its treatment, never a face. Generation now conditions on the scene\u2019s own drawn card instead of your raw upload, so the person you selected is the person in the shot. Scenes made before this release render printed treatments best after a one-tap redraw from the scene\u2019s page."
+      },
+      {
+        heading: "Refine",
+        body: "Refining light and mood no longer wears a shot down: a tonal refinement keeps the photograph\u2019s own pixels and changes only the grade, so the tenth adjustment is as sharp as the first. High-resolution refinements state their working size honestly instead of inflating it, and refining an extended shot works again."
+      },
+      {
+        heading: "Presenters",
+        body: "A presenter\u2019s identity rides with three of their views. A reference you attach cannot lend anyone its face while a presenter is selected, and a mood image carried into a refinement is never mistaken for the person in the picture."
+      }
+    ]
+  },
+  {
+    version: "0.6.13",
+    date: "2026-08-30",
+    sections: [
+      {
+        heading: "Products",
+        body: "A product sold in several colours renders the colour its first photo shows, instead of blending them. Imported products now carry their own description and colour list into every shot, so scale and colourway stay true."
+      },
+      {
+        heading: "Brand",
+        body: "Attach your own logo straight from the Brand tab when composing; it joins the kit and rides the shot. Small logo files are raised to a workable resolution, the smallest lettering and its script are now part of the contract, and a logo too small to survive says so before you spend."
+      },
+      {
+        heading: "Create",
+        body: "The refine strip counts each product once and names the scene a thread keeps. A retried shot carries your recipe, never leftovers from the previous run."
+      }
+    ]
+  },
   {
     version: "0.6.12",
     date: "2026-08-29",
@@ -9002,6 +9281,12 @@ function buildServer(opts) {
       // about its own format — broken in the marks grid, and mislabelled to any
       // engine it is later attached to.
       saveAsset: async (buf) => `asset:${core.images.save(await toMarkPng(buf))}`,
+      // Measured as stored (post-toMarkPng), so the scrape judges the same
+      // pixels the compiler will one day attach.
+      probeLongEdge: async (buf) => {
+        const m = await sharp20(await toMarkPng(buf)).metadata();
+        return Math.max(m.width ?? 0, m.height ?? 0) || null;
+      },
       createdWith: `${meta.name}/${meta.version}`
     });
     const row = core.store.createBrand(brand);
@@ -9087,6 +9372,10 @@ function buildServer(opts) {
     const { brand: scraped, warnings } = await buildFromUrl(url, {
       fetchImpl: opts.fetchImpl,
       saveAsset: async (buf) => `asset:${core.images.save(await toMarkPng(buf))}`,
+      probeLongEdge: async (buf) => {
+        const m = await sharp20(await toMarkPng(buf)).metadata();
+        return Math.max(m.width ?? 0, m.height ?? 0) || null;
+      },
       createdWith: `${meta.name}/${meta.version}`
     });
     const { brand: merged, suggestions } = mergeScrape(brand.json, scraped);
@@ -9189,13 +9478,29 @@ function buildServer(opts) {
   registerDemoProductRoutes(app, { templatesRoot, demoProducts, demoProductById });
   registerShowcaseRoutes(app, { templatesRoot });
   app.get("/api/formats", async () => FORMATS);
+  function briefInputsOnly(brief) {
+    const {
+      inherited,
+      rendered,
+      croppedFrom,
+      resizedFrom,
+      resampledHops,
+      steppedDown,
+      gradeComposited,
+      expand,
+      crop: crop2,
+      sourceImage,
+      ...inputs
+    } = brief;
+    return inputs;
+  }
   async function compileEditBrief(brandId, parentId, brief, engineCaps, opts2) {
     const inherited = inheritedIdentityTokens(parentId, (id) => core.store.getNode(id));
     const borrowed = inherited.tokens;
     const already = new Set(
-      brief.tokens.filter((t) => t.t === "product" || t.t === "character" || t.t === "mark" || t.t === "ref").map((t) => JSON.stringify(t))
+      brief.tokens.filter((t) => t.t === "product" || t.t === "character" || t.t === "mark" || t.t === "ref").map(identityTokenKey)
     );
-    const inheritedTokens = borrowed.filter((t) => !already.has(JSON.stringify(t)));
+    const inheritedTokens = borrowed.filter((t) => !already.has(identityTokenKey(t)));
     const combined = [...brief.tokens, ...inheritedTokens];
     const brandJson = await brandJsonWithResolvedPresenters(
       core,
@@ -9217,6 +9522,9 @@ function buildServer(opts) {
     );
     const inheritedDirectives = [];
     let inheritedMark = false;
+    let inheritedRef = false;
+    const inheritedProduct = inheritedTokens.some((t) => t.t === "product");
+    const inheritedPerson = inheritedTokens.some((t) => t.t === "character");
     for (const tok of inheritedTokens) {
       if (tok.t === "product") {
         const rec = (brandJson?.products ?? []).find((x) => x?.id === tok.id);
@@ -9235,8 +9543,12 @@ function buildServer(opts) {
       } else if (tok.t === "mark" && !inheritedMark) {
         inheritedMark = true;
         inheritedDirectives.push(markEditDirective());
+      } else if (tok.t === "ref" && !inheritedRef) {
+        inheritedRef = true;
+        inheritedDirectives.push(inheritedRefDirective());
       }
     }
+    if (inheritedPerson) inheritedDirectives.push(personSkinDirective());
     const compiled2 = compileBrief(brief, {
       brand: brandJson,
       images: core.images,
@@ -9246,7 +9558,11 @@ function buildServer(opts) {
       mode: "edit",
       editScope: verdict.scope,
       editRemoval: verdict.removal ?? false,
-      inheritedIdentity: inheritedTokens.length > 0,
+      // Kinds, not a count: the identity claim speaks only about the kinds
+      // that actually ride. A mark-only or ref-only inheritance emits no
+      // generic claim - markEditDirective and inheritedRefDirective speak
+      // for themselves.
+      inheritedIdentity: inheritedProduct || inheritedPerson ? { product: inheritedProduct, person: inheritedPerson } : false,
       inheritedDirectives,
       // Only the explicit op drops the dimension promise: an implicit legacy
       // expansion keeps its historical prompt byte for byte.
@@ -9257,7 +9573,7 @@ function buildServer(opts) {
     if (inheritedTokens.length) {
       const identity = compileBrief(
         { tokens: inheritedTokens },
-        { brand: brandJson, images: core.images, engineCaps: uncapped, templateById: sceneById }
+        { brand: brandJson, images: core.images, engineCaps: uncapped, templateById: sceneById, mode: "edit" }
       );
       identityWarnings = identity.warnings;
       const productAngles = /* @__PURE__ */ new Map();
@@ -9412,11 +9728,11 @@ function buildServer(opts) {
     const out = [];
     for (const h of images) {
       const buf = core.images.read(h);
-      const meta2 = await sharp7(buf).metadata().catch(() => null);
+      const meta2 = await sharp20(buf).metadata().catch(() => null);
       if (!meta2?.width || !meta2.height) throw new Error("engine returned an undecodable image");
       const oriented = (meta2.orientation ?? 1) !== 1;
       out.push(
-        buf.subarray(0, 8).equals(PNG_SIG) && !oriented ? h : core.images.save(await sharp7(buf).rotate().png().toBuffer())
+        buf.subarray(0, 8).equals(PNG_SIG) && !oriented ? h : core.images.save(await sharp20(buf).rotate().png().toBuffer())
       );
     }
     return out;
@@ -9428,7 +9744,7 @@ function buildServer(opts) {
       const out = [];
       for (const h of images) {
         const buf = core.images.read(h);
-        const meta2 = await sharp7(buf).metadata();
+        const meta2 = await sharp20(buf).metadata();
         if (!meta2.width || !meta2.height) {
           out.push(h);
           continue;
@@ -9441,7 +9757,7 @@ function buildServer(opts) {
         }
         const w = got > target ? Math.round(meta2.height * target) : meta2.width;
         const hpx = got > target ? meta2.height : Math.round(meta2.width / target);
-        const cropped = await sharp7(buf).resize(w, hpx, { fit: "cover", position: "attention" }).png().toBuffer();
+        const cropped = await sharp20(buf).resize(w, hpx, { fit: "cover", position: "attention" }).png().toBuffer();
         app.log.info(
           { nodeId, got: `${meta2.width}x${meta2.height}`, want: `${w}x${hpx}` },
           "canvas: cropped a drifted frame to the asked ratio"
@@ -9460,7 +9776,7 @@ function buildServer(opts) {
   async function assertAspect(images, expect) {
     const want = expect.width / expect.height;
     for (const h of images) {
-      const meta2 = await sharp7(core.images.read(h)).metadata();
+      const meta2 = await sharp20(core.images.read(h)).metadata();
       if (!meta2.width || !meta2.height) continue;
       const got = meta2.width / meta2.height;
       if (Math.abs(got - want) / want > ASPECT_TOLERANCE)
@@ -9492,7 +9808,7 @@ function buildServer(opts) {
       try {
         const sizes = [];
         for (const h of result.images) {
-          const meta2 = await sharp7(core.images.read(h)).metadata();
+          const meta2 = await sharp20(core.images.read(h)).metadata();
           if (meta2.width && meta2.height) sizes.push([meta2.width, meta2.height]);
         }
         const node = core.store.getNode(nodeId);
@@ -9559,7 +9875,7 @@ function buildServer(opts) {
       if (!srcHash || !core.images.has(String(srcHash)))
         return reply.status(400).send({ error: "edit needs a parent node with an image (sourceImage)" });
       const srcBuf = core.images.read(String(srcHash));
-      const srcMeta = await sharp7(srcBuf).metadata();
+      const srcMeta = await sharp20(srcBuf).metadata();
       if (!srcMeta.width || !srcMeta.height) return reply.status(400).send({ error: "source image unreadable" });
       const plan2 = planCrop({ width: srcMeta.width, height: srcMeta.height }, Number(fmt.w) / Number(fmt.h));
       if (!plan2) return reply.status(400).send({ error: "the picture is already this shape" });
@@ -9576,13 +9892,13 @@ function buildServer(opts) {
         engineId: "local"
       });
       core.store.setBrief(node2.id, {
-        ...brief ?? {},
+        ...briefInputsOnly(brief ?? {}),
         sourceImage: String(srcHash),
         reshape: "crop",
         crop: window
       });
       const work2 = async () => ({
-        images: [core.images.save(await sharp7(srcBuf).extract(window).png().toBuffer())],
+        images: [core.images.save(await sharp20(srcBuf).extract(window).png().toBuffer())],
         costUsd: 0
       });
       void runNode(node2.id, null, 0, work2, { width: plan2.width, height: plan2.height }).catch(
@@ -9604,6 +9920,9 @@ function buildServer(opts) {
     let inheritedTokens = [];
     let mergedEdit = null;
     let editScope = "global";
+    let gradeOnlyAsk = false;
+    let budgetSourceHash;
+    let sentSize;
     const extraWarnings = [];
     let expandPlan = null;
     let expandSourceHash = null;
@@ -9618,6 +9937,9 @@ function buildServer(opts) {
         inheritedTokens = edit.inheritedTokens;
         mergedEdit = edit.merged;
         editScope = edit.editScope;
+        gradeOnlyAsk = editScope === "global" && isGradeOnlyInstruction(
+          (brief?.tokens ?? []).filter((t) => t.t === "text").map((t) => t.v).join(" ")
+        );
         extraWarnings.push(...edit.warnings.filter((w) => !compiled2?.warnings.includes(w)));
         if (!compiled2.prompt.trim() && reshape !== "extend")
           return reply.status(400).send({ error: "the brief is empty" });
@@ -9734,11 +10056,12 @@ function buildServer(opts) {
       const editEdge = engine.capabilities().maxReferenceEdge;
       if (editEdge) for (const r of editRefs) r.path = await capReferenceEdge(core, r.path, editEdge);
       const srcBuf = core.images.read(String(srcHash));
-      const srcMeta = await sharp7(srcBuf).metadata();
+      const srcMeta = await sharp20(srcBuf).metadata();
       if (srcMeta.width && srcMeta.height) expectShape = { width: srcMeta.width, height: srcMeta.height };
       const parentFormat = parent?.brief?.tokens?.find((t) => t?.t === "format");
       const parentNominal = parentFormat && Number(parentFormat.w) > 0 && Number(parentFormat.h) > 0 ? { width: Number(parentFormat.w), height: Number(parentFormat.h) } : null;
-      const reshapeIntended = reshape === "extend" || reshape === void 0 && !!srcMeta.width && !!srcMeta.height && !!compiled2?.width && !!compiled2?.height && wantsImplicitReshape({ width: compiled2.width, height: compiled2.height }, parentNominal, {
+      const briefNamesShape = (brief?.tokens ?? []).some((t) => t?.t === "format");
+      const reshapeIntended = reshape === "extend" || reshape === void 0 && briefNamesShape && !!srcMeta.width && !!srcMeta.height && !!compiled2?.width && !!compiled2?.height && wantsImplicitReshape({ width: compiled2.width, height: compiled2.height }, parentNominal, {
         width: srcMeta.width,
         height: srcMeta.height
       });
@@ -9765,9 +10088,20 @@ 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);
+        budgetSourceHash = core.images.save(
+          await sharp20(srcBuf).resize(sentSize.width, sentSize.height, { fit: "fill", kernel: "lanczos3" }).png().toBuffer()
+        );
+        if (!gradeOnlyAsk)
+          extraWarnings.push(
+            `${runEngine.capabilities().displayName} refines at about ${(editPixelBudget / 1e6).toFixed(1)} megapixels, so this ${srcMeta.width}x${srcMeta.height} frame continues at ${sentSize.width}x${sentSize.height} from here on. The picture is unchanged; the stored size is now the size the engine truly drew.`
+          );
+      }
       const editReq = {
         instruction: expandPlan ? expandInstruction(expandPlan, finalPrompt) : finalPrompt,
-        sourceImage: core.images.pathFor(String(expandSourceHash ?? srcHash)),
+        sourceImage: core.images.pathFor(String(expandSourceHash ?? budgetSourceHash ?? srcHash)),
         brand: ctx,
         ...editRefs.length ? { referenceImages: editRefs.map((r) => r.path) } : {},
         ...editRefs.length ? { referenceRoles: editRefs.map((r) => r.role ?? "reference") } : {},
@@ -9777,7 +10111,7 @@ function buildServer(opts) {
         // engines given no size answered at whatever size they liked, the
         // shrunken answer was stored, and the next refinement inherited it —
         // the chain that walked shots down to thumbnails.
-        ...expandPlan ? { width: expandPlan.width, height: expandPlan.height } : srcMeta.width && srcMeta.height ? { width: srcMeta.width, height: srcMeta.height } : {},
+        ...expandPlan ? { width: expandPlan.width, height: expandPlan.height } : sentSize ? sentSize : srcMeta.width && srcMeta.height ? { width: srcMeta.width, height: srcMeta.height } : {},
         // Only an engine that can genuinely paint a margin is told where the
         // picture sits; the rest would ignore it anyway.
         ...expandPlan && canOutpaint2 ? {
@@ -9854,7 +10188,7 @@ function buildServer(opts) {
     });
     if (brief)
       core.store.setBrief(node.id, {
-        ...brief,
+        ...briefInputsOnly(brief),
         ...editedFrom ? { sourceImage: editedFrom } : {},
         ...kind === "edit" && reshape ? { reshape } : {},
         // How the margin was actually made, and by whom. An extend may be
@@ -9879,13 +10213,29 @@ function buildServer(opts) {
     const original = editedFrom ? core.images.read(editedFrom) : null;
     const localScope = kind === "edit" && !plan && editScope === "local" && original;
     const enforceEditCanvas = async (images) => {
-      const srcMeta = await sharp7(original).metadata();
+      const srcMeta = await sharp20(original).metadata();
       if (!srcMeta.width || !srcMeta.height) return images;
       const out = [];
       for (const h of images) {
-        const meta2 = await sharp7(core.images.read(h)).metadata();
+        const meta2 = await sharp20(core.images.read(h)).metadata();
         const got = { width: meta2.width ?? 0, height: meta2.height ?? 0 };
-        const verdict = judgeEditSize({ width: srcMeta.width, height: srcMeta.height }, got);
+        const verdict = judgeEditSize({ width: srcMeta.width, height: srcMeta.height }, got, {
+          pixelBudget: runEngine.capabilities().editPixelBudget
+        });
+        if (verdict.action === "accept") {
+          app.log.info(
+            { nodeId: node.id, got: `${got.width}x${got.height}`, src: `${srcMeta.width}x${srcMeta.height}` },
+            "edit: kept the engine-native answer (pixel-budget step-down)"
+          );
+          try {
+            const fresh = core.store.getNode(node.id);
+            const b = fresh?.brief ?? {};
+            core.store.setBrief(node.id, { ...b, steppedDown: [srcMeta.width, srcMeta.height] });
+          } catch {
+          }
+          out.push(h);
+          continue;
+        }
         if (verdict.action === "reject")
           throw new Error(
             `engine returned ${got.width}x${got.height} for a ${srcMeta.width}x${srcMeta.height} frame: too little of the picture came back to keep at this resolution`
@@ -9897,7 +10247,7 @@ function buildServer(opts) {
           );
           out.push(
             core.images.save(
-              await sharp7(core.images.read(h)).resize(srcMeta.width, srcMeta.height, { fit: "fill" }).png().toBuffer()
+              await sharp20(core.images.read(h)).resize(srcMeta.width, srcMeta.height, { fit: "fill" }).png().toBuffer()
             )
           );
           try {
@@ -9919,7 +10269,7 @@ function buildServer(opts) {
       const out = [];
       for (const h of images) {
         const answer = core.images.read(h);
-        const got = await sharp7(answer).metadata();
+        const got = await sharp20(answer).metadata();
         if (got.width !== plan.width || got.height !== plan.height)
           app.log.info(
             { nodeId: node.id, got: `${got.width}x${got.height}`, want: `${plan.width}x${plan.height}` },
@@ -9945,6 +10295,26 @@ function buildServer(opts) {
       return images;
     } : kind === "edit" && original ? async (images) => {
       let staged = images;
+      if (gradeOnlyAsk && !expandPlan) {
+        const sent = budgetSourceHash ? core.images.read(budgetSourceHash) : original;
+        const out = [];
+        for (const h of staged) {
+          const g = await gradeComposite(original, sent, core.images.read(h));
+          if (g) {
+            app.log.info(
+              { nodeId: node.id, residual: Number(g.residual.toFixed(2)) },
+              "edit: shipped the original pixels wearing the grade"
+            );
+            out.push(core.images.save(g.image));
+            try {
+              const fresh = core.store.getNode(node.id);
+              core.store.setBrief(node.id, { ...fresh?.brief ?? {}, gradeComposited: true });
+            } catch {
+            }
+          } else out.push(h);
+        }
+        staged = out;
+      }
       if (localScope) {
         const out = [];
         for (const h of staged) {
@@ -10220,8 +10590,8 @@ async function verify() {
     const db = new Database2(":memory:");
     db.pragma("user_version");
     db.close();
-    const { default: sharp19 } = await import('sharp');
-    await sharp19({ create: { width: 1, height: 1, channels: 3, background: "#000" } }).png().toBuffer();
+    const { default: sharp21 } = await import('sharp');
+    await sharp21({ create: { width: 1, height: 1, channels: 3, background: "#000" } }).png().toBuffer();
     console.log(JSON.stringify({ ok: true, version: readMeta().version }));
   } catch (err) {
     console.log(JSON.stringify({ ok: false, error: String(err?.message ?? err) }));