@gentbajko/slopify 3.0.12 → 3.0.14

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

@@ -9,7 +9,7 @@ import { masterPlan } from "./recipe-loudness.js";
 import { resourceIdentity } from "./recipe-model.js";
 import { imageReference, referenceRecipe } from "./recipe-reference.js";
 import { withReviews } from "./recipe-reviews.js";
-import { imageScenes } from "./recipe-scenes.js";
+import { imageScenes, thumbnailScenes } from "./recipe-scenes.js";
 import { shortsRecipes } from "./recipe-shorts.js";
 import { textRecipes } from "./recipe-text.js";
 import { thumbnailRecipes, visualAssets, visualRecipes } from "./recipe-visual.js";
@@ -31,9 +31,11 @@ export function buildRecipes(context) {
     // The establishing image, when it is on: every other image is drawn from it.
     const reference = referenceRecipe(context, appearance);
     const drawnFrom = imageReference(context, reference);
-    // Each image's scene, written from the article, and the thumbnails' when their prompt asks.
+    // Each image's scene, written from the article, and the thumbnails' in a step of their own
+    // when their prompt asks.
     const scenes = imageScenes(context, text);
-    const thumbnail = thumbnailRecipes(context, text.recipes, referenceForThumbnail(context.config) ? drawnFrom : undefined, scenes, appearance);
+    const thumbnailScened = thumbnailScenes(context, text);
+    const thumbnail = thumbnailRecipes(context, text.recipes, referenceForThumbnail(context.config) ? drawnFrom : undefined, thumbnailScened, appearance);
     const youtube = youtubeRecipes(context, exports);
     return withReviews(context, [
         ...text.recipes,
@@ -46,6 +48,7 @@ export function buildRecipes(context) {
         ...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)),
         ...(scenes === undefined ? [] : [scenes.recipe]),
+        ...(thumbnailScened === undefined ? [] : [thumbnailScened.recipe]),
         ...(appearance === undefined ? [] : [appearance.recipe]),
     ]);
 }

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

@@ -47,6 +47,7 @@ export const deferredOperations = [
     // Scenes from the article (`recipe-scenes.ts`): the scenes step and each image waiting on it.
     "image-scenes",
     "image-scene",
+    "thumbnail-scenes",
     // How the subject and characters look (`recipe-appearance.ts`), looked up on the web.
     "image-appearance",
 ];

package/dist/slices/rebuild/recipe-provider-choice.js

@@ -35,6 +35,7 @@ export function recipeProviderChoice(recipe, config) {
     const family = input.operation === "narration-preparation" ||
         input.operation === "narration-description" ||
         input.operation === "image-scenes" ||
+        input.operation === "thumbnail-scenes" ||
         input.operation === "image-appearance"
         ? "llm"
         : recipe.stage === "audio"

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

@@ -4,16 +4,40 @@ import { thumbnailCountOf } from "../admission/model.js";
 import { pictureKind, sceneMessages, usesScene } from "../images/scenes.js";
 import { recipe, selectedReference, } from "./recipe-model.js";
 import { llmInput, llmInputFingerprint } from "./recipe-text.js";
-// 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.
-export function thumbnailScenes(context) {
+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.
+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 0;
+        return undefined;
     const body = content.promptTemplates.thumbnailPrompt ?? config.rendered.thumbnailPrompt;
-    return usesScene(body) ? thumbnailCountOf(config) : 0;
+    if (!usesScene(body))
+        return undefined;
+    const count = thumbnailCountOf(config);
+    const messages = withLanguage(sceneMessages({
+        title: config.title,
+        article: text.articleText ?? "",
+        pictures: [],
+        thumbnails: count,
+    }), config.language);
+    const value = recipe(context, thumbnailScenesKey, "thumbnail", text.articleText === null
+        ? {
+            kind: "deferred",
+            version: 1,
+            operation: "thumbnail-scenes",
+            template: [llmInputFingerprint(context, messages), text.article.fingerprint],
+        }
+        : llmInput(context, messages), [text.article.key]);
+    return {
+        recipe: value,
+        count,
+        scenes: text.articleText === null ? undefined : savedScenes(context, value, count),
+    };
 }
-export const imageScenesKey = "images:scenes";
 export function imageScenes(context, text) {
     const { config, content } = context;
     if (config.sources.images !== "generate" || config.imageScenes !== true)
@@ -34,15 +58,9 @@ export function imageScenes(context, text) {
         keys.push(key);
         pictures.push(pictureKind(body, name));
     }
-    const thumbnailCount = thumbnailScenes(context);
-    if (keys.length === 0 && thumbnailCount === 0)
+    if (keys.length === 0)
         return undefined;
-    const messages = withLanguage(sceneMessages({
-        title: config.title,
-        article: text.articleText ?? "",
-        pictures,
-        ...(thumbnailCount === 0 ? {} : { thumbnails: thumbnailCount }),
-    }), config.language);
+    const messages = withLanguage(sceneMessages({ title: config.title, article: text.articleText ?? "", pictures }), config.language);
     const value = recipe(context, imageScenesKey, "images", text.articleText === null
         ? {
             kind: "deferred",
@@ -51,15 +69,10 @@ export function imageScenes(context, text) {
             template: [llmInputFingerprint(context, messages), text.article.fingerprint],
         }
         : llmInput(context, messages), [text.article.key]);
-    const saved = text.articleText === null
-        ? undefined
-        : savedScenes(context, value, keys.length + thumbnailCount);
     return {
         recipe: value,
         keys,
-        scenes: saved?.slice(0, keys.length),
-        thumbnailCount,
-        thumbnails: saved?.slice(keys.length),
+        scenes: text.articleText === null ? undefined : savedScenes(context, value, keys.length),
     };
 }
 // The scenes saved for this request. The request carries the model's thinking settings from

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

@@ -220,10 +220,8 @@ appearance) {
     const written = config.sources.thumbnail === "prompt_by_llm" && promptRecipe !== undefined
         ? matchingText(context, promptRecipe, "prompt")
         : renderedPrompt(context, "thumbnailPrompt");
-    const sceneFor = (variant) => scenes === undefined || scenes.thumbnailCount === 0
-        ? undefined
-        : scenes.thumbnails?.[variant - 1];
-    const withScenes = scenes !== undefined && scenes.thumbnailCount > 0;
+    const sceneFor = (variant) => scenes?.scenes?.[variant - 1];
+    const withScenes = scenes !== undefined;
     const variants = Array.from({ length: thumbnailCountOf(config) }, (_, index) => index + 1);
     return variants.map((variant) => {
         const scene = sceneFor(variant);

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

@@ -283,6 +283,7 @@ export function priceRecipe(work, value, config) {
     if (input.kind === "deferred" &&
         (input.operation === "image-scene" ||
             input.operation === "image-scenes" ||
+            input.operation === "thumbnail-scenes" ||
             input.operation === "image-appearance")) {
         const choice = config === undefined ? undefined : recipeProviderChoice(value, config);
         if (choice !== undefined && input.operation === "image-scene")

package/dist/slices/rebuild/runtime-export.js

@@ -123,7 +123,8 @@ export async function executeExportRecipe(deps, context, piece) {
             type: "stage.progress",
             projectId: context.work.projectId,
             stage: "video",
-            current: Math.min(100, Math.round(elapsedMs / (totalSeconds * 10))),
+            // A tenth of a percent, so a two-hour render moves every few seconds, not minutes.
+            current: Math.min(100, Math.round(elapsedMs / totalSeconds) / 10),
             total: 100,
         });
         // Level the volume: the audio-only file is mastered to the audio files' target, the video to

package/dist/slices/rebuild/runtime-provider.js

@@ -17,7 +17,7 @@ import { probeDurationMs } from "../video/ffmpeg.js";
 import { parseAttribution } from "../voices/attribution.js";
 import { parseScript } from "../voices/script.js";
 import { imageAppearanceKey } from "./recipe-appearance.js";
-import { imageScenesKey } from "./recipe-scenes.js";
+import { imageScenesKey, thumbnailScenesKey } from "./recipe-scenes.js";
 import { executeArticleRequests } from "./runtime-article.js";
 import { imageCall } from "./runtime-image.js";
 import { frozenInstructions } from "./runtime-instructions.js";
@@ -198,7 +198,8 @@ function checkAnswer(piece, answer) {
             ? "The AI model's description had no words a narrator could say. Use Try again; if it keeps happening, choose another model in the Providers section of Edit project, or turn off Describe tables and figures there."
             : undefined;
     // Scenes from the article: one scene per image, as many as the request lists.
-    if (piece.key === imageScenesKey && piece.input.kind === "llm") {
+    if ((piece.key === imageScenesKey || piece.key === thumbnailScenesKey) &&
+        piece.input.kind === "llm") {
         const checked = checkScenes(answer.text, sceneCountOf(piece.input.messages) ?? 0);
         return checked.ok ? undefined : checked.reason;
     }
@@ -224,7 +225,8 @@ function attributionSource(messages) {
     return messages.at(-1)?.content ?? "";
 }
 async function publishText(deps, context, piece, answer) {
-    if (piece.key === imageScenesKey && piece.input.kind === "llm") {
+    if ((piece.key === imageScenesKey || piece.key === thumbnailScenesKey) &&
+        piece.input.kind === "llm") {
         const checked = checkScenes(answer.text, sceneCountOf(piece.input.messages) ?? 0);
         if (!checked.ok)
             throw new Error(checked.reason);

package/dist/slices/rebuild/transition-repo.js

@@ -79,7 +79,7 @@ export function transitionRevisionWork(deps, input) {
                 db.prepare(`INSERT INTO revision_work_reservations(project_id,revision_id,work_key,work_id,piece_id,fingerprint) VALUES (?,?,?,?,?,?)`).run(input.projectId, input.revisionId, key, existing.workId, existing.pieceId, fp);
                 continue;
             }
-            const kind = exact?.stage ?? stageForKey(key);
+            const kind = exact?.stage ?? input.stages?.[key] ?? stageForKey(key);
             const stage = db
                 .prepare("SELECT id FROM stages WHERE project_id=? AND kind=?")
                 .get(input.projectId, kind);
@@ -129,7 +129,7 @@ function existingWork(db, projectId, key, fingerprint) {
         ? undefined
         : { workId: z.string().parse(row.work_id), pieceId: z.string().parse(row.piece_id) };
 }
-function stageForKey(key) {
+export function stageForKey(key) {
     // A review runs in its item's stage; the narration's review in Audio.
     if (key === "review:narration")
         return "audio";
@@ -142,13 +142,21 @@ function stageForKey(key) {
         return "research";
     if (prefix === "article" || prefix === "entry" || prefix === "script")
         return "article";
-    if (prefix === "audio" || prefix === "narration")
+    if (prefix === "audio" || prefix === "narration" || prefix === "level")
         return "audio";
-    if (prefix === "image" || prefix === "reference")
+    // `images:scenes` and `images:appearance` (the latter is Thumbnail's in a project that draws
+    // no images, which the plan's own stages say).
+    if (prefix === "image" || prefix === "images" || prefix === "reference" || prefix === "figure")
         return "images";
     if (prefix === "thumbnail")
         return "thumbnail";
-    if (prefix === "export" || prefix === "subtitles" || prefix === "video" || prefix === "voices")
+    if (prefix === "export" ||
+        prefix === "subtitles" ||
+        prefix === "video" ||
+        prefix === "voices" ||
+        prefix === "shorts" ||
+        prefix === "youtube" ||
+        prefix === "animate")
         return "video";
     if (prefix === "document")
         return "document";

package/dist/slices/revisions/restore.js

@@ -48,7 +48,12 @@ export async function restoreRevision(deps, input) {
             baseRevisionId: input.baseRevisionId,
             revisionId: revision.id,
             fingerprints: revision.fingerprints,
-            ...(comparison.ok ? { baseFingerprints: comparison.baseFingerprints } : {}),
+            ...(comparison.ok
+                ? {
+                    baseFingerprints: comparison.baseFingerprints,
+                    stages: Object.fromEntries(comparison.recipes.map((row) => [row.key, row.stage])),
+                }
+                : {}),
             logicalKeys: logicalKeys(deps, input.projectId, input.baseRevisionId, revision.fingerprints),
         });
         carryCheckpointGates(deps, input.baseRevisionId, revision);

package/dist/slices/run-cost/timing.js

@@ -4,6 +4,7 @@ import { currentRevisionId } from "../revisions/repo.js";
 const attemptRow = z.object({
     kind: z.enum(stageKinds),
     revision_id: z.string().nullable(),
+    work_id: z.string().nullable(),
     started_at: z.string(),
     ended_at: z.string().nullable(),
     work_state: z.string().nullable(),
@@ -26,14 +27,22 @@ export function coveredMs(intervals) {
 }
 export function projectTiming(db, projectId, now) {
     const rows = db
-        .prepare(`SELECT s.kind AS kind, a.revision_id AS revision_id, a.started_at AS started_at,
-         a.ended_at AS ended_at, w.state AS work_state
+        .prepare(`SELECT s.kind AS kind, a.revision_id AS revision_id, a.work_id AS work_id,
+         a.started_at AS started_at, a.ended_at AS ended_at, w.state AS work_state
        FROM attempts a JOIN stages s ON s.id = a.stage_id
        LEFT JOIN revision_work w ON w.id = a.work_id
        WHERE s.project_id = ?`)
         .all(projectId)
         .map((row) => attemptRow.parse(row));
     const head = currentRevisionId(db, projectId);
+    // Work an edit carried over to the current revision is still its run's work: a video
+    // retried after a thumbnail redo renders on the revision it started on, and its hours count.
+    const carried = new Set(head === undefined
+        ? []
+        : db
+            .prepare("SELECT work_id FROM revision_work_reservations WHERE revision_id=?")
+            .all(head)
+            .flatMap((row) => (typeof row.work_id === "string" ? [row.work_id] : [])));
     const all = [];
     const runs = new Map();
     const stages = new Map();
@@ -50,12 +59,15 @@ export function projectTiming(db, projectId, now) {
         const interval = [start, end];
         all.push(interval);
         stages.set(row.kind, [...(stages.get(row.kind) ?? []), interval]);
-        if (row.revision_id !== null) {
-            const run = runs.get(row.revision_id) ?? { intervals: [], running: false, last: start };
+        const owner = head !== undefined && row.work_id !== null && carried.has(row.work_id)
+            ? head
+            : row.revision_id;
+        if (owner !== null) {
+            const run = runs.get(owner) ?? { intervals: [], running: false, last: start };
             run.intervals.push(interval);
             run.running ||= live;
             run.last = Math.max(run.last, start);
-            runs.set(row.revision_id, run);
+            runs.set(owner, run);
         }
     }
     const latest = (head === undefined ? undefined : runs.get(head)) ??

package/dist/tutorials/Notifications.md

@@ -42,6 +42,15 @@ If you blocked notifications for Slopify earlier, Slopify says "Notifications ar
 
 Some browsers only allow notifications from installed apps. If the test says so, use a Notification URL instead.
 
+## Run sounds
+
+**Settings → Notifications → Run sounds** (on by default) plays a chime when a run starts and a different, longer one when it finishes, fails or stops to wait for you, like a message arriving on a phone. **Play start** and **Play end** let you hear them.
+
+- Works while any Slopify tab is open; only one tab plays each chime.
+- Needs no permission, but browsers keep a page silent until it has been clicked once, so click anywhere in Slopify after opening it.
+- With **Browser notifications** on too, a run's start also shows "Started: *title*".
+- It is this browser's own setting. Your computer's volume sets how loud.
+
 ## Get notifications on your phone (Notification URL)
 
 A Notification URL works with no Slopify tab open. When a run finishes, fails or waits, or a review needs a decision, Slopify sends that address one `POST` with a short plain-text body. Its last line is the project's link, so you can open it straight from the message, for example:

package/dist/tutorials/Play-Images.md

@@ -118,7 +118,7 @@ Where the scene goes:
 - A prompt with `{{Scene}}` gets the scene there, for example a line `Scene: {{Scene}}` under the prompt's first sentence. `{{Scene}}` is never a field to fill in: Slopify writes it.
 - A prompt without it gets the scene as a line of its own after its first paragraph, so any prompt works unchanged.
 - With the switch off, a line holding `{{Scene}}` is left out and the prompt is drawn as it always was.
-- A **thumbnail** prompt with `{{Scene}}` gets a scene from the same call: the article's most striking moment, the one that would make someone click, taken from anywhere in the article. With **Thumbnails** set to 3, each thumbnail gets a different moment, so the A/B test compares ideas as well as compositions. A thumbnail prompt without `{{Scene}}` is drawn as it always was.
+- A **thumbnail** prompt with `{{Scene}}` gets a scene from a call of its own (one more AI call, in the Thumbnail stage, so changing the thumbnail never remakes the images): the article's most striking moment, the one that would make someone click, taken from anywhere in the article. With **Thumbnails** set to 3, each thumbnail gets a different moment, so the A/B test compares ideas as well as compositions. A thumbnail prompt without `{{Scene}}` is drawn as it always was.
 
 The style, composition and everything else in the prompt stay as written; only the scene changes from image to image. The scenes are written once the article exists, and each image waits for them. Switching it on or off in **Edit project** remakes the images.