scenri 0.6.4 → 0.6.6

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [0.6.6](https://github.com/tonygorb/Scenri/compare/v0.6.5...v0.6.6) (2026-08-29)
+
+
+### Bug Fixes
+
+* composer chip removal is deterministic ([11246fc](https://github.com/tonygorb/Scenri/commit/11246fc64e26be522631f0fd6927210d6b5759b5))
+* composer chip removal is deterministic ([29b9a4b](https://github.com/tonygorb/Scenri/commit/29b9a4bffaee289d5066bf15b52254d030547d97))
+* presenter avatars frame head and shoulders like a real portrait ([3edb693](https://github.com/tonygorb/Scenri/commit/3edb69360755280af822380bd7cf3f65297aa258))
+* presenter avatars frame head and shoulders like a real portrait ([1e4040c](https://github.com/tonygorb/Scenri/commit/1e4040c6c07858994ccde2a862927a6047b02062))
+* stop killing healthy codex runs and classify what actually failed ([0d7888b](https://github.com/tonygorb/Scenri/commit/0d7888bcb3da875775ab125797cdf0b3fc7dec0c))
+* stop killing healthy codex runs and classify what actually failed ([87e4df3](https://github.com/tonygorb/Scenri/commit/87e4df3ee680ad7673fad73351b1f36c07dacba6))
+
+## [0.6.5](https://github.com/tonygorb/Scenri/compare/v0.6.4...v0.6.5) (2026-08-29)
+
+
+### Bug Fixes
+
+* a scene stages a subject slot, never its own demo object ([471981a](https://github.com/tonygorb/Scenri/commit/471981a89f7b3bb62cd4e5f7aec795b468e0aa15))
+* a scene stages a subject slot, never its own demo object ([04e2afe](https://github.com/tonygorb/Scenri/commit/04e2afe7da67af13df32d854d2fd861597e6025e))
+
 ## [0.6.4](https://github.com/tonygorb/Scenri/compare/v0.6.3...v0.6.4) (2026-08-28)
 
 

package/dist/serve.js

@@ -8,7 +8,7 @@ import Database from 'better-sqlite3';
 import { randomBytes, createHash, randomUUID, timingSafeEqual } from 'crypto';
 import fs, { realpathSync, existsSync, readFileSync, mkdirSync, chmodSync, writeFileSync, readdirSync, statSync, rmSync, renameSync } from 'fs';
 import { fileURLToPath } from 'url';
-import { readFile, copyFile, mkdtemp, rm, readdir, stat, writeFile } from 'fs/promises';
+import { readFile, copyFile, stat, mkdtemp, rm, readdir, writeFile } from 'fs/promises';
 import { spawn } from 'child_process';
 import sharp7 from 'sharp';
 import Fastify from 'fastify';
@@ -1291,8 +1291,11 @@ var REFERENCE_ROLE_DIRECTIVE = {
   // subject or person from it", which handed the model a photograph of a face
   // treatment and told it to ignore the treatment. A hand-attached reference
   // says "match ... treatment" and works; this now says the same thing, with the
-  // identity carve-out a scene needs and a lone reference does not.
-  scene: "a reference for this world and for the treatment applied to the figure in it \u2014 match the environment, the light, and the material, density, scale, finish and spread of that treatment, including which parts of the form it covers and how far it reaches; take no identity from the person in it, and no product or brand",
+  // identity carve-out a scene needs and a lone reference does not. The tail
+  // names staged objects as stand-ins rather than just "no product": a bare
+  // prohibition still left the demo object in the frame, because the model had
+  // nowhere to put what the photograph so vividly showed.
+  scene: "a reference for this world and for the treatment applied to the figure in it \u2014 match the environment, the light, and the material, density, scale, finish and spread of that treatment, including which parts of the form it covers and how far it reaches; take no identity from the person in it, and treat any product, garment or prop staged in it as a stand-in whose place the attached subject takes \u2014 never an object to reproduce",
   composition: "a reference for framing, camera angle and pose only \u2014 take no subject, color, material or branding from it",
   style: "a reference for overall treatment and mood only \u2014 take no composition, subject or product detail from it",
   reference: "a reference to match in composition, lighting and treatment"
@@ -1964,7 +1967,7 @@ var NOT_AUTHENTICATED_REASON = "Codex CLI is installed but not signed in";
 var UNVERIFIED_REASON = "Could not verify Codex on this computer";
 var DEFAULT_TIMEOUT_MS2 = 3e5;
 var PROBE_TIMEOUT_MS = 1e4;
-var NO_ACTIVITY_TIMEOUT_MS = 12e4;
+var FIRST_OUTPUT_TIMEOUT_MS = 6e4;
 var PROBE_TTL_MS = 3e4;
 function execArgs(dir, effort = "low") {
   return [
@@ -1999,6 +2002,13 @@ function killTree(child, platform, spawnImpl) {
     } catch {
     }
   }
+  if (platform !== "win32" && child.pid && spawnImpl === spawn) {
+    try {
+      process.kill(-child.pid, "SIGTERM");
+      return;
+    } catch {
+    }
+  }
   try {
     child.kill();
   } catch {
@@ -2006,10 +2016,10 @@ function killTree(child, platform, spawnImpl) {
 }
 function createRunner(opts = {}) {
   const spawnImpl = opts.spawnImpl ?? spawn;
-  const timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS2;
+  const defaultTimeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS2;
   const probeTimeoutMs = opts.probeTimeoutMs ?? PROBE_TIMEOUT_MS;
   const probeTtlMs = opts.probeTtlMs ?? PROBE_TTL_MS;
-  const noActivityMs = opts.noActivityMs ?? NO_ACTIVITY_TIMEOUT_MS;
+  const firstOutputMs = opts.firstOutputMs ?? FIRST_OUTPUT_TIMEOUT_MS;
   const platform = opts.platform ?? process.platform;
   const killCodex = (child) => killTree(child, platform, spawnImpl);
   let resolved = null;
@@ -2020,10 +2030,11 @@ function createRunner(opts = {}) {
   const winArg = (a) => `"${a.replace(/[\r\n]+/g, " ").replace(/"/g, "'").replace(/%/g, " percent ")}"`;
   const spawnCodex = (exe, args, stdinOpen) => {
     const stdio = [stdinOpen ? "pipe" : "ignore", "pipe", "pipe"];
-    return exe.direct ? spawnImpl(exe.command, args, { stdio }) : spawnImpl([exe.command, ...args.map(winArg)].join(" "), [], { stdio, shell: true });
+    return exe.direct ? spawnImpl(exe.command, args, { stdio, ...platform !== "win32" ? { detached: true } : {} }) : spawnImpl([exe.command, ...args.map(winArg)].join(" "), [], { stdio, shell: true });
   };
   async function run2(args, signal, io) {
     const exe = await resolution();
+    const timeoutMs = io?.timeoutMs ?? defaultTimeoutMs;
     return new Promise((resolve, reject) => {
       let child;
       try {
@@ -2034,19 +2045,31 @@ function createRunner(opts = {}) {
       }
       let settled = false;
       let stderr = "";
-      let activityTimer = setTimeout(onSilence, noActivityMs);
-      function sawActivity() {
-        if (settled) return;
-        clearTimeout(activityTimer);
-        activityTimer = setTimeout(onSilence, noActivityMs);
-      }
-      function onSilence() {
+      const spawnedAt = Date.now();
+      let firstByteAt = 0;
+      let lastByteAt = 0;
+      let maxGapMs = 0;
+      const firstOutputTimer = setTimeout(() => {
         finish(
+          "first-output-timeout",
           () => reject(
-            new Error(`Codex CLI produced no output for ${Math.round(noActivityMs / 1e3)}s, treating it as stuck`)
+            new Error(
+              `Codex CLI produced no output for ${Math.round(firstOutputMs / 1e3)}s after launch, treating it as stuck`
+            )
           )
         );
         killCodex(child);
+      }, firstOutputMs);
+      function sawActivity() {
+        if (settled) return;
+        const now = Date.now();
+        if (firstByteAt === 0) {
+          firstByteAt = now;
+          clearTimeout(firstOutputTimer);
+        } else {
+          maxGapMs = Math.max(maxGapMs, now - lastByteAt);
+        }
+        lastByteAt = now;
       }
       child.stdout?.on("data", sawActivity);
       child.stderr?.on("data", (d) => {
@@ -2060,19 +2083,23 @@ function createRunner(opts = {}) {
         child.stdin?.end();
       }
       const timer = setTimeout(() => {
-        finish(() => reject(new Error(`Codex CLI timed out after ${timeoutMs}ms`)));
+        finish("hard-timeout", () => reject(new Error(`Codex CLI timed out after ${timeoutMs}ms`)));
         killCodex(child);
       }, timeoutMs);
       const onAbort = () => {
-        finish(() => reject(new Error("Codex CLI run aborted")));
+        finish("abort", () => reject(new Error("Codex CLI run aborted")));
         killCodex(child);
       };
-      function finish(fn) {
+      function finish(outcome, fn) {
         if (settled) return;
         settled = true;
         clearTimeout(timer);
-        clearTimeout(activityTimer);
+        clearTimeout(firstOutputTimer);
         signal?.removeEventListener("abort", onAbort);
+        const ttfb = firstByteAt ? firstByteAt - spawnedAt : -1;
+        const line = `codex exec${io?.label ? ` [${io.label}]` : ""}: outcome=${outcome} ttfb=${ttfb}ms maxGap=${maxGapMs}ms total=${Date.now() - spawnedAt}ms`;
+        if (outcome !== "ok" && outcome !== "abort") console.warn(line);
+        else if (process.env.SCENRI_DEBUG === "1") console.log(line);
         fn();
       }
       if (signal) {
@@ -2083,14 +2110,15 @@ function createRunner(opts = {}) {
         signal.addEventListener("abort", onAbort, { once: true });
       }
       child.on("error", (err) => {
-        finish(() => reject(new Error(`Failed to spawn codex: ${err.message}`)));
+        finish("spawn-error", () => reject(new Error(`Failed to spawn codex: ${err.message}`)));
       });
       child.on("exit", (code) => {
         if (code === 0) {
-          finish(resolve);
+          finish("ok", resolve);
         } else {
           const snippet2 = stderr.trim().slice(0, 200);
           finish(
+            `exit-${code ?? "unknown"}`,
             () => reject(new Error(`codex exited with code ${code ?? "unknown"}${snippet2 ? `: ${snippet2}` : ""}`))
           );
         }
@@ -2215,7 +2243,10 @@ function createCodexAnalyzer(opts = {}) {
           for (const ref of refs) {
             args.splice(args.length - 1, 0, `--image=${ref}`);
           }
-          await runner.run(args, signal, { stdin: buildPrompt(req, refs.length, problems) });
+          await runner.run(args, signal, {
+            stdin: buildPrompt(req, refs.length, problems),
+            label: `analyze refs=${refs.length} attempt=${attempt + 1}`
+          });
           let raw;
           try {
             raw = await readFile(join(dir, OUT_FILE), "utf8");
@@ -2441,6 +2472,10 @@ 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 createCodexEngine(opts) {
   const { saveImage } = opts;
   const platform = opts.platform ?? process.platform;
@@ -2521,7 +2556,15 @@ function createCodexEngine(opts) {
          * shot being edited. A refine carrying a full identity payload was
          * silently editing nothing at all.
          */
-        maxReferenceImages: 5
+        maxReferenceImages: 5,
+        /*
+         * The longest edge a reference is worth sending at. codex's image_gen
+         * reads references at reduced resolution server-side either way, but
+         * the bytes still ride the user's uplink inside the exec's own time
+         * budget — a full-resolution phone-photo PNG is tens of megabytes that
+         * buy nothing. Same cap as brand marks (MARK_MAX_EDGE).
+         */
+        maxReferenceEdge: 2048
       };
     },
     isAvailable() {
@@ -2542,13 +2585,18 @@ function createCodexEngine(opts) {
         { length: count },
         (_, i) => async () => withWorkDir(async (dir) => {
           const args = execArgs(dir);
+          let refBytes = 0;
           for (const [idx, ref] of refs.entries()) {
             const dest = join(dir, `ref-${idx}.png`);
             await copyFile(ref, dest);
+            refBytes += (await stat(dest)).size;
             args.splice(args.length - 1, 0, `--image=${dest}`);
           }
           const before = await snapshotGenerated();
-          await runCodex(args, inner.signal, { stdin: buildPrompt2(req, i, roles) });
+          await runCodex(args, inner.signal, {
+            stdin: buildPrompt2(req, i, roles),
+            label: `gen v${i + 1}/${count} refs=${refs.length} refKB=${Math.round(refBytes / 1024)}`
+          });
           return collectImages(dir, before);
         })
       );
@@ -2557,7 +2605,7 @@ function createCodexEngine(opts) {
       let fatal = null;
       let next = 0;
       try {
-        const workers = Array.from({ length: Math.min(3, count) }, async () => {
+        const workers = Array.from({ length: Math.min(CODEX_POOL, count) }, async () => {
           while (next < count && !inner.signal.aborted) {
             const i = next++;
             try {
@@ -2624,7 +2672,7 @@ function createCodexEngine(opts) {
         }
         const before = await snapshotGenerated();
         try {
-          await runCodex(args, signal, { stdin: promptText });
+          await runCodex(args, signal, { stdin: promptText, label: `edit refs=${editRefs.length}` });
         } catch (err) {
           if (isFatalSetupError(err)) runner.invalidateProbe();
           throw err;
@@ -3129,6 +3177,21 @@ function sceneGuardDirectives(opts) {
       "The scene direction above describes the set, not the cast. If it says the space is empty or that no people appear, disregard that: the attached person stands in this set, clearly visible. A ban on props or extra objects in the scene direction is about set dressing only \u2014 it never applies to the presenter or to the product in their hands."
     );
   }
+  if (opts.hasScenePhoto && (opts.hasProduct || opts.hasPerson)) {
+    out.push(
+      "One attached reference is the scene's own photograph. It shows this world \u2014 the set, the light, and any treatment this world applies \u2014 never a cast: any product, garment, prop or person visible in it is a stand-in, demonstrating where the subject sits, how large it stands in the frame, and what has been done to it."
+    );
+    if (opts.hasProduct) {
+      out.push(
+        "The product in the scene photograph is not in this shot. The attached product photo is the only source of product identity: that exact product takes the stand-in's position, at the placement and scale the scene photograph demonstrates, keeping its own shape, label and colours."
+      );
+    }
+    if (opts.hasPerson) {
+      out.push(
+        "Any person in the scene photograph lends their role, never their face: the attached presenter takes their place, wearing whatever treatment this world applies, with their identity drawn from their own photographs alone."
+      );
+    }
+  }
   return out;
 }
 function brandRuleDirectives(brand) {
@@ -3388,7 +3451,13 @@ function compileBrief(brief, ctx) {
   }
   const sceneCamera = inlineTemplates[0]?.camera?.trim() || ctx.template?.camera?.trim() || "";
   const cameraDirectives = sceneCamera && !shotSpecifiesCamera(sentence) ? [`Camera for this shot: ${sceneCamera}`] : [];
-  const guard = scene ? sceneGuardDirectives({ hasProduct: !!productId, hasPerson }) : [];
+  const max = ctx.engineCaps.maxReferenceImages;
+  const { kept, dropped } = allocateAttachments(attachments, max);
+  const guard = scene ? sceneGuardDirectives({
+    hasProduct: !!productId,
+    hasPerson,
+    hasScenePhoto: kept.some((a) => a.role === "scene")
+  }) : [];
   const pairDirectives = productId && hasPerson ? [
     "If the attached product is something a person wears, the presenter wears that exact product, with the rest of the outfit styled around it; otherwise the presenter presents or uses the product naturally.",
     // A product's own notes are written for solo packshots, and several
@@ -3434,8 +3503,6 @@ function compileBrief(brief, ctx) {
     ...preservation
   ];
   if (allDirectives.length) prompt = `${prompt}${prompt.endsWith(".") ? "" : "."} ${dedupe(allDirectives).join(" ")}`;
-  const max = ctx.engineCaps.maxReferenceImages;
-  const { kept, dropped } = allocateAttachments(attachments, max);
   if (dropped.some((d) => d.role !== "scene")) {
     const names = [...new Set(dropped.filter((d) => d.role !== "scene").map((d) => d.label))];
     const reads = max === 0 ? "reads no reference images" : `reads ${max} reference image${max === 1 ? "" : "s"}`;
@@ -5925,6 +5992,10 @@ async function cardCrop(core, hash) {
     return { left: Math.max(0, Math.round((w - width) / 2)), top: 0, width, height };
   });
 }
+var AVATAR_FIGURE_FRACTION = 0.22;
+var AVATAR_HEADROOM = 0.1;
+var AVATAR_MAX_PX = 512;
+var FIGURE_TRIM_THRESHOLDS = [12, 25];
 async function avatarCrop(core, hash) {
   if (!hash || !core.images.has(hash)) return void 0;
   let box = null;
@@ -5933,31 +6004,39 @@ async function avatarCrop(core, hash) {
   } catch {
     box = null;
   }
-  return crop(core, hash, (w, h) => {
-    if (!box) {
-      const size2 = Math.min(w, h, Math.round(h * 0.16));
-      return { left: Math.max(0, Math.round((w - size2) / 2)), top: 0, width: size2, height: size2 };
-    }
-    const size = Math.min(w, h, Math.max(16, Math.round(box.height * 0.27)));
-    const top = Math.min(Math.max(0, Math.round(box.top - size * 0.08)), h - size);
-    const left = Math.min(Math.max(0, Math.round(box.left + box.width / 2 - size / 2)), w - size);
-    return { left, top, width: size, height: size };
-  });
+  return crop(
+    core,
+    hash,
+    (w, h) => {
+      if (!box) {
+        const size2 = Math.min(w, h, Math.round(h * 0.16));
+        return { left: Math.max(0, Math.round((w - size2) / 2)), top: 0, width: size2, height: size2 };
+      }
+      const size = Math.min(w, h, Math.max(16, Math.round(box.height * AVATAR_FIGURE_FRACTION)));
+      const top = Math.min(Math.max(0, Math.round(box.top - size * AVATAR_HEADROOM)), h - size);
+      const left = Math.min(Math.max(0, Math.round(box.left + box.width / 2 - size / 2)), w - size);
+      return { left, top, width: size, height: size };
+    },
+    AVATAR_MAX_PX
+  );
 }
 async function figureBox(buf) {
   const meta = await sharp7(buf).metadata();
   const W = meta.width ?? 0;
   const H = meta.height ?? 0;
   if (!W || !H) return null;
-  const { info } = await sharp7(buf).trim({ threshold: 12 }).toBuffer({ resolveWithObject: true });
-  const left = Math.abs(info.trimOffsetLeft ?? 0);
-  const top = Math.abs(info.trimOffsetTop ?? 0);
-  const width = info.width ?? 0;
-  const height = info.height ?? 0;
-  if (!width || !height) return null;
-  if (width >= W && height >= H) return null;
-  if (height < H * 0.3 || width < W * 0.05) return null;
-  return { left, top, width, height };
+  for (const threshold of FIGURE_TRIM_THRESHOLDS) {
+    const { info } = await sharp7(buf).trim({ threshold }).toBuffer({ resolveWithObject: true });
+    const left = Math.abs(info.trimOffsetLeft ?? 0);
+    const top = Math.abs(info.trimOffsetTop ?? 0);
+    const width = info.width ?? 0;
+    const height = info.height ?? 0;
+    if (!width || !height) continue;
+    if (width >= W || height >= H) continue;
+    if (height < H * 0.3 || width < W * 0.05) continue;
+    return { left, top, width, height };
+  }
+  return null;
 }
 async function presenterCrops(core, hash, mode) {
   const previewHash = mode === "generated" ? await cardCrop(core, hash) ?? await cardCropSmart(core, hash) : await cardCropSmart(core, hash) ?? await cardCrop(core, hash);
@@ -5992,14 +6071,16 @@ async function smartCover(core, hash, box) {
     return void 0;
   }
 }
-async function crop(core, hash, region) {
+async function crop(core, hash, region, cap2) {
   if (!hash || !core.images.has(hash)) return void 0;
   try {
     const meta = await sharp7(core.images.read(hash)).metadata();
     const w = meta.width ?? 0;
     const h = meta.height ?? 0;
     if (!w || !h) return void 0;
-    const png = await sharp7(core.images.read(hash)).extract(region(w, h)).png().toBuffer();
+    let pipeline = sharp7(core.images.read(hash)).extract(region(w, h));
+    if (cap2) pipeline = pipeline.resize(cap2, cap2, { fit: "inside", withoutEnlargement: true });
+    const png = await pipeline.png().toBuffer();
     return core.images.save(png);
   } catch {
     return void 0;
@@ -6964,6 +7045,23 @@ var COST_PROBE = {
 };
 var MARK_MAX_EDGE = 2048;
 var toMarkPng = (buf) => sharp7(buf, { density: 384 }).rotate().resize({ width: MARK_MAX_EDGE, height: MARK_MAX_EDGE, fit: "inside", withoutEnlargement: true }).png().toBuffer();
+var cappedRefs = /* @__PURE__ */ new Map();
+async function capReferenceEdge(core, path, maxEdge) {
+  const key = `${path}#${maxEdge}`;
+  const hit = cappedRefs.get(key);
+  if (hit) return hit;
+  let out = path;
+  try {
+    const meta = await sharp7(path).metadata();
+    if ((meta.width ?? 0) > maxEdge || (meta.height ?? 0) > maxEdge) {
+      const buf = await sharp7(path).resize({ width: maxEdge, height: maxEdge, fit: "inside", withoutEnlargement: true }).png().toBuffer();
+      out = core.images.pathFor(core.images.save(buf));
+    }
+  } catch {
+  }
+  cappedRefs.set(key, out);
+  return out;
+}
 var readImagePart = async (core, req, normalize2) => {
   const part = await req.file();
   if (!part) return { error: "multipart file field required" };
@@ -7280,7 +7378,7 @@ async function repairPresenterCrops(core, log = () => {
   let repaired = 0;
   for (const brand of core.store.listBrands()) {
     for (const c of brandCharacters(brand.json)) {
-      if (!isCustomPresenter(c)) continue;
+      if (!c?.id) continue;
       try {
         const firstShot = c.shots?.[0]?.file;
         const hash = typeof firstShot === "string" && firstShot.startsWith("asset:") ? firstShot.slice(6) : null;
@@ -7513,7 +7611,11 @@ function registerAssetBuildRoutes(app, deps) {
         kind: "scene",
         sceneId: id,
         name: scene.name,
-        instruction: body.correction == null ? void 0 : String(body.correction),
+        // A plain re-read used to drop the Direction on the floor: body.correction
+        // was the only source, so the analyzer's deciding-word preamble never
+        // fired and whatever the Direction excluded came straight back. No new
+        // word means the stored word.
+        instruction: String(body.correction ?? "").trim() || scene.instruction || void 0,
         imageHashes: []
       });
     } catch (err) {
@@ -7973,6 +8075,30 @@ function registerImageRoutes(app, deps) {
 
 // src/release/notes.data.ts
 var RELEASES = [
+  {
+    version: "0.6.6",
+    date: "2026-08-29",
+    sections: [
+      {
+        heading: "Create",
+        body: "Removing a chip from the brief now works on the first click, every time, including right after dragging chips around. Codex generations no longer fail as timeouts while they are still working, and when a run does fail, the message says what actually happened instead of suggesting a second try."
+      },
+      {
+        heading: "Presenters",
+        body: "Custom presenter avatars are cropped like real profile photos, head and shoulders from the front reference. Presenters you made earlier are reframed automatically, including ones that never got an avatar at all."
+      }
+    ]
+  },
+  {
+    version: "0.6.5",
+    date: "2026-08-29",
+    sections: [
+      {
+        heading: "Scenes",
+        body: "A Scene no longer brings its own demo object into your shots. The product and presenter you select take the place of whatever its reference or preview happened to stage, while the environment, the light and any figure treatment carry over as before. Editing the Direction and pressing Read again now applies the Direction you wrote instead of quietly ignoring it."
+      }
+    ]
+  },
   {
     version: "0.6.4",
     date: "2026-08-29",
@@ -9039,19 +9165,21 @@ function buildServer(opts) {
     }
   }
   const NODE_TIMEOUT_MS = 6e5;
-  async function runNode(nodeId, engine, estimate, work, expect, post) {
+  async function runNode(nodeId, engine, estimate, work, expect, post, timeoutMs) {
     const engineId = engine?.capabilities().id ?? "local";
     reserved.set(engineId, (reserved.get(engineId) ?? 0) + estimate);
     const ctrl = new AbortController();
     runningGenerations.set(nodeId, ctrl);
+    const bound = opts.nodeTimeoutMs ?? timeoutMs ?? NODE_TIMEOUT_MS;
     let watchdogFired = false;
     const watchdog = setTimeout(() => {
       watchdogFired = true;
       ctrl.abort();
-    }, opts.nodeTimeoutMs ?? NODE_TIMEOUT_MS);
+    }, bound);
     const startedAt = Date.now();
     try {
       const result = await work(ctrl.signal);
+      clearTimeout(watchdog);
       result.images = await normalizePngs(result.images);
       if (post) result.images = await post(result.images);
       if (expect) await assertAspect(result.images, expect);
@@ -9073,7 +9201,8 @@ function buildServer(opts) {
       }
       core.ledger.recordCost(engineId, nodeId, result.costUsd);
     } catch (err) {
-      if (watchdogFired) core.store.failNode(nodeId, "generation timed out after 10 minutes");
+      if (watchdogFired)
+        core.store.failNode(nodeId, `generation timed out after ${Math.round(bound / 6e4)} minutes`);
       else if (ctrl.signal.aborted) core.store.cancelNode(nodeId);
       else core.store.failNode(nodeId, String(err?.message ?? err));
     } finally {
@@ -9267,13 +9396,16 @@ function buildServer(opts) {
           error: `${engine.capabilities().displayName} cannot carry enough reference images, so ${names} would be named in the prompt but never shown. The result would not be your ${kindWord}. Choose an engine that supports reference images, or remove ${names} from the brief.`
         });
       }
+      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 genReq = {
         prompt: finalPrompt,
         brand: ctx,
         width: Number(width),
         height: Number(height),
         count: Math.min(Math.max(1, Number(count)), 8),
-        ...referenceImages && cap2 > 0 ? { referenceImages: referenceImages.slice(0, cap2) } : {},
+        ...sentRefs ? { referenceImages: sentRefs } : {},
         ...referenceRoles && cap2 > 0 ? { referenceRoles: referenceRoles.slice(0, cap2) } : {}
       };
       estimate = await engine.costEstimate(genReq);
@@ -9288,6 +9420,8 @@ function buildServer(opts) {
       if (!engine.capabilities().supportsEdit)
         return reply.status(400).send({ error: "engine does not support edits" });
       const editRefs = mergedEdit ? mergedEdit.kept.map((a) => ({ path: core.images.pathFor(a.hash), role: a.role })) : (referenceImages ?? []).map((path, i) => ({ path, role: referenceRoles?.[i] })).slice(0, Math.max(0, engine.capabilities().maxReferenceImages - 1));
+      const editEdge = engine.capabilities().maxReferenceEdge;
+      if (editEdge) for (const r of editRefs) r.path = await capReferenceEdge(core, r.path, editEdge);
       const srcBuf = core.images.read(String(srcHash));
       const srcMeta = await sharp7(srcBuf).metadata();
       if (srcMeta.width && srcMeta.height) expectShape = { width: srcMeta.width, height: srcMeta.height };
@@ -9460,7 +9594,8 @@ function buildServer(opts) {
       }
       return out;
     } : void 0;
-    void runNode(node.id, runEngine, estimate, work, expectShape, post).catch(
+    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")
     );
     const allWarnings = [...compiled2?.warnings ?? [], ...extraWarnings];

package/package.json

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