scenri 0.6.5 → 0.6.7

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [0.6.7](https://github.com/tonygorb/Scenri/compare/v0.6.6...v0.6.7) (2026-08-29)
+
+
+### Bug Fixes
+
+* a scene nobody chose never lands in the brief, or comes back ([db00c8f](https://github.com/tonygorb/Scenri/commit/db00c8f73845a3fab2a453c97acec3e79f846b5c))
+* a scene nobody chose never lands in the brief, or comes back ([1fa34d3](https://github.com/tonygorb/Scenri/commit/1fa34d37699addda945ef31543fe643774e6afb6))
+
+## [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)
 
 

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';
@@ -1967,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 [
@@ -2002,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 {
@@ -2009,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;
@@ -2023,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 {
@@ -2037,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) => {
@@ -2063,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) {
@@ -2086,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}` : ""}`))
           );
         }
@@ -2218,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");
@@ -2444,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;
@@ -2524,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() {
@@ -2545,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);
         })
       );
@@ -2560,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 {
@@ -2627,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;
@@ -5947,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;
@@ -5955,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);
@@ -6014,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;
@@ -6986,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" };
@@ -7302,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;
@@ -7999,6 +8075,30 @@ function registerImageRoutes(app, deps) {
 
 // src/release/notes.data.ts
 var RELEASES = [
+  {
+    version: "0.6.7",
+    date: "2026-08-29",
+    sections: [
+      {
+        heading: "Create",
+        body: "The brief starts empty. A scene you never picked could turn up in it, come back on every later load, and reappear after you removed it and reloaded. Create an image no longer stands a scene in for one you have not shortlisted, and a scene that arrives from a link is spent once it lands rather than waiting in the address to be applied again. Briefs you were part way through writing still come back as they always have."
+      }
+    ]
+  },
+  {
+    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",
@@ -9075,19 +9175,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);
@@ -9109,7 +9211,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 {
@@ -9303,13 +9406,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);
@@ -9324,6 +9430,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 };
@@ -9496,7 +9604,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.5",
+  "version": "0.6.7",
   "author": "Tony Gorb <hello@scenri.co>",
   "license": "AGPL-3.0-only",
   "type": "module",