scenri 0.7.1 → 0.7.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.7.2](https://github.com/tonygorb/Scenri/compare/v0.7.1...v0.7.2) (2026-08-30)
+
+
+### Bug Fixes
+
+* a reshape is planned at the engine budget, never upscaled ([a580adc](https://github.com/tonygorb/Scenri/commit/a580adce27c85ae31b9071d9ff5411cb9d06bdaa))
+* a reshape is planned at the engine budget, never upscaled ([2325779](https://github.com/tonygorb/Scenri/commit/2325779b32bdb83687135a21758953a1e3465eb2))
+
 ## [0.7.1](https://github.com/tonygorb/Scenri/compare/v0.7.0...v0.7.1) (2026-08-30)
 
 

package/dist/serve.js

@@ -3351,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." : "";
@@ -3810,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 ?? []
   ] : [];
@@ -7057,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 });
@@ -8649,6 +8726,21 @@ 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",
@@ -10067,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
@@ -10102,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}` });
@@ -10134,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);
@@ -10288,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);
@@ -10303,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 };
       }
@@ -10324,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") } : {},
@@ -10341,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
@@ -10354,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),
@@ -10425,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:
@@ -10498,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));
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scenri",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "author": "Tony Gorb <hello@scenri.co>",
   "license": "AGPL-3.0-only",
   "type": "module",