scenri 0.7.0 → 0.7.2

package/dist/serve.js

@@ -1315,6 +1315,7 @@ var EDIT_REFERENCE_ROLE_DIRECTIVE = {
   style: "a reference for treatment and mood only",
   reference: "a reference for composition, lighting and treatment only"
 };
+var BUDGET_EXHAUSTED = "scenri:budget-exhausted";
 var ASPECT_TOLERANCE = 0.15;
 var NAMED_RATIOS = [
   ["1:1", 1],
@@ -1363,6 +1364,7 @@ function createCore(homeDir = defaultHome()) {
   };
 }
 var ENDPOINT = "https://openrouter.ai/api/v1/chat/completions";
+var PER_IMAGE_TIMEOUT_MS = 3e5;
 var DEFAULT_MODEL = "google/gemini-2.5-flash-image";
 var DEFAULT_COST_PER_IMAGE_USD = 0.04;
 function dataUrl(path) {
@@ -1401,6 +1403,7 @@ function createOpenRouterEngine(opts) {
     return key;
   }
   async function post(key, body, signal) {
+    const bound = AbortSignal.timeout(PER_IMAGE_TIMEOUT_MS);
     const res = await fetchImpl(ENDPOINT, {
       method: "POST",
       headers: {
@@ -1408,7 +1411,7 @@ function createOpenRouterEngine(opts) {
         "Content-Type": "application/json"
       },
       body: JSON.stringify(body),
-      signal
+      signal: signal ? AbortSignal.any([signal, bound]) : bound
     });
     const text = await res.text();
     if (!res.ok) {
@@ -1451,7 +1454,11 @@ function createOpenRouterEngine(opts) {
         localOnly: false,
         supportsEdit: true,
         supportsMask: false,
-        maxReferenceImages: 4
+        maxReferenceImages: 4,
+        // N sequential calls, one image each: the server budgets the node by
+        // that shape instead of handing the whole run one flat ten minutes.
+        perImageTimeoutMs: PER_IMAGE_TIMEOUT_MS,
+        imageConcurrency: 1
       };
     },
     async isAvailable() {
@@ -1492,7 +1499,12 @@ function createOpenRouterEngine(opts) {
       let reportedCost = 0;
       let sawReportedCost = false;
       for (let i = 0; i < req.count; i++) {
-        const json = await post(key, body, signal);
+        const variation = req.variations?.[i];
+        const json = await post(
+          key,
+          variation ? { ...body, messages: [{ role: "user", content: [...content, { type: "text", text: variation }] }] } : body,
+          signal
+        );
         raws.push(json);
         for (const buf of extractImages(json)) hashes.push(opts.saveImage(buf));
         if (typeof json?.usage?.cost === "number") {
@@ -2527,9 +2539,6 @@ function createCodexSetup(opts = {}) {
 
 // ../engines/codex/src/index.ts
 var CODEX_POOL = 2;
-function codexNodeBudgetMs(count) {
-  return Math.ceil(Math.max(1, count) / CODEX_POOL) * DEFAULT_TIMEOUT_MS2 + 6e4;
-}
 function orientationOf(width, height) {
   return width === height ? "square" : width > height ? "landscape" : "portrait";
 }
@@ -2561,7 +2570,7 @@ function createCodexEngine(opts) {
       return /* @__PURE__ */ new Set();
     }
   }
-  async function collectImages(dir, before = null) {
+  async function collectImages(dir, before = null, claimed) {
     const entries = await readdir(dir);
     const outFiles = entries.filter((name) => /^out-.*\.png$/.test(name)).sort((a, b) => {
       const na = Number(/^out-(\d+)\.png$/.exec(a)?.[1] ?? NaN);
@@ -2571,7 +2580,7 @@ function createCodexEngine(opts) {
     });
     if (outFiles.length === 0) {
       if (before) {
-        const recovered = await recoverFromGenerated(before);
+        const recovered = await recoverFromGenerated(before, claimed);
         if (recovered) return [recovered];
       }
       throw new Error("Codex finished but produced no images");
@@ -2584,11 +2593,11 @@ function createCodexEngine(opts) {
     }
     return hashes;
   }
-  async function recoverFromGenerated(before) {
+  async function recoverFromGenerated(before, claimed) {
     const home = generatedImagesDir();
     let names;
     try {
-      names = (await readdir(home)).filter((n) => !before.has(n));
+      names = (await readdir(home)).filter((n) => !before.has(n) && !claimed?.has(n));
     } catch {
       return null;
     }
@@ -2596,6 +2605,7 @@ function createCodexEngine(opts) {
     const stamped = await Promise.all(names.map(async (n) => ({ n, mtime: (await stat(join(home, n))).mtimeMs })));
     stamped.sort((a, b) => b.mtime - a.mtime);
     const pick2 = stamped[0].n;
+    claimed?.add(pick2);
     console.warn(`codex: workdir empty, recovered ${pick2} from ${home}`);
     return saveImage(await readFile(join(home, pick2)));
   }
@@ -2645,7 +2655,12 @@ function createCodexEngine(opts) {
          * budget — a full-resolution phone-photo PNG is tens of megabytes that
          * buy nothing. Same cap as brand marks (MARK_MAX_EDGE).
          */
-        maxReferenceEdge: 2048
+        maxReferenceEdge: 2048,
+        // One exec per image at CODEX_POOL at a time, each carrying its own
+        // full timer. The server turns these two numbers into the node bound,
+        // which is the same arithmetic codexNodeBudgetMs states above.
+        perImageTimeoutMs: DEFAULT_TIMEOUT_MS2,
+        imageConcurrency: CODEX_POOL
       };
     },
     isAvailable() {
@@ -2659,8 +2674,9 @@ function createCodexEngine(opts) {
       const refs = req.referenceImages ?? [];
       const roles = req.referenceRoles ?? refs.map(() => "reference");
       const inner = new AbortController();
-      const onOuterAbort = () => inner.abort();
-      if (signal?.aborted) inner.abort();
+      const claimed = /* @__PURE__ */ new Set();
+      const onOuterAbort = () => inner.abort(signal?.reason);
+      if (signal?.aborted) inner.abort(signal.reason);
       else signal?.addEventListener("abort", onOuterAbort, { once: true });
       const jobs = Array.from(
         { length: count },
@@ -2679,7 +2695,7 @@ function createCodexEngine(opts) {
             stdin: buildPrompt2(req, i, roles),
             label: `gen v${i + 1}/${count} refs=${refs.length} refKB=${Math.round(refBytes / 1024)}`
           });
-          return collectImages(dir, before);
+          return collectImages(dir, before, claimed);
         })
       );
       const results = new Array(count);
@@ -2693,7 +2709,7 @@ function createCodexEngine(opts) {
             try {
               results[i] = await jobs[i]();
             } catch (err) {
-              if (signal?.aborted) throw err;
+              if (signal?.aborted && signal.reason !== BUDGET_EXHAUSTED) throw err;
               results[i] = [];
               failures.push(err);
               if (fatal == null && isFatalSetupError(err)) {
@@ -2776,10 +2792,10 @@ function createCodexEngine(opts) {
     );
   }
   function buildPrompt2(req, index, roles) {
+    const variation = req.variations?.[index] ?? "";
     const roleDirective = REFERENCE_ROLE_DIRECTIVE;
     const names = refFileNames(roles, roles.length);
     const refDirectives = roles.map((role, i) => `${names[i]} shows ${roleDirective[role]}.`).join(" ");
-    const count = Math.max(1, req.count);
     const native = codexNativeSize(req.width, req.height);
     return (
       // "professional-grade", not "flawless": the audit of the waxy-presenter
@@ -2793,13 +2809,19 @@ function createCodexEngine(opts) {
       // to the requested one, and the aspect check passed BECAUSE of the shear
       // - the reported crushed faces. Copy/move stays licensed because the
       // win32 recovery path moves files out of generated_images.
-      ` Do not browse the web or explore files. Save the tool's output in the current directory as out-1.png, byte-for-byte unchanged: you may run the commands needed to copy or move the file, but never resize, scale, stretch, pad, crop or re-encode it \u2014 deliver the tool's own pixels at the tool's own size. Nothing else.` + // Every take in a batch gets the SAME-shaped clause. Take 1 used to get
-      // nothing - so the first output was literally asked for the most
-      // reference-faithful decode - and later takes were licensed to a
-      // "different composition", which read as permission to drift from the
-      // directives. Reported as: output #1 copies the scene reference, output
-      // #2 mixes identities. A single generation stays byte-stable.
-      (count > 1 ? ` (take ${index + 1} of ${count} \u2014 same brief, same identities and constraints, a naturally different moment and framing of the same shoot)` : "")
+      ` Do not browse the web or explore files. Save the tool's output in the current directory as out-1.png, byte-for-byte unchanged: you may run the commands needed to copy or move the file, but never resize, scale, stretch, pad, crop or re-encode it \u2014 deliver the tool's own pixels at the tool's own size. Nothing else.` + // The set clause, built once by the server for the whole run and handed
+      // over index-aligned with the output slots. It carries the photographic
+      // move this frame explores and the locks every frame shares.
+      //
+      // What used to be here was a COUNTER — "take 3 of 4". Every take got the
+      // same-shaped sentence, so this was already the hardened version, and the
+      // drift survived it: a rising take number is not neutral text. In shoot
+      // language it reads as "we have already done that, go further", a licence
+      // to deviate that grows with the output index, which is precisely the
+      // reported shape (output 1 holds the presenter, 2 and 3 and 4 drift). No
+      // frame is described in terms of any other frame now, and no number
+      // reaches the model at all.
+      (variation ? ` ${variation}` : "")
     );
   }
 }
@@ -3015,14 +3037,22 @@ function presenterRefPath(templatesRoot, id, slot) {
 function presenterAvatarPath(templatesRoot, id) {
   return contentFile(templatesRoot, "previews", "presenters", id, "avatar.jpg");
 }
+var resolvedRefs = /* @__PURE__ */ new Map();
+async function refHash(core, path) {
+  const hit = resolvedRefs.get(path);
+  if (hit && core.images.has(hit)) return hit;
+  const hash = core.images.save(await sharp20(readFileSync(path)).png().toBuffer());
+  resolvedRefs.set(path, hash);
+  return hash;
+}
 async function resolvePresenterImages(core, templatesRoot, presenter) {
   const shots = [];
+  const avatar = presenterAvatarPath(templatesRoot, presenter.id);
+  if (existsSync(avatar)) shots.push({ file: `asset:${await refHash(core, avatar)}`, angle: "portrait", locked: true });
   for (const [slot, angle] of PRESENTER_ANGLES) {
     const path = presenterRefPath(templatesRoot, presenter.id, slot);
     if (!existsSync(path)) continue;
-    const png = await sharp20(readFileSync(path)).png().toBuffer();
-    const hash = core.images.save(png);
-    shots.push({ file: `asset:${hash}`, angle, locked: true });
+    shots.push({ file: `asset:${await refHash(core, path)}`, angle, locked: true });
   }
   if (!shots.length) return null;
   return {
@@ -3031,6 +3061,8 @@ async function resolvePresenterImages(core, templatesRoot, presenter) {
     ...presenter.identityNotes ? { identityNotes: presenter.identityNotes } : {},
     ...presenter.negativeConstraints?.length ? { negativeConstraints: presenter.negativeConstraints } : {},
     ...presenter.skin ? { skin: presenter.skin } : {},
+    ...presenter.facial ? { facial: presenter.facial } : {},
+    ...presenter.build ? { build: presenter.build } : {},
     shots
   };
 }
@@ -3288,6 +3320,7 @@ async function capReferenceEdge(core, path, maxEdge) {
       out = core.images.pathFor(core.images.save(buf));
     }
   } catch {
+    return path;
   }
   cappedRefs.set(key, out);
   return out;
@@ -3318,6 +3351,9 @@ function productFidelityDirective(attached) {
   }
   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 extendPreservationDirective() {
+  return "This grows the frame of a photograph that already exists; it does not restage it. The photograph in hand is the shot: the same person with the same face and the same clothing, the same product with the same label, geometry and colour, each at the same size, in the same place, under the same light. New area only continues the same scene past the original edges. Do not redesign the product, replace the person, change what anyone wears, or move the camera nearer or further away.";
+}
 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." : "";
@@ -3557,17 +3593,25 @@ function compileBrief(brief, ctx) {
         append(p.promptName ?? p.name);
         const primary = tok.angle && p.shots?.find((s) => s.angle === tok.angle) || p.shots?.[0];
         const orderedShots = [primary, ...(p.shots ?? []).filter((s) => s && s !== primary)];
-        const phashes = [];
+        const pshots = [];
         for (const s of orderedShots) {
-          if (phashes.length >= PRODUCT_REF_MAX) break;
+          if (pshots.length >= PRODUCT_REF_MAX) break;
           const h = assetHash2(s?.file);
-          if (h && ctx.images.has(h) && !phashes.includes(h)) phashes.push(h);
+          if (h && ctx.images.has(h) && !pshots.some((x) => x.h === h))
+            pshots.push({ h, ...s?.angle ? { angle: String(s.angle) } : {} });
         }
-        if (phashes.length) {
-          phashes.forEach((h, i) => {
-            attachments.push({ role: "product", id: p.id, label: p.name, hash: h, essential: i === 0 });
+        if (pshots.length) {
+          pshots.forEach(({ h, angle }, i) => {
+            attachments.push({
+              role: "product",
+              id: p.id,
+              label: p.name,
+              hash: h,
+              essential: i === 0,
+              ...angle ? { angle } : {}
+            });
           });
-          productDirectives.push(productFidelityDirective(phashes.length));
+          productDirectives.push(productFidelityDirective(pshots.length));
           productDirectives.push(...productFactDirectives(p));
           if (p.description && !p.dimensions)
             productDirectives.push(
@@ -3586,10 +3630,17 @@ function compileBrief(brief, ctx) {
         }
         hasPerson = true;
         append(c.promptName ?? c.name);
-        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 });
+        const cshots = (c.shots ?? []).slice(0, CHARACTER_REF_MAX).map((s) => ({ h: assetHash2(s?.file), angle: s?.angle ? String(s.angle) : void 0 })).filter((x) => !!x.h && ctx.images.has(x.h));
+        if (cshots.length) {
+          cshots.forEach(({ h, angle }, i) => {
+            attachments.push({
+              role: "character",
+              id: c.id,
+              label: c.name,
+              hash: h,
+              essential: i === 0,
+              ...angle ? { angle } : {}
+            });
           });
           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.`
@@ -3602,6 +3653,11 @@ function compileBrief(brief, ctx) {
             personDirectives.push(
               `${c.promptName ?? c.name}'s skin, exactly as the reference photographs show it: ${c.skin}.`
             );
+          if (c.facial)
+            personDirectives.push(
+              `${c.promptName ?? c.name}'s face, which must survive every generation unchanged: ${c.facial}.`
+            );
+          if (c.build) personDirectives.push(`${c.promptName ?? c.name}'s build: ${c.build}.`);
         } else {
           warnings.push(`${c.name} has no usable photo, so they are named but not attached.`);
         }
@@ -3757,7 +3813,13 @@ function compileBrief(brief, ctx) {
   ] : [];
   const brandLines = brandRuleDirectives(ctx.brand);
   const preservation = ctx.mode === "edit" ? [
-    ...ctx.editReshape === "extend" ? [] : [editPreservationDirective(ctx.editScope ?? "global", { removal: ctx.editRemoval })],
+    // An extend gets its own preservation language: the global
+    // directive's "same framing, same dimensions" lines contradict a
+    // frame that is deliberately growing, but dropping preservation
+    // altogether left the redrawn-frame arm with nothing protecting
+    // the person, the product or the wardrobe. See
+    // extendPreservationDirective.
+    ...ctx.editReshape === "extend" ? [extendPreservationDirective()] : [editPreservationDirective(ctx.editScope ?? "global", { removal: ctx.editRemoval })],
     ...ctx.inheritedIdentity ? [inheritedIdentityDirective(ctx.inheritedIdentity === true ? void 0 : ctx.inheritedIdentity)] : [],
     ...ctx.inheritedDirectives ?? []
   ] : [];
@@ -5984,7 +6046,8 @@ function presenterRecordFrom(input, base) {
   const has = (k) => input[k] !== void 0;
   const name = has("name") ? str3(input.name, 60) : base?.name ?? "";
   if (!name) return { ok: false, error: "a presenter needs a name" };
-  const shots = has("shotHashes") ? strList(input.shotHashes, 8, 64).map((h) => assetRef(h)).filter((f) => !!f).map((file) => ({ file, locked: true })) : base?.shots ?? [];
+  const angles = has("shotAngles") ? strList(input.shotAngles, 8, 32) : [];
+  const shots = has("shotHashes") ? strList(input.shotHashes, 8, 64).map((h) => assetRef(h)).filter((f) => !!f).map((file, i) => angles[i] ? { file, angle: angles[i], locked: true } : { file, locked: true }) : base?.shots ?? [];
   if (!shots.length) return { ok: false, error: "a presenter needs at least one photo" };
   const sources = has("sourceHashes") ? strList(input.sourceHashes, 8, 64).map((h) => assetRef(h)).filter((f) => !!f).map((file) => ({ file })) : base?.sourceRefs;
   const presenter = {
@@ -6122,6 +6185,26 @@ async function runBuild(deps, job, hashes, instruction, signal) {
   }
 }
 var STUDIO_FRAMES = [
+  /*
+   * The identity frame, and it comes first because that is the order a brief
+   * attaches: `shots[0]` is the essential character reference.
+   *
+   * Every other frame here is full-length head-to-toe, which is right for
+   * build, proportion and wardrobe and useless for a face — in a 1024x1280
+   * full-length frame the face is about 105px brow to chin, while a portrait
+   * output renders it at four times that. Measured 2026-08-30 against the
+   * reported failure: four outputs of one brief, four different jaws, and
+   * drift that tracked nothing but how big the face was in the output.
+   *
+   * Drawn `from: 'sources'` rather than chained off the front view, because
+   * the user's own photographs are the only real face evidence in the system
+   * and a chain would just enlarge the same 105px.
+   */
+  {
+    angle: "portrait",
+    from: "sources",
+    subject: (who) => `${who}, head-and-shoulders portrait framing from just above the top of the head down to the collarbone, facing the camera straight-on, relaxed neutral expression, eyes to the lens, their own hair exactly as the references show it, the same plain studio backdrop and even frontal light`
+  },
   {
     angle: "front",
     from: "sources",
@@ -6174,22 +6257,28 @@ async function runPresenterBuild(deps, job, hashes, instruction, signal) {
   }
   if (signal.aborted) throw new Error("cancelled");
   let shotHashes = hashes;
+  let shotAngles = [];
   const warnings = [];
   if (deps.engine) {
     patch(job, { stage: "building", steps: STUDIO_FRAMES.length, message: "Building the studio views" });
     const built2 = await generateStudioSet(deps, job, whoIs(job.name, draft), sourcePaths, signal);
-    if (built2.length) shotHashes = built2;
-    else warnings.push("The studio views could not be drawn, so the photos are being used directly.");
+    if (built2.hashes.length) {
+      shotHashes = built2.hashes;
+      shotAngles = built2.angles;
+    } else warnings.push("The studio views could not be drawn, so the photos are being used directly.");
   } else {
     warnings.push("No engine could draw the studio views, so the photos are being used directly.");
   }
   if (signal.aborted) throw new Error("cancelled");
   patch(job, { stage: "saving", message: null });
   const generated = shotHashes !== hashes;
-  const { previewHash, avatarHash } = await presenterCrops(core, shotHashes[0], generated ? "generated" : "upload");
+  const frontIndex = shotAngles.indexOf("front");
+  const cardSource = frontIndex === -1 ? shotHashes[0] : shotHashes[frontIndex];
+  const { previewHash, avatarHash } = await presenterCrops(core, cardSource, generated ? "generated" : "upload");
   const built = presenterRecordFrom({
     name: job.name,
     shotHashes,
+    shotAngles,
     sourceHashes: hashes,
     previewHash,
     avatarHash,
@@ -6212,16 +6301,16 @@ async function runPresenterBuild(deps, job, hashes, instruction, signal) {
     stage: "done",
     step: job.steps,
     assetId: built.presenter.id,
-    previewHash: previewHash ?? shotHashes[0] ?? null,
+    previewHash: previewHash ?? cardSource ?? null,
     warnings: [...job.warnings, ...warnings],
     finished: true
   });
 }
 async function generateStudioSet(deps, job, who, sourcePaths, signal) {
   const engine = deps.engine;
-  if (!engine) return [];
+  if (!engine) return { hashes: [], angles: [] };
   const caps = engine.capabilities();
-  if (!caps.maxReferenceImages) return [];
+  if (!caps.maxReferenceImages) return { hashes: [], angles: [] };
   const byAngle = /* @__PURE__ */ new Map();
   for (const frame of STUDIO_FRAMES) {
     if (signal.aborted) throw new Error("cancelled");
@@ -6248,7 +6337,8 @@ async function generateStudioSet(deps, job, who, sourcePaths, signal) {
       patch(job, { warnings: [...job.warnings, `The ${frame.angle} view could not be drawn.`] });
     }
   }
-  return STUDIO_FRAMES.map((f) => byAngle.get(f.angle)).filter((h) => !!h);
+  const kept = STUDIO_FRAMES.filter((f) => byAngle.get(f.angle));
+  return { hashes: kept.map((f) => byAngle.get(f.angle)), angles: kept.map((f) => f.angle) };
 }
 async function edgeBarGeometry(buf) {
   const { data, info } = await sharp20(buf).greyscale().raw().toBuffer({ resolveWithObject: true });
@@ -6346,6 +6436,64 @@ async function avatarCrop(core, hash) {
     AVATAR_MAX_PX
   );
 }
+var IDENTITY_FIGURE_FRACTION = 0.26;
+var IDENTITY_HEADROOM = 0.08;
+var IDENTITY_ASPECT = 0.66;
+var IDENTITY_TARGET_HEIGHT = 1280;
+var IDENTITY_MAX_UPSCALE = 3;
+var STANDING_FIGURE_RATIO = 2.2;
+async function identityCrop(core, hash) {
+  if (!hash || !core.images.has(hash)) return void 0;
+  const hit = identityCrops.get(hash);
+  if (hit && core.images.has(hit)) return hit;
+  let box = null;
+  try {
+    box = await figureBox(core.images.read(hash));
+  } catch {
+    box = null;
+  }
+  if (!box) return void 0;
+  if (box.height / Math.max(1, box.width) < STANDING_FIGURE_RATIO) return void 0;
+  let nativeHeight = 0;
+  const out = await crop(core, hash, (w, h) => {
+    const height = Math.min(h, Math.max(16, Math.round(box.height * IDENTITY_FIGURE_FRACTION)));
+    const width = Math.min(w, Math.max(16, Math.round(height * IDENTITY_ASPECT)));
+    nativeHeight = height;
+    const top = Math.min(Math.max(0, Math.round(box.top - height * IDENTITY_HEADROOM)), h - height);
+    const left = Math.min(Math.max(0, Math.round(box.left + box.width / 2 - width / 2)), w - width);
+    return { left, top, width, height };
+  });
+  if (!out) return void 0;
+  try {
+    const height = Math.min(IDENTITY_TARGET_HEIGHT, Math.round(nativeHeight * IDENTITY_MAX_UPSCALE)) || IDENTITY_TARGET_HEIGHT;
+    const png = await sharp20(core.images.read(out)).resize({ height, fit: "inside", kernel: "lanczos3", withoutEnlargement: false }).png().toBuffer();
+    const scaled = core.images.save(png);
+    identityCrops.set(hash, scaled);
+    return scaled;
+  } catch {
+    identityCrops.set(hash, out);
+    return out;
+  }
+}
+var identityCrops = /* @__PURE__ */ new Map();
+async function brandJsonWithIdentityCrops(core, json, characterIds) {
+  const wanted = new Set(characterIds);
+  const roster = json?.characters ?? [];
+  if (!wanted.size || !roster.length) return json;
+  let changed = false;
+  const characters = await Promise.all(
+    roster.map(async (c) => {
+      if (!wanted.has(c?.id) || !c?.shots?.length) return c;
+      if (c.shots[0]?.angle === "portrait") return c;
+      const front = String(c.shots[0]?.file ?? "").replace(/^asset:/, "") || null;
+      const cropped = await identityCrop(core, front ?? void 0);
+      if (!cropped) return c;
+      changed = true;
+      return { ...c, shots: [{ file: `asset:${cropped}`, angle: "identity", locked: true }, ...c.shots] };
+    })
+  );
+  return changed ? { ...json, characters } : json;
+}
 async function figureBox(buf) {
   const meta = await sharp20(buf).metadata();
   const W = meta.width ?? 0;
@@ -6616,6 +6764,49 @@ function inheritedIdentityTokens(parentId, getNode) {
   return { tokens: [], truncated: id !== null };
 }
 
+// src/variationPlan.ts
+var OPEN_LADDER = [
+  "Frame this one as the direction describes it, the straight read of the brief.",
+  "Step the camera to one side of where the direction places it, and let the pose settle with the move.",
+  "Frame tighter on the subject than the straight read, same lens character.",
+  "Drop the eye line a little and leave more air in the frame.",
+  "Step back for a wider read of the same setup.",
+  "Come round to a three-quarter view of the same arrangement.",
+  "Take it from slightly above, the same distance.",
+  "Hold the same framing and let the subject carry a different beat of the same moment."
+];
+var FIXED_LADDER = [
+  "Frame this one as the direction describes it, the straight read of the brief.",
+  "Keep the camera the direction asks for and shift it a little laterally.",
+  "Keep the camera the direction asks for and let the weight and hands settle differently.",
+  "Keep the camera the direction asks for and change the head angle slightly.",
+  "Keep the camera the direction asks for and let the light fall a touch differently across the same setup.",
+  "Keep the camera the direction asks for and give the expression a different beat of the same moment.",
+  "Keep the camera the direction asks for and rearrange the near foreground slightly.",
+  "Keep the camera the direction asks for and let the pose breathe a little wider."
+];
+function locks(ctx) {
+  const parts = [
+    "Every frame in this run belongs to one continuous shoot: the same location, the same light, and the same wardrobe garment for garment, changing only as the pose moves the cloth."
+  ];
+  if (ctx.hasPresenter)
+    parts.push(
+      "The person is the one in the character references and nobody else, unchanged in face, hair, build and skin."
+    );
+  if (ctx.hasProduct)
+    parts.push(
+      "The product is the one in the product references and no other, unchanged in geometry, packaging, label and colour."
+    );
+  if (ctx.hasMark) parts.push("The brand mark stays exactly as drawn.");
+  return parts.join(" ");
+}
+function variationPlan(count, ctx) {
+  if (!Number.isFinite(count) || count <= 1) return [];
+  const ladder = ctx.cameraFixed ? FIXED_LADDER : OPEN_LADDER;
+  const shared = locks(ctx);
+  return Array.from({ length: Math.floor(count) }, (_, i) => `${ladder[i % ladder.length]} ${shared}`);
+}
+
 // src/editScopeRules.ts
 var GLOBAL_CUES = [
   ["light", /\b(light|lighting|lit|relight|exposure|white ?balance|backlit|shadows everywhere)\b/i],
@@ -6875,6 +7066,74 @@ function planCrop(source, targetRatio) {
   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" };
 }
+function defaultReshapeOp(sourceRatio, targetRatio) {
+  if (!(sourceRatio > 0 && targetRatio > 0)) return "extend";
+  return Math.abs(Math.log(targetRatio)) < Math.abs(Math.log(sourceRatio)) - 0.01 ? "crop" : "extend";
+}
+
+// src/outpaint/growth.ts
+var SINGLE_PASS_MAX = 1.5;
+var CROP_ASSIST_ABOVE = 2;
+var CROP_ASSIST_MAX = 0.15;
+var STAGE_MAX = 1.4;
+function planGrowth(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;
+  const axis = targetRatio > current ? "width" : "height";
+  const growth = axis === "width" ? targetRatio / current : current / targetRatio;
+  let cropAssist = 0;
+  if (growth > CROP_ASSIST_ABOVE) {
+    const wanted = 1 - CROP_ASSIST_ABOVE / growth;
+    cropAssist = Math.min(CROP_ASSIST_MAX, wanted);
+  }
+  const effective = growth * (1 - cropAssist);
+  const stages = effective <= SINGLE_PASS_MAX ? 1 : Math.ceil(Math.log(effective) / Math.log(STAGE_MAX));
+  return { growth, axis, stages, cropAssist, effective };
+}
+function cropAssistWindow(source, plan) {
+  if (plan.cropAssist <= 0) return null;
+  if (plan.axis === "width") {
+    const height = Math.max(1, Math.round(source.height * (1 - plan.cropAssist)));
+    return { left: 0, top: Math.floor((source.height - height) / 2), width: source.width, height };
+  }
+  const width = Math.max(1, Math.round(source.width * (1 - plan.cropAssist)));
+  return { left: Math.floor((source.width - width) / 2), top: 0, width, height: source.height };
+}
+
+// src/reshapeRules.ts
+var EXTEND_MAX = CROP_ASSIST_ABOVE;
+function classifyReshape(source, targetRatio, requested) {
+  if (!(source.width > 0 && source.height > 0 && targetRatio > 0)) return { op: "none" };
+  const growth = planGrowth(source, targetRatio);
+  if (!growth) return { op: "none" };
+  const op = requested ?? defaultReshapeOp(source.width / source.height, targetRatio);
+  if (op === "crop") return { op: "crop", forced: false };
+  if (growth.effective > EXTEND_MAX + 1e-9) return { op: "crop", forced: true, growth };
+  return { op: "extend", growth, assist: cropAssistWindow(source, growth) };
+}
+function fitExpandToBudget(plan, source, pixelBudget) {
+  if (!pixelBudget || plan.width * plan.height <= pixelBudget) return { plan, source, scale: 1 };
+  const frame = budgetSize(plan.width, plan.height, pixelBudget);
+  if (plan.axis === "width") {
+    const scale2 = frame.height / plan.height;
+    const width = Math.min(frame.width, Math.max(1, Math.round(source.width * scale2)));
+    const left = Math.min(Math.max(0, Math.round(plan.left * scale2)), frame.width - width);
+    return {
+      plan: { width: frame.width, height: frame.height, left, top: 0, axis: "width" },
+      source: { width, height: frame.height },
+      scale: scale2
+    };
+  }
+  const scale = frame.width / plan.width;
+  const height = Math.min(frame.height, Math.max(1, Math.round(source.height * scale)));
+  const top = Math.min(Math.max(0, Math.round(plan.top * scale)), frame.height - height);
+  return {
+    plan: { width: frame.width, height: frame.height, left: 0, top, axis: "height" },
+    source: { width: frame.width, height },
+    scale
+  };
+}
 async function attentionCropOrigin(srcBuf, source, plan) {
   try {
     const { info } = await sharp20(srcBuf).resize(plan.width, plan.height, { fit: "cover", position: "attention" }).toBuffer({ resolveWithObject: true });
@@ -8467,6 +8726,40 @@ function registerImageRoutes(app, deps) {
 
 // src/release/notes.data.ts
 var RELEASES = [
+  {
+    version: "0.7.2",
+    date: "2026-08-30",
+    title: "Changing a shot to a new shape keeps the photograph.",
+    sections: [
+      {
+        heading: "Create",
+        body: "Refining a shot into a different aspect ratio no longer costs it quality. The frame is planned at the size the engine can genuinely draw, so nothing is enlarged afterwards to fill a canvas its pixels could not reach. The presenter, the product, the wardrobe, the light and the subject scale carry across the new shape, and the stored size is now the size that was really drawn."
+      },
+      {
+        heading: "Fixes",
+        body: "A target shape that is tighter than the shot now crops it, instantly and without a generation, instead of building out around it. A shape too far from the current one to reach in a single step crops as well, and says so, rather than attempting a stretch that could not work. The composer tells you which of the two will happen before you run it."
+      }
+    ]
+  },
+  {
+    version: "0.7.1",
+    date: "2026-08-30",
+    title: "Four images from one brief are one set.",
+    sections: [
+      {
+        heading: "Create",
+        body: "Asking for two, three or four images returns variations of one shot rather than four readings of it. The presenter, the product, the scene and the brand hold across the set, and so does the wardrobe. What changes is the photography: each frame explores a different camera position, crop or pose within the brief you wrote."
+      },
+      {
+        heading: "Presenters",
+        body: "A selected presenter now reaches generation as a portrait, not only as full-length views, so their face carries into every image of a run instead of being rebuilt each time. Presenters built in Scenri gain a head-and-shoulders reference of their own, and their casting notes reach the shot."
+      },
+      {
+        heading: "Fixes",
+        body: "A run that takes too long keeps the images that already finished instead of throwing them away with the rest. Refining a shot conditions on the same presenter portrait the generation used."
+      }
+    ]
+  },
   {
     version: "0.7.0",
     date: "2026-08-30",
@@ -9502,18 +9795,22 @@ function buildServer(opts) {
     );
     const inheritedTokens = borrowed.filter((t) => !already.has(identityTokenKey(t)));
     const combined = [...brief.tokens, ...inheritedTokens];
-    const brandJson = await brandJsonWithResolvedPresenters(
+    const brandJson = await brandJsonWithIdentityCrops(
       core,
-      templatesRoot,
-      presenters,
-      await brandJsonWithResolvedDemoProducts(
+      await brandJsonWithResolvedPresenters(
         core,
         templatesRoot,
-        demoProducts,
-        brandJsonWithCatalogProducts(core, brandId),
+        presenters,
+        await brandJsonWithResolvedDemoProducts(
+          core,
+          templatesRoot,
+          demoProducts,
+          brandJsonWithCatalogProducts(core, brandId),
+          combined
+        ),
         combined
       ),
-      combined
+      combined.filter((t) => t.t === "character").map((t) => t.id)
     );
     const sceneById = sceneFor(brandJson);
     const uncapped = { ...engineCaps, maxReferenceImages: 32 };
@@ -9640,18 +9937,22 @@ function buildServer(opts) {
         referenceCount: edit.merged.kept.length
       };
     }
-    const brandJson = await brandJsonWithResolvedPresenters(
+    const brandJson = await brandJsonWithIdentityCrops(
       core,
-      templatesRoot,
-      presenters,
-      await brandJsonWithResolvedDemoProducts(
+      await brandJsonWithResolvedPresenters(
         core,
         templatesRoot,
-        demoProducts,
-        brandJsonWithCatalogProducts(core, brand.id),
+        presenters,
+        await brandJsonWithResolvedDemoProducts(
+          core,
+          templatesRoot,
+          demoProducts,
+          brandJsonWithCatalogProducts(core, brand.id),
+          brief.tokens
+        ),
         brief.tokens
       ),
-      brief.tokens
+      (brief.tokens ?? []).filter((t) => t.t === "character").map((t) => t.id)
     );
     const sceneById = sceneFor(brandJson);
     const compiled2 = compileBrief(brief, {
@@ -9795,7 +10096,7 @@ function buildServer(opts) {
     let watchdogFired = false;
     const watchdog = setTimeout(() => {
       watchdogFired = true;
-      ctrl.abort();
+      ctrl.abort(BUDGET_EXHAUSTED);
     }, bound);
     const startedAt = Date.now();
     try {
@@ -9858,33 +10159,15 @@ function buildServer(opts) {
     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 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));
+    const runCropNode = async (args) => {
+      const plan2 = planCrop(args.srcSize, Number(args.fmt.w) / Number(args.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 origin = await attentionCropOrigin(args.srcBuf, args.srcSize, 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 label = FORMATS.find((f) => f.id === args.fmt.id)?.label ?? `${args.fmt.w}x${args.fmt.h}`;
       const node2 = core.store.addNode({
         projectId: project.id,
-        parentId: cropParentId,
+        parentId: args.parentId,
         kind: "edit",
         prompt: `Cropped to ${label}`,
         // No provider was asked; recording the engine the client HAPPENED to
@@ -9893,18 +10176,45 @@ function buildServer(opts) {
       });
       core.store.setBrief(node2.id, {
         ...briefInputsOnly(brief ?? {}),
-        sourceImage: String(srcHash),
+        sourceImage: args.srcHash,
         reshape: "crop",
         crop: window
       });
       const work2 = async () => ({
-        images: [core.images.save(await sharp20(srcBuf).extract(window).png().toBuffer())],
+        images: [core.images.save(await sharp20(args.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);
+      return reply.status(202).send(args.note ? { ...node2, warnings: [args.note] } : node2);
+    };
+    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 sharp20(srcBuf).metadata();
+      if (!srcMeta.width || !srcMeta.height) return reply.status(400).send({ error: "source image unreadable" });
+      return runCropNode({
+        parentId: cropParentId,
+        fmt,
+        srcHash: String(srcHash),
+        srcBuf,
+        srcSize: { width: srcMeta.width, height: srcMeta.height }
+      });
     }
     const engine = engines.get(String(engineId));
     if (!engine) return reply.status(400).send({ error: `unknown engine ${engineId}` });
@@ -9925,6 +10235,9 @@ function buildServer(opts) {
     let sentSize;
     const extraWarnings = [];
     let expandPlan = null;
+    let expandSent = null;
+    let expandAssist = null;
+    let expandWorkHash = null;
     let expandSourceHash = null;
     if (brief && Array.isArray(brief.tokens)) {
       const briefErrors = validateBrief(brief);
@@ -9944,18 +10257,22 @@ function buildServer(opts) {
         if (!compiled2.prompt.trim() && reshape !== "extend")
           return reply.status(400).send({ error: "the brief is empty" });
       } else {
-        const brandJson = await brandJsonWithResolvedPresenters(
+        const brandJson = await brandJsonWithIdentityCrops(
           core,
-          templatesRoot,
-          presenters,
-          await brandJsonWithResolvedDemoProducts(
+          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
+          (brief.tokens ?? []).filter((t) => t.t === "character").map((t) => t.id)
         );
         const sceneById = sceneFor(brandJson);
         compiled2 = compileBrief(brief, {
@@ -10021,6 +10338,7 @@ function buildServer(opts) {
     }
     if (kind === "generation") {
       const cap2 = engine.capabilities().maxReferenceImages;
+      const wantedCount = Math.min(Math.max(1, Number(count)), 8);
       const lostIdentity = engine.capabilities().placeholder ? [] : (compiled2?.dropped ?? []).filter((d) => d.essential);
       if (lostIdentity.length) {
         const names = joinNames(lostIdentity.map((d) => d.label));
@@ -10032,14 +10350,23 @@ function buildServer(opts) {
       const maxEdge = engine.capabilities().maxReferenceEdge;
       const keptRefs = referenceImages && cap2 > 0 ? referenceImages.slice(0, cap2) : void 0;
       const sentRefs = keptRefs && maxEdge ? await Promise.all(keptRefs.map((p) => capReferenceEdge(core, p, maxEdge))) : keptRefs;
+      const sentRoles = referenceRoles && cap2 > 0 ? referenceRoles.slice(0, cap2) : referenceRoles ?? [];
+      const briefText = Array.isArray(brief?.tokens) ? brief.tokens.filter((t) => t?.t === "text").map((t) => String(t?.v ?? "")).join(" ") : String(prompt ?? "");
+      const variations = variationPlan(wantedCount, {
+        hasPresenter: sentRoles.includes("character"),
+        hasProduct: sentRoles.includes("product"),
+        hasMark: sentRoles.includes("brand"),
+        cameraFixed: shotSpecifiesCamera(briefText)
+      });
       const genReq = {
         prompt: finalPrompt,
         brand: ctx,
         width: Number(width),
         height: Number(height),
-        count: Math.min(Math.max(1, Number(count)), 8),
+        count: wantedCount,
         ...sentRefs ? { referenceImages: sentRefs } : {},
-        ...referenceRoles && cap2 > 0 ? { referenceRoles: referenceRoles.slice(0, cap2) } : {}
+        ...sentRoles.length && cap2 > 0 ? { referenceRoles: sentRoles } : {},
+        ...variations.length ? { variations } : {}
       };
       estimate = await engine.costEstimate(genReq);
       work = (signal) => engine.generate(genReq, signal);
@@ -10065,14 +10392,41 @@ function buildServer(opts) {
         width: srcMeta.width,
         height: srcMeta.height
       });
-      if (reshapeIntended && srcMeta.width && srcMeta.height && compiled2?.width && compiled2?.height) {
-        expandPlan = planExpand({ width: srcMeta.width, height: srcMeta.height }, compiled2.width / compiled2.height);
+      let workBuf = srcBuf;
+      let workSize = srcMeta.width && srcMeta.height ? { width: srcMeta.width, height: srcMeta.height } : null;
+      if (reshapeIntended && workSize && compiled2?.width && compiled2?.height) {
+        const targetRatio = compiled2.width / compiled2.height;
+        const decision = classifyReshape(workSize, targetRatio, reshape);
+        if (decision.op === "crop") {
+          if (reshape === "extend")
+            return reply.status(400).send({
+              error: `growing a ${workSize.width}x${workSize.height} frame to this shape would invent more of the photograph than it keeps; crop instead`
+            });
+          const fmt = (brief?.tokens ?? []).find(
+            (t) => t.t === "format" && Number(t.w) > 0 && Number(t.h) > 0
+          );
+          if (fmt)
+            return runCropNode({
+              parentId: resolvedParentId,
+              fmt,
+              srcHash: String(srcHash),
+              srcBuf,
+              srcSize: workSize,
+              note: decision.forced ? "That shape is further than one extend can reach, so the picture was cropped to it instead." : void 0
+            });
+        } else if (decision.op === "extend") {
+          if (decision.assist) {
+            expandAssist = { width: decision.assist.width, height: decision.assist.height };
+            workBuf = await sharp20(srcBuf).extract(decision.assist).png().toBuffer();
+            workSize = { width: decision.assist.width, height: decision.assist.height };
+          }
+          expandPlan = planExpand(workSize, targetRatio);
+        }
       }
       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 && workSize) {
+        expandPlan = placeExpand(expandPlan, workSize, await subjectFraction(workBuf, workSize, expandPlan.axis));
       }
       if (expandPlan) {
         const route = await resolveOutpaintRoute(engines.all(), engine);
@@ -10080,11 +10434,25 @@ function buildServer(opts) {
         expandMethod = route.method;
       }
       const canOutpaint2 = expandMethod === "outpaint";
+      if (expandPlan && workSize) {
+        const fit = fitExpandToBudget(expandPlan, workSize, runEngine.capabilities().editPixelBudget);
+        if (fit.scale < 1) {
+          expandPlan = fit.plan;
+          workBuf = await sharp20(workBuf).resize(fit.source.width, fit.source.height, { fit: "fill", kernel: "lanczos3" }).png().toBuffer();
+          workSize = fit.source;
+          extraWarnings.push(
+            `${runEngine.capabilities().displayName} draws about ${((runEngine.capabilities().editPixelBudget ?? 0) / 1e6).toFixed(1)} megapixels, so this shape continues as a ${fit.plan.width}x${fit.plan.height} frame with the photograph riding inside it at ${fit.source.width}x${fit.source.height}. Nothing is upscaled; the stored size is the size the engine truly drew.`
+          );
+        }
+        expandSent = workSize;
+      }
       let reframeSourceHash;
       if (expandPlan) {
         if (!canOutpaint2) {
-          expandSourceHash = core.images.save(await expandCanvas(srcBuf, expandPlan));
-          reframeSourceHash = core.images.save(await conditioningCanvas(srcBuf, expandPlan, "edge"));
+          expandSourceHash = core.images.save(await expandCanvas(workBuf, expandPlan));
+          reframeSourceHash = core.images.save(await conditioningCanvas(workBuf, expandPlan, "edge"));
+        } else {
+          expandWorkHash = core.images.save(workBuf);
         }
         expectShape = { width: expandPlan.width, height: expandPlan.height };
       }
@@ -10101,7 +10469,7 @@ function buildServer(opts) {
       }
       const editReq = {
         instruction: expandPlan ? expandInstruction(expandPlan, finalPrompt) : finalPrompt,
-        sourceImage: core.images.pathFor(String(expandSourceHash ?? budgetSourceHash ?? srcHash)),
+        sourceImage: core.images.pathFor(String(expandSourceHash ?? expandWorkHash ?? budgetSourceHash ?? srcHash)),
         brand: ctx,
         ...editRefs.length ? { referenceImages: editRefs.map((r) => r.path) } : {},
         ...editRefs.length ? { referenceRoles: editRefs.map((r) => r.role ?? "reference") } : {},
@@ -10118,8 +10486,10 @@ function buildServer(opts) {
           expand: {
             left: expandPlan.left,
             top: expandPlan.top,
-            width: srcMeta.width ?? 0,
-            height: srcMeta.height ?? 0
+            // The sent copy's own size: after crop assist and the budget
+            // fit these are the pixels the offsets actually refer to.
+            width: workSize?.width ?? srcMeta.width ?? 0,
+            height: workSize?.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
@@ -10131,8 +10501,8 @@ function buildServer(opts) {
       };
       estimate = await runEngine.costEstimate(editReq);
       const plan2 = expandPlan;
-      const srcSize = { width: srcMeta.width ?? 0, height: srcMeta.height ?? 0 };
-      const original2 = srcBuf;
+      const srcSize = workSize ?? { width: srcMeta.width ?? 0, height: srcMeta.height ?? 0 };
+      const original2 = workBuf;
       const reframeReq = plan2 && !canOutpaint2 && reframeSourceHash ? {
         ...editReq,
         instruction: reframeInstruction(plan2, srcSize, finalPrompt),
@@ -10202,7 +10572,13 @@ function buildServer(opts) {
             // 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
+            top: expandPlan.top,
+            // The planned frame and the size the photograph was sent at,
+            // so requested-versus-drawn is a readable fact — and the
+            // assist window when a slice of the other axis was given up.
+            frame: [expandPlan.width, expandPlan.height],
+            ...expandSent ? { source: [expandSent.width, expandSent.height] } : {},
+            ...expandAssist ? { assist: [expandAssist.width, expandAssist.height] } : {}
           }
         } : {},
         // What the refinement carried, recorded apart from what it asked for:
@@ -10275,7 +10651,8 @@ function buildServer(opts) {
             { 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);
+        const pasted = expandWorkHash ? core.images.read(expandWorkHash) : original;
+        const { image, aligned } = await compositeExpand(answer, pasted, plan);
         if (!aligned) app.log.warn({ nodeId: node.id }, "expand: engine frame did not align, kept the bed");
         out.push(core.images.save(image));
       }
@@ -10328,7 +10705,8 @@ function buildServer(opts) {
       }
       return enforceEditCanvas(staged);
     } : kind === "generation" && compiled2?.width && compiled2?.height ? conformToCanvas(node.id, { width: compiled2.width, height: compiled2.height }) : void 0;
-    const nodeBudgetMs = kind === "generation" && runEngine.capabilities().id === "codex-cli" ? codexNodeBudgetMs(Math.min(Math.max(1, Number(count)), 8)) : void 0;
+    const runCaps = runEngine.capabilities();
+    const nodeBudgetMs = kind === "generation" && runCaps.perImageTimeoutMs ? Math.ceil(Math.min(Math.max(1, Number(count)), 8) / Math.max(1, runCaps.imageConcurrency ?? 1)) * runCaps.perImageTimeoutMs + 6e4 : void 0;
     void runNode(node.id, runEngine, estimate, work, expectShape, post, nodeBudgetMs).catch(
       (err) => app.log.error({ err }, "node run failed")
     );