scenri 0.17.0 → 0.17.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.17.1](https://github.com/tonygorb/Scenri/compare/v0.17.0...v0.17.1) (2026-09-24)
+
+
+### Bug Fixes
+
+* keep the presenter's own body, marks and accessories in every shot ([51ecbf0](https://github.com/tonygorb/Scenri/commit/51ecbf0744e81939e10e04559ffabeff583547e9))
+* keep the presenter's own body, marks and accessories in every shot ([6b6af6a](https://github.com/tonygorb/Scenri/commit/6b6af6a72338871de74d0b24bbf2c0af3dc0cc15))
+* mend a cut trait to its last full sentence, not a fragment ([3c31a67](https://github.com/tonygorb/Scenri/commit/3c31a6725c20818683772131ccfae2fd41168634))
+
 ## [0.17.0](https://github.com/tonygorb/Scenri/compare/v0.16.0...v0.17.0) (2026-09-24)
 
 

package/dist/serve.js

@@ -1355,7 +1355,7 @@ function presenterBody(req, refCount) {
   const same = refCount > 1 ? " Every attached photograph is the same person." : "";
   const ask = req.instruction ? ` The person who supplied these adds: ${req.instruction}.` : "";
   const categories = req.vocabulary?.categories?.length ? ` Choose "suitableCategories" only from this list: ${req.vocabulary.categories.join(", ")}.` : "";
-  return `These are photographs of one person, supplied by the person casting them.${same}${ask} Write a casting sheet: what a photographer would need in order to recognise this person again in a different shot. Do not name, identify, or guess who this person is, and do not use any proper name anywhere in your answer. Describe the person, not the photograph: their build, face and hair belong to them, but the background, crop, pose, clothing and lighting of these pictures belong to a shoot and must be left out. ${OUT_FILE} must be a JSON object with exactly these keys: "promptName": a short noun phrase a generator can be handed, such as "a woman in her early thirties with dark shoulder-length waves"; "presentation": either "woman" or "man"; "descriptor": a three-beat casting caption joined by " \xB7 ", such as "Warm editorial \xB7 dark waves \xB7 composed"; "ageRange": an approximate range such as "early 30s"; "hair": colour, length, texture and how it is worn; "identityNotes": one paragraph naming the two or three features that must survive every generation, drawn from face shape, eyes, nose, mouth, jaw, skin, distinctive marks, and build where it is visible; "negativeConstraints": an array of short refusals for the drift these photographs invite, such as "no youth-smoothing that erases the natural lines"; "suitableCategories": the industries this person would be cast for.${categories} "coverage": an array of at most two short sentences naming a view that is missing and would make this person more consistent, such as "A three-quarter photo would pin the cheekbones down." Use an empty array when the coverage is already good; "facial": bone structure in words, the face shape, jaw, cheekbones, eyes and brows a photographer would need to recognise them again; "skin": their skin tone and texture exactly as the photographs show it, never smoothed; "build": their body type and proportions where the photographs show them.` + (req.classifyPhotos ? photosClause(refCount) : "");
+  return `These are photographs of one person, supplied by the person casting them.${same}${ask} Write a casting sheet: what a photographer would need in order to recognise this person again in a different shot. Do not name, identify, or guess who this person is, and do not use any proper name anywhere in your answer. Describe the person, not the photograph: their build, face and hair belong to them, but the background, crop, pose, clothing and lighting of these pictures belong to a shoot and must be left out. ${OUT_FILE} must be a JSON object with exactly these keys: "promptName": a short noun phrase a generator can be handed, such as "a woman in her early thirties with dark shoulder-length waves"; "presentation": either "woman" or "man"; "descriptor": a three-beat casting caption joined by " \xB7 ", such as "Warm editorial \xB7 dark waves \xB7 composed"; "ageRange": an approximate range such as "early 30s"; "hair": colour, length, texture and how it is worn; "identityNotes": one paragraph naming the two or three features that must survive every generation, drawn from face shape, eyes, nose, mouth, jaw, skin, distinctive marks, and build where it is visible. Name every tattoo, scar, birthmark, piercing and anything they always wear, such as glasses, by what it is, exactly where it sits and which side, as the person's own left or right; "negativeConstraints": an array of short refusals for the drift these photographs invite, such as "no youth-smoothing that erases the natural lines"; "suitableCategories": the industries this person would be cast for.${categories} "coverage": an array of at most two short sentences naming a view that is missing and would make this person more consistent, such as "A three-quarter photo would pin the cheekbones down." Use an empty array when the coverage is already good; "facial": bone structure in words, the face shape, jaw, cheekbones, eyes and brows a photographer would need to recognise them again; "skin": their skin tone and texture exactly as the photographs show it, never smoothed; "build": their body type and proportions where the photographs show them.` + (req.classifyPhotos ? photosClause(refCount) : "");
 }
 function photosClause(refCount) {
   return ` Also write "photos": an array with one entry per attached image in attachment order (ref-1.png is index 0, up to index ${Math.max(0, refCount - 1)}), each an object {"index", "view", "usable", "note"}, where "view" is exactly one of "portrait" (head and shoulders, the face large and facing the camera), "front" (full length, standing, facing the camera), "three-quarter" (turned about forty-five degrees, both eyes visible), "back" (full length, facing away from the camera), "left" (full length, the left side of the body to the camera), "right" (full length, the right side of the body to the camera), or "other"; "usable" is true only when the image is sharp, evenly lit, unobstructed, and shows this person clearly enough to stand in as that view; "note" is a few words on why. If the photographs appear to show more than one person, also write "conflict": one sentence saying which images disagree; otherwise leave "conflict" out.`;
@@ -1397,16 +1397,18 @@ function parsePresenter(req, o) {
       presentation,
       descriptor: cap(str(o.descriptor), 120),
       ageRange: cap(str(o.ageRange), 40),
-      hair: cap(str(o.hair), 120),
+      // Cut at a clause, never mid-word: every shot of a person is told these,
+      // and a hard slice sent "full-body proporti." with each one.
+      hair: trait(o.hair, 120),
       identityNotes: cap(identityNotes, 900),
       negativeConstraints: list(o.negativeConstraints, 6, 160),
       suitableCategories: pick(o.suitableCategories, req.vocabulary?.categories, 6),
       coverage: sentences(o.coverage, 2, 240),
       // Non-blocking, like scene's `camera`: a model that omits or fumbles
       // these must not burn the single retry that exists for a broken contract.
-      ...optional("facial", cap(str(o.facial), 300)),
-      ...optional("skin", cap(str(o.skin), 200)),
-      ...optional("build", cap(str(o.build), 200)),
+      ...optional("facial", trait(o.facial, 300)),
+      ...optional("skin", trait(o.skin, 200)),
+      ...optional("build", trait(o.build, 200)),
       ...req.classifyPhotos ? optional("photos", photoFilings(o.photos, req.imagePaths.length)) : {},
       ...req.classifyPhotos ? optional("conflict", cap(str(o.conflict), 200)) : {}
     }
@@ -1474,6 +1476,16 @@ function oneLine(v, max) {
   return (/\s/.test(one[max] ?? "") ? cut : cut.replace(/\s+\S*$/, "")).replace(/[\s,;:-]+$/, "");
 }
 var cap = (v, max) => v.length > max ? v.slice(0, max).trim() : v;
+function trait(v, max) {
+  const one = str(v).replace(/\s+/g, " ");
+  if (one.length <= max) return one;
+  const cut = one.slice(0, max);
+  const sentence = cut.lastIndexOf(". ");
+  if (sentence >= max * 0.6) return cut.slice(0, sentence + 1);
+  const clause = Math.max(cut.lastIndexOf(", "), cut.lastIndexOf("; "));
+  if (clause > max / 3) return cut.slice(0, clause).trim();
+  return cut.replace(/\s+\S*$/, "").replace(/[\s,;:-]+$/, "");
+}
 function sentences(v, max, each) {
   if (!Array.isArray(v)) return [];
   return v.map((x) => oneLine(x, each)).filter(Boolean).slice(0, max);
@@ -2274,6 +2286,7 @@ async function resolvePresenterImages(core, templatesRoot, presenter) {
     ...presenter.negativeConstraints?.length ? { negativeConstraints: presenter.negativeConstraints } : {},
     ...presenter.skin ? { skin: presenter.skin } : {},
     ...presenter.facial ? { facial: presenter.facial } : {},
+    ...presenter.hair ? { hair: presenter.hair } : {},
     ...presenter.build ? { build: presenter.build } : {},
     shots
   };
@@ -4469,11 +4482,11 @@ function presenterRecordFrom(input, base) {
   if (source && PRESENTER_SOURCES.includes(source)) presenter.source = source;
   const likeness = has("likeness") ? likenessOf(input.likeness) : base?.likeness;
   if (likeness) presenter.likeness = likeness;
-  const facial = has("facial") ? str3(input.facial, 300) : base?.facial;
+  const facial = has("facial") ? phrase(input.facial, 300) : base?.facial;
   if (facial) presenter.facial = facial;
-  const skin = has("skin") ? str3(input.skin, 200) : base?.skin;
+  const skin = has("skin") ? phrase(input.skin, 200) : base?.skin;
   if (skin) presenter.skin = skin;
-  const build = has("build") ? str3(input.build, 200) : base?.build;
+  const build = has("build") ? phrase(input.build, 200) : base?.build;
   if (build) presenter.build = build;
   const edits = has("identityEdits") ? identityEditsOf(input.identityEdits) : base?.identityEdits;
   if (edits?.length) presenter.identityEdits = edits;
@@ -4577,6 +4590,7 @@ var SEAT_TIER = {
   composition: 1,
   style: 2
 };
+var PRESENTER_FLOOR = 2;
 var ROLE_PRIORITY = {
   product: 0,
   character: 1,
@@ -4587,7 +4601,7 @@ var ROLE_PRIORITY = {
   composition: 6,
   style: 7
 };
-function allocateAttachments(attachments, cap2) {
+function allocateAttachments(attachments, cap2, opts = {}) {
   const max = Math.max(0, cap2);
   const indexed = attachments.map((a, i) => ({ a, i }));
   const legacyOrder = [...indexed].sort(
@@ -4595,12 +4609,22 @@ function allocateAttachments(attachments, cap2) {
   );
   const groupOf = (a) => `${a.role}:${a.id ?? a.hash}`;
   const kept = /* @__PURE__ */ new Set();
-  const keptGroups = /* @__PURE__ */ new Set();
+  const keptGroups = /* @__PURE__ */ new Map();
   const admit = (x) => {
     kept.add(x.i);
-    keptGroups.add(groupOf(x.a));
+    keptGroups.set(groupOf(x.a), (keptGroups.get(groupOf(x.a)) ?? 0) + 1);
   };
   const seatOrder = [...indexed].sort((x, y) => SEAT_TIER[x.a.role] - SEAT_TIER[y.a.role] || x.i - y.i);
+  if (opts.identityFloor) {
+    for (const x of seatOrder) {
+      if (kept.size >= max) break;
+      if ((x.a.role === "product" || x.a.role === "character") && !keptGroups.has(groupOf(x.a))) admit(x);
+    }
+    for (const x of seatOrder) {
+      if (kept.size >= max) break;
+      if (x.a.role === "character" && !kept.has(x.i) && (keptGroups.get(groupOf(x.a)) ?? 0) < PRESENTER_FLOOR) admit(x);
+    }
+  }
   for (const x of seatOrder) {
     if (kept.size >= max) break;
     if (!kept.has(x.i) && !keptGroups.has(groupOf(x.a))) admit(x);
@@ -4866,7 +4890,7 @@ async function pickBuildEngine(engines, opts = {}) {
 // src/briefDirectives.ts
 function productFidelityDirective(attached) {
   if (attached <= 1) {
-    return "The attached product image is the exact product: preserve its label, shape, colors and proportions faithfully, and do not redesign it. Where the image shows it more than once, side by side from the front and the back or at several angles, those are views of one product: this shot contains exactly one of it. It is also the only view of this product that exists. Any face, side or detail not visible in it is unknown \u2014 keep those plain and consistent with the visible materials and color, and do not invent hardware, text, seams, closures, ornament or branding on them. Prefer a composition that shows the product from the view the reference gives, unless this shot's own direction asks for another view.";
+    return "The attached product image is the exact product: preserve its label, shape, colors and proportions faithfully, and do not redesign it. Where the image shows it more than once, side by side from the front and the back or at several angles, those are views of one product: this shot contains exactly one of it. It is the only view of this product in this shot. Any face, side or detail not visible in it is unknown \u2014 keep those plain and consistent with the visible materials and color, and do not invent hardware, text, seams, closures, ornament or branding on them. Prefer a composition that shows the product from the view the reference gives, unless this shot's own direction asks for another view.";
   }
   return "The attached product images all show the exact product to feature: preserve its label, shape and proportions faithfully, do not redesign it, and never treat an extra image as an additional product. The first product image is the authority for its color, finish and material. Where another image differs in color or finish, it shows the same product in another colorway \u2014 never blend colorways, and render the one the first image shows. Any face not visible in them is unknown \u2014 keep it plain and consistent with the materials the first image shows, and do not invent detail on it. If the direction above explicitly asks for more than one colorway, that explicit request wins.";
 }
@@ -4909,7 +4933,12 @@ function productFactDirectives(p) {
 }
 function characterFactDirectives(c) {
   const out = [];
-  if (c.identityNotes) out.push(String(c.identityNotes));
+  if (c.identityNotes) {
+    const notes = String(c.identityNotes).trim().replace(/[\s,;:]+$/, "");
+    out.push(
+      `${c.promptName ?? c.name}'s own, in every shot and never capture context, as part of who they are: ${notes}${/[.!?]$/.test(notes) ? "" : "."}`
+    );
+  }
   if (c.negativeConstraints?.length) out.push(`Avoid: ${[].concat(c.negativeConstraints).join(", ")}`);
   return out;
 }
@@ -4920,7 +4949,25 @@ function characterEditIdentityDirective(name) {
   return `${name} is the person in this photograph: keep them present and clearly visible. Match their face, facial structure, skin, hair and build to the attached person reference exactly. The reference's plain outfit and studio backdrop are capture conditions, not direction: keep the styling this photograph already has unless the instruction itself changes it, and never return them to the plain base layers they were photographed in.`;
 }
 function referenceIdentityGuard() {
-  return "A reference shot lends its composition, lighting and treatment, never its cast: the attached presenter is the only source of person identity in this shot, and any person visible in a reference shot is a stand-in whose place the presenter takes. This holds even where the direction asks to use someone from a reference \u2014 the attached presenter is that someone.";
+  return "A reference shot lends its composition, lighting and treatment, never its cast: the attached presenter is the only source of person identity in this shot, and any person visible in a reference shot is a stand-in whose place the presenter takes. The stand-in's clothes are not part of the pose: unless this shot's own words dress the presenter, dress them for this place in clothes of their own that show their own build, never in the stand-in's outfit. This holds even where the direction asks to use someone from a reference \u2014 the attached presenter is that someone.";
+}
+var HAIR_STYLED = /\b(hair|hairstyle|updo|bun|ponytail|braids?|braided|plaits?|fringe|bangs|slicked|cornrows)\b/i;
+function hairDirective(who, hair, userWords) {
+  const h = hair.trim().replace(/[\s.,;:]+$/, "");
+  return HAIR_STYLED.test(userWords) ? `${who}'s hair keeps its own colour, length and texture (${h}), styled the way this shot's words ask.` : `${who}'s hair, exactly as their references show it: ${h}.`;
+}
+function mendedTrait(text, cap2) {
+  if (!text) return text;
+  const t = text.trim();
+  if (t.length < cap2 - 1 || /[.!?]$/.test(t)) return t;
+  return wholeClauses(t);
+}
+function wholeClauses(t) {
+  const sentence = t.lastIndexOf(". ");
+  if (sentence >= t.length * 0.6) return t.slice(0, sentence + 1);
+  const clause = Math.max(t.lastIndexOf(", "), t.lastIndexOf("; "));
+  if (clause > t.length / 3) return `${t.slice(0, clause).replace(/[\s,;:]+$/, "")}.`;
+  return sentence > 0 ? t.slice(0, sentence + 1) : t;
 }
 function markEditDirective() {
   return "The attached brand mark is this brand's own mark: wherever the logo appears or the instruction asks for it, reproduce it exactly as drawn \u2014 same colours, letterforms and proportions \u2014 never redrawn or re-lettered. Every character it carries stays intact, including the smallest secondary lettering, in its original script and reading direction \u2014 never translated, transliterated or re-spelled.";
@@ -5269,15 +5316,20 @@ function compileBrief(brief, ctx) {
             "Their expression and gaze in the reference are neutral capture conditions too, not a look to reproduce: give them the genuine expression this exact moment and place call for, the effort, delight, focus, calm or ease a real person would show doing exactly this, and let their eyes go where the direction and the moment put them, never a copy of the reference's straight-to-lens look, while their face stays unmistakably theirs."
           );
           personDirectives.push(...characterFactDirectives(c));
-          if (c.skin)
+          const skin = mendedTrait(c.skin, 200);
+          const facial = mendedTrait(c.facial, 300);
+          const build = mendedTrait(c.build, 200);
+          const hair = mendedTrait(c.hair, 120);
+          if (skin)
             personDirectives.push(
-              `${c.promptName ?? c.name}'s skin, exactly as the reference photographs show it: ${c.skin}.`
+              `${c.promptName ?? c.name}'s skin, exactly as the reference photographs show it: ${skin.replace(/[.\s]+$/, "")}.`
             );
-          if (c.facial)
+          if (facial)
             personDirectives.push(
-              `${c.promptName ?? c.name}'s face, which must survive every generation unchanged: ${c.facial}.`
+              `${c.promptName ?? c.name}'s face, which must survive every generation unchanged: ${facial.replace(/[.\s]+$/, "")}.`
             );
-          if (c.build) personDirectives.push(`${c.promptName ?? c.name}'s build: ${c.build}.`);
+          if (hair) personDirectives.push(hairDirective(c.promptName ?? c.name, hair, userWords));
+          if (build) personDirectives.push(`${c.promptName ?? c.name}'s build: ${build.replace(/[.\s]+$/, "")}.`);
         } else {
           warnings.push(`${c.name} has no usable photo, so they are named but not attached.`);
           unattachable.push({
@@ -5442,7 +5494,13 @@ function compileBrief(brief, ctx) {
     }
   }
   const max = ctx.engineCaps.maxReferenceImages;
-  const { kept, dropped: budgetDropped, seated } = allocateAttachments(attachments, max);
+  const {
+    kept,
+    dropped: budgetDropped,
+    seated
+  } = allocateAttachments(attachments, max, {
+    identityFloor: ctx.mode !== "edit"
+  });
   const presentKeys = new Set((ctx.presentAttachments ?? kept).map((a) => `${a.role}:${a.hash}`));
   const resolveDirective = (d) => {
     if (typeof d === "string") return d;
@@ -5461,7 +5519,7 @@ function compileBrief(brief, ctx) {
     if (presentKeys.has(key) || absentSeen.has(key)) continue;
     if (a.role === "reference") {
       absentSeen.add(key);
-      const words = ctx.wordsFor?.(a.hash) ?? null;
+      const words = hasPerson ? null : ctx.wordsFor?.(a.hash) ?? null;
       absentDirectives.push(
         words ? `A reference shot was not attached this time; it showed ${words}. Match that composition, lighting and treatment.` : "A reference image was attached but not sent this time."
       );
@@ -11361,8 +11419,8 @@ function traitOf(sentence) {
 function mergeIdentityEdits(existing, adjustment) {
   const next = str4(adjustment, IDENTITY_EDIT_CHARS).replace(/\s+/g, " ");
   if (!next) return existing.slice(-IDENTITY_EDITS_MAX);
-  const trait = traitOf(next);
-  const kept = existing.filter((e) => e.toLowerCase() !== next.toLowerCase() && (!trait || traitOf(e) !== trait));
+  const trait2 = traitOf(next);
+  const kept = existing.filter((e) => e.toLowerCase() !== next.toLowerCase() && (!trait2 || traitOf(e) !== trait2));
   return [...kept, next].slice(-IDENTITY_EDITS_MAX);
 }
 async function filePhotos(deps, id, signal) {
@@ -13942,6 +14000,16 @@ function registerImageRoutes(app, deps) {
 
 // src/release/notes.data.ts
 var RELEASES = [
+  {
+    version: "0.17.1",
+    date: "2026-09-24",
+    sections: [
+      {
+        heading: "Presenters",
+        body: "A presenter keeps their own face, hair, build, glasses and tattoos when a scene or a reference picture shows someone else, with every mark on its own side. A picture used for a pose no longer dresses them in that person's clothes, and their descriptions are no longer cut off mid-word."
+      }
+    ]
+  },
   {
     version: "0.17.0",
     date: "2026-09-24",

package/package.json

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