scenri 0.4.7 → 0.5.1

package/dist/serve.js

@@ -10,7 +10,7 @@ import fs, { realpathSync, existsSync, readFileSync, mkdirSync, chmodSync, write
 import { fileURLToPath } from 'url';
 import { readFile, copyFile, mkdtemp, rm, readdir, stat, writeFile } from 'fs/promises';
 import { spawn } from 'child_process';
-import sharp8 from 'sharp';
+import sharp7 from 'sharp';
 import Fastify from 'fastify';
 import fastifyStatic from '@fastify/static';
 import fastifyMultipart from '@fastify/multipart';
@@ -643,14 +643,9 @@ function createStore(db) {
         if (!parent || parent.projectId !== input.projectId) throw new Error("parent node not found in project");
       }
       const id = randomUUID();
-      db.prepare("INSERT INTO nodes (id, project_id, parent_id, kind, prompt, engine_id) VALUES (?,?,?,?,?,?)").run(
-        id,
-        input.projectId,
-        input.parentId,
-        input.kind,
-        input.prompt,
-        input.engineId
-      );
+      db.prepare(
+        "INSERT INTO nodes (id, project_id, parent_id, kind, prompt, engine_id, created_at) VALUES (?,?,?,?,?,?, strftime('%Y-%m-%d %H:%M:%f','now'))"
+      ).run(id, input.projectId, input.parentId, input.kind, input.prompt, input.engineId);
       return this.getNode(id);
     },
     completeNode(id, result) {
@@ -672,7 +667,7 @@ function createStore(db) {
       return r ? rowToNode(r) : null;
     },
     treeFor(projectId) {
-      return db.prepare("SELECT * FROM nodes WHERE project_id=? ORDER BY created_at").all(projectId).map(
+      return db.prepare("SELECT * FROM nodes WHERE project_id=? ORDER BY created_at, id").all(projectId).map(
         rowToNode
       );
     },
@@ -697,7 +692,7 @@ function createStore(db) {
             WHERE p.brand_id = ?
               AND n.kind != 'root'
               AND (n.status = 'running' OR n.created_at >= datetime('now', '-2 days'))
-            ORDER BY n.created_at DESC
+            ORDER BY n.created_at DESC, n.id DESC
             LIMIT ?`
       ).all(brandId, limit);
       return rows.map((r) => ({
@@ -1243,9 +1238,9 @@ function libraryMethods(db) {
           local: String(i.sourceUrl).startsWith("local:")
         });
         const seen = /* @__PURE__ */ new Set();
-        const usable = images.filter((i) => i.assetRef && !seen.has(i.assetRef) && seen.add(i.assetRef));
-        const shots = usable.filter((i) => !i.excluded).map(shot);
-        const hiddenShots = usable.filter((i) => i.excluded).map(shot);
+        const usable2 = images.filter((i) => i.assetRef && !seen.has(i.assetRef) && seen.add(i.assetRef));
+        const shots = usable2.filter((i) => !i.excluded).map(shot);
+        const hiddenShots = usable2.filter((i) => i.excluded).map(shot);
         return {
           id: `cat-${p.id}`,
           name: p.title,
@@ -1491,6 +1486,7 @@ function createOpenRouterEngine(opts) {
 var API_BASE = "https://api.replicate.com/v1";
 var DEFAULT_MODEL2 = "black-forest-labs/flux-schnell";
 var DEFAULT_EDIT_MODEL = "black-forest-labs/flux-kontext-pro";
+var DEFAULT_EXPAND_MODEL = "bria/expand-image";
 var DEFAULT_POLL_INTERVAL_MS = 1500;
 var DEFAULT_TIMEOUT_MS = 12e4;
 var GENERATE_COST_PER_IMAGE_USD = 3e-3;
@@ -1552,6 +1548,7 @@ function createReplicateEngine(opts) {
     fetchImpl = globalThis.fetch,
     model = DEFAULT_MODEL2,
     editModel = DEFAULT_EDIT_MODEL,
+    expandModel = DEFAULT_EXPAND_MODEL,
     pollIntervalMs = DEFAULT_POLL_INTERVAL_MS,
     timeoutMs = DEFAULT_TIMEOUT_MS
   } = opts;
@@ -1646,6 +1643,8 @@ function createReplicateEngine(opts) {
         localOnly: false,
         supportsEdit: true,
         supportsMask: false,
+        // bria/expand-image: the picture plus the canvas it belongs in.
+        supportsOutpaint: true,
         // 0, deliberately — see the same note in the fal adapter. generate()
         // sends only prompt/num_outputs/aspect_ratio, so a declared capacity
         // of 1 was a promise this adapter never kept.
@@ -1684,12 +1683,30 @@ function createReplicateEngine(opts) {
     async edit(req, signal) {
       const key = requireKey();
       const file = await readFile(req.sourceImage);
+      const dataUri = `data:image/png;base64,${file.toString("base64")}`;
+      if (req.expand && req.width && req.height) {
+        const started = await createPrediction(
+          key,
+          expandModel,
+          {
+            image_url: dataUri,
+            canvas_size: [req.width, req.height],
+            original_image_size: [req.expand.width, req.expand.height],
+            original_image_location: [req.expand.left, req.expand.top],
+            ...req.instruction.trim() ? { prompt: req.instruction } : {},
+            ...typeof req.seed === "number" ? { seed: req.seed } : {}
+          },
+          signal
+        );
+        const done = await waitForCompletion(key, started, signal);
+        return { images: await downloadOutputs(done, signal), costUsd: EDIT_COST_USD, raw: done };
+      }
       const created = await createPrediction(
         key,
         editModel,
         {
           prompt: req.instruction,
-          input_image: `data:image/png;base64,${file.toString("base64")}`
+          input_image: dataUri
         },
         signal
       );
@@ -1705,6 +1722,7 @@ function createReplicateEngine(opts) {
 }
 var DEFAULT_MODEL3 = "fal-ai/flux/schnell";
 var DEFAULT_EDIT_MODEL2 = "fal-ai/flux-kontext/dev";
+var DEFAULT_EXPAND_MODEL2 = "fal-ai/bria/expand";
 var GENERATE_COST_PER_IMAGE_USD2 = 3e-3;
 var EDIT_COST_USD2 = 0.025;
 function snippetOf(text) {
@@ -1754,6 +1772,7 @@ function createFalEngine(opts) {
   const fetchImpl = opts.fetchImpl ?? globalThis.fetch;
   const model = opts.model ?? DEFAULT_MODEL3;
   const editModel = opts.editModel ?? DEFAULT_EDIT_MODEL2;
+  const expandModel = opts.expandModel ?? DEFAULT_EXPAND_MODEL2;
   function requireKey() {
     const key = opts.getKey();
     if (!key) throw new Error("fal.ai API key not set. Set a fal.ai key in Settings.");
@@ -1811,6 +1830,8 @@ function createFalEngine(opts) {
         localOnly: false,
         supportsEdit: true,
         supportsMask: false,
+        // bria/expand: the picture plus where it sits, margin only.
+        supportsOutpaint: true,
         // 0, deliberately. This adapter's generate() sends only prompt/size/
         // count — it has never forwarded a reference image to the model. It
         // previously advertised 1, so compileBrief would resolve a product
@@ -1849,6 +1870,26 @@ function createFalEngine(opts) {
     async edit(req, signal) {
       const key = requireKey();
       const imageUrl = await sourceImageToDataUri(req.sourceImage);
+      if (req.expand && req.width && req.height) {
+        const json2 = await postJson(
+          expandModel,
+          key,
+          {
+            image_url: imageUrl,
+            canvas_size: [req.width, req.height],
+            original_image_size: [req.expand.width, req.expand.height],
+            original_image_location: [req.expand.left, req.expand.top],
+            ...req.instruction.trim() ? { prompt: req.instruction } : {},
+            // Same picture, same shape, same margin: an extend a user runs
+            // twice should not be a different picture twice.
+            ...typeof req.seed === "number" ? { seed: req.seed } : {}
+          },
+          signal
+        );
+        const urls2 = extractImageUrls(json2);
+        const images2 = await saveAll(urls2, signal);
+        return { images: images2, costUsd: EDIT_COST_USD2, raw: json2 };
+      }
       const json = await postJson(editModel, key, { prompt: req.instruction, image_url: imageUrl }, signal);
       const urls = extractImageUrls(json);
       const images = await saveAll(urls, signal);
@@ -2508,7 +2549,14 @@ function createCodexEngine(opts) {
       } finally {
         signal?.removeEventListener("abort", onOuterAbort);
       }
-      const images = results.filter(Boolean).flat();
+      const images = [];
+      const variantIndexes = [];
+      for (const [i, slot] of results.entries()) {
+        for (const hash of slot ?? []) {
+          images.push(hash);
+          variantIndexes.push(i);
+        }
+      }
       if (!images.length && failures.length) throw fatal ?? failures[0];
       if (failures.length) {
         console.warn(
@@ -2517,7 +2565,11 @@ function createCodexEngine(opts) {
         return {
           images,
           costUsd: 0,
-          raw: { requested: count, partialFailures: failures.map((f) => String(f?.message ?? f)) }
+          raw: {
+            requested: count,
+            variantIndexes,
+            partialFailures: failures.map((f) => String(f?.message ?? f))
+          }
         };
       }
       return { images, costUsd: 0 };
@@ -2534,7 +2586,9 @@ function createCodexEngine(opts) {
           await copyFile(editRefs[i], join(dir, name));
           refLines.push(`${name} shows ${EDIT_REFERENCE_ROLE_DIRECTIVE[role]}`);
         }
-        const promptText = `Edit input.png using your image generation/editing tool: ${req.instruction}.` + (refLines.length ? ` ${refLines.join(". ")}.` : "") + ` Do not browse the web or explore files. Save the result in the current directory as out-1.png (you may run the commands needed to save and resize it). Nothing else.`;
+        const promptText = `Edit input.png using your image generation/editing tool: ${req.instruction}.` + (refLines.length ? ` ${refLines.join(". ")}.` : "") + ` Do not browse the web or explore files. Save the result in the current directory as out-1.png (you may run the commands needed to save and resize it).` + // sips is already licensed by the parenthesis above; an exact-size
+        // answer lets the caller's compositing pass skip its rescale.
+        (req.width && req.height ? ` Save the result at exactly ${req.width}x${req.height} pixels.` : "") + ` Nothing else.`;
         const args = execArgs(dir);
         for (const name of ["input.png", ...refLines.map((_, i) => `${editRoles[i] ?? "reference"}-${i + 1}.png`)]) {
           args.splice(args.length - 1, 0, `--image=${join(dir, name)}`);
@@ -2607,7 +2661,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 sharp8(Buffer.from(svg)).png().toBuffer();
+    return sharp7(Buffer.from(svg)).png().toBuffer();
   }
   return {
     capabilities() {
@@ -2617,6 +2671,11 @@ function createDemoEngine(saveImage) {
         localOnly: false,
         supportsEdit: true,
         supportsMask: false,
+        // It draws a placeholder for everything, expansions included, so it
+        // stands in for a capable engine rather than blocking the path in
+        // development and in the end-to-end suite. `placeholder` below is what
+        // says none of this is a real picture.
+        supportsOutpaint: true,
         maxReferenceImages: 0,
         placeholder: true
       };
@@ -2770,7 +2829,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 sharp8(readFileSync(path)).png().toBuffer();
+    const png = await sharp7(readFileSync(path)).png().toBuffer();
     const hash = core.images.save(png);
     shots.push({ file: `asset:${hash}`, angle, locked: true });
   }
@@ -2864,7 +2923,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 sharp8(readFileSync(path)).png().toBuffer();
+    const png = await sharp7(readFileSync(path)).png().toBuffer();
     const hash = core.images.save(png);
     shots.push({ file: `asset:${hash}`, angle, locked: true });
   }
@@ -2913,6 +2972,67 @@ function defaultDemoProductsDir() {
   return join(here, "..", "..", "..", "templates", "demo-products");
 }
 
+// src/attachmentBudget.ts
+var ROLE_PRIORITY = {
+  product: 0,
+  character: 1,
+  brand: 2,
+  scene: 3,
+  composition: 4,
+  reference: 5,
+  style: 6
+};
+function allocateAttachments(attachments, cap2) {
+  const max = Math.max(0, cap2);
+  const indexed = attachments.map((a, i) => ({ a, i }));
+  const legacyOrder = [...indexed].sort(
+    (x, y) => Number(!!y.a.essential) - Number(!!x.a.essential) || ROLE_PRIORITY[x.a.role] - ROLE_PRIORITY[y.a.role] || x.i - y.i
+  );
+  const groupOf = (a) => `${a.role}:${a.id ?? a.hash}`;
+  const kept = /* @__PURE__ */ new Set();
+  const keptGroups = /* @__PURE__ */ new Set();
+  const admit = (x) => {
+    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) {
+    if (kept.size >= max) break;
+    if (!kept.has(x.i) && !keptGroups.has(groupOf(x.a))) admit(x);
+  }
+  const queues = /* @__PURE__ */ new Map();
+  for (const x of legacyOrder) {
+    if (kept.has(x.i)) continue;
+    const g = groupOf(x.a);
+    if (!queues.has(g)) queues.set(g, []);
+    queues.get(g).push(x);
+  }
+  let admitted = true;
+  while (kept.size < max && admitted) {
+    admitted = false;
+    for (const queue of queues.values()) {
+      if (kept.size >= max) break;
+      const x = queue.shift();
+      if (x) {
+        admit(x);
+        admitted = true;
+      }
+    }
+  }
+  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)
+  };
+}
+function mergeEditAttachments(own, inherited, cap2) {
+  const seen = new Set(own.map((a) => a.hash));
+  const borrowed = inherited.filter((a) => !seen.has(a.hash)).map((a) => ({ ...a, inherited: true }));
+  return allocateAttachments([...own, ...borrowed], cap2);
+}
+
 // src/briefDirectives.ts
 function productFidelityDirective(attached) {
   if (attached <= 1) {
@@ -2934,7 +3054,7 @@ function garmentDisplayDirective() {
   return "No person is part of this brief. Present the garment as a product, laid, hung, folded or dressed on a plain form, never on a person, a partial figure or an invisible body, unless the direction above explicitly asks for it worn.";
 }
 function shotSpecifiesCamera(text) {
-  return /\b\d{2,3}\s?mm\b|\bf\/\d|\blens\b|\bcamera\b|\bshot from\b|\beye[- ]level\b|\blow angle\b|\bhigh angle\b|\boverhead\b|\btop[- ]down\b|\bbird'?s[- ]eye\b|\bclose[- ]up\b|\bmacro\b|\bwide shot\b|\bcrop(?:ped)?\b|\bframing\b|\bdepth of field\b|\bbokeh\b|\bshallow (?:focus|depth)\b|\bdeep focus\b/i.test(
+  return /\b\d{2,3}\s?mm\b|\bf\/\d|\blens\b|\bcamera\b|\bshot from\b|\beye[- ]level\b|\blow angle\b|\bhigh angle\b|\boverhead\b|\btop[- ]down\b|\bbird'?s[- ]eye\b|\bclose[- ]?up\b|\bmacro\b|\bwide shot\b|\bcrop(?:ped)?\b|\bframing\b|\bDOF\b|\bdepth of field\b|\bbokeh\b|\bshallow (?:focus|depth)\b|\bdeep focus\b/i.test(
     text
   );
 }
@@ -2949,6 +3069,9 @@ function sceneGuardDirectives(opts) {
     out.push(
       "Disregard any wardrobe, accessory, or garment brand named in the scene direction above \u2014 dress the attached person reference only in the generic material and color terms described; do not print, stitch, or render any brand name or wordmark from the scene text onto them."
     );
+    out.push(
+      "The scene direction above describes the set, not the cast. If it says the space is empty or that no people appear, disregard that: the attached person stands in this set, clearly visible. A ban on props or extra objects in the scene direction is about set dressing only \u2014 it never applies to the presenter or to the product in their hands."
+    );
   }
   return out;
 }
@@ -3099,6 +3222,9 @@ function compileBrief(brief, ctx) {
           chashes.forEach((chash, i) => {
             attachments.push({ role: "character", id: c.id, label: c.name, hash: chash, essential: i === 0 });
           });
+          personDirectives.push(
+            `${c.promptName ?? c.name} is in this photograph: a real person, clearly visible in the frame. Do not leave them out, crop them out, or reduce them to a reflection or a shadow.`
+          );
           personDirectives.push(
             "The attached person reference is the same person every time: match their face, facial structure, skin, hair and build exactly. Their outfit, pose, background and lighting are neutral studio capture conditions, not styling direction: dress and style them for this shot, to a commercial standard, following any wardrobe the direction itself specifies. Where the direction specifies none, dress them for the place and the occasion the frame shows, and never return them to the plain base layers they were photographed in."
           );
@@ -3199,11 +3325,21 @@ function compileBrief(brief, ctx) {
   const cameraDirectives = sceneCamera && !shotSpecifiesCamera(sentence) ? [`Camera for this shot: ${sceneCamera}`] : [];
   const guard = scene ? sceneGuardDirectives({ hasProduct: !!productId, hasPerson }) : [];
   const pairDirectives = productId && hasPerson ? [
-    "If the attached product is something a person wears, the presenter wears that exact product, with the rest of the outfit styled around it; otherwise the presenter presents or uses the product naturally."
+    "If the attached product is something a person wears, the presenter wears that exact product, with the rest of the outfit styled around it; otherwise the presenter presents or uses the product naturally.",
+    // A product's own notes are written for solo packshots, and several
+    // catalog records literally say "no props, hands, or presenter in
+    // frame". That data already shipped, so the override lives here in
+    // the compiler: fired only when a person is attached, worded like
+    // the mark exception — the ban stays for invented people, the
+    // attached one is deliberate.
+    "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."
+  ] : [];
+  const closeUpDirectives = hasPerson && /\bclose[- ]?up\b|\bmacro\b|\bzoom(?:ed)?\b|\bDOF\b|\bdepth of field\b/i.test(sentence) ? [
+    "The tight framing includes the presenter: keep at least their hand in genuine contact with the product, and as much more of them as the crop allows. A close-up is never a reason to leave the person out of the photograph."
   ] : [];
   const brandLines = brandRuleDirectives(ctx.brand);
   const preservation = ctx.mode === "edit" ? [
-    editPreservationDirective(ctx.editScope ?? "global", { removal: ctx.editRemoval }),
+    ...ctx.editReshape === "extend" ? [] : [editPreservationDirective(ctx.editScope ?? "global", { removal: ctx.editRemoval })],
     ...ctx.inheritedIdentity ? [inheritedIdentityDirective()] : []
   ] : [];
   const apparelUnworn = ctx.mode !== "edit" && !hasPerson && attachments.some((a) => {
@@ -3215,6 +3351,7 @@ function compileBrief(brief, ctx) {
     ...productDirectives,
     ...personDirectives,
     ...pairDirectives,
+    ...closeUpDirectives,
     ...otherDirectives,
     ...cameraDirectives,
     ...apparelUnworn,
@@ -3223,25 +3360,8 @@ function compileBrief(brief, ctx) {
     ...preservation
   ];
   if (allDirectives.length) prompt = `${prompt}${prompt.endsWith(".") ? "" : "."} ${dedupe(allDirectives).join(" ")}`;
-  const ROLE_PRIORITY = {
-    product: 0,
-    character: 1,
-    brand: 2,
-    scene: 3,
-    composition: 4,
-    reference: 5,
-    style: 6
-  };
-  const ordered = attachments.map((a, i) => ({ a, i })).sort(
-    (x, y) => (
-      // Essential identity first, so a tight cap sheds extra product angles
-      // and style references before it sheds a subject entirely.
-      Number(!!y.a.essential) - Number(!!x.a.essential) || ROLE_PRIORITY[x.a.role] - ROLE_PRIORITY[y.a.role] || x.i - y.i
-    )
-  ).map((x) => x.a);
   const max = ctx.engineCaps.maxReferenceImages;
-  const kept = ordered.slice(0, Math.max(0, max));
-  const dropped = ordered.slice(kept.length);
+  const { kept, dropped } = allocateAttachments(attachments, max);
   if (dropped.length) {
     const names = [...new Set(dropped.map((d) => d.label))];
     warnings.push(
@@ -5213,8 +5333,8 @@ async function runJob(deps, jobId, brandId, url, signal) {
             errors.push({ code: "image_empty", message: "Empty image", url: img.sourceUrl });
             return;
           }
-          const png = await sharp8(buf).rotate().png().toBuffer();
-          const meta = await sharp8(png).metadata();
+          const png = await sharp7(buf).rotate().png().toBuffer();
+          const meta = await sharp7(png).metadata();
           const hash = core.images.save(png);
           core.catalog.setImageAsset(img.productId, img.sourceUrl, `asset:${hash}`, {
             width: meta.width,
@@ -5558,8 +5678,8 @@ async function runPresenterBuild(deps, job, hashes, instruction, signal) {
   }
   if (signal.aborted) throw new Error("cancelled");
   patch(job, { stage: "saving", message: null });
-  const previewHash = await cardCrop(core, shotHashes[0]);
-  const avatarHash = await avatarCrop(core, shotHashes[0]);
+  const generated = shotHashes !== hashes;
+  const { previewHash, avatarHash } = await presenterCrops(core, shotHashes[0], generated ? "generated" : "upload");
   const built = presenterRecordFrom({
     name: job.name,
     shotHashes,
@@ -5624,7 +5744,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 sharp8(buf).greyscale().raw().toBuffer({ resolveWithObject: true });
+  const { data, info } = await sharp7(buf).greyscale().raw().toBuffer({ resolveWithObject: true });
   const W = info.width;
   const H = info.height;
   const scan = (len, cross, at) => {
@@ -5678,7 +5798,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 sharp8(buf).extract({ left: g.left, top: g.top, width, height }).png().toBuffer();
+    const png = await sharp7(buf).extract({ left: g.left, top: g.top, width, height }).png().toBuffer();
     return core.images.save(png);
   } catch {
     return hash;
@@ -5692,19 +5812,80 @@ async function cardCrop(core, hash) {
   });
 }
 async function avatarCrop(core, hash) {
+  if (!hash || !core.images.has(hash)) return void 0;
+  let box = null;
+  try {
+    box = await figureBox(core.images.read(hash));
+  } catch {
+    box = null;
+  }
   return crop(core, hash, (w, h) => {
-    const size = Math.min(w, h, Math.round(h * 0.16));
-    return { left: Math.max(0, Math.round((w - size) / 2)), top: 0, width: size, height: size };
+    if (!box) {
+      const size2 = Math.min(w, h, Math.round(h * 0.16));
+      return { left: Math.max(0, Math.round((w - size2) / 2)), top: 0, width: size2, height: size2 };
+    }
+    const size = Math.min(w, h, Math.max(16, Math.round(box.height * 0.27)));
+    const top = Math.min(Math.max(0, Math.round(box.top - size * 0.08)), h - size);
+    const left = Math.min(Math.max(0, Math.round(box.left + box.width / 2 - size / 2)), w - size);
+    return { left, top, width: size, height: size };
   });
 }
+async function figureBox(buf) {
+  const meta = await sharp7(buf).metadata();
+  const W = meta.width ?? 0;
+  const H = meta.height ?? 0;
+  if (!W || !H) return null;
+  const { info } = await sharp7(buf).trim({ threshold: 12 }).toBuffer({ resolveWithObject: true });
+  const left = Math.abs(info.trimOffsetLeft ?? 0);
+  const top = Math.abs(info.trimOffsetTop ?? 0);
+  const width = info.width ?? 0;
+  const height = info.height ?? 0;
+  if (!width || !height) return null;
+  if (width >= W && height >= H) return null;
+  if (height < H * 0.3 || width < W * 0.05) return null;
+  return { left, top, width, height };
+}
+async function presenterCrops(core, hash, mode) {
+  const previewHash = mode === "generated" ? await cardCrop(core, hash) ?? await cardCropSmart(core, hash) : await cardCropSmart(core, hash) ?? await cardCrop(core, hash);
+  const avatarHash = mode === "generated" ? await avatarCrop(core, hash) ?? await avatarCropSmart(core, hash) : await avatarCropSmart(core, hash) ?? await avatarCrop(core, hash);
+  return { previewHash, avatarHash };
+}
+async function cardCropSmart(core, hash) {
+  return smartCover(core, hash, (w, h) => {
+    if (w / h > 0.8) return { width: Math.round(h * 0.8), height: h };
+    return { width: w, height: Math.min(h, Math.round(w / 0.8)) };
+  });
+}
+async function avatarCropSmart(core, hash) {
+  return smartCover(core, hash, (w, h) => {
+    const size = Math.min(w, h, 512);
+    return { width: size, height: size };
+  });
+}
+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 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();
+    return core.images.save(png);
+  } catch {
+    return void 0;
+  }
+}
 async function crop(core, hash, region) {
   if (!hash || !core.images.has(hash)) return void 0;
   try {
-    const meta = await sharp8(core.images.read(hash)).metadata();
+    const meta = await sharp7(core.images.read(hash)).metadata();
     const w = meta.width ?? 0;
     const h = meta.height ?? 0;
     if (!w || !h) return void 0;
-    const png = await sharp8(core.images.read(hash)).extract(region(w, h)).png().toBuffer();
+    const png = await sharp7(core.images.read(hash)).extract(region(w, h)).png().toBuffer();
     return core.images.save(png);
   } catch {
     return void 0;
@@ -5870,7 +6051,9 @@ function inheritedIdentityTokens(parentId, getNode) {
   for (let hop = 0; hop < MAX_HOPS && id; hop++) {
     const node = getNode(id);
     if (!node || node.kind === "root") return [];
-    const identity = tokensOf(node).filter((t) => t.t === "product" || t.t === "character" || t.t === "mark");
+    const identity = tokensOf(node).filter(
+      (t) => t.t === "product" || t.t === "character" || t.t === "mark" || t.t === "ref"
+    );
     if (identity.length) return identity;
     id = node.parentId;
   }
@@ -5956,33 +6139,436 @@ function planExpand(source, targetRatio) {
   };
 }
 function expandInstruction(plan, direction) {
-  const where = plan.axis === "width" ? "to the left and right" : "above and below";
-  return `Extend this photograph ${where} to fill the empty margin, continuing the same scene, the same surface, the same lighting and the same perspective straight out to the new edges. Do not change, move, rescale or reinterpret anything already in the picture, and do not add a subject, a product or a person that is not already there.${direction.trim() ? ` ${direction.trim()}` : ""}`;
+  const where = plan.axis === "width" ? "left and right" : "top and bottom";
+  const nearEdge = plan.axis === "height" ? "\nDepth: the bottom edge of the frame is the part of the surface nearest the camera; the top edge is the furthest away." : "";
+  const extra = direction.trim().replace(/^[.\s]+/, "");
+  const own = extra ? `
+Also: ${extra}` : "";
+  return `Fill only the soft blurred margin at the ${where} of this frame so the photograph continues into it.
+Continue: the same surface, the same light direction, the same colour temperature and the same depth of field that are already in the picture.` + nearEdge + `
+Constraints: change only the blurred margin; keep the sharp photograph unchanged in position, scale and content.
+Avoid: new objects, products, people, text or watermarks.` + own;
+}
+
+// src/cropRules.ts
+function planCrop(source, targetRatio) {
+  if (!(source.width > 0 && source.height > 0 && targetRatio > 0)) return null;
+  const current = source.width / source.height;
+  if (Math.abs(current - targetRatio) / targetRatio < 0.01) return null;
+  if (targetRatio < current) {
+    const width = Math.max(1, Math.min(source.width, Math.round(source.height * targetRatio)));
+    return { left: Math.floor((source.width - width) / 2), top: 0, width, height: source.height, axis: "width" };
+  }
+  const height = Math.max(1, Math.min(source.height, Math.round(source.width / targetRatio)));
+  return { left: 0, top: Math.floor((source.height - height) / 2), width: source.width, height, axis: "height" };
+}
+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 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);
+    const top = Math.round((attnTop + plan.top) / 2);
+    return plan.axis === "width" ? { left: Math.min(Math.max(0, left), source.width - plan.width), top: 0 } : { left: 0, top: Math.min(Math.max(0, top), source.height - plan.height) };
+  } catch {
+    return { left: plan.left, top: plan.top };
+  }
+}
+
+// src/outpaint/membrane.ts
+var SOLVE_MAX_EDGE = 192;
+var SOLVE_MIN_EDGE = 8;
+var SWEEPS_PER_EDGE = 2;
+var MIN_SWEEPS = 40;
+var POLISH_SWEEPS = 32;
+var POLISH_MAX_CELLS = 4e6;
+function solveMembrane(req) {
+  const { width, height, axis, seamAt } = req;
+  const along = axis === "width" ? height : width;
+  const depth = axis === "width" ? width : height;
+  const out = new Float32Array(width * height * 3);
+  if (width < 1 || height < 1 || along < 1 || depth < 1) return out;
+  if (depth === 1) {
+    for (let a = 0; a < along; a++) {
+      const off = marginOffset(0, a, width, axis, seamAt, depth) * 3;
+      for (let c = 0; c < 3; c++) out[off + c] = req.seam[a * 3 + c];
+    }
+    return out;
+  }
+  const coarse = cascade(req.seam, along, depth);
+  if (depth * along <= POLISH_MAX_CELLS) {
+    const full = { along, depth, data: new Float32Array(along * depth * 3) };
+    prolong(coarse, full);
+    relax(full, req.seam, POLISH_SWEEPS);
+    for (let d = 0; d < depth; d++) {
+      for (let a = 0; a < along; a++) {
+        const off = marginOffset(d, a, width, axis, seamAt, depth) * 3;
+        const src = (d * along + a) * 3;
+        out[off] = full.data[src];
+        out[off + 1] = full.data[src + 1];
+        out[off + 2] = full.data[src + 2];
+      }
+    }
+    return out;
+  }
+  for (let d = 0; d < depth; d++) {
+    for (let a = 0; a < along; a++) {
+      const off = marginOffset(d, a, width, axis, seamAt, depth) * 3;
+      sampleGrid(coarse, d, a, depth, along, out, off);
+    }
+  }
+  return out;
 }
+function marginOffset(d, a, width, axis, seamAt, depth) {
+  if (axis === "width") {
+    const x = seamAt === "far" ? depth - 1 - d : d;
+    return a * width + x;
+  }
+  const y = seamAt === "far" ? depth - 1 - d : d;
+  return y * width + a;
+}
+function cascade(seam, along, depth) {
+  const scale = Math.max(1, Math.ceil(Math.max(along, depth) / SOLVE_MAX_EDGE));
+  const targetAlong = Math.max(2, Math.round(along / scale));
+  const targetDepth = Math.max(2, Math.round(depth / scale));
+  const edges = [];
+  for (let e = SOLVE_MIN_EDGE; e < Math.max(targetAlong, targetDepth); e *= 2) edges.push(e);
+  edges.push(Math.max(targetAlong, targetDepth));
+  let grid = null;
+  for (const edge of edges) {
+    const ratio = edge / Math.max(targetAlong, targetDepth);
+    const la = Math.max(2, Math.round(targetAlong * ratio));
+    const ld = Math.max(2, Math.round(targetDepth * ratio));
+    const next = { along: la, depth: ld, data: new Float32Array(la * ld * 3) };
+    if (grid) prolong(grid, next);
+    relax(next, resampleSeam(seam, along, la));
+    grid = next;
+  }
+  return grid;
+}
+function resampleSeam(seam, along, to) {
+  const out = new Float32Array(to * 3);
+  for (let i = 0; i < to; i++) {
+    const src = to === 1 ? 0 : i * (along - 1) / (to - 1);
+    const lo = Math.floor(src);
+    const hi = Math.min(along - 1, lo + 1);
+    const t = src - lo;
+    for (let c = 0; c < 3; c++) out[i * 3 + c] = seam[lo * 3 + c] * (1 - t) + seam[hi * 3 + c] * t;
+  }
+  return out;
+}
+function prolong(from, to) {
+  for (let d = 0; d < to.depth; d++) {
+    const sd = to.depth === 1 ? 0 : d * (from.depth - 1) / (to.depth - 1);
+    for (let a = 0; a < to.along; a++) {
+      const sa = to.along === 1 ? 0 : a * (from.along - 1) / (to.along - 1);
+      sampleGrid(from, sd, sa, from.depth, from.along, to.data, (d * to.along + a) * 3);
+    }
+  }
+}
+function sampleGrid(grid, d, a, fromDepth, fromAlong, into, off) {
+  const sd = fromDepth === grid.depth ? d : grid.depth === 1 ? 0 : d * (grid.depth - 1) / (fromDepth - 1);
+  const sa = fromAlong === grid.along ? a : grid.along === 1 ? 0 : a * (grid.along - 1) / (fromAlong - 1);
+  const d0 = Math.floor(sd);
+  const a0 = Math.floor(sa);
+  const d1 = Math.min(grid.depth - 1, d0 + 1);
+  const a1 = Math.min(grid.along - 1, a0 + 1);
+  const td = sd - d0;
+  const ta = sa - a0;
+  const i00 = (d0 * grid.along + a0) * 3;
+  const i01 = (d0 * grid.along + a1) * 3;
+  const i10 = (d1 * grid.along + a0) * 3;
+  const i11 = (d1 * grid.along + a1) * 3;
+  for (let c = 0; c < 3; c++) {
+    const top = grid.data[i00 + c] * (1 - ta) + grid.data[i01 + c] * ta;
+    const bot = grid.data[i10 + c] * (1 - ta) + grid.data[i11 + c] * ta;
+    into[off + c] = top * (1 - td) + bot * td;
+  }
+}
+function relax(grid, seam, fixedSweeps) {
+  const { depth, along, data } = grid;
+  for (let a = 0; a < along; a++) {
+    const off = a * 3;
+    for (let c = 0; c < 3; c++) data[off + c] = seam[off + c];
+  }
+  if (depth < 2) return;
+  const n = Math.max(depth, along);
+  const omega = Math.min(1.99, 2 / (1 + Math.sin(Math.PI / Math.max(2, n))));
+  const sweeps = fixedSweeps ?? Math.max(MIN_SWEEPS, SWEEPS_PER_EDGE * n);
+  for (let sweep = 0; sweep < sweeps; sweep++) {
+    for (let parity = 0; parity < 2; parity++) {
+      for (let d = 1; d < depth; d++) {
+        const row = d * along;
+        const rowUp = (d - 1) * along;
+        const rowDn = (d < depth - 1 ? d + 1 : d - 1) * along;
+        for (let a = (d + parity) % 2; a < along; a += 2) {
+          const iL = row + (a > 0 ? a - 1 : Math.min(1, along - 1));
+          const iR = row + (a < along - 1 ? a + 1 : Math.max(0, along - 2));
+          const i = row + a;
+          for (let c = 0; c < 3; c++) {
+            const avg = (data[(rowUp + a) * 3 + c] + data[(rowDn + a) * 3 + c] + data[iL * 3 + c] + data[iR * 3 + c]) * 0.25;
+            data[i * 3 + c] += omega * (avg - data[i * 3 + c]);
+          }
+        }
+      }
+    }
+  }
+}
+
+// src/expand.ts
 async function expandCanvas(source, plan) {
-  const bed = await sharp8(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 sharp8(bed).composite([{ input: source, left: plan.left, top: plan.top }]).png().toBuffer();
+  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();
 }
 async function compositeExpand(engineImage, source, plan) {
-  const meta = await sharp8(engineImage).metadata();
+  const meta = await sharp7(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 surround = aligned ? await sharp8(engineImage).resize(plan.width, plan.height, { fit: "cover", position: "centre" }).toBuffer() : await expandCanvasBedOnly(source, plan);
-  const image = await sharp8(surround).composite([{ input: source, left: plan.left, top: plan.top }]).png().toBuffer();
+  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 matched = aligned ? await matchMarginsToSeam(surround, source, plan) : surround;
+  const image = await sharp7(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();
+  if (!src.width || !src.height) return surround;
+  const SW = src.width;
+  const SH = src.height;
+  const sides = [];
+  if (plan.axis === "width") {
+    if (plan.left > 0)
+      sides.push({
+        margin: { left: 0, top: plan.top, width: plan.left, height: SH },
+        srcEdge: { left: 0, top: 0, width: 1, height: SH },
+        seamAt: "far"
+      });
+    const rightAt = plan.left + SW;
+    if (rightAt < plan.width)
+      sides.push({
+        margin: { left: rightAt, top: plan.top, width: plan.width - rightAt, height: SH },
+        srcEdge: { left: SW - 1, top: 0, width: 1, height: SH },
+        seamAt: "near"
+      });
+  } else {
+    if (plan.top > 0)
+      sides.push({
+        margin: { left: plan.left, top: 0, width: SW, height: plan.top },
+        srcEdge: { left: 0, top: 0, width: SW, height: 1 },
+        seamAt: "far"
+      });
+    const bottomAt = plan.top + SH;
+    if (bottomAt < plan.height)
+      sides.push({
+        margin: { left: plan.left, top: bottomAt, width: SW, height: plan.height - bottomAt },
+        srcEdge: { left: 0, top: SH - 1, width: SW, height: 1 },
+        seamAt: "near"
+      });
+  }
+  let out = surround;
+  for (const side of sides) {
+    try {
+      out = await reconcile(out, source, side, plan.axis);
+    } catch {
+    }
+  }
+  return out;
+}
+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 W = margin.width;
+  const H = margin.height;
+  const along = axis === "width" ? H : W;
+  const seamIndex = side.seamAt === "far" ? axis === "width" ? W - 1 : H - 1 : 0;
+  const err = new Float32Array(along * 3);
+  for (let i = 0; i < along; i++) {
+    const mOff = axis === "width" ? (i * W + seamIndex) * 3 : (seamIndex * W + i) * 3;
+    for (let c = 0; c < 3; c++) {
+      const want = edgeRaw[i * 3 + c];
+      const have = marginRaw[mOff + c];
+      err[i * 3 + c] = Math.max(-MAX_CORRECTION, Math.min(MAX_CORRECTION, want - have));
+    }
+  }
+  const radius = Math.max(2, Math.round(along / 64));
+  const smooth = new Float32Array(err.length);
+  for (let i = 0; i < along; i++) {
+    for (let c = 0; c < 3; c++) {
+      let sum = 0;
+      let n = 0;
+      for (let k = -radius; k <= radius; k++) {
+        const j = i + k;
+        if (j < 0 || j >= along) continue;
+        sum += err[j * 3 + c];
+        n++;
+      }
+      smooth[i * 3 + c] = sum / n;
+    }
+  }
+  const half = Math.max(1, Math.floor(along / 2));
+  const centreLo = (half - 1) / 2;
+  const centreHi = half + (along - half - 1) / 2;
+  const span = Math.max(1, centreHi - centreLo);
+  const base = [0, 0, 0];
+  const slope = [0, 0, 0];
+  for (let c = 0; c < 3; c++) {
+    const lo = medianOf(smooth, c, 0, half);
+    const hi = medianOf(smooth, c, half, along);
+    slope[c] = (hi - lo) / span;
+    base[c] = lo - slope[c] * centreLo;
+    for (let i = 0; i < along; i++) smooth[i * 3 + c] -= base[c] + slope[c] * i;
+  }
+  const field = solveMembrane({ width: W, height: H, axis, seamAt: side.seamAt, seam: smooth });
+  const corrected = Buffer.from(marginRaw);
+  for (let y = 0; y < H; y++) {
+    for (let x = 0; x < W; x++) {
+      const i = axis === "width" ? y : x;
+      const off = (y * W + x) * 3;
+      for (let c = 0; c < 3; c++) {
+        const v = corrected[off + c] + base[c] + slope[c] * i + field[off + c];
+        corrected[off + c] = v < 0 ? 0 : v > 255 ? 255 : Math.round(v);
+      }
+    }
+  }
+  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();
+}
 async function expandCanvasBedOnly(source, plan) {
-  return sharp8(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(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;
+  if (n < 1) return 0;
+  const values = new Float64Array(n);
+  for (let i = 0; i < n; i++) values[i] = rgb[(from + i) * 3 + channel];
+  values.sort();
+  return n % 2 ? values[(n - 1) / 2] : (values[n / 2 - 1] + values[n / 2]) / 2;
+}
+async function seamScore(image, plan, source) {
+  const { data, info } = await sharp7(image).removeAlpha().greyscale().raw().toBuffer({ resolveWithObject: true });
+  const W = info.width;
+  const H = info.height;
+  const horizontal = plan.axis === "width";
+  const line = (i) => {
+    let sum = 0;
+    if (horizontal) {
+      if (i < 1 || i >= W) return 0;
+      for (let y = 0; y < H; y++) sum += Math.abs(data[y * W + i] - data[y * W + i - 1]);
+      return sum / H;
+    }
+    if (i < 1 || i >= H) return 0;
+    for (let x = 0; x < W; x++) sum += Math.abs(data[i * W + x] - data[(i - 1) * W + x]);
+    return sum / W;
+  };
+  const at = (seam) => {
+    const near = [];
+    for (let d = 6; d <= 30; d++) {
+      near.push(line(seam - d));
+      near.push(line(seam + d));
+    }
+    const ordinary = near.reduce((a, b) => a + b, 0) / near.length;
+    if (ordinary < 0.05) return 1;
+    return line(seam) / ordinary;
+  };
+  const first = horizontal ? plan.left : plan.top;
+  const second = first + (horizontal ? source.width : source.height);
+  return Math.max(at(first), at(second));
+}
+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 W = info.width;
+  const H = info.height;
+  const ch = info.channels;
+  const horizontal = plan.axis === "width";
+  const between = (a, b) => {
+    const limit = horizontal ? W : H;
+    if (a < 0 || b < 0 || a >= limit || b >= limit) return null;
+    const run2 = horizontal ? H : W;
+    let sum = 0;
+    for (let i = 0; i < run2; i++) {
+      const ia = (horizontal ? i * W + a : a * W + i) * ch;
+      const ib = (horizontal ? i * W + b : b * W + i) * ch;
+      sum += Math.abs(data[ia] - data[ib]) + Math.abs(data[ia + 1] - data[ib + 1]) + Math.abs(data[ia + 2] - data[ib + 2]);
+    }
+    return sum / (run2 * 3);
+  };
+  const near = horizontal ? plan.left : plan.top;
+  const far = near + (horizontal ? source.width : source.height);
+  const both = [
+    // The margin before the picture starts, against the picture just inside it.
+    between(near - OFFSET, near + OFFSET - 1),
+    // The picture just before it ends, against the margin just after.
+    between(far - OFFSET, far + OFFSET - 1)
+  ].filter((v) => v !== null);
+  return both.length ? Math.max(...both) : 0;
+}
+function seamPenalty(score, residual) {
+  return Math.max(score / SEAM_VISIBLE, residual / RESIDUAL_VISIBLE);
+}
+var MIN_SHARE = 0.2;
+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 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;
+    const centre = (offset + extent / 2) / span;
+    return Math.min(1, Math.max(0, (centre + 0.5) / 2));
+  } catch {
+    return 0.5;
+  }
+}
+function placeExpand(plan, source, fraction) {
+  const share = Math.min(MAX_SHARE, Math.max(MIN_SHARE, fraction));
+  if (plan.axis === "width") {
+    const room2 = plan.width - source.width;
+    if (room2 <= 0) return plan;
+    return { ...plan, left: Math.min(room2, Math.max(0, Math.round(room2 * share))) };
+  }
+  const room = plan.height - source.height;
+  if (room <= 0) return plan;
+  return { ...plan, top: Math.min(room, Math.max(0, Math.round(room * share))) };
+}
+
+// src/outpaint/route.ts
+var canOutpaint = (e) => {
+  const caps = e.capabilities();
+  return caps.supportsOutpaint === true;
+};
+var usable = async (e) => {
+  try {
+    return (await e.isAvailable()).ok;
+  } catch {
+    return false;
+  }
+};
+async function resolveOutpaintRoute(all, shot) {
+  if (canOutpaint(shot)) return { engine: shot, method: "outpaint", crossed: false };
+  const shotId = shot.capabilities().id;
+  for (const candidate of all) {
+    const caps = candidate.capabilities();
+    if (caps.id === shotId || caps.placeholder || !canOutpaint(candidate)) continue;
+    if (await usable(candidate)) return { engine: candidate, method: "outpaint", crossed: true };
+  }
+  return { engine: shot, method: "reframe", crossed: false };
 }
 async function driftDiff(a, b) {
-  const metaA = await sharp8(a).metadata();
-  const metaB = await sharp8(b).metadata();
+  const metaA = await sharp7(a).metadata();
+  const metaB = await sharp7(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) => sharp8(buf).resize(width, height, { fit: "cover" }).ensureAlpha().raw().toBuffer())
+    [a, b].map((buf) => sharp7(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] });
@@ -5994,11 +6580,11 @@ async function driftDiff(a, b) {
   };
 }
 async function changeMask(a, b, cap2 = 1024) {
-  const metaA = await sharp8(a).metadata();
+  const metaA = await sharp7(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) => sharp8(buf).resize(width, height, { fit: "fill" }).ensureAlpha().raw().toBuffer())
+    [a, b].map((buf) => sharp7(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 });
@@ -6047,8 +6633,8 @@ function dilationFor(longEdge) {
 // src/localEdit.ts
 async function preserveOutsideChange(source, edited) {
   try {
-    const srcMeta = await sharp8(source).metadata();
-    const outMeta = await sharp8(edited).metadata();
+    const srcMeta = await sharp7(source).metadata();
+    const outMeta = await sharp7(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;
@@ -6058,15 +6644,15 @@ 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 sharp8(shape.mask, rawShape).blur(r).toColourspace("b-w").raw().toBuffer();
-    const dilated = await sharp8(spread, rawShape).threshold(8).toColourspace("b-w").raw().toBuffer();
-    const feathered = await sharp8(dilated, rawShape).blur(Math.max(2, r / 3)).toColourspace("b-w").raw().toBuffer();
-    const grown = await sharp8(feathered, rawShape).resize(srcMeta.width, srcMeta.height, { fit: "fill", kernel: "cubic" }).toColourspace("b-w").raw().toBuffer();
-    const editedRgb = await sharp8(edited).resize(srcMeta.width, srcMeta.height, { fit: "fill" }).removeAlpha().raw().toBuffer();
-    const masked = await sharp8(editedRgb, {
+    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, {
       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 sharp8(source).removeAlpha().composite([{ input: masked }]).png().toBuffer();
+    const image = await sharp7(source).removeAlpha().composite([{ input: masked }]).png().toBuffer();
     return { image, outcome: "composited", changed: shape.changed };
   } catch {
     return { image: edited, outcome: "error", changed: 0 };
@@ -6095,7 +6681,7 @@ var assetHash2 = (ref) => {
 };
 var LOGO_ROLES = ["primary", "mark", "wordmark", "monochrome", "alternate"];
 var LOGO_BACKGROUNDS = ["light", "dark", "any"];
-var toPng = (buf) => sharp8(buf).rotate().png().toBuffer();
+var toPng = (buf) => sharp7(buf).rotate().png().toBuffer();
 var COST_PROBE = {
   prompt: "",
   brand: { brand: {}, assetPaths: {} },
@@ -6104,7 +6690,7 @@ var COST_PROBE = {
   count: 1
 };
 var MARK_MAX_EDGE = 2048;
-var toMarkPng = (buf) => sharp8(buf, { density: 384 }).rotate().resize({ width: MARK_MAX_EDGE, height: MARK_MAX_EDGE, fit: "inside", withoutEnlargement: true }).png().toBuffer();
+var toMarkPng = (buf) => sharp7(buf, { density: 384 }).rotate().resize({ width: MARK_MAX_EDGE, height: MARK_MAX_EDGE, fit: "inside", withoutEnlargement: true }).png().toBuffer();
 var readImagePart = async (core, req, normalize2) => {
   const part = await req.file();
   if (!part) return { error: "multipart file field required" };
@@ -6281,7 +6867,7 @@ async function vibrantColor(input) {
   let data;
   let channels;
   try {
-    const out = await sharp8(input).resize(48, 48, { fit: "inside" }).raw().toBuffer({ resolveWithObject: true });
+    const out = await sharp7(input).resize(48, 48, { fit: "inside" }).raw().toBuffer({ resolveWithObject: true });
     data = out.data;
     channels = out.info.channels;
   } catch {
@@ -6304,7 +6890,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 sharp8(input).stats();
+      const { dominant } = await sharp7(input).stats();
       return toHex(dominant.r, dominant.g, dominant.b);
     } catch {
       return null;
@@ -6412,6 +6998,39 @@ function registerPresenterRoutes(app, deps) {
   });
 }
 
+// src/presenterRepair.ts
+function presenterCropMode(firstShotFile, firstSourceFile) {
+  return firstShotFile && firstShotFile === firstSourceFile ? "upload" : "generated";
+}
+async function repairPresenterCrops(core, log = () => {
+}) {
+  let repaired = 0;
+  for (const brand of core.store.listBrands()) {
+    for (const c of brandCharacters(brand.json)) {
+      if (!isCustomPresenter(c)) continue;
+      try {
+        const firstShot = c.shots?.[0]?.file;
+        const hash = typeof firstShot === "string" && firstShot.startsWith("asset:") ? firstShot.slice(6) : null;
+        if (!hash) continue;
+        const mode = presenterCropMode(firstShot, c.sourceRefs?.[0]?.file);
+        const { previewHash, avatarHash } = await presenterCrops(core, hash, mode);
+        const preview = previewHash ? `asset:${previewHash}` : void 0;
+        const avatar = avatarHash ? `asset:${avatarHash}` : void 0;
+        if ((!preview || preview === c.preview) && (!avatar || avatar === c.avatar)) continue;
+        commit(core, brand.id, (json) => {
+          json.characters = brandCharacters(json).map(
+            (row) => row.id === c.id ? { ...row, ...preview ? { preview } : {}, ...avatar ? { avatar } : {} } : row
+          );
+        });
+        repaired += 1;
+        log(`Repaired presenter thumbnails: ${c.name ?? c.id}`);
+      } catch {
+      }
+    }
+  }
+  return { repaired };
+}
+
 // src/routes/assetBuilds.ts
 function registerAssetBuildRoutes(app, deps) {
   const { core, engines, scenes, presenters } = deps;
@@ -6514,7 +7133,7 @@ function registerAssetBuildRoutes(app, deps) {
   app.post("/api/brands/:id/presenters", async (req, reply) => {
     const brand = brandOr404(req, reply);
     if (!brand) return;
-    const built = presenterRecordFrom(req.body ?? {});
+    const built = presenterRecordFrom(await withDerivedCrops(core, req.body ?? {}));
     if (!built.ok) return reply.status(400).send({ error: built.error });
     try {
       commit(core, brand.id, (json) => {
@@ -6532,7 +7151,7 @@ function registerAssetBuildRoutes(app, deps) {
     const base = brandCharacters(brand.json).find((c) => c.id === id);
     if (!base) return reply.status(404).send({ error: "presenter not found" });
     if (!isCustomPresenter(base)) return reply.status(400).send({ error: "this presenter is not editable" });
-    const built = presenterRecordFrom(req.body ?? {}, base);
+    const built = presenterRecordFrom(await withDerivedCrops(core, req.body ?? {}, base), base);
     if (!built.ok) return reply.status(400).send({ error: built.error });
     try {
       commit(core, brand.id, (json) => {
@@ -6631,6 +7250,18 @@ function registerAssetBuildRoutes(app, deps) {
     return { preview: `asset:${hash}`, brand: core.store.getBrand(brand.id) };
   });
 }
+async function withDerivedCrops(core, body, base) {
+  const shots = Array.isArray(body?.shotHashes) ? body.shotHashes : null;
+  if (!shots?.length || body.previewHash !== void 0 && body.avatarHash !== void 0) return body;
+  const firstShot = `asset:${String(shots[0])}`;
+  const firstSource = Array.isArray(body.sourceHashes) ? `asset:${String(body.sourceHashes[0])}` : base?.sourceRefs?.[0]?.file;
+  const derived = await presenterCrops(core, String(shots[0]), presenterCropMode(firstShot, firstSource));
+  return {
+    ...body,
+    ...body.previewHash === void 0 && derived.previewHash ? { previewHash: derived.previewHash } : {},
+    ...body.avatarHash === void 0 && derived.avatarHash ? { avatarHash: derived.avatarHash } : {}
+  };
+}
 function registerDemoProductRoutes(app, deps) {
   const { templatesRoot, demoProducts, demoProductById } = deps;
   const demoProductThumbPath = (id) => {
@@ -6847,7 +7478,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 sharp8(image).resize(p.width, p.height, { fit: "cover", position: "attention" }).png().toBuffer() : image;
+    const buf = p.width && p.height ? await sharp7(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" });
@@ -7008,7 +7639,7 @@ 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 sharp8(buf).rotate().png().toBuffer();
+    const png = await sharp7(buf).rotate().png().toBuffer();
     return { hash: core.images.save(png) };
   });
   app.post("/api/diff", async (req, reply) => {
@@ -7043,6 +7674,39 @@ function registerImageRoutes(app, deps) {
 
 // src/release/notes.data.ts
 var RELEASES = [
+  {
+    version: "0.5.1",
+    date: "2026-08-26",
+    sections: [
+      {
+        heading: "Shots",
+        body: "An extended shot keeps its subject where it was composed, so a product standing near one edge stays near that edge in the wider frame rather than drifting to the middle. The new margin now meets the picture across the whole join instead of only at the seam, so a difference in tone or light no longer survives out at the frame edge. Where a connected engine can paint a margin directly, an extension is handed to it."
+      }
+    ]
+  },
+  {
+    version: "0.5.0",
+    date: "2026-08-26",
+    title: "A finished shot can change shape, and a presenter you attach is a requirement rather than a suggestion.",
+    sections: [
+      {
+        heading: "Create",
+        body: "A brief can be rearranged by hand: drag its chips into a new order, or move them with the keyboard and on touch. Chips now sit on the sentence's own baseline, so a brief reads as a line of writing rather than a row of boxes."
+      },
+      {
+        heading: "Shots",
+        body: "Pick a new shape for a finished shot and Scenri works out from the geometry whether that means cropping or extending. A crop keeps every original pixel, follows the subject, costs nothing and calls no engine. An extension leaves the original untouched to the byte and paints only the new margin, and it is offered by the engines that can genuinely paint one."
+      },
+      {
+        heading: "Presenters",
+        body: "A presenter you attach now survives what used to drop them from the picture: product notes written for a solo packshot, close-up framing, and scene direction that bans props. A custom presenter is cropped for their avatar the way the built-in ones are, measured from the person rather than from the frame."
+      },
+      {
+        heading: "Fixes",
+        body: "What a shot says it used is what the engine received, including references and brand marks carried into a refine. Two shots sent in the same second keep their order, the newest shot is always top left, and text in right-to-left languages renders and travels correctly through the app."
+      }
+    ]
+  },
   {
     version: "0.4.7",
     date: "2026-08-24",
@@ -7570,6 +8234,14 @@ function registerSystemRoutes(app, deps) {
 }
 
 // src/server.ts
+function seedFor(sourceHash, width, height) {
+  let h = 2166136261;
+  for (const ch of `${sourceHash}:${width}x${height}`) {
+    h ^= ch.charCodeAt(0);
+    h = Math.imul(h, 16777619);
+  }
+  return Math.abs(h) % 2147483647;
+}
 var SECRET_KEYS = ["openrouter_api_key", "replicate_api_token", "fal_key"];
 function buildServer(opts) {
   const { core, engines } = opts;
@@ -7647,7 +8319,14 @@ function buildServer(opts) {
       const part = await readImagePart(core, req, toPng);
       if ("error" in part) return reply.status(400).send({ error: part.error });
       hashes = [part.hash];
-      name = String(part.fields?.name?.value ?? part.filename ?? spec.fallback).slice(0, 80);
+      const explicit = part.fields?.name?.value;
+      const fromFile = String(part.filename ?? "").replace(/\.[A-Za-z0-9]{1,5}$/, "");
+      name = Array.from(
+        String(explicit ?? (fromFile || spec.fallback)).replace(
+          /[\u200e\u200f\u061c\u202a-\u202e\u2066-\u2069]/g,
+          ""
+        )
+      ).slice(0, 80).join("").trim() || spec.fallback;
     }
     const id = `${spec.prefix}-${randomUUID().slice(0, 8)}`;
     const json = { ...brand.json };
@@ -7785,8 +8464,81 @@ function buildServer(opts) {
   registerDemoProductRoutes(app, { templatesRoot, demoProducts, demoProductById });
   registerShowcaseRoutes(app, { templatesRoot });
   app.get("/api/formats", async () => FORMATS);
+  async function compileEditBrief(brandId, parentId, brief, engineCaps, opts2) {
+    const borrowed = inheritedIdentityTokens(parentId, (id) => core.store.getNode(id));
+    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))
+    );
+    const inheritedTokens = borrowed.filter((t) => !already.has(JSON.stringify(t)));
+    const combined = [...brief.tokens, ...inheritedTokens];
+    const brandJson = await brandJsonWithResolvedPresenters(
+      core,
+      templatesRoot,
+      presenters,
+      await brandJsonWithResolvedDemoProducts(
+        core,
+        templatesRoot,
+        demoProducts,
+        brandJsonWithCatalogProducts(core, brandId),
+        combined
+      ),
+      combined
+    );
+    const sceneById = sceneFor(brandJson);
+    const uncapped = { ...engineCaps, maxReferenceImages: 32 };
+    const verdict = scopeOfInstruction(
+      brief.tokens.filter((t) => t.t === "text").map((t) => t.v).join(" ")
+    );
+    const compiled2 = compileBrief(brief, {
+      brand: brandJson,
+      images: core.images,
+      engineCaps: uncapped,
+      template: brief.templateId ? sceneById(String(brief.templateId)) : void 0,
+      templateById: sceneById,
+      mode: "edit",
+      editScope: verdict.scope,
+      editRemoval: verdict.removal ?? false,
+      inheritedIdentity: inheritedTokens.length > 0,
+      // Only the explicit op drops the dimension promise: an implicit legacy
+      // expansion keeps its historical prompt byte for byte.
+      ...opts2?.reshape === "extend" ? { editReshape: "extend" } : {}
+    });
+    let inheritedAttachments = [];
+    if (inheritedTokens.length) {
+      const identity = compileBrief(
+        { tokens: inheritedTokens },
+        { brand: brandJson, images: core.images, engineCaps: uncapped, templateById: sceneById }
+      );
+      inheritedAttachments = identity.attachments.filter((a) => a.essential || a.role === "brand" || a.role === "reference").map((a) => ({ ...a, inherited: true }));
+    }
+    const cap2 = Math.max(0, engineCaps.maxReferenceImages - 1);
+    const merged = mergeEditAttachments(compiled2.attachments, inheritedAttachments, cap2);
+    const warnings = [...compiled2.warnings];
+    if (merged.dropped.length) {
+      if (engineCaps.maxReferenceImages <= 1) {
+        warnings.push(
+          `${engineCaps.displayName} cannot carry reference images, so the identity rides on the source frame alone.`
+        );
+      } else {
+        const names = [...new Set(merged.dropped.map((d) => d.label))];
+        warnings.push(
+          `${engineCaps.displayName} reads ${engineCaps.maxReferenceImages} reference images and the frame being refined keeps one, so ${names.join(
+            " and "
+          )} ${names.length === 1 ? "was" : "were"} left out.`
+        );
+      }
+    }
+    return {
+      compiled: compiled2,
+      inheritedTokens,
+      merged,
+      warnings,
+      editScope: verdict.scope,
+      editRemoval: verdict.removal ?? false
+    };
+  }
   app.post("/api/brief/preview", async (req, reply) => {
-    const { brief, engineId, brandId } = req.body;
+    const { brief, engineId, brandId, parentId } = req.body;
     const brand = core.store.getBrand(String(brandId));
     if (!brand) return reply.status(404).send({ error: "brand not found" });
     const engine = engines.get(String(engineId));
@@ -7795,6 +8547,20 @@ function buildServer(opts) {
       return reply.status(400).send({ error: "brief.tokens must be an array" });
     const briefErrors = validateBrief(brief);
     if (briefErrors.length) return reply.status(400).send({ error: `invalid brief: ${briefErrors.join("; ")}` });
+    if (parentId && core.store.getNode(String(parentId))) {
+      const previewReshape = req.body.reshape;
+      const edit = await compileEditBrief(brand.id, String(parentId), brief, engine.capabilities(), {
+        reshape: previewReshape === "extend" ? "extend" : previewReshape === "crop" ? "crop" : void 0
+      });
+      const { referenceImages: referenceImages2, ...rest2 } = edit.compiled;
+      return {
+        ...rest2,
+        attachments: edit.merged.kept,
+        dropped: edit.merged.dropped,
+        warnings: edit.warnings,
+        referenceCount: edit.merged.kept.length
+      };
+    }
     const brandJson = await brandJsonWithResolvedPresenters(
       core,
       templatesRoot,
@@ -7883,14 +8649,14 @@ function buildServer(opts) {
     const out = [];
     for (const h of images) {
       const buf = core.images.read(h);
-      out.push(buf.subarray(0, 8).equals(PNG_SIG) ? h : core.images.save(await sharp8(buf).png().toBuffer()));
+      out.push(buf.subarray(0, 8).equals(PNG_SIG) ? h : core.images.save(await sharp7(buf).png().toBuffer()));
     }
     return out;
   }
   async function assertAspect(images, expect) {
     const want = expect.width / expect.height;
     for (const h of images) {
-      const meta2 = await sharp8(core.images.read(h)).metadata();
+      const meta2 = await sharp7(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)
@@ -7901,7 +8667,7 @@ function buildServer(opts) {
   }
   const NODE_TIMEOUT_MS = 6e5;
   async function runNode(nodeId, engine, estimate, work, expect, post) {
-    const engineId = engine.capabilities().id;
+    const engineId = engine?.capabilities().id ?? "local";
     reserved.set(engineId, (reserved.get(engineId) ?? 0) + estimate);
     const ctrl = new AbortController();
     runningGenerations.set(nodeId, ctrl);
@@ -7920,13 +8686,15 @@ function buildServer(opts) {
       try {
         const sizes = [];
         for (const h of result.images) {
-          const meta2 = await sharp8(core.images.read(h)).metadata();
+          const meta2 = await sharp7(core.images.read(h)).metadata();
           if (meta2.width && meta2.height) sizes.push([meta2.width, meta2.height]);
         }
         const node = core.store.getNode(nodeId);
         if (node && sizes.length) {
           const brief = node.brief ?? {};
-          core.store.setBrief(nodeId, { ...brief, rendered: { sizes } });
+          const raw = result.raw;
+          const survivors = typeof raw?.requested === "number" && Array.isArray(raw.variantIndexes) ? { requested: raw.requested, variantIndexes: raw.variantIndexes } : {};
+          core.store.setBrief(nodeId, { ...brief, rendered: { sizes, ...survivors } });
         }
       } catch {
       }
@@ -7959,6 +8727,56 @@ function buildServer(opts) {
     let { width = 1024, height = 1024 } = req.body;
     const project = core.store.getProject(String(projectId));
     if (!project) return reply.status(404).send({ error: "project not found" });
+    const rawReshape = req.body.reshape ?? req.body.brief?.reshape;
+    const reshape = rawReshape === "crop" ? "crop" : rawReshape === "extend" ? "extend" : void 0;
+    if (kind === "edit" && reshape === "crop") {
+      const rootForCrop = core.store.treeFor(project.id).find((n) => n.kind === "root");
+      if (!rootForCrop) return reply.status(500).send({ error: "project has no root node" });
+      const cropParentId = parentId ? String(parentId) : rootForCrop.id;
+      if (brief && Array.isArray(brief.tokens)) {
+        const briefErrors = validateBrief(brief);
+        if (briefErrors.length) return reply.status(400).send({ error: `invalid brief: ${briefErrors.join("; ")}` });
+      }
+      const fmt = Array.isArray(brief?.tokens) ? brief.tokens.find(
+        (t) => t.t === "format" && Number(t.w) > 0 && Number(t.h) > 0
+      ) : void 0;
+      if (!fmt) return reply.status(400).send({ error: "a crop needs a target format" });
+      const parent = core.store.getNode(cropParentId);
+      const srcHash = req.body.sourceImage ?? parent?.images[0];
+      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();
+      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" });
+      const origin = await attentionCropOrigin(srcBuf, { width: srcMeta.width, height: srcMeta.height }, plan2);
+      const window = { left: origin.left, top: origin.top, width: plan2.width, height: plan2.height };
+      const label = FORMATS.find((f) => f.id === fmt.id)?.label ?? `${fmt.w}x${fmt.h}`;
+      const node2 = core.store.addNode({
+        projectId: project.id,
+        parentId: cropParentId,
+        kind: "edit",
+        prompt: `Cropped to ${label}`,
+        // No provider was asked; recording the engine the client HAPPENED to
+        // have selected made the overlay display a name that did nothing.
+        engineId: "local"
+      });
+      core.store.setBrief(node2.id, {
+        ...brief ?? {},
+        sourceImage: String(srcHash),
+        reshape: "crop",
+        crop: window
+      });
+      const work2 = async () => ({
+        images: [core.images.save(await sharp7(srcBuf).extract(window).png().toBuffer())],
+        costUsd: 0
+      });
+      void runNode(node2.id, null, 0, work2, { width: plan2.width, height: plan2.height }).catch(
+        (err) => app.log.error({ err }, "crop run failed")
+      );
+      return reply.status(202).send(node2);
+    }
     const engine = engines.get(String(engineId));
     if (!engine) return reply.status(400).send({ error: `unknown engine ${engineId}` });
     const avail = await engine.isAvailable();
@@ -7971,58 +8789,48 @@ function buildServer(opts) {
     const ctx = brandContext(core, project.brandId);
     let compiled2 = null;
     let inheritedTokens = [];
-    let inheritedAttachments = [];
+    let mergedEdit = null;
     let editScope = "global";
-    let editRemoval = false;
     const extraWarnings = [];
     let expandPlan = null;
     let expandSourceHash = null;
     if (brief && Array.isArray(brief.tokens)) {
       const briefErrors = validateBrief(brief);
       if (briefErrors.length) return reply.status(400).send({ error: `invalid brief: ${briefErrors.join("; ")}` });
-      const brandJson = await brandJsonWithResolvedPresenters(
-        core,
-        templatesRoot,
-        presenters,
-        await brandJsonWithResolvedDemoProducts(
+      if (kind === "edit") {
+        const edit = await compileEditBrief(project.brandId, resolvedParentId, brief, engine.capabilities(), {
+          reshape
+        });
+        compiled2 = edit.compiled;
+        inheritedTokens = edit.inheritedTokens;
+        mergedEdit = edit.merged;
+        editScope = edit.editScope;
+        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" });
+      } else {
+        const brandJson = await brandJsonWithResolvedPresenters(
           core,
           templatesRoot,
-          demoProducts,
-          brandJsonWithCatalogProducts(core, project.brandId),
+          presenters,
+          await brandJsonWithResolvedDemoProducts(
+            core,
+            templatesRoot,
+            demoProducts,
+            brandJsonWithCatalogProducts(core, project.brandId),
+            brief.tokens
+          ),
           brief.tokens
-        ),
-        brief.tokens
-      );
-      const sceneById = sceneFor(brandJson);
-      if (kind === "edit") {
-        const borrowed = inheritedIdentityTokens(resolvedParentId, (id) => core.store.getNode(id));
-        if (borrowed.length) {
-          const already = new Set(
-            brief.tokens.filter((t) => t.t === "product" || t.t === "character" || t.t === "mark").map((t) => JSON.stringify(t))
-          );
-          inheritedTokens = borrowed.filter((t) => !already.has(JSON.stringify(t)));
-        }
-        const verdict = scopeOfInstruction(
-          brief.tokens.filter((t) => t.t === "text").map((t) => t.v).join(" ")
         );
-        editScope = verdict.scope;
-        editRemoval = verdict.removal ?? false;
-      }
-      compiled2 = compileBrief(brief, {
-        brand: brandJson,
-        images: core.images,
-        engineCaps: engine.capabilities(),
-        template: brief.templateId ? sceneById(String(brief.templateId)) : void 0,
-        templateById: sceneById,
-        ...kind === "edit" ? { mode: "edit", editScope, editRemoval, inheritedIdentity: inheritedTokens.length > 0 } : {}
-      });
-      if (!compiled2.prompt.trim()) return reply.status(400).send({ error: "the brief is empty" });
-      if (inheritedTokens.length) {
-        const identity = compileBrief(
-          { tokens: inheritedTokens },
-          { brand: brandJson, images: core.images, engineCaps: engine.capabilities(), templateById: sceneById }
-        );
-        inheritedAttachments = identity.attachments.filter((a) => a.essential);
+        const sceneById = sceneFor(brandJson);
+        compiled2 = compileBrief(brief, {
+          brand: brandJson,
+          images: core.images,
+          engineCaps: engine.capabilities(),
+          template: brief.templateId ? sceneById(String(brief.templateId)) : void 0,
+          templateById: sceneById
+        });
+        if (!compiled2.prompt.trim()) return reply.status(400).send({ error: "the brief is empty" });
       }
     }
     let finalPrompt = String(prompt ?? "");
@@ -8066,6 +8874,8 @@ function buildServer(opts) {
     let work;
     let expectShape;
     let editedFrom = null;
+    let runEngine = engine;
+    let expandMethod = null;
     if (compiled2) {
       finalPrompt = compiled2.prompt;
       referenceImages = compiled2.referenceImages;
@@ -8103,23 +8913,30 @@ function buildServer(opts) {
         return reply.status(400).send({ error: "edit needs a parent node with an image (sourceImage)" });
       if (!engine.capabilities().supportsEdit)
         return reply.status(400).send({ error: "engine does not support edits" });
-      const cap2 = Math.max(0, engine.capabilities().maxReferenceImages - 1);
-      const own = (referenceImages ?? []).map((path, i) => ({ path, role: referenceRoles?.[i] }));
-      const borrowedRefs = inheritedAttachments.map((a) => ({ path: core.images.pathFor(a.hash), role: a.role })).filter((r) => !own.some((o) => o.path === r.path));
-      const editRefs = [...own, ...borrowedRefs].slice(0, cap2);
-      if (cap2 === 0 && borrowedRefs.length)
-        extraWarnings.push(
-          `${engine.capabilities().displayName} cannot carry reference images, so the identity rides on the source frame alone.`
-        );
+      const editRefs = mergedEdit ? mergedEdit.kept.map((a) => ({ path: core.images.pathFor(a.hash), role: a.role })) : (referenceImages ?? []).map((path, i) => ({ path, role: referenceRoles?.[i] })).slice(0, Math.max(0, engine.capabilities().maxReferenceImages - 1));
       const srcBuf = core.images.read(String(srcHash));
-      const srcMeta = await sharp8(srcBuf).metadata();
+      const srcMeta = await sharp7(srcBuf).metadata();
       if (srcMeta.width && srcMeta.height) expectShape = { width: srcMeta.width, height: srcMeta.height };
       if (srcMeta.width && srcMeta.height && compiled2?.width && compiled2?.height) {
         expandPlan = planExpand({ width: srcMeta.width, height: srcMeta.height }, compiled2.width / compiled2.height);
       }
+      if (reshape === "extend" && !expandPlan)
+        return reply.status(400).send({ error: "the picture is already this shape" });
+      if (expandPlan && srcMeta.width && srcMeta.height) {
+        const size = { width: srcMeta.width, height: srcMeta.height };
+        expandPlan = placeExpand(expandPlan, size, await subjectFraction(srcBuf, size, expandPlan.axis));
+      }
+      if (expandPlan) {
+        const route = await resolveOutpaintRoute(engines.all(), engine);
+        runEngine = route.engine;
+        expandMethod = route.method;
+      }
+      const canOutpaint2 = expandMethod === "outpaint";
       if (expandPlan) {
-        const canvas = await expandCanvas(srcBuf, expandPlan);
-        expandSourceHash = core.images.save(canvas);
+        if (!canOutpaint2) {
+          const canvas = await expandCanvas(srcBuf, expandPlan);
+          expandSourceHash = core.images.save(canvas);
+        }
         expectShape = { width: expandPlan.width, height: expandPlan.height };
       }
       const editReq = {
@@ -8127,27 +8944,98 @@ function buildServer(opts) {
         sourceImage: core.images.pathFor(String(expandSourceHash ?? srcHash)),
         brand: ctx,
         ...editRefs.length ? { referenceImages: editRefs.map((r) => r.path) } : {},
-        ...editRefs.length ? { referenceRoles: editRefs.map((r) => r.role ?? "reference") } : {}
+        ...editRefs.length ? { referenceRoles: editRefs.map((r) => r.role ?? "reference") } : {},
+        // An answer at the planned size lets compositeExpand skip its rescale,
+        // which is one whole class of seam misalignment gone when honored.
+        ...expandPlan ? { width: expandPlan.width, height: expandPlan.height } : {},
+        // Only an engine that can genuinely paint a margin is told where the
+        // picture sits; the rest would ignore it anyway.
+        ...expandPlan && canOutpaint2 ? {
+          expand: {
+            left: expandPlan.left,
+            top: expandPlan.top,
+            width: srcMeta.width ?? 0,
+            height: srcMeta.height ?? 0
+          },
+          // Derived from the picture and the shape asked for, so the same
+          // extend of the same shot is the same picture every time. Without
+          // it the margin is a fresh roll of the dice on every run, which
+          // is not something a person can iterate against — or that a test
+          // can measure.
+          seed: seedFor(String(editedFrom ?? srcHash), expandPlan.width, expandPlan.height)
+        } : {}
       };
-      estimate = await engine.costEstimate(editReq);
-      work = (signal) => engine.edit(editReq, signal);
+      estimate = await runEngine.costEstimate(editReq);
+      const plan2 = expandPlan;
+      const srcSize = { width: srcMeta.width ?? 0, height: srcMeta.height ?? 0 };
+      const original2 = srcBuf;
+      work = plan2 && !canOutpaint2 ? async (signal) => {
+        const draws = await Promise.all([
+          runEngine.edit(editReq, signal),
+          runEngine.edit(editReq, signal).catch(() => null)
+        ]);
+        const scored = await Promise.all(
+          draws.map(async (got) => {
+            const first = got?.images[0];
+            if (!got || !first) return null;
+            const { image } = await compositeExpand(core.images.read(first), original2, plan2);
+            const [score, residual] = await Promise.all([
+              seamScore(image, plan2, srcSize),
+              seamResidual(image, plan2, srcSize)
+            ]);
+            return { got, penalty: seamPenalty(score, residual) };
+          })
+        );
+        const best = scored.filter((x) => x !== null).sort((a, b) => a.penalty - b.penalty)[0];
+        return best?.got ?? draws[0];
+      } : (signal) => runEngine.edit(editReq, signal);
     }
-    core.ledger.assertUnderCap(engine.capabilities().id, estimate + (reserved.get(engine.capabilities().id) ?? 0));
+    const billedId = runEngine.capabilities().id;
+    core.ledger.assertUnderCap(billedId, estimate + (reserved.get(billedId) ?? 0));
     const node = core.store.addNode({
       projectId: project.id,
       parentId: resolvedParentId,
       kind,
       prompt: finalPrompt,
-      engineId: String(engineId)
+      engineId: billedId
     });
-    if (brief) core.store.setBrief(node.id, editedFrom ? { ...brief, sourceImage: editedFrom } : brief);
+    if (brief)
+      core.store.setBrief(node.id, {
+        ...brief,
+        ...editedFrom ? { sourceImage: editedFrom } : {},
+        ...kind === "edit" && reshape ? { reshape } : {},
+        // How the margin was actually made, and by whom. An extend may be
+        // handed to a different engine than the shot used, and a record that
+        // does not say so cannot be read back later.
+        ...expandMethod && expandPlan ? {
+          expand: {
+            method: expandMethod,
+            engineId: billedId,
+            // Where the protected picture sits in the frame it grew into.
+            // Placement is no longer always centred, so a reader that
+            // assumes it is would be looking in the wrong place.
+            left: expandPlan.left,
+            top: expandPlan.top
+          }
+        } : {},
+        // What the refinement carried, recorded apart from what it asked for:
+        // the detail view shows both, and remix reads tokens alone.
+        ...kind === "edit" && inheritedTokens.length ? { inherited: inheritedTokens } : {}
+      });
     const plan = expandPlan;
     const original = editedFrom ? core.images.read(editedFrom) : null;
     const localScope = kind === "edit" && !plan && editScope === "local" && original;
     const post = plan ? async (images) => {
       const out = [];
       for (const h of images) {
-        const { image, aligned } = await compositeExpand(core.images.read(h), original, plan);
+        const answer = core.images.read(h);
+        const got = await sharp7(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}` },
+            "expand: engine size differs from plan"
+          );
+        const { image, aligned } = await compositeExpand(answer, original, plan);
         if (!aligned) app.log.warn({ nodeId: node.id }, "expand: engine frame did not align, kept the bed");
         out.push(core.images.save(image));
       }
@@ -8161,7 +9049,7 @@ function buildServer(opts) {
       }
       return out;
     } : void 0;
-    void runNode(node.id, engine, estimate, work, expectShape, post).catch(
+    void runNode(node.id, runEngine, estimate, work, expectShape, post).catch(
       (err) => app.log.error({ err }, "node run failed")
     );
     const allWarnings = [...compiled2?.warnings ?? [], ...extraWarnings];
@@ -8317,6 +9205,7 @@ async function run() {
   const onlyThisMachine = LOOPBACK2.includes(HOST);
   const token = onlyThisMachine ? void 0 : randomBytes(24).toString("base64url");
   const reachableAt = onlyThisMachine ? [] : HOST === "0.0.0.0" || HOST === "::" ? lanAddresses() : [HOST];
+  await repairPresenterCrops(core, (line) => console.log(line));
   const app = buildServer({
     core,
     engines,
@@ -8421,8 +9310,8 @@ async function verify() {
     const db = new Database2(":memory:");
     db.pragma("user_version");
     db.close();
-    const { default: sharp14 } = await import('sharp');
-    await sharp14({ create: { width: 1, height: 1, channels: 3, background: "#000" } }).png().toBuffer();
+    const { default: sharp18 } = await import('sharp');
+    await sharp18({ 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) }));