@gentbajko/slopify 3.25.8 → 4.0.0

package/dist/slices/rebuild/preview-plan.js

@@ -2,6 +2,7 @@ import { z } from "zod";
 import { catalogueSchema } from "../../catalog/schema.js";
 import { stageKinds } from "../../kernel/pipeline.js";
 import { estimateRequests } from "../estimate/index.js";
+import { assetPathOrUndefined } from "../revisions/mutation-assets.js";
 import { requestHash } from "../revisions/mutation-request.js";
 import { previewDetails } from "./preview-details.js";
 import { hasSubmittedRequest, requiresNewSubmission, retainedPreviewPlan, } from "./preview-retained.js";
@@ -99,23 +100,17 @@ export function planPreview(deps, view, catalogue, selection, id) {
             });
     for (const row of view.pieces)
         if (row.selected && selected.has(row.key) && row.assetId !== null) {
-            const asset = deps.db
-                .prepare("SELECT path FROM project_assets WHERE id=? AND project_id=?")
-                .get(row.assetId, view.revision.projectId);
             relevantAssets.set(row.assetId, {
                 id: row.assetId,
-                path: String(asset?.path ?? ""),
+                path: assetPathOrUndefined(deps, view.revision.projectId, row.assetId) ?? "",
                 available: row.available,
             });
         }
     for (const recipe of recipes)
         if (recipe.input.kind === "provided" && recipe.input.assetId !== null) {
-            const asset = deps.db
-                .prepare("SELECT path FROM project_assets WHERE id=? AND project_id=?")
-                .get(recipe.input.assetId, view.revision.projectId);
             relevantAssets.set(recipe.input.assetId, {
                 id: recipe.input.assetId,
-                path: String(asset?.path ?? ""),
+                path: assetPathOrUndefined(deps, view.revision.projectId, recipe.input.assetId) ?? "",
                 available: !recipe.unresolved,
             });
         }

package/dist/slices/rebuild/recipe-build.js

@@ -4,6 +4,7 @@ import { audioRecipes } from "./recipe-audio.js";
 import { documentRecipes } from "./recipe-document.js";
 import { editPlan } from "./recipe-edit.js";
 import { exportRecipes } from "./recipe-exports.js";
+import { fillPrompt } from "./recipe-keywords.js";
 import { linePlan } from "./recipe-lines.js";
 import { masterPlan } from "./recipe-loudness.js";
 import { resourceIdentity } from "./recipe-model.js";
@@ -11,6 +12,7 @@ import { imageReference, referenceRecipe } from "./recipe-reference.js";
 import { withReviews } from "./recipe-reviews.js";
 import { imageScenes, thumbnailScenes } from "./recipe-scenes.js";
 import { shortsRecipes } from "./recipe-shorts.js";
+import { socialRecipes } from "./recipe-social.js";
 import { unsoftenedTimelines } from "./recipe-softening.js";
 import { textRecipes } from "./recipe-text.js";
 import { thumbnailRecipes, visualAssets, visualRecipes } from "./recipe-visual.js";
@@ -50,8 +52,10 @@ export function buildRecipes(context) {
     return built;
 }
 const descriptionKey = "youtube:description";
-function buildEach(context) {
-    const text = textRecipes(context);
+function buildEach(plain) {
+    const text = textRecipes(plain);
+    // Every later step fills its prompts' keywords from what the text steps write.
+    const context = { ...plain, keywords: text.keywords };
     const audio = audioRecipes(context, text);
     const exports = exportRecipes(context, audio, () => unsoftenedTimelines(context, text));
     const captions = exports.find((value) => value.key === "subtitles:files");
@@ -72,11 +76,12 @@ function buildEach(context) {
         ...audio.recipes,
         ...exports,
         ...youtube,
+        ...socialRecipes(context, text),
         ...(reference === undefined ? [] : [reference]),
         ...shortsRecipes(context, exports, drawnFrom, audio.cards ?? [], masterPlan(context, audio.levels, "video"), appearance),
         ...thumbnail,
         ...documentRecipes(context, text, thumbnail),
-        ...visualAssets(context, visualRecipes(context.config, context.content, audio.mediaFingerprint, captions?.fingerprint ?? null, (images) => editPlan(context, exports, youtube, images, audio.cards ?? []), drawnFrom, timing === undefined ? null : resourceIdentity(context, timing), withLines(masterPlan(context, audio.levels, "video"), linePlan(context, timing)), scenes, appearance)),
+        ...visualAssets(context, visualRecipes(context.config, context.content, audio.mediaFingerprint, captions?.fingerprint ?? null, (images) => editPlan(context, exports, youtube, images, audio.cards ?? []), drawnFrom, timing === undefined ? null : resourceIdentity(context, timing), withLines(masterPlan(context, audio.levels, "video"), linePlan(context, timing)), scenes, appearance, (text) => fillPrompt(context, text, "image"))),
         ...(scenes === undefined ? [] : [scenes.recipe]),
         ...(thumbnailScened === undefined ? [] : [thumbnailScened.recipe]),
         ...(appearance === undefined ? [] : [appearance.recipe]),

package/dist/slices/rebuild/recipe-describe.js

@@ -2,7 +2,7 @@ import { usesDescribedNarration, usesFigureCards, usesShorts } from "../admissio
 import { describedBlocks, narrationBlocks, spokenNarration, } from "../narration/blocks.js";
 import { describeMessages, spokenPassage } from "../narration/describe.js";
 import { recipe } from "./recipe-model.js";
-import { llmInput, matchingText, renderedPrompt } from "./recipe-text.js";
+import { llmInput, matchingText, promptOf } from "./recipe-text.js";
 // "Describe tables and figures in the narration": one text-model step per table, figure,
 // diagram, equation or code block (`narration:describe:<n>`, in reading order), whose answer
 // is said in the block's place. The narration is chunked, prepared and spoken from that
@@ -19,7 +19,7 @@ export function describing(context) {
 // the model and the style guidance. The future step's template, so a change to any of them
 // reaches the narration still to be written.
 export function describeTemplate(context) {
-    const input = llmInput(context, describeMessages({ kind: "table", index: 1, source: "", section: null }, renderedPrompt(context, "narration"), context.config.language));
+    const input = llmInput(context, describeMessages({ kind: "table", index: 1, source: "", section: null }, promptOf(context, "narration").text, context.config.language));
     return [
         "narration-description-v1",
         JSON.parse(JSON.stringify({ ...input, thinkingConfig: null })),
@@ -43,7 +43,7 @@ export function describedText(context, markdown, dependsOn, offset = 0) {
         code: config.audio?.skipCode === true ? "skip" : "describe",
         language: config.language,
     });
-    const style = renderedPrompt(context, "narration");
+    const style = promptOf(context, "narration").text;
     const passages = new Map();
     const cards = [];
     const recipes = describedBlocks(blocks).map((block) => {

package/dist/slices/rebuild/recipe-digest.js

@@ -0,0 +1,58 @@
+import { withLanguage } from "../../kernel/ports/languages.js";
+import { subjectOf } from "../admission/model.js";
+import { digestMessages, digestNames } from "../keywords/digest.js";
+import { keywordUsesOf } from "../keywords/rules.js";
+import { recipe, selectedReference, } from "./recipe-model.js";
+import { llmInput, llmInputFingerprint } from "./recipe-text.js";
+import { keywordBodies } from "./recipe-validation.js";
+export const digestKey = "article:digest";
+// The keyword digest step, only while a prompt the version runs uses a digest keyword, and the
+// digest it wrote once it answers this plan's request. It reads the article the pictures are
+// drawn from, so editing the article by hand keeps it with them.
+export function keywordDigest(context, text) {
+    const { config } = context;
+    if (keywordUsesOf(keywordBodies(config, context.content)).digest === undefined)
+        return undefined;
+    const messages = withLanguage(digestMessages({ title: subjectOf(config), article: text.pictureText ?? "" }), config.language);
+    const value = recipe(context, digestKey, "article", text.pictureText === null
+        ? {
+            kind: "deferred",
+            version: 1,
+            operation: "keyword-digest",
+            template: [llmInputFingerprint(context, messages), text.article.fingerprint],
+        }
+        : llmInput(context, messages), [text.article.key]);
+    return {
+        recipe: value,
+        producer: {
+            key: value.key,
+            fingerprint: value.fingerprint,
+            names: digestNames,
+            values: text.pictureText === null ? undefined : savedDigest(context, value),
+        },
+    };
+}
+// The digest saved for this request, by either fingerprint (see `savedScenes`).
+function savedDigest(context, value) {
+    const logical = context.catalogue === undefined || value.input.kind !== "llm"
+        ? value.fingerprint
+        : recipe({ content: context.content }, value.key, value.stage, { ...value.input, thinkingConfig: null }, value.dependsOn).fingerprint;
+    const piece = context.manifest.pieces.find((row) => row.key === value.key &&
+        selectedReference(row) &&
+        row.piece.state === "done" &&
+        (row.fingerprint === value.fingerprint || row.fingerprint === logical));
+    if (piece?.piece.payload == null)
+        return undefined;
+    const payload = JSON.parse(piece.piece.payload);
+    const digest = payload.digest;
+    if (typeof digest !== "object" || digest === null)
+        return undefined;
+    const values = {};
+    for (const name of digestNames) {
+        const one = digest[name];
+        if (typeof one !== "string")
+            return undefined;
+        values[name] = one;
+    }
+    return values;
+}

package/dist/slices/rebuild/recipe-input-schema.js

@@ -2,6 +2,7 @@ import { z } from "zod";
 import { messageRoles, thinkingModes } from "../../kernel/ports/llm.js";
 import { llmDocumentsSchema } from "../../kernel/ports/llm-documents.js";
 import { describedKinds } from "../narration/blocks.js";
+import { socialPlatforms } from "../social/model.js";
 import { deferredOperations, localOperations } from "./recipe-model.js";
 const value = z.lazy(() => z.union([
     z.null(),
@@ -59,6 +60,15 @@ export const recipeInputSchema = z.discriminatedUnion("kind", [
         })
             .strict()
             .optional(),
+        // A post for another site (`recipe-social.ts`): the limit its answer must keep.
+        social: z
+            .object({
+            platform: z.enum(socialPlatforms),
+            max: z.number().int().positive(),
+            unit: z.enum(["weighted", "graphemes", "characters"]),
+        })
+            .strict()
+            .optional(),
     })
         .strict(),
     z

package/dist/slices/rebuild/recipe-keywords.js

@@ -0,0 +1,71 @@
+import { subjectOf } from "../admission/model.js";
+import { detectSlots } from "../admission/substitute.js";
+import { splitEndMatter } from "../article/split.js";
+import { fillKeywords, mentionsKeyword } from "../keywords/fill.js";
+import { placeOfKey } from "../keywords/rules.js";
+import { keywordOf } from "../keywords/specs.js";
+import { factValues } from "../keywords/values.js";
+import { topHeadings } from "../video/chapters.js";
+import { usesScriptPrompt } from "../voices/model.js";
+export const articleKey = "article:body";
+// The article as this version has it, or null while it is still to be written.
+export function articleMarkdownOf(context) {
+    const { config, content, resolved } = context;
+    return config.sources.article !== "generate" || content.articleEdited === true
+        ? (content.articleMarkdown ?? config.provided.article ?? "")
+        : resolved.articleMarkdown;
+}
+// The article's chapter titles, once it is written.
+export function chaptersProducer(markdown, article) {
+    return {
+        key: article.key,
+        fingerprint: article.fingerprint,
+        names: ["Slopify_Chapters"],
+        values: markdown === null
+            ? undefined
+            : {
+                Slopify_Chapters: topHeadings(splitEndMatter(markdown).body)
+                    .map((heading) => heading.title)
+                    .join("\n"),
+            },
+    };
+}
+// A prompt with its keywords filled. A text without a `Slopify_` keyword is returned as the very
+// string it was, so a project that uses none plans the requests it always did.
+export function fillPrompt(context, text, place) {
+    if (place === undefined || !mentionsKeyword(text))
+        return { text, waits: [], dependsOn: [] };
+    const producers = context.keywords?.producers ?? [
+        chaptersProducer(articleMarkdownOf(context), { key: articleKey, fingerprint: "" }),
+    ];
+    const values = {
+        ...factValues(context.config.keywordFacts, subjectOf(context.config), place),
+    };
+    const used = new Set();
+    for (const producer of producers)
+        for (const name of producer.names)
+            if (usesName(text, name, place)) {
+                used.add(producer.key);
+                const value = producer.values?.[name];
+                if (value !== undefined)
+                    values[name] = value;
+            }
+    const filled = fillKeywords(text, place, values);
+    const dependsOn = producers.filter((one) => used.has(one.key)).map((one) => one.key);
+    if (filled.ok)
+        return { text: filled.text, waits: [], dependsOn };
+    return {
+        text,
+        waits: producers
+            .filter((one) => one.names.some((name) => filled.waiting.includes(name)))
+            .map((one) => ({ key: one.key, fingerprint: one.fingerprint })),
+        dependsOn,
+    };
+}
+// A picked prompt (`library/slots.ts` names its key), rendered and filled.
+export function filledPrompt(context, key, rendered) {
+    return fillPrompt(context, rendered, placeOfKey(key, { script: usesScriptPrompt(context.config) }));
+}
+function usesName(text, name, place) {
+    return (detectSlots(text).names.includes(name) && (keywordOf(name)?.places.includes(place) ?? false));
+}

package/dist/slices/rebuild/recipe-legacy.js

@@ -1,4 +1,5 @@
 import { z } from "zod";
+import { internalError } from "../../kernel/errors.js";
 import { referenceKey } from "../admission/model.js";
 import { buildRecipes } from "./recipe-build.js";
 export function baselineFingerprints(project, outputs, pieces, content, stages = []) {
@@ -92,6 +93,9 @@ export function legacyOutputWorkKey(output, config) {
         case "render_params":
         case "instructions":
             return `${output.stageKind}:${output.role}`;
+        // Only ever made by a revision.
+        case "social_post":
+            return `social:post:${output.meta.platform ?? "x"}`;
     }
 }
 export function legacyPieceKey(piece, stageKind, outputs = []) {
@@ -145,7 +149,7 @@ export function legacyImageOutput(piece, outputs) {
                     row.meta.promptName === undefined ||
                     row.meta.promptName === promptName)));
     if (matches.length > 1)
-        throw new Error(`Slopify hit an internal error (an image from an older Slopify version, ${piece.id}, matches multiple outputs). Try again; if it happens again, use Download diagnostics in Settings and report it.`);
+        throw new Error(internalError(`an image from an older Slopify version, ${piece.id}, matches multiple outputs`));
     return matches[0];
 }
 const legacyImageMetadata = z

package/dist/slices/rebuild/recipe-model.js

@@ -51,6 +51,10 @@ export const deferredOperations = [
     "thumbnail-scenes",
     // How the subject and characters look (`recipe-appearance.ts`), looked up on the web.
     "image-appearance",
+    // The keyword digest (`recipe-digest.ts`), written once the article is.
+    "keyword-digest",
+    // A post for another site written by a post prompt (`recipe-social.ts`), once the article is.
+    "social-post",
 ];
 export function recipe(context, key, stage, input, dependsOn = [], options = {}) {
     const requestFingerprint = input.kind === "tts" && input.dialogue !== undefined

package/dist/slices/rebuild/recipe-narration-text.js

@@ -1,3 +1,4 @@
+import { internalError } from "../../kernel/errors.js";
 import { recipe, resourceIdentity, } from "./recipe-model.js";
 export function narrationFileRecipe(context, segment, parts) {
     const key = `narration:files:${segment}`;
@@ -26,7 +27,7 @@ export function narrationFileRecipe(context, segment, parts) {
                     ];
                 if (part.input.kind === "provided")
                     return [resourceIdentity(context, part), part.input.semantic, null];
-                throw new Error("Slopify hit an internal error (a narration chunk has an unexpected source). Try again; if it happens again, use Download diagnostics in Settings and report it.");
+                throw new Error(internalError("a narration chunk has an unexpected source"));
             }),
         },
     }, dependencies, { unresolved: parts.length === 0 });

package/dist/slices/rebuild/recipe-preparation.js

@@ -2,9 +2,9 @@ import { z } from "zod";
 import { preparationMessages, validatePreparation, } from "../narration/preparation.js";
 import { prepareRequests } from "../narration/steering.js";
 import { recipe, selectedReference, } from "./recipe-model.js";
-import { llmInput, renderedPrompt } from "./recipe-text.js";
+import { llmInput, promptOf } from "./recipe-text.js";
 export function preparationTemplate(context) {
-    const input = llmInput(context, preparationMessages(renderedPrompt(context, "narration"), "", [], context.config.language));
+    const input = llmInput(context, preparationMessages(promptOf(context, "narration").text, "", [], context.config.language));
     return [
         "inworld-tts-2",
         1,
@@ -29,7 +29,7 @@ export function preparationForGroup(context, logicalKey, source, segment, depend
     // A delivery note for this chunk alone (Edit project → Narration), after the project's prompt.
     const override = context.content.narrationOverrides[logicalKey];
     const note = override?.kind === "text" ? override.direction : undefined;
-    const prompt = renderedPrompt(context, "narration");
+    const prompt = promptOf(context, "narration").text;
     const preparation = recipe(context, `narration:prepare:${segment}:${logicalKey}`, "audio", {
         ...llmInput(context, preparationMessages(note === undefined ? prompt : `${prompt}\n\n${note}`, source, aliases, context.config.language, speaker)),
         preparation: { format: "inworld-tts-2", version: 1, source, logicalKey, segment },

package/dist/slices/rebuild/recipe-reference.js

@@ -1,9 +1,10 @@
 import { referenceKey, subjectOf } from "../admission/model.js";
 import { usesReference } from "../admission/rules.js";
+import { withoutSlopifyScene } from "../images/scenes.js";
 import { lookWait, withLooks } from "./recipe-appearance.js";
 import { castFor } from "./recipe-cast.js";
 import { recipe, selectedAsset, } from "./recipe-model.js";
-import { renderedPrompt } from "./recipe-text.js";
+import { promptOf } from "./recipe-text.js";
 // The establishing image (`RunDraft.reference`): one step of the Images stage, made before
 // every other image of the run and never part of the video. Made from its library prompt, whose
 // keywords are filled like every other image prompt's, or the file the user uploaded.
@@ -30,8 +31,10 @@ appearance) {
             assetId: content.provided.reference ?? null,
             semantic: "reference",
         }, [], { unresolved: content.provided.reference === undefined });
-    const written = renderedPrompt(context, referencePromptKey);
-    const prompt = withLooks(written, appearance);
+    const filled = promptOf(context, referencePromptKey);
+    // The establishing image has no scene of its own.
+    const written = withoutSlopifyScene(filled.text);
+    const prompt = filled.waits.length > 0 ? null : withLooks(written, appearance);
     if (prompt === null) {
         const wait = lookWait(written, appearance);
         return recipe(context, referenceKey, "images", {
@@ -45,8 +48,9 @@ appearance) {
                 config.images?.model ?? null,
                 config.format,
                 ...(config.images?.thinking === undefined ? [] : [config.images.thinking]),
+                ...filled.waits.map((one) => one.fingerprint),
             ],
-        }, wait.dependsOn);
+        }, [...wait.dependsOn, ...filled.waits.map((one) => one.key)]);
     }
     return recipe(context, referenceKey, "images", {
         kind: "image",

package/dist/slices/rebuild/recipe-reviews.js

@@ -1,7 +1,7 @@
-import { narrationItemKey, reviewedByAgent, reviewKey, reviewModeOf, reviewPromptKey, reviewRetriesOf, } from "../reviews/model.js";
+import { narrationItemKey, promiseItemKey, reviewedByAgent, reviewKey, reviewModeOf, reviewPromptKey, reviewRetriesOf, } from "../reviews/model.js";
 import { activeReviewStages } from "../reviews/rules.js";
 import { recipe, resourceIdentity, } from "./recipe-model.js";
-import { renderedPrompt } from "./recipe-text.js";
+import { promptOf } from "./recipe-text.js";
 // A review is a step of its own, `review:<item>`, planned like any other: it waits for the
 // item, its fingerprint follows the item's output, the reviewer and the prompt, and it is
 // kept and reused while those stay the same. What depends on a reviewed item waits for its
@@ -13,16 +13,23 @@ export function withReviews(context, recipes) {
     if (settings === undefined || stages.length === 0)
         return recipes;
     const byKey = new Map(recipes.map((row) => [row.key, row]));
-    const items = stages.flatMap((stage) => reviewedItems(stage, recipes, byKey));
+    const all = stages.flatMap((stage) => reviewedItems(stage, recipes, byKey));
+    // A template studio sample shows how each stage's review answers on its first item only.
+    const items = context.config.sample === undefined
+        ? all
+        : all.filter((item, index) => all.findIndex((one) => one.stage === item.stage) === index);
     const byAgent = reviewedByAgent(settings);
     const reviews = items.map((item) => {
         const inputs = item.inputs.map((input) => [input.key, resourceIdentity(context, input)]);
         // Blank means the stage's built-in prompt; the step fills it in, so a new built-in
         // wording ships as a new operation version rather than a silent change here.
-        const prompt = settings.stages[item.stage]?.prompt?.trim()
-            ? renderedPrompt(context, reviewPromptKey(item.stage))
-            : "";
-        const dependsOn = item.inputs.map((input) => input.key);
+        const filled = settings.stages[item.stage]?.prompt?.trim()
+            ? promptOf(context, reviewPromptKey(item.stage))
+            : undefined;
+        const prompt = filled?.text ?? "";
+        const dependsOn = [
+            ...new Set([...item.inputs.map((input) => input.key), ...(filled?.dependsOn ?? [])]),
+        ];
         // An external agent answers through MCP: no provider, no charge, nothing to be ready.
         if (byAgent)
             return recipe(context, reviewKey(item.itemKey), stageOf(item.stage), {
@@ -79,6 +86,18 @@ function reviewedItems(stage, recipes, byKey) {
                 ? []
                 : [one(article.key, [article], [article.key])];
         }
+        // The opening read against the title and thumbnail before the paid narration: everything
+        // that reads the article waits for it. A thumbnail brief a model writes is read too; the
+        // drawn thumbnail isn't, since it is made after the narration.
+        case "promise": {
+            const article = byKey.get("article:body");
+            if (article === undefined || article.kind !== "provider")
+                return [];
+            const brief = byKey.get("thumbnail:prompt");
+            return [
+                one(promiseItemKey, brief === undefined ? [article] : [article, brief], [article.key]),
+            ];
+        }
         case "images": {
             const reference = byKey.get("reference:image");
             return recipes
@@ -114,6 +133,7 @@ function reviewedItems(stage, recipes, byKey) {
 function stageOf(stage) {
     switch (stage) {
         case "article":
+        case "promise":
             return "article";
         case "images":
             return "images";

package/dist/slices/rebuild/recipe-save.js

@@ -3,11 +3,12 @@ import { sourceOf } from "../admission/model.js";
 import { allowedSources, articleOffFields, edgeSilenceSecondsProblem, imageSecondsProblem, normaliseDraft, silenceGapSecondsMax, voicesFields, zoomPercentProblem, } from "../admission/rules.js";
 import { shortModeFields } from "../admission/short-mode.js";
 import { render } from "../admission/substitute.js";
+import { keywordUsesOf } from "../keywords/rules.js";
 import { effectiveClips, pickedShortsOf, rangeProblem } from "../shorts/clips.js";
 import { buildRecipes } from "./recipe-build.js";
 import { selectedReference } from "./recipe-model.js";
 import { shortsPickKey } from "./recipe-shorts.js";
-import { validateRecipeInputs } from "./recipe-validation.js";
+import { keywordBodies, validateRecipeInputs } from "./recipe-validation.js";
 import { finishedShorts, keepChosen, movedShorts, withKeep } from "./shorts-keep-save.js";
 // A range set by hand for a short is checked against the pick it was set on, while that is
 // still the project's pick; one left from an earlier pick no longer applies and is ignored.
@@ -47,10 +48,12 @@ export function normalizeArticleIntent(base, edit) {
     };
 }
 // The steps that are made from the article: each image's scene, the looks, the thumbnails'
-// scenes, the thumbnail prompt and an intro or outro the AI model writes from it.
+// scenes, the keyword digest, the thumbnail prompt and an intro or outro the AI model writes
+// from it.
 export const pictureWorkKeys = [
     "images:scenes",
     "thumbnail:scenes",
+    "article:digest",
     "images:appearance",
     "thumbnail:prompt",
     "entry:intro:text",
@@ -321,7 +324,7 @@ export function validateRevisionEdit(config, content) {
     if (config.sources.article === "provide" &&
         !(content.articleMarkdown ?? config.provided.article)?.trim())
         fields.push({ field: "provided.article", message: "Paste the article." });
-    fields.push(...articleOffFields(config));
+    fields.push(...articleOffFields(config, keywordUsesOf(keywordBodies(config, content))));
     if (config.sources.audio === "off" &&
         config.subtitles !== undefined &&
         config.subtitles.mode !== "off")

package/dist/slices/rebuild/recipe-scenes.js

@@ -1,28 +1,30 @@
 import { z } from "zod";
 import { withLanguage } from "../../kernel/ports/languages.js";
 import { subjectOf, thumbnailCountOf } from "../admission/model.js";
-import { pictureKind, sceneMessages, usesScene } from "../images/scenes.js";
+import { pictureKind, sceneMessages, usesScene, usesSlopifyScene, wantsSceneDetails, } from "../images/scenes.js";
 import { recipe, selectedReference, } from "./recipe-model.js";
 import { llmInput, llmInputFingerprint } from "./recipe-text.js";
 export const imageScenesKey = "images:scenes";
 export const thumbnailScenesKey = "thumbnail:scenes";
 // With Scenes from the article on, a thumbnail drawn from a Library prompt whose text asks for
-// `{{Scene}}` takes one scene per thumbnail; any other thumbnail is drawn as it always was.
+// `{{Scene}}` takes one scene per thumbnail; so does one whose prompt uses a `Slopify_` scene
+// keyword, switch or no switch. Any other thumbnail is drawn as it always was.
 export function thumbnailScenes(context, text) {
     const { config, content } = context;
-    if (config.sources.images !== "generate" || config.imageScenes !== true)
-        return undefined;
     if (config.sources.thumbnail !== "from_prompt")
         return undefined;
     const body = content.promptTemplates.thumbnailPrompt ?? config.rendered.thumbnailPrompt;
-    if (!usesScene(body))
+    const legacy = config.sources.images === "generate" && config.imageScenes === true && usesScene(body);
+    if (!legacy && !usesSlopifyScene(body))
         return undefined;
     const count = thumbnailCountOf(config);
+    const details = wantsSceneDetails(body);
     const messages = withLanguage(sceneMessages({
         title: subjectOf(config),
         article: text.pictureText ?? "",
         pictures: [],
         thumbnails: count,
+        ...(details ? { details } : {}),
     }), config.language);
     const value = recipe(context, thumbnailScenesKey, "thumbnail", text.pictureText === null
         ? {
@@ -32,18 +34,23 @@ export function thumbnailScenes(context, text) {
             template: [llmInputFingerprint(context, messages), text.article.fingerprint],
         }
         : llmInput(context, messages), [text.article.key]);
+    const saved = text.pictureText === null ? undefined : savedScenes(context, value, count);
     return {
         recipe: value,
         count,
-        scenes: text.pictureText === null ? undefined : savedScenes(context, value, count),
+        scenes: saved?.scenes,
+        ...(saved?.details === undefined ? {} : { details: saved.details }),
+        legacy,
     };
 }
 export function imageScenes(context, text) {
     const { config, content } = context;
-    if (config.sources.images !== "generate" || config.imageScenes !== true)
+    if (config.sources.images !== "generate")
         return undefined;
+    const legacy = config.imageScenes === true;
     const keys = [];
     const pictures = [];
+    let details = false;
     for (const key of content.imageOrder) {
         const image = content.imageDefinitions[key];
         if (image?.source !== "generate")
@@ -53,6 +60,10 @@ export function imageScenes(context, text) {
             : (content.promptTemplates[image.templateKey] ?? image.prompt);
         if (body == null || body.trim() === "")
             continue;
+        // With the switch off a picture takes a scene only for its own `Slopify_` keywords.
+        if (!legacy && !usesSlopifyScene(body))
+            continue;
+        details ||= wantsSceneDetails(body);
         const at = /^imagePrompts\.(\d+)$/.exec(image.templateKey ?? "")?.[1];
         const name = at === undefined ? "Image" : (config.imagePrompts[Number(at)]?.name ?? "Image");
         keys.push(key);
@@ -60,7 +71,12 @@ export function imageScenes(context, text) {
     }
     if (keys.length === 0)
         return undefined;
-    const messages = withLanguage(sceneMessages({ title: subjectOf(config), article: text.pictureText ?? "", pictures }), config.language);
+    const messages = withLanguage(sceneMessages({
+        title: subjectOf(config),
+        article: text.pictureText ?? "",
+        pictures,
+        ...(details ? { details } : {}),
+    }), config.language);
     const value = recipe(context, imageScenesKey, "images", text.pictureText === null
         ? {
             kind: "deferred",
@@ -69,10 +85,13 @@ export function imageScenes(context, text) {
             template: [llmInputFingerprint(context, messages), text.article.fingerprint],
         }
         : llmInput(context, messages), [text.article.key]);
+    const saved = text.pictureText === null ? undefined : savedScenes(context, value, keys.length);
     return {
         recipe: value,
         keys,
-        scenes: text.pictureText === null ? undefined : savedScenes(context, value, keys.length),
+        scenes: saved?.scenes,
+        ...(saved?.details === undefined ? {} : { details: saved.details }),
+        legacy,
     };
 }
 // The scenes saved for this request. The request carries the model's thinking settings from
@@ -89,7 +108,17 @@ function savedScenes(context, value, count) {
     if (piece?.piece.payload == null)
         return undefined;
     const parsed = z
-        .object({ scenes: z.array(z.string()) })
+        .object({
+        scenes: z.array(z.string()),
+        details: z
+            .array(z.object({ setting: z.string().optional(), mood: z.string().optional() }))
+            .optional(),
+    })
         .safeParse(JSON.parse(piece.piece.payload));
-    return parsed.success && parsed.data.scenes.length === count ? parsed.data.scenes : undefined;
+    if (!parsed.success || parsed.data.scenes.length !== count)
+        return undefined;
+    return {
+        scenes: parsed.data.scenes,
+        ...(parsed.data.details === undefined ? {} : { details: parsed.data.details }),
+    };
 }

package/dist/slices/rebuild/recipe-shorts.js

@@ -11,7 +11,7 @@ import { castFor } from "./recipe-cast.js";
 import { noMaster } from "./recipe-loudness.js";
 import { recipe, resourceIdentity, selectedAsset, selectedReference, } from "./recipe-model.js";
 import { castField, imageChoice } from "./recipe-reference.js";
-import { llmInput, renderedPrompt } from "./recipe-text.js";
+import { llmInput, promptOf } from "./recipe-text.js";
 // The Shorts step unfolds as its answers land, the way research's chapters unfold from the
 // plan. `shorts:pick` reads the word timing, so it waits for `subtitles:timing` and runs
 // beside the render; until its saved answer matches, one deferred `shorts:future` stands in
@@ -39,6 +39,10 @@ appearance) {
     const timing = exports.find((value) => value.key === "subtitles:timing");
     if (!usesShorts(config) || shorts === undefined || timing === undefined)
         return [];
+    const prompt = shorts.prompt?.trim() ? promptOf(context, "shorts") : undefined;
+    // A shorts image prompt may name `{{Scene}}` like the video's: the prompts call already writes
+    // each image's moment from what the clip says, so that line is left out here.
+    const styled = shorts.imagePrompt?.trim() ? promptOf(context, "shortsImage") : undefined;
     const pickFor = (timingIdentity) => recipe(context, shortsPickKey, "video", {
         kind: "local",
         version: 1,
@@ -50,7 +54,7 @@ appearance) {
             config.llm?.thinking ?? null,
             // Blank means the built-in prompt; the step fills it in, so a new built-in wording
             // ships as a new operation version rather than a silent change here.
-            shorts.prompt?.trim() ? renderedPrompt(context, "shorts") : "",
+            prompt?.text ?? "",
             shorts.count,
             shorts.minSeconds,
             shorts.maxSeconds,
@@ -78,7 +82,7 @@ appearance) {
                     ],
                 ]),
         ],
-    }, [timing.key], 
+    }, [...new Set([timing.key, ...(prompt?.dependsOn ?? []), ...(styled?.dependsOn ?? [])])], 
     // A paid LLM call: readiness, the charge warning and the estimate treat it like one.
     { kind: "provider" });
     const pick = pickFor(resourceIdentity(context, timing));
@@ -93,11 +97,7 @@ appearance) {
         selectedReference(row));
     const picked = savedPicked(context, pick, recorded === undefined ? [] : [pickFor([recorded.fingerprint, asset]).fingerprint]);
     const images = config.images ?? { provider: "", model: "" };
-    // A shorts image prompt may name `{{Scene}}` like the video's: the prompts call already writes
-    // each image's moment from what the clip says, so that line is left out here.
-    const style = shorts.imagePrompt?.trim()
-        ? withoutScene(renderedPrompt(context, "shortsImage"))
-        : defaultShortsImagePrompt;
+    const style = styled === undefined ? defaultShortsImagePrompt : withoutScene(styled.text);
     if (picked === undefined)
         return [
             pick,