scenri 0.6.9 → 0.6.11

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [0.6.11](https://github.com/tonygorb/Scenri/compare/v0.6.10...v0.6.11) (2026-08-29)
+
+
+### Bug Fixes
+
+* **engine-codex:** say what a usage limit means instead of quoting the banner ([f769d81](https://github.com/tonygorb/Scenri/commit/f769d812675e8671c46959c6b2007808cb3fa97e))
+* **engine-codex:** say what a usage limit means instead of quoting the banner ([edd2155](https://github.com/tonygorb/Scenri/commit/edd2155fe1bf6592376feef9ab9871e1c51ca3b1))
+
+## [0.6.10](https://github.com/tonygorb/Scenri/compare/v0.6.9...v0.6.10) (2026-08-29)
+
+
+### Bug Fixes
+
+* **engine-codex:** ask for the tool's own grid point, not our nominal pixels ([a0cc518](https://github.com/tonygorb/Scenri/commit/a0cc518c2e79702f728bc7d00edddf874d3b2dc3))
+* **engine-codex:** bind references by role-named files and give every take the same instruction ([2e645b2](https://github.com/tonygorb/Scenri/commit/2e645b2d34dc7006f23792cad04ad9170f3bae28))
+* **engine-codex:** bind references by role-named files and give every take the same instruction ([416999d](https://github.com/tonygorb/Scenri/commit/416999d85ad984e8e5ee4df06e12a6edf09ed84a))
+* **engine-codex:** never let the model resize; the frame rides as ratio language ([a5907a0](https://github.com/tonygorb/Scenri/commit/a5907a0a2a247eb5e369d3eae94884880cdb6cc3))
+* **engine-codex:** never let the model resize; the frame rides as ratio language ([063316a](https://github.com/tonygorb/Scenri/commit/063316ad15fe01000d112cf240ad10a6e5707ccf))
+* validate and orient engine images before storing; crop drifted frames to the asked ratio ([b88c039](https://github.com/tonygorb/Scenri/commit/b88c0392ff97a103301617ad23ddfcb500303e90))
+* validate and orient engine images before storing; crop drifted frames to the asked ratio ([3cbd462](https://github.com/tonygorb/Scenri/commit/3cbd462df35b322cd55c1e3b6e8c47b767ee4880))
+* widen the crop net to the drift real briefs actually produce ([491aa3c](https://github.com/tonygorb/Scenri/commit/491aa3c9f03e1511188a3fc71a2de817a9aff289))
+
 ## [0.6.9](https://github.com/tonygorb/Scenri/compare/v0.6.8...v0.6.9) (2026-08-29)
 
 

package/dist/serve.js

@@ -1310,6 +1310,28 @@ var EDIT_REFERENCE_ROLE_DIRECTIVE = {
   reference: "a reference for composition, lighting and treatment only"
 };
 var ASPECT_TOLERANCE = 0.15;
+var NAMED_RATIOS = [
+  ["1:1", 1],
+  ["4:5", 4 / 5],
+  ["5:4", 5 / 4],
+  ["2:3", 2 / 3],
+  ["3:2", 3 / 2],
+  ["3:4", 3 / 4],
+  ["4:3", 4 / 3],
+  ["9:16", 9 / 16],
+  ["16:9", 16 / 9],
+  ["2:1", 2],
+  ["1:2", 0.5]
+];
+function ratioLabel(width, height) {
+  const ratio = width / height;
+  for (const [label, value] of NAMED_RATIOS) {
+    if (Math.abs(ratio - value) / value < 0.02) return label;
+  }
+  const gcd = (a, b) => b ? gcd(b, a % b) : a;
+  const d = gcd(width, height) || 1;
+  return `${Math.round(width / d)}:${Math.round(height / d)}`;
+}
 
 // ../core/src/index.ts
 function defaultHome() {
@@ -2118,13 +2140,26 @@ function createRunner(opts = {}) {
       child.on("exit", (code) => {
         if (code === 0) {
           finish("ok", resolve);
-        } else {
-          const snippet2 = stderr.trim().slice(0, 200);
+          return;
+        }
+        const limit = /You've hit your usage limit\.(?:[^\n]*?\btry again at ([^.\n]+)\.)?/.exec(stderr);
+        if (limit) {
+          const when = limit[1]?.trim();
           finish(
             `exit-${code ?? "unknown"}`,
-            () => reject(new Error(`codex exited with code ${code ?? "unknown"}${snippet2 ? `: ${snippet2}` : ""}`))
+            () => reject(
+              new Error(
+                `Your Codex plan's usage limit is used up${when ? ` until ${when}` : ""}. Generation resumes on its own then, or add credits from your Codex account.`
+              )
+            )
           );
+          return;
         }
+        const snippet2 = stderr.trim().slice(0, 200);
+        finish(
+          `exit-${code ?? "unknown"}`,
+          () => reject(new Error(`codex exited with code ${code ?? "unknown"}${snippet2 ? `: ${snippet2}` : ""}`))
+        );
       });
     });
   }
@@ -2479,6 +2514,27 @@ 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";
+}
+var CODEX_PIXEL_BUDGET = 1572864;
+function codexNativeSize(width, height) {
+  const ratio = width / height;
+  if (!(ratio > 0) || !Number.isFinite(ratio)) return { width, height };
+  return {
+    width: Math.round(Math.sqrt(CODEX_PIXEL_BUDGET * ratio)),
+    height: Math.round(Math.sqrt(CODEX_PIXEL_BUDGET / ratio))
+  };
+}
+function refFileNames(roles, count) {
+  const perRole = /* @__PURE__ */ new Map();
+  return Array.from({ length: count }, (_, i) => {
+    const role = roles[i] ?? "reference";
+    const n = (perRole.get(role) ?? 0) + 1;
+    perRole.set(role, n);
+    return `${role}-${n}.png`;
+  });
+}
 function createCodexEngine(opts) {
   const { saveImage } = opts;
   const platform = opts.platform ?? process.platform;
@@ -2511,7 +2567,9 @@ function createCodexEngine(opts) {
     }
     const hashes = [];
     for (const name of outFiles) {
-      hashes.push(saveImage(await readFile(join(dir, name))));
+      const buf = await readFile(join(dir, name));
+      if (buf.length === 0) throw new Error(`codex: ${name} is empty`);
+      hashes.push(saveImage(buf));
     }
     return hashes;
   }
@@ -2558,6 +2616,11 @@ function createCodexEngine(opts) {
          * attached — and on an edit the first one attached is `input.png`, the
          * shot being edited. A refine carrying a full identity payload was
          * silently editing nothing at all.
+         *
+         * That same backwards walk is why every reference is bound to its role
+         * by FILENAME (refFileNames) on both paths: the tool decides which
+         * pictures it surfaces and in what order, so an ordinal "Attached
+         * image N" binding pointed identity claims at the wrong picture.
          */
         maxReferenceImages: 5,
         /*
@@ -2589,8 +2652,9 @@ function createCodexEngine(opts) {
         (_, i) => async () => withWorkDir(async (dir) => {
           const args = execArgs(dir);
           let refBytes = 0;
+          const names = refFileNames(roles, refs.length);
           for (const [idx, ref] of refs.entries()) {
-            const dest = join(dir, `ref-${idx}.png`);
+            const dest = join(dir, names[idx]);
             await copyFile(ref, dest);
             refBytes += (await stat(dest)).size;
             args.splice(args.length - 1, 0, `--image=${dest}`);
@@ -2666,9 +2730,15 @@ 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).` + // 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 promptText = `Edit input.png using your image generation/editing tool: ${req.instruction}.` + (refLines.length ? ` ${refLines.join(". ")}.` : "") + // The old tail licensed "the commands needed to save and resize it"
+        // and then asked for exactly WxH pixels - which the model honoured
+        // with sips -z, a force-fit of BOTH axes. Every refine hop was a
+        // cheap-kernel shell resample of freshly generated pixels, and when
+        // the tool had drifted the shape it was a shear: the reported
+        // crushed faces and the deep-chain mush. The server's own canvas
+        // pass (enforceEditCanvas) owns size now, with one uniform lanczos
+        // only when actually needed.
+        (req.width && req.height ? ` Keep the edited frame at input.png's own ${ratioLabel(req.width, req.height)} shape, ${codexNativeSize(req.width, req.height).width}x${codexNativeSize(req.width, req.height).height}.` : "") + ` 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.`;
         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)}`);
@@ -2692,16 +2762,29 @@ function createCodexEngine(opts) {
   }
   function buildPrompt2(req, index, roles) {
     const roleDirective = REFERENCE_ROLE_DIRECTIVE;
-    const refDirectives = roles.map(
-      (role, i) => roles.length > 1 ? `Attached image ${i + 1} is ${roleDirective[role]}.` : `The attached image is ${roleDirective[role]}.`
-    ).join(" ");
+    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
       // report traced part of the plastic, over-perfected rendering to that
       // one unconditional word. Still "image", never "photograph" - this
       // wrapper also generates graphic assets. Independently revertible on
       // render evidence.
-      `Generate one professional-grade image immediately using your image generation tool, ${req.width}x${req.height}: ${req.prompt}.` + (refDirectives ? ` ${refDirectives}` : "") + ` Do not browse the web or explore files. Save the image in the current directory as out-1.png (you may run the commands needed to save and resize it). Nothing else.` + (index > 0 ? ` (variant ${index + 1} \u2014 same brief, different composition)` : "")
+      `Generate one professional-grade image immediately using your image generation tool, composed as a ${native.width}x${native.height} frame (${ratioLabel(req.width, req.height)} ${orientationOf(req.width, req.height)}): ${req.prompt}.` + (refDirectives ? ` ${refDirectives}` : "") + // The save instruction bans what the old one licensed. "you may run the
+      // commands needed to save and resize it" invited sips -z, which
+      // force-fits BOTH axes: the model drew at one shape, sheared the pixels
+      // 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)` : "")
     );
   }
 }
@@ -6442,28 +6525,6 @@ Continue: the same surface, the same light direction, the same colour temperatur
 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;
 }
-var NAMED_RATIOS = [
-  ["1:1", 1],
-  ["4:5", 4 / 5],
-  ["5:4", 5 / 4],
-  ["2:3", 2 / 3],
-  ["3:2", 3 / 2],
-  ["3:4", 3 / 4],
-  ["4:3", 4 / 3],
-  ["9:16", 9 / 16],
-  ["16:9", 16 / 9],
-  ["2:1", 2],
-  ["1:2", 0.5]
-];
-function ratioLabel(width, height) {
-  const ratio = width / height;
-  for (const [label, value] of NAMED_RATIOS) {
-    if (Math.abs(ratio - value) / value < 0.02) return label;
-  }
-  const gcd = (a, b) => b ? gcd(b, a % b) : a;
-  const d = gcd(width, height) || 1;
-  return `${Math.round(width / d)}:${Math.round(height / d)}`;
-}
 function reframeInstruction(plan, source, direction) {
   const wider = plan.axis === "width";
   const where = wider ? "to the left and to the right" : "above and below";
@@ -8164,6 +8225,31 @@ function registerImageRoutes(app, deps) {
 
 // src/release/notes.data.ts
 var RELEASES = [
+  {
+    version: "0.6.11",
+    date: "2026-08-29",
+    sections: [
+      {
+        heading: "Create",
+        body: "Hitting your Codex plan's usage limit now says so in plain words, with the time it comes back, instead of a technical session listing."
+      }
+    ]
+  },
+  {
+    version: "0.6.10",
+    date: "2026-08-29",
+    title: "Pictures keep their shape.",
+    sections: [
+      {
+        heading: "Create",
+        body: "Images can no longer come back crushed or stretched: Scenri now works with the exact frame sizes the Codex image tool actually produces, and an answer that drifts off the requested shape is trimmed to it rather than distorted or refused. The wave of failed shots saying the engine could not produce the requested aspect ratio is gone with it, and refining an image over and over keeps its full sharpness at every step."
+      },
+      {
+        heading: "Scenes",
+        body: "When a scene built from photographs of one person is used with a chosen presenter, every output now shows the chosen presenter. Each reference image travels with a name that says what it is, so a scene photograph can lend its world and its styling without lending anyone a face, and asking for several variations gives every variation the same instructions rather than letting the first one copy the reference."
+      }
+    ]
+  },
   {
     version: "0.6.9",
     date: "2026-08-29",
@@ -9316,10 +9402,51 @@ 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 sharp7(buf).png().toBuffer()));
+      const meta2 = await sharp7(buf).metadata().catch(() => null);
+      if (!meta2?.width || !meta2.height) throw new Error("engine returned an undecodable image");
+      const oriented = (meta2.orientation ?? 1) !== 1;
+      out.push(
+        buf.subarray(0, 8).equals(PNG_SIG) && !oriented ? h : core.images.save(await sharp7(buf).rotate().png().toBuffer())
+      );
     }
     return out;
   }
+  const CROPPABLE_DRIFT = 0.35;
+  function conformToCanvas(nodeId, want) {
+    return async (images) => {
+      const target = want.width / want.height;
+      const out = [];
+      for (const h of images) {
+        const buf = core.images.read(h);
+        const meta2 = await sharp7(buf).metadata();
+        if (!meta2.width || !meta2.height) {
+          out.push(h);
+          continue;
+        }
+        const got = meta2.width / meta2.height;
+        const drift = Math.abs(got - target) / target;
+        if (drift <= SAME_SHAPE_TOL || drift > CROPPABLE_DRIFT) {
+          out.push(h);
+          continue;
+        }
+        const w = got > target ? Math.round(meta2.height * target) : meta2.width;
+        const hpx = got > target ? meta2.height : Math.round(meta2.width / target);
+        const cropped = await sharp7(buf).resize(w, hpx, { fit: "cover", position: "attention" }).png().toBuffer();
+        app.log.info(
+          { nodeId, got: `${meta2.width}x${meta2.height}`, want: `${w}x${hpx}` },
+          "canvas: cropped a drifted frame to the asked ratio"
+        );
+        out.push(core.images.save(cropped));
+        try {
+          const fresh = core.store.getNode(nodeId);
+          const b = fresh?.brief ?? {};
+          core.store.setBrief(nodeId, { ...b, croppedFrom: [meta2.width, meta2.height] });
+        } catch {
+        }
+      }
+      return out;
+    };
+  }
   async function assertAspect(images, expect) {
     const want = expect.width / expect.height;
     for (const h of images) {
@@ -9363,7 +9490,13 @@ function buildServer(opts) {
           const brief = node.brief ?? {};
           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 } });
+          const asked = expect ? { requestedSize: [expect.width, expect.height] } : {};
+          core.store.setBrief(nodeId, { ...brief, rendered: { sizes, ...survivors, ...asked } });
+          if (node.kind === "generation" && engineId === "codex-cli" && expect && expect.width !== expect.height && sizes.some(([w, h]) => w === expect.width && h === expect.height))
+            app.log.warn(
+              { nodeId },
+              "codex delivered exactly the requested pixels; its image tool cannot pin size - suggests a forbidden shell resize"
+            );
         }
       } catch {
       }
@@ -9760,7 +9893,12 @@ function buildServer(opts) {
           try {
             const fresh = core.store.getNode(node.id);
             const b = fresh?.brief ?? {};
-            core.store.setBrief(node.id, { ...b, resizedFrom: [got.width, got.height] });
+            const parentBrief = core.store.getNode(resolvedParentId)?.brief ?? {};
+            core.store.setBrief(node.id, {
+              ...b,
+              resizedFrom: [got.width, got.height],
+              resampledHops: (parentBrief.resampledHops ?? 0) + 1
+            });
           } catch {
           }
         } else out.push(h);
@@ -9805,9 +9943,11 @@ function buildServer(opts) {
           out.push(outcome === "composited" ? core.images.save(image) : h);
         }
         staged = out;
+      } else if (expectShape) {
+        staged = await conformToCanvas(node.id, expectShape)(staged);
       }
       return enforceEditCanvas(staged);
-    } : void 0;
+    } : 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;
     void runNode(node.id, runEngine, estimate, work, expectShape, post, nodeBudgetMs).catch(
       (err) => app.log.error({ err }, "node run failed")

package/package.json

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