@gentbajko/slopify 3.25.9 → 4.1.0

package/dist/adapters/account-limits.js

@@ -0,0 +1,30 @@
+import { statfs } from "node:fs/promises";
+import { z } from "zod";
+// The autopilot's hourly look at what may stop the schedules: the OpenRouter key's spending
+// limit (`GET /api/v1/key`, the same read Settings → Keys & services' Test makes) and the free disk.
+// Read-only: neither starts paid work.
+const keyAnswer = z.object({
+    data: z.object({ limit: z.number().nullable(), limit_remaining: z.number().nullable() }).loose(),
+});
+// The key's limit and what is left of it; null for a key with no limit. Throws, with the
+// status only, when OpenRouter refuses or answers something else: the caller skips the check.
+export async function openRouterKeyLimit(fetchImpl, key, signal) {
+    const response = await fetchImpl("https://openrouter.ai/api/v1/key", {
+        headers: { Authorization: `Bearer ${key}` },
+        signal,
+    });
+    if (!response.ok)
+        throw new Error(`OpenRouter answered ${String(response.status)}`);
+    const parsed = keyAnswer.safeParse(await response.json());
+    if (!parsed.success)
+        throw new Error("OpenRouter's answer wasn't the key's limits");
+    const { limit, limit_remaining: remaining } = parsed.data.data;
+    return limit === null || remaining === null ? null : { limit, remaining };
+}
+export async function diskSpaceAt(path) {
+    const stats = await statfs(path);
+    return {
+        freeBytes: Number(stats.bavail) * Number(stats.bsize),
+        totalBytes: Number(stats.blocks) * Number(stats.bsize),
+    };
+}

package/dist/adapters/alignment/audio.js

@@ -33,7 +33,7 @@ export async function decodeAudio(ffmpeg, source, output, signal) {
         child.on("close", (code) => {
             signal.removeEventListener("abort", abort);
             if (signal.aborted)
-                reject(new Error("Subtitle audio preparation was canceled."));
+                reject(new Error("Caption audio preparation was canceled."));
             else if (code !== 0)
                 reject(new Error(`Could not prepare the narration for subtitles. ${errorText}`));
             else

package/dist/adapters/alignment/cache.js

@@ -5,6 +5,7 @@ import { join } from "node:path";
 import { Readable } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import { setTimeout as delay } from "node:timers/promises";
+import { hasErrnoCode } from "../../kernel/errors.js";
 import { defaultEnglishSubtitleModel, } from "../../kernel/ports/subtitles.js";
 // Xenova/wav2vec2-base-960h at one pinned revision, which carries the same model at three
 // precisions. Each keeps its own file name so the cache can hold any of them at once; int8
@@ -144,7 +145,7 @@ async function downloadModel(input, deps, target) {
         catch (error) {
             if (await verified(target, deps.model, input.signal))
                 return target;
-            if (!isCode(error, "EEXIST") && !isCode(error, "EPERM"))
+            if (!hasErrnoCode(error, "EEXIST") && !hasErrnoCode(error, "EPERM"))
                 throw error;
             await rm(target, { force: true });
             await rename(part, target);
@@ -169,7 +170,7 @@ async function seedModel(input, seed, target) {
         await rm(staging, { recursive: true, force: true });
     }
 }
-const smaller = " To download less, pick a smaller model in Settings → Production defaults → Subtitle timing model.";
+const smaller = " To download less, pick a smaller model in Settings → Production defaults → Caption timing model.";
 function megabytes(bytes) {
     return `${String(Math.round(bytes / 1_000_000))} MB`;
 }
@@ -187,11 +188,8 @@ async function verified(path, model, signal) {
         return hash.digest("hex") === model.sha256;
     }
     catch (error) {
-        if (isCode(error, "ENOENT"))
+        if (hasErrnoCode(error, "ENOENT"))
             return false;
         throw error;
     }
 }
-function isCode(error, code) {
-    return error instanceof Error && "code" in error && error.code === code;
-}

package/dist/adapters/alignment/ctc.js

@@ -1,6 +1,5 @@
-import { englishMismatch, englishSpec } from "./spec.js";
+import { englishSpec } from "./spec.js";
 export const frameSeconds = 0.02;
-export const mismatch = englishMismatch;
 export function alignWindow(logits, frames, words, complete, spec = englishSpec) {
     const labels = spec.labels;
     if (frames < 1 || frames > 1100 || logits.length !== frames * labels)

package/dist/adapters/alignment/lock.js

@@ -1,6 +1,7 @@
 import { open, readFile, rm, stat } from "node:fs/promises";
 import { join } from "node:path";
 import { setTimeout } from "node:timers/promises";
+import { hasErrnoCode } from "../../kernel/errors.js";
 // Models run one at a time per data directory, including requests from separate app
 // processes. A canceled waiter never removes another request's lock.
 export async function claimWorker(cacheDir, signal) {
@@ -26,7 +27,7 @@ export async function claimWorker(cacheDir, signal) {
             };
         }
         catch (error) {
-            if (!(error instanceof Error && "code" in error && error.code === "EEXIST"))
+            if (!hasErrnoCode(error, "EEXIST"))
                 throw error;
         }
         try {
@@ -41,7 +42,7 @@ export async function claimWorker(cacheDir, signal) {
                     process.kill(owner, 0);
                 }
                 catch (error) {
-                    if (error instanceof Error && "code" in error && error.code === "ESRCH") {
+                    if (hasErrnoCode(error, "ESRCH")) {
                         await rm(path, { force: true });
                         continue;
                     }
@@ -50,7 +51,7 @@ export async function claimWorker(cacheDir, signal) {
             }
         }
         catch (error) {
-            if (!(error instanceof Error && "code" in error && error.code === "ENOENT"))
+            if (!hasErrnoCode(error, "ENOENT"))
                 throw error;
         }
         await setTimeout(250, undefined, { signal });

package/dist/adapters/alignment/multilingual.js

@@ -1,4 +1,5 @@
 import { languageInfo } from "../../kernel/ports/languages.js";
+import { editSettings } from "../../kernel/ports/settings-places.js";
 import { englishSpec } from "./spec.js";
 import { spellers, spokenNumber } from "./spell.js";
 import { respoken, speechWords } from "./text.js";
@@ -121,9 +122,6 @@ export const multilingualGates = {
     anchorLetters: 20,
     anchorConfidence: 0.75,
 };
-export function multilingualLanguages() {
-    return Object.keys(alphabets);
-}
 // The model and language view the aligner uses for a project language. English keeps its own
 // model and every constant it had.
 export function alignmentSpecFor(language) {
@@ -242,7 +240,7 @@ function spell(text, alphabet, raw, language) {
         }
         const folded = fold(character);
         if (folded === undefined)
-            throw new Error(`Word timing for ${languageInfo(language).name} reads Latin letters only, and "${raw}" has letters from another alphabet. Write that word in Latin letters in the article (open the project, Edit project → Article), then Try again.`);
+            throw new Error(`Word timing for ${languageInfo(language).name} reads Latin letters only, and "${raw}" has letters from another alphabet. Write that word in Latin letters in the article (${editSettings.article}), then Try again.`);
         result += folded;
     }
     return result.replace(/\s+/g, " ").trim();

package/dist/adapters/alignment/prefetch.js

@@ -1,5 +1,6 @@
 import { mkdir, readFile, rm } from "node:fs/promises";
 import { join } from "node:path";
+import { hasErrnoCode } from "../../kernel/errors.js";
 import { defaultEnglishSubtitleModel, } from "../../kernel/ports/subtitles.js";
 import { englishModels, prepareModel } from "./cache.js";
 import { claimWorker } from "./lock.js";
@@ -31,7 +32,7 @@ async function clearOwnLock(cacheDir) {
         owner = await readFile(path, "utf8");
     }
     catch (error) {
-        if (error instanceof Error && "code" in error && error.code === "ENOENT")
+        if (hasErrnoCode(error, "ENOENT"))
             return;
         throw error;
     }

package/dist/adapters/alignment/runner.js

@@ -24,7 +24,7 @@ export async function runAlignmentWorker(input, signal, onProgress, worker = new
             signal.removeEventListener("abort", abort);
             child.kill("SIGKILL");
         };
-        const abort = () => finish(new Error("Subtitle alignment was canceled."));
+        const abort = () => finish(new Error("Caption timing was canceled."));
         signal.addEventListener("abort", abort, { once: true });
         child.stderr?.on("data", (data) => {
             stderr = (stderr + data.toString("utf8")).slice(-2000);

package/dist/adapters/alignment/worker.js

@@ -1,4 +1,5 @@
 import { open, readFile, stat } from "node:fs/promises";
+import { errorText } from "../../kernel/errors.js";
 import { SubtitleMismatch } from "../../kernel/ports/subtitles.js";
 import { alignmentSpecFor } from "./multilingual.js";
 import { workerInput } from "./protocol.js";
@@ -15,7 +16,7 @@ process.once("message", (raw) => {
     }
     run(input.data).then((words) => send({ type: "done", words }), (error) => send({
         type: "error",
-        message: error instanceof Error ? error.message : String(error),
+        message: errorText(error),
         ...(error instanceof SubtitleMismatch
             ? { mismatch: { at: error.at, expected: error.expected, heard: error.heard } }
             : {}),
@@ -167,7 +168,7 @@ async function openSession(modelPath) {
             const reason = nativeError instanceof Error
                 ? (nativeError.message.split("\n")[0] ?? "")
                 : String(nativeError);
-            throw new Error(`Subtitle timing could not start: neither of its speech engines loaded on this computer (${system}): ${reason}. Reinstall Slopify so npm installs the engine for this system, then try again; if it keeps failing, turn subtitles off for this project.`);
+            throw new Error(`Caption timing could not start: neither of its speech engines loaded on this computer (${system}): ${reason}. Reinstall Slopify so npm installs the engine for this system, then try again; if it keeps failing, turn captions off for this project.`);
         }
     }
     const session = await native.InferenceSession.create(modelPath, {

package/dist/adapters/explain.js

@@ -1,3 +1,4 @@
+import { editSettings } from "../kernel/ports/settings-places.js";
 // The sentences a failed provider call shows. Whatever an adapter throws becomes the stage's
 // failure reason on the project page, read by someone who only wants the video, so each one
 // says what failed, the likely cause and the next step, using the names on screen. The
@@ -6,19 +7,19 @@
 // A provider's error body can be a whole HTML page; the first few hundred characters say why.
 const detailMax = 300;
 export function missingKey(provider) {
-    return `No ${provider} API key is saved. Add one in Settings → Providers, then use Try again.`;
+    return `No ${provider} API key is saved. Add one in Settings → Keys & services, then use Try again.`;
 }
 export const refreshList = "refresh the list";
-export const checkChoice = "Check the provider and model chosen in the Providers section of Edit project, then use Try again.";
+export const checkChoice = `Check the service and model chosen in ${editSettings.open} (under Written by in Article, in Narration or in Images), then use Try again.`;
 export function httpFailure(failure) {
     const { provider, status } = failure;
     const said = quoted(failure.label ?? `error ${String(status)}`, failure.detail);
     const next = failure.next ?? "use Try again";
     if (status === 401) {
-        return `${provider} did not accept the API key${said}. The key may be wrong, expired or revoked: paste a current key in Settings → Providers, then ${next}.`;
+        return `${provider} did not accept the API key${said}. The key may be wrong, expired or revoked: paste a current key in Settings → Keys & services, then ${next}.`;
     }
     if (status === 403) {
-        return `${provider} refused access${said}. The API key may not be allowed to use this model, or the account needs attention: check your ${provider} account and the key in Settings → Providers, then ${next}.`;
+        return `${provider} refused access${said}. The API key may not be allowed to use this model, or the account needs attention: check your ${provider} account and the key in Settings → Keys & services, then ${next}.`;
     }
     if (status === 402) {
         return `${provider} says the account is out of credits${said}. Add credits on the ${provider} website, then ${next}.`;
@@ -27,7 +28,7 @@ export function httpFailure(failure) {
         return `${provider} is limiting requests${said}. Too many requests were sent at once or the plan's quota is used up: wait a few minutes or check your ${provider} usage and billing, then ${next}.`;
     }
     if (status >= 400 && status < 500) {
-        return `${provider} rejected the ${failure.subject ?? "request"}${said}. ${failure.fix ?? (failure.next === undefined ? checkChoice : `Check the key in Settings → Providers, then ${next}.`)}`;
+        return `${provider} rejected the ${failure.subject ?? "request"}${said}. ${failure.fix ?? (failure.next === undefined ? checkChoice : `Check the key in Settings → Keys & services, then ${next}.`)}`;
     }
     if (status >= 500) {
         return `${provider} had a problem on its side${said}. This is usually temporary: wait a few minutes, then ${next}.`;
@@ -48,18 +49,15 @@ export function noAudio(provider) {
     return `${provider} finished without sending any audio. Use Try again; if it keeps happening, check the voice in Settings → Voices.`;
 }
 export function noImage(provider) {
-    return `${provider} finished without sending an image. Use Try again; if it keeps happening, reword the image prompt in the Images section of Edit project or choose another image model in its Providers section.`;
+    return `${provider} finished without sending an image. Use Try again; if it keeps happening, reword the image prompt in ${editSettings.images} or choose another image model there.`;
 }
 export function refusedImage(provider, detail) {
-    return `${provider} refused to make this image under its content rules${quoted("", detail)}. Reword the image prompt in the Images section of Edit project, or choose another image provider in its Providers section.`;
+    return `${provider} refused to make this image under its content rules${quoted("", detail)}. Reword the image prompt in ${editSettings.images}, or choose another image service there.`;
 }
 // A narration request the provider turned down is most often a voice that no longer exists
 // or a part longer than the model takes.
 export function voiceFix(voiceId) {
-    return `Check that voice "${voiceId}" still exists in Settings → Voices and that each narration part fits the model's length limit (Chunking, in the Providers section of Edit project), then use Try again.`;
-}
-export function internalError(what) {
-    return `Slopify hit an internal error (${what}). Use Try again; if it happens again, use Download diagnostics in Settings and report it.`;
+    return `Check that voice "${voiceId}" still exists in Settings → Voices and that each narration part fits the model's length limit (Chunking, in ${editSettings.narration}), then use Try again.`;
 }
 const cliNames = {
     claude: "Claude Code CLI",
@@ -82,7 +80,7 @@ export function cliReported(binary, detail, next) {
     return `The ${cliName(binary)} reported an error${quoted("", detail)}. ${next}`;
 }
 export function cliCheck(binary) {
-    return `Use Try again; if it keeps failing, run ${commandOf(binary)} in a terminal to check it works and is signed in, or choose another model in the Providers section of Edit project.`;
+    return `Use Try again; if it keeps failing, run ${commandOf(binary)} in a terminal to check it works and is signed in, or choose another model in ${editSettings.writer}.`;
 }
 // ` (error 401: "Unauthorized")`, ` (error 401)`, ` ("Unauthorized")`, or nothing.
 export function quoted(label, detail) {

package/dist/adapters/ffmpeg.js

@@ -4,6 +4,7 @@ import { createRequire } from "node:module";
 import { join } from "node:path";
 import { promisify } from "node:util";
 import { z } from "zod";
+import { errorText } from "../kernel/errors.js";
 import { redact } from "../kernel/log.js";
 // ffmpeg-static exports a path even when npm skipped its install script. Recover using
 // that dependency's own downloader, including its source notice and license, without
@@ -73,6 +74,23 @@ async function verify(bin) {
         throw new Error(`ffmpeg at ${bin} could not be started. Reinstall ffmpeg or check your antivirus has not quarantined it, then restart Slopify. ${remedy} ${detail(error)}`);
     }
 }
+// One short ffmpeg run to its end, answering its stdout; a failure carries the last thing it
+// said on stderr. For questions about an ffmpeg (its encoders, a test encode), never renders.
+export async function ffmpegOutput(bin, args) {
+    try {
+        const { stdout } = await promisify(execFile)(bin, [...args], {
+            windowsHide: true,
+            timeout: 30_000,
+            maxBuffer: 4 * 1024 * 1024,
+        });
+        return stdout;
+    }
+    catch (error) {
+        const stderr = z.object({ stderr: z.string() }).safeParse(error);
+        const said = stderr.success ? stderr.data.stderr.trim().split("\n").slice(-2).join(" / ") : "";
+        throw new Error(said === "" ? detail(error) : redact(said));
+    }
+}
 function detail(error) {
-    return redact(error instanceof Error ? error.message : String(error));
+    return redact(errorText(error));
 }

package/dist/adapters/host-cli/index.js

@@ -1,12 +1,14 @@
 import { redact } from "../../kernel/log.js";
 import { bridgeLimits, decodeHostImageReport, hostFaultSchema, hostFrameSchema, hostHealthSchema, hostImageReportHeader, hostImageSchema, hostLlmSchema, hostModelsSchema, hostOpenedSchema, hostOpenFolderSchema, hostStatusSchema, } from "../../kernel/ports/host-cli.js";
 import { agentImageTimeoutMs } from "../../kernel/ports/image.js";
-import { isProviderError, providerError } from "../../kernel/ports/model.js";
+import { isProviderError, providerError, } from "../../kernel/ports/model.js";
+import { editSettings } from "../../kernel/ports/settings-places.js";
 import { sniffImage } from "../image/bytes.js";
 import { claudePlanLimit } from "../llm/claude-code.js";
 import { codexPlanLimit } from "../llm/codex-limits.js";
+import { accessField } from "../model-access.js";
 import { hostRequest, hostUnavailable, readHostBytes, } from "./transport.js";
-const tooBigForHost = "Slopify could not send this request to the host helper because it is larger than, or shaped differently from, what the helper accepts. Make the inputs shorter in Edit project, then use Try again; if it happens again, use Download diagnostics in Settings and report it.";
+const tooBigForHost = `Slopify could not send this request to the host helper because it is larger than, or shaped differently from, what the helper accepts. Make the article or its research notes shorter in ${editSettings.article}, then use Try again; if it happens again, use Download diagnostics in Settings and report it.`;
 export function createHostCliClient(options) {
     async function request(input) {
         if (!options.directory)
@@ -16,7 +18,7 @@ export function createHostCliClient(options) {
             try {
                 const parsed = hostFaultSchema.safeParse(JSON.parse((await readHostBytes(response, bridgeLimits.status)).toString("utf8")));
                 if (parsed.success)
-                    throw providerError({ kind: parsed.data.kind, message: redact(parsed.data.message) });
+                    throw bridgedFault(parsed.data.kind, parsed.data.message);
             }
             catch (error) {
                 if (isProviderError(error))
@@ -163,6 +165,16 @@ export function createHostCliClient(options) {
                                 base64: Buffer.from(req.reference.bytes).toString("base64"),
                             },
                         }),
+                    ...(req.edit === undefined
+                        ? {}
+                        : {
+                            edit: {
+                                source: {
+                                    mime: req.edit.source.mime,
+                                    base64: Buffer.from(req.edit.source.bytes).toString("base64"),
+                                },
+                            },
+                        }),
                     ...(req.cast === undefined
                         ? {}
                         : {
@@ -216,6 +228,11 @@ export function createHostCliClient(options) {
         },
     };
 }
+// A fault from the host helper carries its kind and the host adapter's words only; whether it
+// was about the model's access is read again from those words, as the plan limit is below.
+export function bridgedFault(kind, message) {
+    return providerError({ kind, message: redact(message), ...accessField(null, message) });
+}
 // A used-up plan crosses the bridge as a rate-limit fault carrying the CLI's own words, which
 // the host-side adapter already quoted; they are read again here so a Docker run waits for the
 // reset like a local one instead of failing.
@@ -256,7 +273,7 @@ async function* readEvents(response) {
                     throw hostUnavailable(true);
                 const event = hostFrameSchema.parse(JSON.parse(line));
                 if (event.type === "error")
-                    throw providerError({ kind: event.kind, message: redact(event.message) });
+                    throw bridgedFault(event.kind, event.message);
                 if (event.type === "done")
                     terminal = event;
                 else

package/dist/adapters/host-cli/transport.js

@@ -5,6 +5,7 @@ import { join } from "node:path";
 import { bridgeLimits, hostFramesHeader, hostFramesVersion } from "../../kernel/ports/host-cli.js";
 import { agentImageTimeoutMs } from "../../kernel/ports/image.js";
 import { providerError } from "../../kernel/ports/model.js";
+import { editSettings } from "../../kernel/ports/settings-places.js";
 export function hostUnavailable(submitted = false) {
     return providerError({
         kind: "unavailable",
@@ -34,7 +35,7 @@ export async function hostRequest(options) {
     if (options.body && options.body.byteLength > bridgeLimits.request)
         throw providerError({
             kind: "unsupported",
-            message: "This request is larger than the host helper accepts (16 MB), so nothing was sent. Make the inputs shorter in Edit project, or choose an API provider such as OpenRouter in its Providers section, then use Try again.",
+            message: `This request is larger than the host helper accepts (16 MB), so nothing was sent. Make the article or its research notes shorter in ${editSettings.article}, or choose an API service such as OpenRouter under Written by there, then use Try again.`,
         });
     let token;
     try {

package/dist/adapters/http-failure.js

@@ -0,0 +1,53 @@
+import { providerError } from "../kernel/ports/model.js";
+import { missingKey } from "./explain.js";
+import { retryAfter } from "./retry-after.js";
+// The plumbing every HTTP provider adapter repeats around a failed call. What the provider
+// said and which sentence it earns stay in each adapter; only the shape is shared.
+export function safeJson(text) {
+    try {
+        return JSON.parse(text);
+    }
+    catch {
+        return undefined;
+    }
+}
+// The body of a failed response, or nothing when it cannot be read.
+export async function failureText(response) {
+    return await response.text().catch(() => "");
+}
+// Only the adapter sees the vendor's status code, so only the adapter names the kind.
+export function kindOfStatus(status) {
+    if (status === 401 || status === 403) {
+        return "auth";
+    }
+    if (status === 429) {
+        return "rate_limit";
+    }
+    // ceiling: everything else is `other` and is retried, so a request the provider will never
+    // accept fails the same way four times over. A terminal "this will never work" kind has to
+    // reach the port's error contract first, which is not an adapter's to widen.
+    // The provider's own server failed; the same request may well succeed later.
+    if (status >= 500)
+        return "dropped";
+    return "other";
+}
+// `missing_key`, not `auth`, because that rule makes it terminal: an absent key never becomes
+// a request.
+export function requireKey(key, provider) {
+    if (key === undefined || key === "") {
+        throw providerError({ kind: "missing_key", message: missingKey(provider) });
+    }
+    return key;
+}
+// A 429's Retry-After replaces the fixed backoff; `fallbackRetryMs` is the provider's own
+// hint, used when the header is absent. `access` is what the failure says about the chosen
+// model (see model-access.ts); it never changes the kind.
+export function httpProviderError(response, kind, message, fallbackRetryMs, access) {
+    const retryAfterMs = retryAfter(response.headers.get("retry-after")) ?? fallbackRetryMs;
+    return providerError({
+        kind,
+        message,
+        ...(access === undefined ? {} : { access }),
+        ...(retryAfterMs === undefined ? {} : { retryAfterMs }),
+    });
+}

package/dist/adapters/image/bytes.js

@@ -1,4 +1,5 @@
 import { providerError } from "../../kernel/ports/model.js";
+import { editSettings } from "../../kernel/ports/settings-places.js";
 // Two of the three image providers answer with a link rather than with bytes, so fetching
 // that link is part of the provider call and belongs inside the attempt with it: a URL
 // that 404s or hands back an HTML error page is a failed attempt, not a corrupt file on
@@ -48,7 +49,7 @@ export async function downloadImage(download) {
     if (mime === undefined) {
         throw providerError({
             kind: "other",
-            message: `${download.provider} sent back something that is not a PNG or JPEG image (${describeBytes(bytes)}). Use Try again; if it keeps happening, choose another image model in the Providers section of Edit project.`,
+            message: `${download.provider} sent back something that is not a PNG or JPEG image (${describeBytes(bytes)}). Use Try again; if it keeps happening, choose another image model in ${editSettings.images}.`,
         });
     }
     return { bytes, mime };

package/dist/adapters/image/codex.js

@@ -5,14 +5,16 @@ import { z } from "zod";
 import { redact } from "../../kernel/log.js";
 import { agentImageTimeoutMs, } from "../../kernel/ports/image.js";
 import { providerError } from "../../kernel/ports/model.js";
+import { editSettings } from "../../kernel/ports/settings-places.js";
 import { cliReported, quoted, refusedImage } from "../explain.js";
 import { cliLoginError } from "../llm/cli-login-error.js";
 import { codexLimitError, readingOf } from "../llm/codex.js";
 import { codexPlanLimit } from "../llm/codex-limits.js";
 import { cliEvent, cliShaped, endedKind, endedWithout, stopCliRun, } from "../llm/run-cli.js";
 import { lines } from "../llm/sse-lines.js";
+import { accessField } from "../model-access.js";
 import { codexGeneratedImage, codexImageCount } from "./codex-output.js";
-import { referencePictures } from "./reference.js";
+import { attachedPictures, editNote } from "./reference.js";
 // "Codex default" puts no model and no effort on the command line, so the CLI's own defaults
 // draw the image; it is what every project saved before the choice existed runs. Every other
 // model id is one of the Codex CLI's own models - the list the Codex text provider shows -
@@ -46,7 +48,7 @@ const alwaysDisabled = [
 function reviews(req) {
     return (req.model !== codexImageModel.id ||
         req.thinking !== undefined ||
-        referencePictures(req).length > 0);
+        attachedPictures(req).length > 0);
 }
 // The binary's image tool (`ImagegenArgs`: prompt, referenced_image_paths,
 // num_last_images_to_include) takes each referenced image as an absolute path it reads
@@ -57,10 +59,12 @@ export function codexReferencePath(directory, image) {
 // Every picture the request carries, each at its own path: the establishing image keeps the
 // name it always had, the cast pictures follow it as reference-2, reference-3 and so on.
 export function codexReferencePaths(directory, req) {
-    return referencePictures(req).map((picture, index) => ({
+    return attachedPictures(req).map((picture, index) => ({
         picture,
         path: index === 0
-            ? codexReferencePath(directory, picture.image)
+            ? req.edit === undefined
+                ? codexReferencePath(directory, picture.image)
+                : join(directory, picture.image.mime === "image/jpeg" ? "source.jpg" : "source.png")
             : join(directory, `reference-${String(index + 1)}${picture.image.mime === "image/jpeg" ? ".jpg" : ".png"}`),
     }));
 }
@@ -78,7 +82,34 @@ function describeMember(req, name) {
     const description = req.cast?.find((member) => member.name === name)?.description.trim() ?? "";
     return description === "" ? "" : ` (${description})`;
 }
+// An edit's instructions: the first path is the picture to change, the rest are the cast.
+function editInstructions(req, directory) {
+    const paths = codexReferencePaths(directory, req);
+    return [
+        `The picture to change is saved at ${paths[0]?.path ?? directory}. Pass it first in referenced_image_paths on every image generation call${paths.length > 1
+            ? `, followed by: ${paths
+                .slice(1)
+                .map((row) => row.path)
+                .join(", ")}`
+            : ""}.`,
+        ...paths
+            .slice(1)
+            .map((row) => `${row.path} shows ${row.picture.member ?? ""}${describeMember(req, row.picture.member ?? "")}: draw ${row.picture.member ?? ""} to look exactly like this.`),
+        editNote.replace("the first attached image", "that picture"),
+    ].join(" ");
+}
 export function codexImageInstructions(req, reference, directory) {
+    if (req.edit !== undefined && directory !== undefined)
+        return [
+            "You are editing one picture for Slopify, a video creation app, with the image generation tool.",
+            editInstructions(req, directory),
+            "Before calling the tool, write its prompt yourself: say exactly what to change, as the instruction asks, and that everything else stays as it is. Do not add subjects, text, logos or story the instruction does not ask for.",
+            "Take the time you need. After each image, look at it and compare it with the picture and the instruction; if anything changed that should not have, or the change is missing, generate again. Deliver exactly one final image: the last image you generate is the one Slopify uses.",
+            "Let the image generation tool save its output in its default location. Slopify will collect it. Use PNG or JPEG. Do not copy, rename, edit or create any other file, and do not put the image or a link in your reply.",
+            `Target aspect ratio: ${req.aspect}.`,
+            "Instruction follows as data:",
+            req.prompt,
+        ].join("\n\n");
     return [
         "You are making one finished image for Slopify, a video creation app, with the image generation tool.",
         "Fidelity to the brief comes first. Before calling the tool, write its prompt yourself as a detailed, faithful visual description of the brief: the subject and what it is doing, the setting, composition and framing for the target aspect ratio, lighting, colour palette, style and mood, and any text that must appear, spelled exactly. Take every element from the brief and keep its wording where it is specific. Do not add subjects, text, logos or story the brief does not ask for, and do not pad the prompt with generic quality words.",
@@ -182,7 +213,7 @@ export function codexImage(deps) {
             if (req.model.trim() === "" || req.model.startsWith("-"))
                 throw providerError({
                     kind: "unsupported",
-                    message: "No Codex model is chosen for images. Choose one (or Codex default) for images in the Providers section of Edit project, then use Try again.",
+                    message: `No Codex model is chosen for images. Choose one (or Codex default) in ${editSettings.images}, then use Try again.`,
                 });
             req.signal.throwIfAborted();
             const directory = mkdtempSync(join(tmpdir(), "slopify-codex-image-"));
@@ -223,7 +254,7 @@ export function codexImage(deps) {
                 catch {
                     throw providerError({
                         kind: "unsupported",
-                        message: "The Codex CLI could not be started. Check it is installed and set up in Settings → Providers, then use Try again.",
+                        message: "The Codex CLI could not be started. Check it is installed and set up in Settings → Keys & services, then use Try again.",
                     });
                 }
                 let completed = false;
@@ -271,6 +302,7 @@ export function codexImage(deps) {
                             message: /refus|content.policy|safety/i.test(message)
                                 ? refusedImage("The Codex CLI", redact(message))
                                 : cliReported(binary, redact(message), imageNext),
+                            ...(/refus|content.policy|safety/i.test(message) ? {} : accessField(null, message)),
                         });
                     }
                     else if (event.type === "error") {
@@ -288,6 +320,7 @@ export function codexImage(deps) {
                             message: /image.generation|image tool|feature.*unavailable/i.test(message)
                                 ? `The Codex CLI cannot make images${quoted("", redact(message))}. ${cannotDraw}`
                                 : cliReported(binary, redact(message), imageNext),
+                            ...accessField(null, message),
                         });
                     }
                     else if (event.type === "item.completed") {
@@ -305,7 +338,7 @@ export function codexImage(deps) {
                 if (ended.error !== null)
                     throw providerError({
                         kind: "unsupported",
-                        message: "The Codex CLI could not be started. Check it is installed and set up in Settings → Providers, then use Try again.",
+                        message: "The Codex CLI could not be started. Check it is installed and set up in Settings → Keys & services, then use Try again.",
                     });
                 const stderrLimit = codexPlanLimit(run.stderr(), new Date());
                 if ((ended.code !== 0 || !completed) && stderrLimit !== undefined)
@@ -365,8 +398,8 @@ async function* bounded(source, maximum) {
         yield chunk;
     }
 }
-const imageNext = "Use Try again; if it keeps failing, run codex in a terminal to check it works and is signed in, or choose another image provider in the Providers section of Edit project.";
-const cannotDraw = "Update the Codex CLI and check your ChatGPT plan includes image generation, or choose another image provider in the Providers section of Edit project.";
+const imageNext = `Use Try again; if it keeps failing, run codex in a terminal to check it works and is signed in, or choose another image service in ${editSettings.images}.`;
+const cannotDraw = `Update the Codex CLI and check your ChatGPT plan includes image generation, or choose another image service in ${editSettings.images}.`;
 function imageEnvironment(directory, source) {
     const env = { PWD: directory };
     const allowed = [