@gentbajko/slopify 3.9.0 → 3.10.0

package/dist/slices/outputs/model.js

@@ -0,0 +1,36 @@
+import { z } from "zod";
+import { runConfigSchema } from "../admission/schema.js";
+import { costEstimateSchema } from "../rebuild/model.js";
+import { revisionViewSchema } from "../revisions/schema.js";
+import { addableOutputs } from "./add.js";
+// The add-another-output requests and replies, shared by the route and the project page.
+const revisionId = z
+    .string()
+    .min(1)
+    .max(64)
+    .regex(/^[0-9A-Za-z_-]+$/);
+export const addOutputPreviewRequestSchema = z
+    .object({ baseRevisionId: revisionId, kind: z.enum(addableOutputs) })
+    .strict();
+export const addOutputRequestSchema = addOutputPreviewRequestSchema
+    .extend({ idempotencyKey: z.uuid(), adapt: z.boolean().optional() })
+    .strict();
+const fieldSchema = z.object({ field: z.string(), message: z.string() });
+export const addedOutputPreviewSchema = z.object({
+    kind: z.enum(addableOutputs),
+    label: z.string(),
+    reused: z.array(z.string()),
+    created: z.array(z.string()),
+    textUse: z.string(),
+    adapts: z.boolean(),
+    estimate: costEstimateSchema,
+    problems: z.array(fieldSchema),
+    // The settings with the output switched on, for Settings to open with when a choice is missing.
+    config: runConfigSchema,
+});
+export const addedOutputSchema = z.object({
+    ok: z.literal(true),
+    view: revisionViewSchema,
+    workKeys: z.array(z.string()),
+    duplicate: z.boolean(),
+});

package/dist/slices/outputs/service.js

@@ -0,0 +1,136 @@
+import { stageKinds } from "../../kernel/pipeline.js";
+import { sourceOf } from "../admission/model.js";
+import { admit } from "../admission/rules.js";
+import { estimateRun } from "../estimate/index.js";
+import { retainedPreviewPlan } from "../rebuild/preview-retained.js";
+import { saveRevision } from "../revisions/mutations.js";
+import { currentRevisionId } from "../revisions/repo.js";
+import { getRevisionView } from "../revisions/view.js";
+import { addableOutputLabels, planAddedOutput, } from "./add.js";
+function planned(deps, projectId, baseRevisionId, kind) {
+    const view = getRevisionView(deps, projectId, baseRevisionId);
+    if (view === undefined)
+        return {
+            ok: false,
+            reason: currentRevisionId(deps.db, projectId) === undefined ? "no-project" : "no-revision",
+        };
+    const result = planAddedOutput(view.revision.config, kind);
+    if (!result.ok)
+        return result;
+    if (kind !== "images" && (view.articleMarkdown ?? "").trim() === "")
+        return {
+            ok: false,
+            reason: "needs-article",
+            message: `${addableOutputLabels[kind]} is made from the article, which is not written yet. Wait for the Article step to finish, then add it.`,
+        };
+    return { ok: true, view, plan: result.plan };
+}
+export function previewAddedOutput(deps, input) {
+    const found = planned(deps, input.projectId, input.baseRevisionId, input.kind);
+    if (!found.ok)
+        return found;
+    if (!found.view.current)
+        return { ok: false, reason: "conflict" };
+    const { view, plan } = found;
+    const text = view.articleMarkdown ?? "";
+    return {
+        ok: true,
+        value: {
+            kind: plan.kind,
+            label: addableOutputLabels[plan.kind],
+            reused: plan.reused,
+            created: plan.created,
+            textUse: plan.textUse,
+            adapts: plan.adapts,
+            estimate: estimateRun(addedOnly(view.revision.config, plan.config, text), plan.config.rendered, words(text), deps.catalogue),
+            problems: newProblems(view.revision.config, plan.config),
+            config: plan.config,
+        },
+    };
+}
+// Saves the revision that switches the new output on, and names the work only it needs: the
+// keys the previous revision did not have, minus anything the new revision can reuse. The
+// caller previews and starts exactly those, so nothing already accepted runs again.
+export async function addOutput(deps, input) {
+    const found = planned(deps, input.projectId, input.baseRevisionId, input.kind);
+    if (!found.ok)
+        return found;
+    const { view, plan } = found;
+    if (plan.adapts && input.adapt !== true)
+        return {
+            ok: false,
+            reason: "adaptation-not-accepted",
+            message: `${addableOutputLabels[plan.kind]} rewrites your article as a conversation. Tick "Adapt my article into a conversation" in Add another output, then add it.`,
+        };
+    const problems = newProblems(view.revision.config, plan.config);
+    if (problems.length > 0)
+        return { ok: false, reason: "invalid-edit", fields: problems };
+    const catalogue = catalogueOf(deps);
+    const before = new Set(retainedPreviewPlan(deps, view, catalogue).work.map((row) => row.key));
+    const saved = await saveRevision(deps, {
+        projectId: input.projectId,
+        baseRevisionId: input.baseRevisionId,
+        idempotencyKey: input.idempotencyKey,
+        edit: { config: plan.config, content: view.revision.content },
+    });
+    if (!saved.ok)
+        return {
+            ok: false,
+            reason: saved.reason,
+            ...(saved.fields === undefined ? {} : { fields: saved.fields }),
+        };
+    const workKeys = retainedPreviewPlan(deps, saved.view, catalogue)
+        .work.filter((row) => !before.has(row.key) && row.disposition !== "reuse")
+        .map((row) => row.key);
+    return { ok: true, view: saved.view, workKeys, duplicate: saved.duplicate };
+}
+// The new output priced on its own: the accepted text as supplied, the stages already made
+// switched off (narration as supplied when a video is added over it).
+function addedOnly(before, after, text) {
+    const made = stageKinds.filter((kind) => sourceOf(before.sources, kind) !== "off");
+    const sources = {
+        ...after.sources,
+        ...Object.fromEntries(made.map((kind) => [kind, suppliedSource(kind)])),
+    };
+    return {
+        ...after,
+        sources,
+        provided: { ...after.provided, article: text },
+        ...(sourceOf(before.sources, "video") === "off"
+            ? {}
+            : { youtubeDescription: undefined, shorts: undefined }),
+    };
+}
+function suppliedSource(kind) {
+    return kind === "audio" || kind === "images" || kind === "article" ? "provide" : "off";
+}
+// What admission refuses for the new configuration that it did not refuse before: the choices
+// the new output needs and the project lacks. Problems the project already had stay its own.
+function newProblems(before, after) {
+    const fieldsOf = (config) => {
+        const result = admit({ draft: config, staged: [], requiredSlots: [] });
+        return result.ok ? [] : result.fields;
+    };
+    const known = new Set(fieldsOf(before).map((one) => `${one.field}\n${one.message}`));
+    return fieldsOf(after)
+        .filter((one) => !known.has(`${one.field}\n${one.message}`))
+        .map((one) => ({ field: one.field, message: settingsHint(one) }));
+}
+function settingsHint(problem) {
+    return /Settings|Edit project/.test(problem.message)
+        ? problem.message
+        : `${problem.message} Set it in this project's Settings, save, then add the output again.`;
+}
+function catalogueOf(deps) {
+    return (deps.catalogue?.read() ?? {
+        schemaVersion: 1,
+        updatedAt: "",
+        providers: {},
+        llm: [],
+        tts: [],
+        image: [],
+    });
+}
+function words(text) {
+    return text.split(/\s+/u).filter((one) => one !== "").length;
+}

package/dist/slices/rebuild/model.js

@@ -34,7 +34,7 @@ const costRowSchema = z.object({
     apiLow: z.number().finite().nonnegative().nullable().optional(),
     apiHigh: z.number().finite().nonnegative().nullable().optional(),
 });
-const costEstimateSchema = z.object({
+export const costEstimateSchema = z.object({
     currency: z.literal("USD"),
     rows: z.array(costRowSchema),
     low: z.number().finite().nonnegative(),

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

@@ -16,6 +16,7 @@ import { researchDocuments } from "../research/documents.js";
 import { plannerMessages, subAgentMessages } from "../research/planner.js";
 import { synthesisMessages } from "../research/synthesis.js";
 import { thumbnailMessages } from "../thumbnail/by-llm.js";
+import { adaptationMessages } from "../voices/adaptation.js";
 import { attributionMessages } from "../voices/attribution.js";
 import { usesVoices } from "../voices/model.js";
 import { scriptMessages } from "../voices/script.js";
@@ -123,7 +124,7 @@ export function textRecipes(context) {
         ? undefined
         : {
             speakers: voices.speakers.map((speaker) => ({ id: speaker.id, name: speaker.name })),
-            attribute: !writesScript,
+            attribute: voices.source === "attribute",
         };
     // A pasted article, or with Article Off an empty one: nothing is written.
     const article = config.sources.article !== "generate" || content.articleEdited === true
@@ -156,7 +157,11 @@ export function textRecipes(context) {
         if (writesScript)
             script = { text: endMatter?.body ?? null, dependsOn: [article.key] };
         else {
-            // An audiobook from a text: the text model hands the article's passages to speakers.
+            // An audiobook from a text: the text model hands the article's passages to speakers. Or,
+            // with `adapt`, it rewrites the article as a conversation; the article stays as written.
+            const spoken = (source) => voices.source === "adapt"
+                ? adaptationMessages(source, voices.format, voices.speakers)
+                : attributionMessages(source, voices.speakers);
             const attribute = recipe(context, "script:attribute", "article", endMatter === null
                 ? {
                     kind: "deferred",
@@ -164,11 +169,11 @@ export function textRecipes(context) {
                     operation: "script-attribution",
                     template: [
                         article.fingerprint,
-                        llmInputFingerprint(context, withLanguage(attributionMessages("", voices.speakers), config.language)),
+                        llmInputFingerprint(context, withLanguage(spoken(""), config.language)),
                     ],
                 }
                 : {
-                    ...llmInput(context, withLanguage(attributionMessages(endMatter.body, voices.speakers), config.language)),
+                    ...llmInput(context, withLanguage(spoken(endMatter.body), config.language)),
                     script: scriptCheck,
                 }, [article.key]);
             recipes.push(attribute);

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

@@ -3,6 +3,7 @@ import { subjectOf, thumbnailCountOf, thumbnailKey } from "../admission/model.js
 import { usesShortMode } from "../admission/short-mode.js";
 import { render } from "../admission/substitute.js";
 import { withoutScene, withScene } from "../images/scenes.js";
+import { thumbnailOverrideOf } from "../revisions/model.js";
 import { usesAmbientBed } from "../video/ambient-bed.js";
 import { lookWait, withLooks } from "./recipe-appearance.js";
 import { castFor } from "./recipe-cast.js";
@@ -225,6 +226,11 @@ appearance) {
     const withScenes = scenes !== undefined;
     const variants = Array.from({ length: thumbnailCountOf(config) }, (_, index) => index + 1);
     return variants.map((variant) => {
+        // A thumbnail the person replaced with their own file uses that file, not a drawing.
+        const slot = thumbnailOverrideOf(variant);
+        const own = slot === undefined ? undefined : content.thumbnailOverrides?.[slot];
+        if (own !== undefined)
+            return recipe(context, thumbnailKey(variant), "thumbnail", { kind: "provided", version: 1, assetId: own, semantic: null }, [], { unresolved: false });
         const scene = sceneFor(variant);
         // With a scene the thumbnail waits for it; with the switch off a `{{Scene}}` line is left
         // out, as the images do.

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

@@ -1,7 +1,7 @@
 import { rmSync, statSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { z } from "zod";
-import { referenceKey } from "../admission/model.js";
+import { referenceKey, thumbnailVariant } from "../admission/model.js";
 import { plainText } from "../article/plain.js";
 import { splitEndMatter } from "../article/split.js";
 import { levelPieces } from "../loudness/level-pieces.js";
@@ -39,16 +39,23 @@ export async function executeLocalRecipe(deps, context, piece) {
             createdAt: row.created_at,
             bytes: statSync(outputPath(deps.paths, row.project_id, row.path)).size,
         };
+        const variant = thumbnailVariant(piece.key);
         const role = piece.key === "audio:provided"
             ? "audio_body"
-            : piece.key === "thumbnail:image"
+            : variant !== undefined
                 ? "thumbnail"
                 : piece.key === referenceKey
                     ? "reference"
                     : piece.key.startsWith("image:")
                         ? "image"
                         : undefined;
-        await publishResult(deps, context, piece, role === undefined ? [] : [preparedResult(deps, context, piece, role, asset)], {}, asset);
+        await publishResult(deps, context, piece, role === undefined
+            ? []
+            : [
+                preparedResult(deps, context, piece, role, asset, null, 
+                // The second and third thumbnails carry their number, as when they are drawn.
+                variant !== undefined && variant > 1 ? { index: variant } : {}),
+            ], {}, asset);
         return "done";
     }
     if (input.kind !== "local")

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

@@ -220,6 +220,13 @@ function checkAnswer(piece, answer) {
         const checked = parseAttribution(answer.text, attributionSource(piece.input.messages), piece.input.script.speakers);
         return checked.ok ? undefined : checked.reason;
     }
+    // A conversation adapted from the article is a rewrite: it has to read as a script.
+    if (piece.key === "script:attribute" && piece.input.kind === "llm" && piece.input.script) {
+        const checked = parseScript(answer.text, piece.input.script.speakers);
+        return checked.ok
+            ? undefined
+            : `The conversation the text model wrote can't be read as a script: ${checked.reason}`;
+    }
     return undefined;
 }
 function attributionSource(messages) {

package/dist/slices/revisions/downloads.js

@@ -4,7 +4,7 @@ import { zipSync } from "fflate";
 import { z } from "zod";
 import { stageKinds } from "../../kernel/pipeline.js";
 import { thumbnailCountOf } from "../admission/model.js";
-import { contentTypeOf, downloadName, slugOf } from "../storage/downloads.js";
+import { contentTypeOf, downloadName, fileVersion, slugOf, versionedName, } from "../storage/downloads.js";
 import { outputPath } from "../storage/layout.js";
 import { projectTitle } from "../storage/repo.js";
 import { outputSchema } from "../storage/schema.js";
@@ -18,14 +18,14 @@ export function findRevisionDownload(deps, projectId, revisionId, recordId) {
     if (revision === undefined)
         return { ok: false, reason: "unknown-asset" };
     const output = deps.db
-        .prepare(`SELECT o.descriptor, a.path FROM revision_outputs o
+        .prepare(`SELECT o.descriptor, o.slot, o.asset_id, a.path FROM revision_outputs o
     JOIN project_assets a ON a.project_id=o.project_id AND a.id=o.asset_id
     WHERE o.project_id=? AND o.revision_id=? AND o.id=?`)
         .get(projectId, revisionId, recordId);
     if (output !== undefined) {
         const path = outputPath(deps.paths, projectId, z.string().parse(output.path));
         const descriptor = outputSchema.parse(JSON.parse(z.string().parse(output.descriptor)));
-        return fileDownload(path, downloadName(slugOf(revision.config.title), { ...descriptor, path }));
+        return fileDownload(path, versionedName(downloadName(slugOf(revision.config.title), { ...descriptor, path }), fileVersion(deps, projectId, z.string().parse(output.slot), z.string().parse(output.asset_id))));
     }
     const piece = deps.db
         .prepare(`SELECT p.descriptor, p.stage_kind, a.path FROM revision_pieces p
@@ -39,25 +39,38 @@ export function findRevisionDownload(deps, projectId, revisionId, recordId) {
     const stageKind = z.enum(stageKinds).parse(piece.stage_kind);
     return fileDownload(path, `${slugOf(revision.config.title)}-${stageKind}-${descriptor.kind}-${descriptor.idx}${extname(path)}`);
 }
+// The sets the project page downloads as one zip: every picture (Images' Download all), the
+// thumbnails alone, or every rendered short. `only` narrows a set to the records the person
+// picked, so the zip holds exactly those files and nothing else.
+export const zipSets = ["images", "thumbnails", "shorts"];
 export function revisionImagesZip(deps, projectId, revisionId) {
+    return revisionSetZip(deps, projectId, revisionId, "images");
+}
+export function revisionSetZip(deps, projectId, revisionId, set, only) {
     if (projectTitle(deps.db, projectId) === undefined)
         return { ok: false, reason: "unknown-project" };
     const revision = revisionById(deps.db, projectId, revisionId);
     if (revision === undefined)
         return { ok: false, reason: "no-images" };
     const slug = slugOf(revision.config.title);
+    const picked = only === undefined ? undefined : new Set(only);
     const entries = {};
-    const images = outputsForRevision(deps.db, projectId, revisionId)
+    const thumbnail = (role, index) => 
+    // Every thumbnail the project makes; a second or third left from when it made three stays
+    // out once it makes one.
+    role === "thumbnail" &&
+        (typeof index === "number" ? index : 1) <= thumbnailCountOf(revision.config);
+    const members = outputsForRevision(deps.db, projectId, revisionId)
         .filter((row) => row.selected &&
-        (row.output.role === "image" ||
-            // Every thumbnail the project makes; a second or third left from when it made three
-            // stays out once it makes one.
-            (row.output.role === "thumbnail" &&
-                (row.output.meta.index ?? 1) <= thumbnailCountOf(revision.config))))
-        .map((row) => positionedOutput(revision, row))
-        .sort((a, b) => imageOrder(a.output.role, a.output.meta.index) -
-        imageOrder(b.output.role, b.output.meta.index));
-    for (const row of images) {
+        (picked === undefined || picked.has(row.recordId)) &&
+        (set === "images"
+            ? row.output.role === "image" || thumbnail(row.output.role, row.output.meta.index)
+            : set === "thumbnails"
+                ? thumbnail(row.output.role, row.output.meta.index)
+                : row.output.role === "short_video"))
+        .map((row) => ({ ...positionedOutput(revision, row), slot: row.slot }))
+        .sort((a, b) => setOrder(a.output.role, a.output.meta) - setOrder(b.output.role, b.output.meta));
+    for (const row of members) {
         const asset = deps.db
             .prepare("SELECT path FROM project_assets WHERE project_id=? AND id=?")
             .get(projectId, row.assetId);
@@ -66,11 +79,16 @@ export function revisionImagesZip(deps, projectId, revisionId) {
         const path = outputPath(deps.paths, projectId, z.string().parse(asset.path));
         if (statSync(path, { throwIfNoEntry: false })?.isFile() !== true)
             continue;
-        entries[downloadName(slug, { ...row.output, path })] = [readFileSync(path), { level: 0 }];
+        // Images and video are already compressed, so they are stored rather than deflated.
+        entries[versionedName(downloadName(slug, { ...row.output, path }), fileVersion(deps, projectId, row.slot, row.assetId))] = [readFileSync(path), { level: 0 }];
     }
     return Object.keys(entries).length === 0
         ? { ok: false, reason: "no-images" }
-        : { ok: true, filename: `${slug}-images.zip`, bytes: zipSync(entries) };
+        : {
+            ok: true,
+            filename: `${slug}-${set}${picked === undefined ? "" : "-selected"}.zip`,
+            bytes: zipSync(entries),
+        };
 }
 function fileDownload(path, filename) {
     const stats = statSync(path, { throwIfNoEntry: false });
@@ -81,6 +99,9 @@ function fileDownload(path, filename) {
             download: { path, filename, bytes: stats.size, contentType: contentTypeOf(path) },
         };
 }
-function imageOrder(role, index) {
-    return role === "thumbnail" ? Number.MAX_SAFE_INTEGER : typeof index === "number" ? index : 0;
+function setOrder(role, meta) {
+    if (role === "short_video")
+        return typeof meta.short === "number" ? meta.short : 0;
+    const index = typeof meta.index === "number" ? meta.index : 0;
+    return role === "thumbnail" ? 1_000_000 + index : index;
 }

package/dist/slices/revisions/model.js

@@ -1 +1,3 @@
-export {};
+export function thumbnailOverrideOf(variant) {
+    return variant === 1 ? "1" : variant === 2 ? "2" : variant === 3 ? "3" : undefined;
+}

package/dist/slices/revisions/mutation-assets.js

@@ -1,9 +1,10 @@
 import { statSync } from "node:fs";
 import { z } from "zod";
-import { referenceKey } from "../admission/model.js";
+import { referenceKey, thumbnailCountOf } from "../admission/model.js";
 import { usesReference } from "../admission/rules.js";
 import { outputPath, stagingPath } from "../storage/layout.js";
 import { stagedFileById } from "../storage/repo.js";
+import { thumbnailOverrideOf } from "./model.js";
 export function bindUpload(content, upload, assetId) {
     const to = upload.destination;
     if (to.kind === "provided")
@@ -15,6 +16,15 @@ export function bindUpload(content, upload, assetId) {
         };
     if (to.kind === "shortsMusic")
         return { ...content, shortsMusic: assetId };
+    if (to.kind === "thumbnail") {
+        const variant = thumbnailOverrideOf(to.variant);
+        if (variant === undefined)
+            throw new Error("Validated thumbnail destination disappeared.");
+        return {
+            ...content,
+            thumbnailOverrides: { ...content.thumbnailOverrides, [variant]: assetId },
+        };
+    }
     const image = content.imageDefinitions[to.imageKey];
     if (image === undefined)
         throw new Error("Validated image destination disappeared.");
@@ -40,6 +50,12 @@ export function validateUploads(deps, edit) {
                 field,
                 message: "This section is off or not set to use your own file. Change the section's setting first, then add the file.",
             });
+        if (to.kind === "thumbnail" &&
+            (!generatesThumbnail(edit.config) || to.variant > thumbnailCountOf(edit.config)))
+            fields.push({
+                field,
+                message: "This thumbnail is no longer one the project draws, so it can't take your file. Reload the project page and use Replace with my file on a thumbnail shown there.",
+            });
         if (to.kind === "shortsMusic" && edit.config.shorts?.enabled !== true)
             fields.push({
                 field,
@@ -60,7 +76,9 @@ export function validateUploads(deps, edit) {
                 : to.stage
             : to.kind === "image"
                 ? "images"
-                : "audio";
+                : to.kind === "thumbnail"
+                    ? "thumbnail"
+                    : "audio";
         if (file === undefined ||
             file.state !== "staged" ||
             file.stageKind !== kind ||
@@ -96,6 +114,9 @@ export function validateAssetReferences(deps, projectId, content, prepared) {
     for (const [key, row] of Object.entries(content.narrationOverrides))
         if (row.kind === "asset")
             refs.push([`content.narrationOverrides.${key}.assetId`, row.assetId, "audio", true]);
+    for (const [variant, assetId] of Object.entries(content.thumbnailOverrides ?? {}))
+        if (assetId !== undefined)
+            refs.push([`content.thumbnailOverrides.${variant}`, assetId, "thumbnail", false]);
     const roles = {
         research: ["notes"],
         article: ["article_md", "article_txt"],
@@ -171,6 +192,10 @@ export function assetPath(deps, projectId, id) {
         .prepare("SELECT path FROM project_assets WHERE project_id=? AND id=?")
         .get(projectId, id)).path;
 }
+// A thumbnail step that draws its thumbnails, so each can be replaced by a file of one's own.
+export function generatesThumbnail(config) {
+    return config.sources.thumbnail === "from_prompt" || config.sources.thumbnail === "prompt_by_llm";
+}
 // A stage whose own file the project uses: Provide for audio and the thumbnail, Upload for the
 // establishing image.
 export function providesOwnFile(config, kind) {
@@ -196,6 +221,7 @@ export function validateReplacementAvailability(deps, base, edit) {
         ...Object.values(base.revision.content.provided),
         ...Object.values(base.revision.content.imageDefinitions).map((row) => row.assetId),
         ...Object.values(base.revision.content.narrationOverrides).flatMap((row) => row.kind === "asset" ? [row.assetId] : []),
+        ...Object.values(base.revision.content.thumbnailOverrides ?? {}),
     ]);
     for (const kind of ["audio", "thumbnail", "reference"]) {
         const assetId = edit.content.provided[kind];
@@ -209,6 +235,7 @@ export function validateReplacementAvailability(deps, base, edit) {
         ...Object.values(edit.content.provided),
         ...Object.values(edit.content.imageDefinitions).map((row) => row.assetId),
         ...Object.values(edit.content.narrationOverrides).flatMap((row) => row.kind === "asset" ? [row.assetId] : []),
+        ...Object.values(edit.content.thumbnailOverrides ?? {}),
     ];
     return next.flatMap((id) => id == null ||
         previous.has(id) ||

package/dist/slices/revisions/mutation-prepare.js

@@ -1,29 +1,37 @@
 import { z } from "zod";
+import { thumbnailKey, thumbnailVariant } from "../admission/model.js";
 import { plainText } from "../article/plain.js";
 import { splitEndMatter } from "../article/split.js";
 import { normalizeArticleIntent } from "../rebuild/recipe-save.js";
 import { discardPreparedAssets } from "../storage/assets.js";
 import { prepareStagedFile, prepareText } from "../storage/prepare.js";
 import { outputSchema } from "../storage/schema.js";
+import { thumbnailOverrideOf, } from "./model.js";
 import { bindUpload, measureAudio, providedAssetSelected, providedOutput, providesOwnFile, } from "./mutation-assets.js";
 export async function prepareEditAssets(deps, base, edit) {
     const prepared = [];
     const allocated = [];
     try {
         const projectId = base.revision.projectId;
-        let content = normalizeArticleIntent(base, edit);
+        let content = remadeThumbnails(normalizeArticleIntent(base, edit), edit);
         for (const upload of edit.uploads ?? []) {
             const to = upload.destination;
             const role = to.kind === "image"
                 ? "image"
-                : to.kind === "provided" && to.stage !== "audio"
-                    ? providedOutput[to.stage].role
-                    : "audio_body";
+                : to.kind === "thumbnail"
+                    ? "thumbnail"
+                    : to.kind === "provided" && to.stage !== "audio"
+                        ? providedOutput[to.stage].role
+                        : "audio_body";
             const result = prepareStagedFile(deps, {
                 projectId,
                 stagedFileId: upload.stagedFileId,
                 role,
-                index: to.kind === "image" ? content.imageOrder.indexOf(to.imageKey) + 1 : 1,
+                index: to.kind === "image"
+                    ? content.imageOrder.indexOf(to.imageKey) + 1
+                    : to.kind === "thumbnail"
+                        ? to.variant
+                        : 1,
             });
             if (!result.ok)
                 throw new Error("A validated upload became unavailable.");
@@ -35,14 +43,25 @@ export async function prepareEditAssets(deps, base, edit) {
                     ? to.key
                     : to.kind === "shortsMusic"
                         ? "shorts:music"
-                        : providedOutput[to.stage].workKey;
+                        : to.kind === "thumbnail"
+                            ? thumbnailKey(to.variant)
+                            : providedOutput[to.stage].workKey;
+            // The first thumbnail keeps the slot a thumbnail always had; the second and third have
+            // their own, as when they are drawn (`rebuild/runtime-publication.ts`).
+            const ownSlot = to.kind === "image" ||
+                to.kind === "narration" ||
+                to.kind === "shortsMusic" ||
+                (to.kind === "thumbnail" && to.variant > 1);
             const item = {
                 ...result,
                 upload,
                 workKey,
-                slot: to.kind === "image" || to.kind === "narration" || to.kind === "shortsMusic"
-                    ? workKey
-                    : `${result.output.stageKind}:${role}`,
+                slot: ownSlot ? workKey : `${result.output.stageKind}:${role}`,
+                // The second and third thumbnails carry their number; the first carries none, as when
+                // they are drawn.
+                ...(to.kind === "thumbnail" && to.variant > 1
+                    ? { output: { ...result.output, meta: { ...result.output.meta, index: to.variant } } }
+                    : {}),
             };
             allocated.push(result.asset);
             const durationMs = result.output.stageKind === "audio"
@@ -160,6 +179,22 @@ export async function prepareEditAssets(deps, base, edit) {
         throw error;
     }
 }
+// Remaking a thumbnail that was replaced by the person's own file draws it again: the edit's
+// regenerate list names it, and no new file for it comes with the edit.
+function remadeThumbnails(content, edit) {
+    const overrides = { ...content.thumbnailOverrides };
+    for (const key of edit.regenerate ?? []) {
+        const variant = thumbnailVariant(key);
+        const slot = variant === undefined ? undefined : thumbnailOverrideOf(variant);
+        if (slot !== undefined &&
+            !edit.uploads?.some((one) => one.destination.kind === "thumbnail" && one.destination.variant === variant))
+            delete overrides[slot];
+    }
+    if (content.thumbnailOverrides === undefined)
+        return content;
+    const { thumbnailOverrides: _dropped, ...rest } = content;
+    return Object.keys(overrides).length === 0 ? rest : { ...rest, thumbnailOverrides: overrides };
+}
 function retainedAsset(deps, projectId, assetId) {
     const row = z
         .object({

package/dist/slices/revisions/schema.js

@@ -95,6 +95,7 @@ export const revisionContentSchema = z
         .strict())
         .optional(),
     ambientBed: id.optional(),
+    thumbnailOverrides: z.partialRecord(z.enum(["1", "2", "3"]), id).optional(),
 })
     .strict();
 export const revisionEditSchema = z
@@ -116,6 +117,9 @@ export const revisionEditSchema = z
             z.object({ kind: z.literal("image"), imageKey: id }).strict(),
             z.object({ kind: z.literal("narration"), key: workKey }).strict(),
             z.object({ kind: z.literal("shortsMusic") }).strict(),
+            z
+                .object({ kind: z.literal("thumbnail"), variant: z.number().int().min(1).max(3) })
+                .strict(),
         ]),
     })
         .strict())