scenri 0.3.4 → 0.4.0

package/dist/serve.js

@@ -1,5 +1,5 @@
 import { portBusyLines } from './chunk-WGIZJXNE.js';
-import { createUpdateChecker, classify, stageVersion, findNpm } from './chunk-GA7P7K2M.js';
+import { createUpdateChecker, classify, stageVersion, findNpm } from './chunk-3W2RHBZC.js';
 import { readMeta, repoSlug } from './chunk-Y3ZPBPLP.js';
 import { newestStaged, compareSemver } from './chunk-4MAFHYAD.js';
 import { networkInterfaces, homedir, tmpdir } from 'os';
@@ -10,7 +10,7 @@ import fs, { realpathSync, existsSync, readFileSync, mkdirSync, chmodSync, write
 import { fileURLToPath } from 'url';
 import { readFile, copyFile, readdir, mkdtemp, rm, writeFile } from 'fs/promises';
 import { spawn } from 'child_process';
-import sharp5 from 'sharp';
+import sharp6 from 'sharp';
 import Fastify from 'fastify';
 import fastifyStatic from '@fastify/static';
 import fastifyMultipart from '@fastify/multipart';
@@ -702,8 +702,20 @@ function createStore(db) {
     setKept(id, kept) {
       db.prepare("UPDATE nodes SET kept=? WHERE id=?").run(kept ? 1 : 0, id);
     },
+    /**
+     * Archiving also clears the keeper mark.
+     *
+     * The two flags were independent, and the Keepers lens reads the live list,
+     * so archiving a keeper removed it from Keepers and from the Keepers count
+     * without saying anything: the star stayed lit on a shot that was no longer
+     * in the shortlist it claimed to be in. Keepers is a live shortlist and
+     * archive means put away, so one clears the other and the two can never
+     * disagree. Restoring does not re-star: the judgement was made once and
+     * putting the shot back is not the same as making it again.
+     */
     setArchived(id, archived) {
-      db.prepare("UPDATE nodes SET archived=? WHERE id=?").run(archived ? 1 : 0, id);
+      if (archived) db.prepare("UPDATE nodes SET archived=1, kept=0 WHERE id=?").run(id);
+      else db.prepare("UPDATE nodes SET archived=0 WHERE id=?").run(id);
     },
     /** Permanent. Orphans any children rather than blocking or cascading —
      * same technique collapseProjects already uses for a surplus root. */
@@ -1857,11 +1869,17 @@ function execArgs(dir, promptText, effort = "low") {
 function createRunner(opts = {}) {
   const spawnImpl = opts.spawnImpl ?? spawn;
   const timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS2;
+  const platform = opts.platform ?? process.platform;
+  const winArg = (a) => `"${a.replace(/[\r\n]+/g, " ").replace(/"/g, "'").replace(/%/g, " percent ")}"`;
+  const spawnCodex = (args) => platform === "win32" ? spawnImpl(["codex", ...args].map(winArg).join(" "), [], {
+    stdio: ["ignore", "pipe", "pipe"],
+    shell: true
+  }) : spawnImpl("codex", args, { stdio: ["ignore", "pipe", "pipe"] });
   function run2(args, signal) {
     return new Promise((resolve, reject) => {
       let child;
       try {
-        child = spawnImpl("codex", args, { stdio: ["ignore", "pipe", "pipe"] });
+        child = spawnCodex(args);
       } catch (err) {
         reject(new Error(`Failed to spawn codex: ${err.message}`));
         return;
@@ -1930,7 +1948,7 @@ function createRunner(opts = {}) {
       };
       let child;
       try {
-        child = spawnImpl("codex", args, { stdio: ["ignore", "pipe", "pipe"] });
+        child = spawnCodex(args);
       } catch {
         done(false);
         return;
@@ -2108,6 +2126,7 @@ function stateFrom(avail) {
 }
 function createCodexSetup(opts = {}) {
   const spawnImpl = opts.spawnImpl ?? spawn;
+  const platform = opts.platform ?? process.platform;
   const runner = createRunner(opts);
   const installTimeoutMs = opts.installTimeoutMs ?? DEFAULT_INSTALL_TIMEOUT_MS;
   function run2(cmd, args, timeoutMs) {
@@ -2126,7 +2145,7 @@ function createCodexSetup(opts = {}) {
         done({ code: null, stderr, spawnError: `${cmd} timed out after ${timeoutMs}ms` });
       }, timeoutMs);
       try {
-        child = spawnImpl(cmd, args, { stdio: ["ignore", "pipe", "pipe"], shell: process.platform === "win32" });
+        child = spawnImpl(cmd, args, { stdio: ["ignore", "pipe", "pipe"], shell: platform === "win32" });
       } catch (err) {
         done({ code: null, stderr, spawnError: err.message });
         return;
@@ -2159,7 +2178,7 @@ function createCodexSetup(opts = {}) {
         }
         return { ok: true };
       }
-      if (process.platform !== "win32" && /EACCES|permission denied/i.test(res.stderr)) {
+      if (platform !== "win32" && /EACCES|permission denied/i.test(res.stderr)) {
         return {
           ok: false,
           fallbackCommand: INSTALL_COMMAND_SUDO,
@@ -2245,15 +2264,29 @@ function createCodexEngine(opts) {
         })
       );
       const results = new Array(count);
+      const failures = [];
       let next = 0;
       const workers = Array.from({ length: Math.min(3, count) }, async () => {
         while (next < count) {
           const i = next++;
-          results[i] = await jobs[i]();
+          try {
+            results[i] = await jobs[i]();
+          } catch (err) {
+            if (signal?.aborted) throw err;
+            results[i] = [];
+            failures.push(err);
+          }
         }
       });
       await Promise.all(workers);
-      return { images: results.flat(), costUsd: 0 };
+      const images = results.flat();
+      if (!images.length && failures.length) throw failures[0];
+      if (failures.length) {
+        console.warn(
+          `codex: ${failures.length} of ${count} variants failed, keeping ${images.length}: ${String(failures[0]?.message ?? failures[0])}`
+        );
+      }
+      return { images, costUsd: 0 };
     },
     async edit(req, signal) {
       return withWorkDir(async (dir) => {
@@ -2262,13 +2295,17 @@ function createCodexEngine(opts) {
         const editRoles = req.referenceRoles ?? [];
         const refLines = [];
         for (let i = 0; i < editRefs.length; i++) {
-          const role = editRoles[i] ?? "product";
+          const role = editRoles[i] ?? "reference";
           const name = `${role}-${i + 1}.png`;
           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). Nothing else.`;
-        await runCodex(execArgs(dir, promptText), signal);
+        const args = execArgs(dir, promptText);
+        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)}`);
+        }
+        await runCodex(args, signal);
         const images = await collectImages(dir);
         return { images, costUsd: 0 };
       });
@@ -2323,7 +2360,7 @@ function createDemoEngine(saveImage) {
       <text x="24" y="${h - 48}" font-family="Helvetica, Arial" font-size="${Math.max(14, Math.round(w / 42))}" fill="#ffffff" opacity="0.92">${esc(label)}</text>
       <text x="24" y="${h - 22}" font-family="Helvetica, Arial" font-size="12" fill="#ffffff" opacity="0.6">Scenri demo engine</text>
     </svg>`;
-    return sharp5(Buffer.from(svg)).png().toBuffer();
+    return sharp6(Buffer.from(svg)).png().toBuffer();
   }
   return {
     capabilities() {
@@ -2486,7 +2523,7 @@ async function resolvePresenterImages(core, templatesRoot, presenter) {
   for (const [slot, angle] of PRESENTER_ANGLES) {
     const path = presenterRefPath(templatesRoot, presenter.id, slot);
     if (!existsSync(path)) continue;
-    const png = await sharp5(readFileSync(path)).png().toBuffer();
+    const png = await sharp6(readFileSync(path)).png().toBuffer();
     const hash = core.images.save(png);
     shots.push({ file: `asset:${hash}`, angle, locked: true });
   }
@@ -2580,7 +2617,7 @@ async function resolveDemoProductImages(core, templatesRoot, product) {
   for (const angle of angles) {
     const path = demoProductRefPath(templatesRoot, product.id, angle);
     if (!existsSync(path)) continue;
-    const png = await sharp5(readFileSync(path)).png().toBuffer();
+    const png = await sharp6(readFileSync(path)).png().toBuffer();
     const hash = core.images.save(png);
     shots.push({ file: `asset:${hash}`, angle, locked: true });
   }
@@ -2636,6 +2673,15 @@ function productFidelityDirective(attached) {
   }
   return "The attached product images all show the exact same product from different angles: preserve its label, shape and colors faithfully, do not redesign it, and do not treat the extra angles as additional products. Any face not visible in them is unknown \u2014 keep it plain and consistent with the visible materials, and do not invent detail on it.";
 }
+function editPreservationDirective(scope) {
+  if (scope === "local") {
+    return "This is a change to a photograph that already exists, not a new photograph. Return the same image with one change made. Everything the instruction does not name comes back exactly as it is now: the same framing, the same crop, the same camera position, the same subject placement and pose, the same lighting, the same colours, the same background and the same dimensions. Do not re-render, re-stage, re-light or re-compose the picture. Change only what was asked for, together with the shadows, reflections and contact points that move with it.";
+  }
+  return "This is a change to a photograph that already exists, not a new photograph. Apply the instruction to the image you were given and keep what it does not name: the same subject and the same face, the same product with the same label, geometry and colour, and the same dimensions. Do not replace the subject and do not redesign the product.";
+}
+function inheritedIdentityDirective() {
+  return "The extra attached references are the same product and the same person that are already in this picture. Use them to hold that identity exact while you make the change, not as a reason to re-stage the shot.";
+}
 function shotSpecifiesCamera(text) {
   return /\b\d{2,3}\s?mm\b|\bf\/\d|\blens\b|\bcamera\b|\bshot from\b|\beye[- ]level\b|\blow angle\b|\bhigh angle\b|\boverhead\b|\btop[- ]down\b|\bbird'?s[- ]eye\b|\bclose[- ]up\b|\bmacro\b|\bwide shot\b|\bcrop(?:ped)?\b|\bframing\b|\bdepth of field\b|\bbokeh\b|\bshallow (?:focus|depth)\b|\bdeep focus\b/i.test(
     text
@@ -2803,7 +2849,7 @@ function compileBrief(brief, ctx) {
             attachments.push({ role: "character", id: c.id, label: c.name, hash: chash, essential: i === 0 });
           });
           personDirectives.push(
-            "The attached person reference is the same person every time: match their face, facial structure, skin, hair and build exactly. Their outfit, pose, background and lighting are neutral studio capture conditions, not styling direction: dress and style them for this shot, to a commercial standard, following any wardrobe the direction itself specifies."
+            "The attached person reference is the same person every time: match their face, facial structure, skin, hair and build exactly. Their outfit, pose, background and lighting are neutral studio capture conditions, not styling direction: dress and style them for this shot, to a commercial standard, following any wardrobe the direction itself specifies. Where the direction specifies none, dress them for the place and the occasion the frame shows, and never return them to the plain base layers they were photographed in."
           );
           if (c.identityNotes) personDirectives.push(String(c.identityNotes));
           if (c.negativeConstraints?.length)
@@ -2905,6 +2951,10 @@ function compileBrief(brief, ctx) {
     "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."
   ] : [];
   const brandLines = brandRuleDirectives(ctx.brand);
+  const preservation = ctx.mode === "edit" ? [
+    editPreservationDirective(ctx.editScope ?? "global"),
+    ...ctx.inheritedIdentity ? [inheritedIdentityDirective()] : []
+  ] : [];
   const allDirectives = [
     ...productDirectives,
     ...personDirectives,
@@ -2912,7 +2962,8 @@ function compileBrief(brief, ctx) {
     ...otherDirectives,
     ...cameraDirectives,
     ...brandLines,
-    ...guard
+    ...guard,
+    ...preservation
   ];
   if (allDirectives.length) prompt = `${prompt}${prompt.endsWith(".") ? "" : "."} ${dedupe(allDirectives).join(" ")}`;
   const ROLE_PRIORITY = {
@@ -4905,8 +4956,8 @@ async function runJob(deps, jobId, brandId, url, signal) {
             errors.push({ code: "image_empty", message: "Empty image", url: img.sourceUrl });
             return;
           }
-          const png = await sharp5(buf).rotate().png().toBuffer();
-          const meta = await sharp5(png).metadata();
+          const png = await sharp6(buf).rotate().png().toBuffer();
+          const meta = await sharp6(png).metadata();
           const hash = core.images.save(png);
           core.catalog.setImageAsset(img.productId, img.sourceUrl, `asset:${hash}`, {
             width: meta.width,
@@ -5316,7 +5367,7 @@ async function generateStudioSet(deps, job, who, sourcePaths, signal) {
   return STUDIO_FRAMES.map((f) => byAngle.get(f.angle)).filter((h) => !!h);
 }
 async function edgeBarGeometry(buf) {
-  const { data, info } = await sharp5(buf).greyscale().raw().toBuffer({ resolveWithObject: true });
+  const { data, info } = await sharp6(buf).greyscale().raw().toBuffer({ resolveWithObject: true });
   const W = info.width;
   const H = info.height;
   const scan = (len, cross, at) => {
@@ -5370,7 +5421,7 @@ async function trimEdgeBars(core, hash) {
     const width = g.right - g.left + 1;
     const height = g.bottom - g.top + 1;
     if (width < g.W * 0.6 || height < g.H * 0.6) return hash;
-    const png = await sharp5(buf).extract({ left: g.left, top: g.top, width, height }).png().toBuffer();
+    const png = await sharp6(buf).extract({ left: g.left, top: g.top, width, height }).png().toBuffer();
     return core.images.save(png);
   } catch {
     return hash;
@@ -5392,11 +5443,11 @@ async function avatarCrop(core, hash) {
 async function crop(core, hash, region) {
   if (!hash || !core.images.has(hash)) return void 0;
   try {
-    const meta = await sharp5(core.images.read(hash)).metadata();
+    const meta = await sharp6(core.images.read(hash)).metadata();
     const w = meta.width ?? 0;
     const h = meta.height ?? 0;
     if (!w || !h) return void 0;
-    const png = await sharp5(core.images.read(hash)).extract(region(w, h)).png().toBuffer();
+    const png = await sharp6(core.images.read(hash)).extract(region(w, h)).png().toBuffer();
     return core.images.save(png);
   } catch {
     return void 0;
@@ -5550,6 +5601,215 @@ function registerAccessGuard(app, opts = {}) {
     }
   });
 }
+
+// src/editIdentity.ts
+var MAX_HOPS = 8;
+var tokensOf = (node) => {
+  const t = node?.brief?.tokens;
+  return Array.isArray(t) ? t : [];
+};
+function inheritedIdentityTokens(parentId, getNode) {
+  let id = parentId;
+  for (let hop = 0; hop < MAX_HOPS && id; hop++) {
+    const node = getNode(id);
+    if (!node || node.kind === "root") return [];
+    const identity = tokensOf(node).filter((t) => t.t === "product" || t.t === "character" || t.t === "mark");
+    if (identity.length) return identity;
+    id = node.parentId;
+  }
+  return [];
+}
+
+// src/editScopeRules.ts
+var GLOBAL_CUES = [
+  ["light", /\b(light|lighting|lit|relight|exposure|white ?balance|backlit|shadows everywhere)\b/i],
+  [
+    "grade",
+    /\b(grade|grading|colou?r ?grade|tone|tint|saturation|contrast|filmic|film stock|grain|black and white|monochrome|sepia)\b/i
+  ],
+  ["time", /\b(night|nighttime|daytime|dusk|dawn|sunset|sunrise|golden hour|midday|morning|evening)\b/i],
+  ["weather", /\b(rain|rainy|snow|snowy|fog|foggy|misty|storm|overcast|sunny)\b/i],
+  ["scene", /\b(scene|background|backdrop|environment|location|setting|studio|indoors|outdoors)\b/i],
+  [
+    "camera",
+    /\b(angle|zoom|closer|wider|crop|reframe|recompose|framing|perspective|lens|\d{2,3} ?mm|shot from|low angle|high angle|overhead|top ?down|eye ?level)\b/i
+  ],
+  ["mood", /\b(mood|vibe|feel|editorial|cinematic|dramatic|moody|minimal|luxurious|playful|clinical)\b/i],
+  [
+    "comparative",
+    /\b(warmer|cooler|brighter|darker|softer|harder|punchier|richer|flatter|sharper|moodier|more|less)\b/i
+  ],
+  [
+    "restage",
+    /\b(regenerate|redo|re-?do|start over|another take|different (take|composition|version)|try again|new (version|take))\b/i
+  ],
+  ["whole", /\b(overall|whole (image|frame|shot|thing)|entire|everything|all of it|throughout)\b/i],
+  ["wardrobe", /\b(outfit|wardrobe|clothes|clothing|dress(ed)?|styling)\b/i],
+  ["pose", /\b(pose|posture|expression|smile|smiling|looking)\b/i]
+];
+var LOCAL_VERB = /\b(add|remove|delete|erase|take out|get rid of|replace|swap|clean up|fix|repair|straighten|hide|cover)\b/i;
+var DEFINITE_OBJECT = /\b(the|that|this|his|her|their|its|a|an|one)\b/i;
+var REGION_CUE = /\b(in the (top|bottom|upper|lower|left|right)|on the (left|right|label|cap|lid|sleeve|table|floor|wall|shelf)|behind|next to|beside|in front of|to the (left|right)|corner|foreground|background object)\b/i;
+var COORDINATION = /\b(and|then|also|plus)\b|[;]/i;
+var MAX_LOCAL_WORDS = 16;
+function scopeOfInstruction(text) {
+  const s = String(text ?? "").trim();
+  if (!s) return { scope: "global", matched: ["empty"] };
+  const globals = GLOBAL_CUES.filter(([, re]) => re.test(s)).map(([name]) => name);
+  if (globals.length) return { scope: "global", matched: globals };
+  const words = s.split(/\s+/).filter(Boolean);
+  if (words.length > MAX_LOCAL_WORDS) return { scope: "global", matched: ["long"] };
+  const clauses = s.split(COORDINATION).filter((c) => c.trim().length > 0);
+  if (clauses.length > 1 && clauses.filter((c) => LOCAL_VERB.test(c)).length > 1) {
+    return { scope: "global", matched: ["multiple"] };
+  }
+  const matched = [];
+  if (REGION_CUE.test(s)) matched.push("region");
+  if (LOCAL_VERB.test(s) && DEFINITE_OBJECT.test(s)) matched.push("verb+object");
+  if (!matched.length) return { scope: "global", matched: ["no local cue"] };
+  return { scope: "local", matched };
+}
+
+// src/expandRules.ts
+var round8 = (n) => Math.max(8, Math.round(n / 8) * 8);
+function planExpand(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;
+  if (targetRatio > current) {
+    const width = round8(source.height * targetRatio);
+    if (width <= source.width) return null;
+    return {
+      width,
+      height: source.height,
+      left: Math.round((width - source.width) / 2),
+      top: 0,
+      axis: "width"
+    };
+  }
+  const height = round8(source.width / targetRatio);
+  if (height <= source.height) return null;
+  return {
+    width: source.width,
+    height,
+    left: 0,
+    top: Math.round((height - source.height) / 2),
+    axis: "height"
+  };
+}
+function expandInstruction(plan, direction) {
+  const where = plan.axis === "width" ? "to the left and right" : "above and below";
+  return `Extend this photograph ${where} to fill the empty margin, continuing the same scene, the same surface, the same lighting and the same perspective straight out to the new edges. Do not change, move, rescale or reinterpret anything already in the picture, and do not add a subject, a product or a person that is not already there.${direction.trim() ? ` ${direction.trim()}` : ""}`;
+}
+async function expandCanvas(source, plan) {
+  const bed = await sharp6(source).resize(plan.width, plan.height, { fit: "cover", position: "centre" }).blur(Math.max(8, Math.round(Math.max(plan.width, plan.height) / 40))).toBuffer();
+  return sharp6(bed).composite([{ input: source, left: plan.left, top: plan.top }]).png().toBuffer();
+}
+async function compositeExpand(engineImage, source, plan) {
+  const meta = await sharp6(engineImage).metadata();
+  const want = plan.width / plan.height;
+  const got = meta.width && meta.height ? meta.width / meta.height : 0;
+  const sameOrientation = got > 0 && got >= 1 === want >= 1;
+  const aligned = sameOrientation;
+  const surround = aligned ? await sharp6(engineImage).resize(plan.width, plan.height, { fit: "cover", position: "centre" }).toBuffer() : await expandCanvasBedOnly(source, plan);
+  const image = await sharp6(surround).composite([{ input: source, left: plan.left, top: plan.top }]).png().toBuffer();
+  return { image, aligned };
+}
+async function expandCanvasBedOnly(source, plan) {
+  return sharp6(source).resize(plan.width, plan.height, { fit: "cover", position: "centre" }).blur(Math.max(8, Math.round(Math.max(plan.width, plan.height) / 40))).toBuffer();
+}
+async function driftDiff(a, b) {
+  const metaA = await sharp6(a).metadata();
+  const metaB = await sharp6(b).metadata();
+  const width = Math.min(metaA.width ?? 1, metaB.width ?? 1, 1024);
+  const height = Math.min(metaA.height ?? 1, metaB.height ?? 1, 1024);
+  const [rawA, rawB] = await Promise.all(
+    [a, b].map((buf) => sharp6(buf).resize(width, height, { fit: "cover" }).ensureAlpha().raw().toBuffer())
+  );
+  const out = new PNG({ width, height });
+  const changed = pixelmatch(rawA, rawB, out.data, width, height, { threshold: 0.1, diffColor: [255, 64, 64] });
+  return {
+    score: changed / (width * height),
+    heatmap: PNG.sync.write(out),
+    width,
+    height
+  };
+}
+async function changeMask(a, b, cap2 = 1024) {
+  const metaA = await sharp6(a).metadata();
+  const width = Math.min(metaA.width ?? 1, cap2);
+  const height = Math.min(metaA.height ?? 1, cap2);
+  const [rawA, rawB] = await Promise.all(
+    [a, b].map((buf) => sharp6(buf).resize(width, height, { fit: "fill" }).ensureAlpha().raw().toBuffer())
+  );
+  const out = new PNG({ width, height });
+  pixelmatch(rawA, rawB, out.data, width, height, { threshold: 0.1, includeAA: true, diffMask: true });
+  const mask = Buffer.alloc(width * height);
+  let changed = 0;
+  let minX = width;
+  let minY = height;
+  let maxX = -1;
+  let maxY = -1;
+  for (let i = 0; i < width * height; i++) {
+    if (out.data[i * 4 + 3] > 0) {
+      mask[i] = 255;
+      changed++;
+      const x = i % width;
+      const y = i / width | 0;
+      if (x < minX) minX = x;
+      if (x > maxX) maxX = x;
+      if (y < minY) minY = y;
+      if (y > maxY) maxY = y;
+    }
+  }
+  const boxArea = maxX < 0 ? 0 : (maxX - minX + 1) * (maxY - minY + 1);
+  return {
+    mask,
+    width,
+    height,
+    changed: changed / (width * height),
+    spread: boxArea / (width * height)
+  };
+}
+
+// src/localEditRules.ts
+var MIN_CHANGED = 5e-4;
+var MAX_CHANGED = 0.25;
+var MAX_SPREAD = 0.85;
+function judgeChange(shape) {
+  if (!(shape.changed > 0) || shape.changed < MIN_CHANGED) return "no-change";
+  if (shape.changed > MAX_CHANGED) return "too-much-changed";
+  if (shape.spread > MAX_SPREAD && shape.changed < 0.2) return "scattered";
+  return "composited";
+}
+function dilationFor(longEdge) {
+  return Math.max(6, Math.round(longEdge * 0.02));
+}
+
+// src/localEdit.ts
+async function preserveOutsideChange(source, edited) {
+  try {
+    const srcMeta = await sharp6(source).metadata();
+    const outMeta = await sharp6(edited).metadata();
+    if (!srcMeta.width || !srcMeta.height || !outMeta.width || !outMeta.height)
+      return { image: edited, outcome: "error", changed: 0 };
+    const sameShape = Math.abs(outMeta.width / outMeta.height - srcMeta.width / srcMeta.height) / (srcMeta.width / srcMeta.height) <= 0.01;
+    if (!sameShape) return { image: edited, outcome: "shape-changed", changed: 0 };
+    const shape = await changeMask(source, edited);
+    const outcome = judgeChange(shape);
+    if (outcome !== "composited") return { image: edited, outcome, changed: shape.changed };
+    const r = dilationFor(Math.max(shape.width, shape.height));
+    const grown = await sharp6(shape.mask, { raw: { width: shape.width, height: shape.height, channels: 1 } }).blur(Math.max(1, r / 3)).threshold(1).blur(Math.max(2, r / 3)).resize(srcMeta.width, srcMeta.height, { fit: "fill", kernel: "cubic" }).toColourspace("b-w").raw().toBuffer();
+    const editedRgb = await sharp6(edited).resize(srcMeta.width, srcMeta.height, { fit: "fill" }).removeAlpha().raw().toBuffer();
+    const masked = await sharp6(editedRgb, {
+      raw: { width: srcMeta.width, height: srcMeta.height, channels: 3 }
+    }).joinChannel(grown, { raw: { width: srcMeta.width, height: srcMeta.height, channels: 1 } }).png().toBuffer();
+    const image = await sharp6(source).removeAlpha().composite([{ input: masked }]).png().toBuffer();
+    return { image, outcome: "composited", changed: shape.changed };
+  } catch {
+    return { image: edited, outcome: "error", changed: 0 };
+  }
+}
 function joinNames(labels) {
   const uniq = [...new Set(labels)];
   if (uniq.length <= 1) return uniq[0] ?? "";
@@ -5573,7 +5833,7 @@ var assetHash2 = (ref) => {
 };
 var LOGO_ROLES = ["primary", "mark", "wordmark", "monochrome", "alternate"];
 var LOGO_BACKGROUNDS = ["light", "dark", "any"];
-var toPng = (buf) => sharp5(buf).png().toBuffer();
+var toPng = (buf) => sharp6(buf).rotate().png().toBuffer();
 var COST_PROBE = {
   prompt: "",
   brand: { brand: {}, assetPaths: {} },
@@ -5582,7 +5842,7 @@ var COST_PROBE = {
   count: 1
 };
 var MARK_MAX_EDGE = 2048;
-var toMarkPng = (buf) => sharp5(buf, { density: 384 }).resize({ width: MARK_MAX_EDGE, height: MARK_MAX_EDGE, fit: "inside", withoutEnlargement: true }).png().toBuffer();
+var toMarkPng = (buf) => sharp6(buf, { density: 384 }).rotate().resize({ width: MARK_MAX_EDGE, height: MARK_MAX_EDGE, fit: "inside", withoutEnlargement: true }).png().toBuffer();
 var readImagePart = async (core, req, normalize2) => {
   const part = await req.file();
   if (!part) return { error: "multipart file field required" };
@@ -5759,7 +6019,7 @@ async function vibrantColor(input) {
   let data;
   let channels;
   try {
-    const out = await sharp5(input).resize(48, 48, { fit: "inside" }).raw().toBuffer({ resolveWithObject: true });
+    const out = await sharp6(input).resize(48, 48, { fit: "inside" }).raw().toBuffer({ resolveWithObject: true });
     data = out.data;
     channels = out.info.channels;
   } catch {
@@ -5782,7 +6042,7 @@ async function vibrantColor(input) {
   const best = buckets.reduce((a, b) => b.score > a.score ? b : a, buckets[0]);
   if (best.score <= 0) {
     try {
-      const { dominant } = await sharp5(input).stats();
+      const { dominant } = await sharp6(input).stats();
       return toHex(dominant.r, dominant.g, dominant.b);
     } catch {
       return null;
@@ -6314,23 +6574,6 @@ function registerCodexSetupRoutes(app, deps) {
     }
   });
 }
-async function driftDiff(a, b) {
-  const metaA = await sharp5(a).metadata();
-  const metaB = await sharp5(b).metadata();
-  const width = Math.min(metaA.width ?? 1, metaB.width ?? 1, 1024);
-  const height = Math.min(metaA.height ?? 1, metaB.height ?? 1, 1024);
-  const [rawA, rawB] = await Promise.all(
-    [a, b].map((buf) => sharp5(buf).resize(width, height, { fit: "cover" }).ensureAlpha().raw().toBuffer())
-  );
-  const out = new PNG({ width, height });
-  const changed = pixelmatch(rawA, rawB, out.data, width, height, { threshold: 0.1, diffColor: [255, 64, 64] });
-  return {
-    score: changed / (width * height),
-    heatmap: PNG.sync.write(out),
-    width,
-    height
-  };
-}
 var EXPORT_PRESETS = [
   { id: "original", label: "Original", width: null, height: null },
   { id: "ig-post", label: "Instagram post 1080\xD71080", width: 1080, height: 1080 },
@@ -6342,7 +6585,7 @@ async function buildExportZip(image, baseName, presetIds) {
   const chosen = EXPORT_PRESETS.filter((p) => presetIds.includes(p.id));
   if (chosen.length === 0) throw new Error("No valid export presets selected");
   for (const p of chosen) {
-    const buf = p.width && p.height ? await sharp5(image).resize(p.width, p.height, { fit: "cover", position: "attention" }).png().toBuffer() : image;
+    const buf = p.width && p.height ? await sharp6(image).resize(p.width, p.height, { fit: "cover", position: "attention" }).png().toBuffer() : image;
     zip.file(`${baseName}-${p.id}.png`, buf);
   }
   return zip.generateAsync({ type: "nodebuffer" });
@@ -6503,7 +6746,7 @@ function registerImageRoutes(app, deps) {
     if (!part) return reply.status(400).send({ error: "multipart file field required" });
     const buf = await part.toBuffer();
     if (buf.length === 0) return reply.status(400).send({ error: "empty file" });
-    const png = await sharp5(buf).png().toBuffer();
+    const png = await sharp6(buf).rotate().png().toBuffer();
     return { hash: core.images.save(png) };
   });
   app.post("/api/diff", async (req, reply) => {
@@ -6538,6 +6781,39 @@ function registerImageRoutes(app, deps) {
 
 // src/release/notes.data.ts
 var RELEASES = [
+  {
+    version: "0.4.0",
+    date: "2026-08-23",
+    title: "Refining a shot keeps the shot.",
+    sections: [
+      {
+        heading: "Refining",
+        body: "Asking for one change now makes one change. Adding a prop or removing an object keeps the rest of the photograph exactly as it was, down to the pixel, instead of returning a fresh interpretation of the same idea. A refinement also carries the product and the presenter it started from, so identity holds through a thread of edits, and a request that genuinely affects the whole frame, like new lighting or a different time of day, is still free to change it."
+      },
+      {
+        heading: "Expand",
+        body: "A finished shot can be grown into another shape. Choosing a new aspect ratio while refining extends the picture you have and generates only the new margin, so the original is kept at its own resolution rather than being replaced by a different take. Nothing is ever cropped to fit."
+      },
+      {
+        heading: "Presenters",
+        body: "The plain studio layers a presenter is photographed in no longer turn up as the outfit in a finished shot. Where the direction names no wardrobe, they are dressed for the place and the occasion in the frame."
+      },
+      {
+        heading: "Fixes",
+        body: "The row of takes under a shot no longer stretches portrait and landscape images into squares. A shot card states what it is in one row, so set names no longer print over the version count and the Refine button, and the keeper star can now be used to keep a shot rather than only to un-keep one. Photos uploaded from a phone are stored the right way up. A run that loses one variant keeps the others instead of throwing all of them away, and the resolution setting no longer promises pixel counts on an engine that renders at its own size."
+      }
+    ]
+  },
+  {
+    version: "0.3.5",
+    date: "2026-08-21",
+    sections: [
+      {
+        heading: "Fixes",
+        body: "Setting up the Codex engine on Windows no longer reports a successful install as missing, and updates can now find npm there. When npm truly is unreachable, the update command points to the one-line recovery instead of a dead end."
+      }
+    ]
+  },
   {
     version: "0.3.4",
     date: "2026-08-21",
@@ -6895,7 +7171,7 @@ function registerSystemRoutes(app, deps) {
     }
     core.close();
     for (const name of ["scenri.db", "scenri.db-wal", "scenri.db-shm", "images", "backups"]) {
-      rmSync(join(core.home, name), { recursive: true, force: true });
+      rmSync(join(core.home, name), { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
     }
     return { ok: true, scope };
   });
@@ -7215,14 +7491,14 @@ 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 sharp5(buf).png().toBuffer()));
+      out.push(buf.subarray(0, 8).equals(PNG_SIG) ? h : core.images.save(await sharp6(buf).png().toBuffer()));
     }
     return out;
   }
   async function assertAspect(images, expect) {
     const want = expect.width / expect.height;
     for (const h of images) {
-      const meta2 = await sharp5(core.images.read(h)).metadata();
+      const meta2 = await sharp6(core.images.read(h)).metadata();
       if (!meta2.width || !meta2.height) continue;
       const got = meta2.width / meta2.height;
       if (Math.abs(got - want) / want > ASPECT_TOLERANCE)
@@ -7231,7 +7507,7 @@ function buildServer(opts) {
         );
     }
   }
-  async function runNode(nodeId, engine, estimate, work, expect) {
+  async function runNode(nodeId, engine, estimate, work, expect, post) {
     const engineId = engine.capabilities().id;
     reserved.set(engineId, (reserved.get(engineId) ?? 0) + estimate);
     const ctrl = new AbortController();
@@ -7239,6 +7515,7 @@ function buildServer(opts) {
     try {
       const result = await work(ctrl.signal);
       result.images = await normalizePngs(result.images);
+      if (post) result.images = await post(result.images);
       if (expect) await assertAspect(result.images, expect);
       core.store.completeNode(nodeId, result);
       core.ledger.recordCost(engineId, nodeId, result.costUsd);
@@ -7279,6 +7556,12 @@ function buildServer(opts) {
     const resolvedParentId = parentId ? String(parentId) : rootNode.id;
     const ctx = brandContext(core, project.brandId);
     let compiled2 = null;
+    let inheritedTokens = [];
+    let inheritedAttachments = [];
+    let editScope = "global";
+    const extraWarnings = [];
+    let expandPlan = null;
+    let expandSourceHash = null;
     if (brief && Array.isArray(brief.tokens)) {
       const briefErrors = validateBrief(brief);
       if (briefErrors.length) return reply.status(400).send({ error: `invalid brief: ${briefErrors.join("; ")}` });
@@ -7296,14 +7579,34 @@ function buildServer(opts) {
         brief.tokens
       );
       const sceneById = sceneFor(brandJson);
+      if (kind === "edit") {
+        const borrowed = inheritedIdentityTokens(resolvedParentId, (id) => core.store.getNode(id));
+        if (borrowed.length) {
+          const already = new Set(
+            brief.tokens.filter((t) => t.t === "product" || t.t === "character" || t.t === "mark").map((t) => JSON.stringify(t))
+          );
+          inheritedTokens = borrowed.filter((t) => !already.has(JSON.stringify(t)));
+        }
+        editScope = scopeOfInstruction(
+          brief.tokens.filter((t) => t.t === "text").map((t) => t.v).join(" ")
+        ).scope;
+      }
       compiled2 = compileBrief(brief, {
         brand: brandJson,
         images: core.images,
         engineCaps: engine.capabilities(),
         template: brief.templateId ? sceneById(String(brief.templateId)) : void 0,
-        templateById: sceneById
+        templateById: sceneById,
+        ...kind === "edit" ? { mode: "edit", editScope, inheritedIdentity: inheritedTokens.length > 0 } : {}
       });
       if (!compiled2.prompt.trim()) return reply.status(400).send({ error: "the brief is empty" });
+      if (inheritedTokens.length) {
+        const identity = compileBrief(
+          { tokens: inheritedTokens },
+          { brand: brandJson, images: core.images, engineCaps: engine.capabilities(), templateById: sceneById }
+        );
+        inheritedAttachments = identity.attachments.filter((a) => a.essential);
+      }
     }
     let finalPrompt = String(prompt ?? "");
     let referenceImages;
@@ -7383,13 +7686,31 @@ function buildServer(opts) {
         return reply.status(400).send({ error: "edit needs a parent node with an image (sourceImage)" });
       if (!engine.capabilities().supportsEdit)
         return reply.status(400).send({ error: "engine does not support edits" });
-      const cap2 = engine.capabilities().maxReferenceImages;
+      const cap2 = Math.max(0, engine.capabilities().maxReferenceImages - 1);
+      const own = (referenceImages ?? []).map((path, i) => ({ path, role: referenceRoles?.[i] }));
+      const borrowedRefs = inheritedAttachments.map((a) => ({ path: core.images.pathFor(a.hash), role: a.role })).filter((r) => !own.some((o) => o.path === r.path));
+      const editRefs = [...own, ...borrowedRefs].slice(0, cap2);
+      if (cap2 === 0 && borrowedRefs.length)
+        extraWarnings.push(
+          `${engine.capabilities().displayName} cannot carry reference images, so the identity rides on the source frame alone.`
+        );
+      const srcBuf = core.images.read(String(srcHash));
+      const srcMeta = await sharp6(srcBuf).metadata();
+      if (srcMeta.width && srcMeta.height) expectShape = { width: srcMeta.width, height: srcMeta.height };
+      if (srcMeta.width && srcMeta.height && compiled2?.width && compiled2?.height) {
+        expandPlan = planExpand({ width: srcMeta.width, height: srcMeta.height }, compiled2.width / compiled2.height);
+      }
+      if (expandPlan) {
+        const canvas = await expandCanvas(srcBuf, expandPlan);
+        expandSourceHash = core.images.save(canvas);
+        expectShape = { width: expandPlan.width, height: expandPlan.height };
+      }
       const editReq = {
-        instruction: finalPrompt,
-        sourceImage: core.images.pathFor(String(srcHash)),
+        instruction: expandPlan ? expandInstruction(expandPlan, finalPrompt) : finalPrompt,
+        sourceImage: core.images.pathFor(String(expandSourceHash ?? srcHash)),
         brand: ctx,
-        ...referenceImages && cap2 > 0 ? { referenceImages: referenceImages.slice(0, cap2) } : {},
-        ...referenceRoles && cap2 > 0 ? { referenceRoles: referenceRoles.slice(0, cap2) } : {}
+        ...editRefs.length ? { referenceImages: editRefs.map((r) => r.path) } : {},
+        ...editRefs.length ? { referenceRoles: editRefs.map((r) => r.role ?? "reference") } : {}
       };
       estimate = await engine.costEstimate(editReq);
       work = (signal) => engine.edit(editReq, signal);
@@ -7403,10 +7724,31 @@ function buildServer(opts) {
       engineId: String(engineId)
     });
     if (brief) core.store.setBrief(node.id, editedFrom ? { ...brief, sourceImage: editedFrom } : brief);
-    void runNode(node.id, engine, estimate, work, expectShape).catch(
+    const plan = expandPlan;
+    const original = editedFrom ? core.images.read(editedFrom) : null;
+    const localScope = kind === "edit" && !plan && editScope === "local" && original;
+    const post = plan ? async (images) => {
+      const out = [];
+      for (const h of images) {
+        const { image, aligned } = await compositeExpand(core.images.read(h), original, plan);
+        if (!aligned) app.log.warn({ nodeId: node.id }, "expand: engine frame did not align, kept the bed");
+        out.push(core.images.save(image));
+      }
+      return out;
+    } : localScope ? async (images) => {
+      const out = [];
+      for (const h of images) {
+        const { image, outcome, changed } = await preserveOutsideChange(original, core.images.read(h));
+        app.log.info({ nodeId: node.id, outcome, changed }, "local edit");
+        out.push(outcome === "composited" ? core.images.save(image) : h);
+      }
+      return out;
+    } : void 0;
+    void runNode(node.id, engine, estimate, work, expectShape, post).catch(
       (err) => app.log.error({ err }, "node run failed")
     );
-    return reply.status(202).send(compiled2?.warnings?.length ? { ...node, warnings: compiled2.warnings } : node);
+    const allWarnings = [...compiled2?.warnings ?? [], ...extraWarnings];
+    return reply.status(202).send(allWarnings.length ? { ...node, warnings: allWarnings } : node);
   });
   app.post("/api/nodes/:id/cancel", async (req, reply) => {
     const id = req.params.id;
@@ -7662,8 +8004,8 @@ async function verify() {
     const db = new Database2(":memory:");
     db.pragma("user_version");
     db.close();
-    const { default: sharp12 } = await import('sharp');
-    await sharp12({ create: { width: 1, height: 1, channels: 3, background: "#000" } }).png().toBuffer();
+    const { default: sharp14 } = await import('sharp');
+    await sharp14({ create: { width: 1, height: 1, channels: 3, background: "#000" } }).png().toBuffer();
     console.log(JSON.stringify({ ok: true, version: readMeta().version }));
   } catch (err) {
     console.log(JSON.stringify({ ok: false, error: String(err?.message ?? err) }));