@vibes.diy/base 14.3.114 → 14.3.115

package/hooks/img-gen/use-img-gen.js

@@ -149,6 +149,10 @@ let imgGenProbeDeadlineMs = IMG_GEN_PROBE_DEADLINE_MS;
 export function __setImgGenProbeDeadlineMsForTests(ms) {
     imgGenProbeDeadlineMs = ms ?? IMG_GEN_PROBE_DEADLINE_MS;
 }
+const imgGenLeases = new Map();
+export function __resetImgGenLeasesForTests() {
+    imgGenLeases.clear();
+}
 const IMG_GEN_COMMIT_REPROBE_DELAYS_MS = [500, 1000, 2000, 4000, 8000, 15000];
 let imgGenCommitReprobeDelaysMs = IMG_GEN_COMMIT_REPROBE_DELAYS_MS;
 export function __setImgGenCommitReprobeDelaysMsForTests(ms) {
@@ -248,6 +252,8 @@ export function useImgGen(opts) {
     const playgroundSpentKeyRef = useRef(undefined);
     const currentGenRef = useRef(null);
     const probeInFlightRef = useRef(null);
+    const leaseWaitRef = useRef(null);
+    const ownedLeaseRef = useRef(null);
     const commitProbeInFlightRef = useRef(null);
     const displayReadBackRef = useRef(null);
     const committedGenRef = useRef(null);
@@ -310,13 +316,18 @@ export function useImgGen(opts) {
         };
     }, [skip, _id, mediaDb, db]);
     useEffect(() => {
-        if (skip || !_id)
+        if (skip || !_id) {
+            leaseWaitRef.current = null;
             return;
+        }
         const inputMeta = inputImage;
         const inputKey = inputMeta
             ? `${inputMeta.uploadId ?? ""}|${inputMeta.name ?? ""}|${inputMeta.lastModified ?? ""}|${inputMeta.size ?? ""}|${inputMeta.type ?? ""}`
             : "";
         const genKey = `${_id}-${generationId ?? ""}-${inputKey}-${model ?? ""}-${myHandle ?? ""}`;
+        const leaseWaitKey = `${mediaDbName(dbName)}\u0000${genKey}\u0000${prompt ?? ""}`;
+        if (leaseWaitRef.current !== leaseWaitKey)
+            leaseWaitRef.current = null;
         if (currentGenRef.current === genKey)
             return;
         currentGenRef.current = genKey;
@@ -496,14 +507,14 @@ export function useImgGen(opts) {
             }
             const promptForProbeKey = prompt ?? existingDoc?.prompt;
             const inputIsStoredRef = incomingSourceKey !== undefined;
-            if (authoritative === false &&
-                !isRegen &&
-                (inputImage === undefined || inputIsStoredRef) &&
-                (readStartedPending || readPending())) {
+            if (authoritative === false && !isRegen && (inputImage === undefined || inputIsStoredRef)) {
                 if (existingDoc)
                     setDocument(existingDoc);
                 setPending(true);
                 if (confirmedMediaProbe === undefined || confirmedMediaProbe === null) {
+                    if (readStartedPending === false && readPending() === false) {
+                        return decide(mediaDocs, legacyDoc, true);
+                    }
                     currentGenRef.current = null;
                     if (readPending() === false)
                         setDeferTick((t) => t + 1);
@@ -560,339 +571,398 @@ export function useImgGen(opts) {
                     setDocument(existingDoc);
                 return;
             }
-            dropEarlyPreview();
-            setPreviewUrl(undefined);
-            setLoading(true);
-            setProgress(10);
-            setError(null);
-            const target = {
-                dbName,
-                docId: hostDocId,
-                regen: isRegen,
-                ...(incomingSourceKey !== undefined ? { sourceKey: incomingSourceKey } : {}),
-            };
-            const tapRun = tapStarted && generationId !== undefined && tapSpentRef.current !== generationId;
-            if (tapRun)
-                tapSpentRef.current = generationId;
-            const rFiles = await exception2Result(() => imgGen(promptText, {
-                inputImage,
-                model,
-                target,
-                ...(tapRun ? { userActivation: true } : {}),
-                onPreview: (blob) => {
-                    if (currentGenRef.current !== genKey || unmountSignalRef.current.aborted)
-                        return;
-                    if (earlyPreviewRef.current !== null)
-                        return;
-                    const url = URL.createObjectURL(blob);
-                    earlyPreviewRef.current = { genKey, url, blob };
-                    setPreviewUrl(url);
-                },
-            }));
-            if (rFiles.isErr()) {
-                if (earlyPreviewRef.current?.genKey === genKey)
-                    dropEarlyPreview();
-                const message = rFiles.Err().message;
-                if (message === IMG_GEN_NEEDS_TAP || message === IMG_GEN_CANCELLED) {
-                    if (existingDoc)
-                        setDocument(existingDoc);
-                    playgroundSpentKeyRef.current = genKey;
-                    playgroundModeRef.current = true;
-                    currentGenRef.current = null;
-                    setNeedsTap(true);
+            const leaseKey = `${mediaDbName(dbName)}\u0000${hostDocId}\u0000${myHandle}`;
+            if (unmountSignalRef.current.aborted)
+                return;
+            const liveLease = imgGenLeases.get(leaseKey);
+            const previousLease = ownedLeaseRef.current;
+            const replacesOwnLease = previousLease !== null && previousLease.genKey !== genKey && previousLease.promise === liveLease;
+            const deliberateRequest = isRegen || (inputImage !== undefined && inputIsStoredRef === false);
+            if (liveLease !== undefined && replacesOwnLease === false && deliberateRequest === false) {
+                setPending(true);
+                const waitKey = leaseWaitKey;
+                currentGenRef.current = null;
+                if (leaseWaitRef.current === waitKey)
+                    return;
+                leaseWaitRef.current = waitKey;
+                await liveLease;
+                if (unmountSignalRef.current.aborted || leaseWaitRef.current !== waitKey)
+                    return;
+                if (currentGenRef.current !== null)
+                    return;
+                const rRead = await exception2Result(loadMediaDocs);
+                if (unmountSignalRef.current.aborted || leaseWaitRef.current !== waitKey || currentGenRef.current !== null)
+                    return;
+                leaseWaitRef.current = null;
+                currentGenRef.current = genKey;
+                if (rRead.isErr()) {
+                    setError(rRead.Err());
+                    setPending(false);
                     setLoading(false);
+                    currentGenRef.current = null;
                     return;
                 }
-                if (message === IMG_GEN_SOURCE_UNUSABLE) {
-                    vibe.log("warn", IMG_GEN_SOURCE_UNUSABLE, { docId: hostDocId, dbName });
-                }
-                if (message === IMG_GEN_UNREACHABLE) {
-                    playgroundModeRef.current = true;
-                    setError(new Error(IMG_GEN_UNREACHABLE_MESSAGE));
-                }
-                else {
-                    setError(rFiles.Err());
-                }
-                setLoading(false);
-                if (playgroundModeRef.current)
-                    setNeedsTap(true);
-                currentGenRef.current = null;
-                return;
-            }
-            const { files, docWritten } = rFiles.Ok();
-            playgroundModeRef.current = false;
-            const file = files[0];
-            const early = earlyPreviewRef.current?.genKey === genKey ? earlyPreviewRef.current : null;
-            if (early !== null) {
-                earlyPreviewRef.current = null;
-                if (previewUrlsRef.current.has(file.uploadId) === false)
-                    previewUrlsRef.current.set(file.uploadId, early.url);
-                else
-                    URL.revokeObjectURL(early.url);
+                return decide(rRead.Ok(), legacyDoc, false);
             }
-            else if (file.preview instanceof Blob && previewUrlsRef.current.has(file.uploadId) === false) {
-                previewUrlsRef.current.set(file.uploadId, URL.createObjectURL(file.preview));
-            }
-            const ownBytes = early?.blob ?? (file.preview instanceof Blob ? file.preview : undefined);
-            if (ownBytes !== undefined && pictures !== undefined) {
-                void pictures.seed(file.uploadId, ownBytes);
-                seededRef.current.add(file.uploadId);
+            let resolveLease = () => undefined;
+            const lease = new Promise((resolve) => {
+                resolveLease = resolve;
+            });
+            imgGenLeases.set(leaseKey, lease);
+            if (replacesOwnLease && previousLease !== null)
+                previousLease.release();
+            function releaseLease() {
+                if (imgGenLeases.get(leaseKey) === lease)
+                    imgGenLeases.delete(leaseKey);
+                resolveLease();
+                if (ownedLeaseRef.current?.release === releaseLease)
+                    ownedLeaseRef.current = null;
             }
-            const rRun = await exception2Result(async () => {
-                setProgress(90);
-                const showCommitted = async (uploadId, clientWrite) => {
-                    if (currentGenRef.current !== genKey)
-                        return;
-                    committedGenRef.current = { genKey, uploadId };
-                    let after = await loadMediaDocs();
-                    const landedLocally = sortVersionDocs(after).some((vd) => Object.values(vd._files).some((f) => f.uploadId === uploadId && f.url !== undefined));
-                    const waitForSync = (rows) => {
-                        setDocument(composeDocument({
-                            hostDocId,
-                            versionDocs: sortVersionDocs(rows),
-                            pointer: findPointerDoc(rows, myHandle),
-                            legacyDoc,
-                        }));
-                        setPending(true);
-                        setLoading(false);
+            ownedLeaseRef.current = { genKey, promise: lease, release: releaseLease };
+            const generationHandle = myHandle;
+            const generationPrompt = promptText;
+            async function generate() {
+                dropEarlyPreview();
+                setPreviewUrl(undefined);
+                setLoading(true);
+                setProgress(10);
+                setError(null);
+                const target = {
+                    dbName,
+                    docId: hostDocId,
+                    regen: isRegen,
+                    ...(incomingSourceKey !== undefined ? { sourceKey: incomingSourceKey } : {}),
+                };
+                const tapRun = tapStarted && generationId !== undefined && tapSpentRef.current !== generationId;
+                if (tapRun)
+                    tapSpentRef.current = generationId;
+                const rFiles = await exception2Result(() => imgGen(generationPrompt, {
+                    inputImage,
+                    model,
+                    target,
+                    ...(tapRun ? { userActivation: true } : {}),
+                    onPreview: (blob) => {
+                        if (currentGenRef.current !== genKey || unmountSignalRef.current.aborted)
+                            return;
+                        if (earlyPreviewRef.current !== null)
+                            return;
+                        const url = URL.createObjectURL(blob);
+                        earlyPreviewRef.current = { genKey, url, blob };
+                        setPreviewUrl(url);
+                    },
+                }));
+                if (rFiles.isErr()) {
+                    if (earlyPreviewRef.current?.genKey === genKey)
+                        dropEarlyPreview();
+                    const message = rFiles.Err().message;
+                    if (message === IMG_GEN_NEEDS_TAP || message === IMG_GEN_CANCELLED) {
+                        if (existingDoc)
+                            setDocument(existingDoc);
+                        playgroundSpentKeyRef.current = genKey;
+                        playgroundModeRef.current = true;
                         currentGenRef.current = null;
-                    };
-                    if (landedLocally) {
-                        setDocument(composeDocument({
-                            hostDocId,
-                            versionDocs: sortVersionDocs(after),
-                            pointer: findPointerDoc(after, myHandle),
-                            legacyDoc,
-                        }));
-                        setProgress(100);
+                        setNeedsTap(true);
                         setLoading(false);
                         return;
                     }
-                    if (confirmedMediaProbe === undefined || confirmedMediaProbe === null) {
-                        waitForSync(after);
-                        return;
+                    if (message === IMG_GEN_SOURCE_UNUSABLE) {
+                        vibe.log("warn", IMG_GEN_SOURCE_UNUSABLE, { docId: hostDocId, dbName });
                     }
-                    const heldLocally = sortVersionDocs(after).some((vd) => Object.values(vd._files).some((f) => f.uploadId === uploadId));
-                    if (heldLocally) {
-                        setDocument(composeDocument({
-                            hostDocId,
-                            versionDocs: sortVersionDocs(after),
-                            pointer: findPointerDoc(after, myHandle),
-                            legacyDoc,
-                        }));
-                        setPending(true);
-                        setLoading(false);
-                        currentGenRef.current = null;
+                    if (message === IMG_GEN_UNREACHABLE) {
+                        playgroundModeRef.current = true;
+                        setError(new Error(IMG_GEN_UNREACHABLE_MESSAGE));
                     }
                     else {
-                        setPending(true);
-                        currentGenRef.current = null;
+                        setError(rFiles.Err());
                     }
-                    const probeKey = `${genKey}\u0000${promptText}`;
-                    const stillOurs = () => unmountSignalRef.current.aborted === false &&
-                        commitProbeInFlightRef.current === probeKey &&
-                        (currentGenRef.current === null || currentGenRef.current === genKey);
-                    commitProbeInFlightRef.current = probeKey;
-                    let ourSeq = clientWrite?.seq;
-                    let rekeeps = 0;
-                    let collided = false;
-                    const readBack = () => readBackFromServer({
-                        probe: confirmedMediaProbe,
-                        dbName,
-                        hostDocId,
-                        signal: unmountSignalRef.current,
-                        stillOurs,
-                        logEvent: "imggen-commit-probe-failed",
-                        examine: async (probedDocs, probedLegacy) => {
-                            const probedVersions = sortVersionDocs(probedDocs);
-                            if (holdsUpload(probedVersions, uploadId, true)) {
-                                commitProbeInFlightRef.current = null;
-                                currentGenRef.current = genKey;
-                                setDocument(composeDocument({
-                                    hostDocId,
-                                    versionDocs: probedVersions,
-                                    pointer: laterPointer(findPointerDoc(after, myHandle), findPointerDoc(probedDocs, myHandle)),
-                                    legacyDoc: probedLegacy ?? legacyDoc,
-                                }));
-                                setPending(false);
-                                setProgress(100);
-                                setLoading(false);
-                                return { done: true, value: "shown" };
-                            }
-                            const taken = clientWrite !== undefined &&
-                                ourSeq !== undefined &&
-                                probedVersions.some((vd) => vd.seq === ourSeq && holdsUpload([vd], uploadId, false) === false);
-                            if (taken === false || clientWrite === undefined)
+                    setLoading(false);
+                    if (playgroundModeRef.current)
+                        setNeedsTap(true);
+                    currentGenRef.current = null;
+                    return;
+                }
+                const { files, docWritten } = rFiles.Ok();
+                playgroundModeRef.current = false;
+                const file = files[0];
+                const early = earlyPreviewRef.current?.genKey === genKey ? earlyPreviewRef.current : null;
+                if (early !== null) {
+                    earlyPreviewRef.current = null;
+                    if (previewUrlsRef.current.has(file.uploadId) === false)
+                        previewUrlsRef.current.set(file.uploadId, early.url);
+                    else
+                        URL.revokeObjectURL(early.url);
+                }
+                else if (file.preview instanceof Blob && previewUrlsRef.current.has(file.uploadId) === false) {
+                    previewUrlsRef.current.set(file.uploadId, URL.createObjectURL(file.preview));
+                }
+                const ownBytes = early?.blob ?? (file.preview instanceof Blob ? file.preview : undefined);
+                if (ownBytes !== undefined && pictures !== undefined) {
+                    void pictures.seed(file.uploadId, ownBytes);
+                    seededRef.current.add(file.uploadId);
+                }
+                const rRun = await exception2Result(async () => {
+                    setProgress(90);
+                    const showCommitted = async (uploadId, clientWrite) => {
+                        releaseLease();
+                        if (currentGenRef.current !== genKey)
+                            return;
+                        committedGenRef.current = { genKey, uploadId };
+                        let after = await loadMediaDocs();
+                        const landedLocally = sortVersionDocs(after).some((vd) => Object.values(vd._files).some((f) => f.uploadId === uploadId && f.url !== undefined));
+                        const waitForSync = (rows) => {
+                            setDocument(composeDocument({
+                                hostDocId,
+                                versionDocs: sortVersionDocs(rows),
+                                pointer: findPointerDoc(rows, myHandle),
+                                legacyDoc,
+                            }));
+                            setPending(true);
+                            setLoading(false);
+                            currentGenRef.current = null;
+                        };
+                        if (landedLocally) {
+                            setDocument(composeDocument({
+                                hostDocId,
+                                versionDocs: sortVersionDocs(after),
+                                pointer: findPointerDoc(after, myHandle),
+                                legacyDoc,
+                            }));
+                            setProgress(100);
+                            setLoading(false);
+                            return;
+                        }
+                        if (confirmedMediaProbe === undefined || confirmedMediaProbe === null) {
+                            waitForSync(after);
+                            return;
+                        }
+                        const heldLocally = sortVersionDocs(after).some((vd) => Object.values(vd._files).some((f) => f.uploadId === uploadId));
+                        if (heldLocally) {
+                            setDocument(composeDocument({
+                                hostDocId,
+                                versionDocs: sortVersionDocs(after),
+                                pointer: findPointerDoc(after, myHandle),
+                                legacyDoc,
+                            }));
+                            setPending(true);
+                            setLoading(false);
+                            currentGenRef.current = null;
+                        }
+                        else {
+                            setPending(true);
+                            currentGenRef.current = null;
+                        }
+                        const probeKey = `${genKey}\u0000${promptText}`;
+                        const stillOurs = () => unmountSignalRef.current.aborted === false &&
+                            commitProbeInFlightRef.current === probeKey &&
+                            (currentGenRef.current === null || currentGenRef.current === genKey);
+                        commitProbeInFlightRef.current = probeKey;
+                        let ourSeq = clientWrite?.seq;
+                        let rekeeps = 0;
+                        let collided = false;
+                        const readBack = () => readBackFromServer({
+                            probe: confirmedMediaProbe,
+                            dbName,
+                            hostDocId,
+                            signal: unmountSignalRef.current,
+                            stillOurs,
+                            logEvent: "imggen-commit-probe-failed",
+                            examine: async (probedDocs, probedLegacy) => {
+                                const probedVersions = sortVersionDocs(probedDocs);
+                                if (holdsUpload(probedVersions, uploadId, true)) {
+                                    commitProbeInFlightRef.current = null;
+                                    currentGenRef.current = genKey;
+                                    setDocument(composeDocument({
+                                        hostDocId,
+                                        versionDocs: probedVersions,
+                                        pointer: laterPointer(findPointerDoc(after, myHandle), findPointerDoc(probedDocs, myHandle)),
+                                        legacyDoc: probedLegacy ?? legacyDoc,
+                                    }));
+                                    setPending(false);
+                                    setProgress(100);
+                                    setLoading(false);
+                                    return { done: true, value: "shown" };
+                                }
+                                const taken = clientWrite !== undefined &&
+                                    ourSeq !== undefined &&
+                                    probedVersions.some((vd) => vd.seq === ourSeq && holdsUpload([vd], uploadId, false) === false);
+                                if (taken === false || clientWrite === undefined)
+                                    return { done: false };
+                                collided = true;
+                                if (rekeeps >= IMG_GEN_MAX_REKEEPS)
+                                    return { done: true, value: "unkept" };
+                                rekeeps++;
+                                vibe.log("warn", "imggen-version-seq-taken", { docId: hostDocId, dbName, seq: ourSeq ?? 0 });
+                                const rekept = await clientWrite.rekeep(probedVersions);
+                                if (rekept === undefined)
+                                    return { done: true, value: "unkept" };
+                                ourSeq = rekept;
+                                after = await loadMediaDocs();
                                 return { done: false };
+                            },
+                        });
+                        let outcome = await readBack();
+                        while (outcome.kind === "exhausted" &&
+                            clientWrite !== undefined &&
+                            ourSeq !== undefined &&
+                            rekeeps < IMG_GEN_MAX_REKEEPS) {
+                            const localVersions = sortVersionDocs(await loadMediaDocs());
+                            if (stillOurs() === false)
+                                return;
+                            const lostLocally = localVersions.some((vd) => vd.seq === ourSeq && holdsUpload([vd], uploadId, false) === false);
+                            if (lostLocally === false)
+                                break;
                             collided = true;
-                            if (rekeeps >= IMG_GEN_MAX_REKEEPS)
-                                return { done: true, value: "unkept" };
                             rekeeps++;
-                            vibe.log("warn", "imggen-version-seq-taken", { docId: hostDocId, dbName, seq: ourSeq ?? 0 });
-                            const rekept = await clientWrite.rekeep(probedVersions);
-                            if (rekept === undefined)
-                                return { done: true, value: "unkept" };
+                            vibe.log("warn", "imggen-version-seq-taken", { docId: hostDocId, dbName, seq: ourSeq });
+                            const rekept = await clientWrite.rekeep(localVersions);
+                            if (rekept === undefined) {
+                                outcome = { kind: "done", value: "unkept" };
+                                break;
+                            }
                             ourSeq = rekept;
                             after = await loadMediaDocs();
-                            return { done: false };
-                        },
-                    });
-                    let outcome = await readBack();
-                    while (outcome.kind === "exhausted" &&
-                        clientWrite !== undefined &&
-                        ourSeq !== undefined &&
-                        rekeeps < IMG_GEN_MAX_REKEEPS) {
-                        const localVersions = sortVersionDocs(await loadMediaDocs());
+                            outcome = await readBack();
+                        }
+                        if (outcome.kind === "lost" || (outcome.kind === "done" && outcome.value === "shown"))
+                            return;
+                        const latest = await loadMediaDocs();
                         if (stillOurs() === false)
                             return;
-                        const lostLocally = localVersions.some((vd) => vd.seq === ourSeq && holdsUpload([vd], uploadId, false) === false);
-                        if (lostLocally === false)
+                        commitProbeInFlightRef.current = null;
+                        const shownFiles = (documentRef.current?._files ?? {});
+                        if (Object.values(shownFiles).some((f) => f.uploadId === uploadId && f.url !== undefined))
+                            return;
+                        const lostAtOurSeq = ourSeq !== undefined &&
+                            sortVersionDocs(latest).some((vd) => vd.seq === ourSeq && holdsUpload([vd], uploadId, false) === false);
+                        if ((outcome.kind === "done" && outcome.value === "unkept") || lostAtOurSeq) {
+                            vibe.log("warn", "imggen-version-unkept", { docId: hostDocId, dbName, uploadId, rekeeps, collided });
+                            setDocument(composeDocument({
+                                hostDocId,
+                                versionDocs: sortVersionDocs(latest),
+                                pointer: findPointerDoc(latest, myHandle),
+                                legacyDoc,
+                            }));
+                            setError(new Error(IMG_GEN_UNKEPT_MESSAGE));
+                            setPending(false);
+                            setLoading(false);
+                            currentGenRef.current = null;
+                            return;
+                        }
+                        waitForSync(latest);
+                    };
+                    if (docWritten === true) {
+                        await showCommitted(file.uploadId);
+                        return;
+                    }
+                    const fileMeta = {
+                        uploadId: file.uploadId,
+                        type: file.mimeType,
+                        size: file.size,
+                        lastModified: Date.now(),
+                        ...(temporaryDraft && file.url !== undefined ? { url: file.url } : {}),
+                    };
+                    const putVersionAt = (seq) => {
+                        const versionBody = buildMediaVersionDoc({
+                            hostDocId,
+                            promptKey: PROMPT_KEY,
+                            seq,
+                            authorHandle: generationHandle,
+                            files: { [`m${seq}`]: fileMeta },
+                            prompt: promptText,
+                            model,
+                            sourceKey: incomingSourceKey,
+                        });
+                        return exception2Result(() => mediaDb.put({ ...versionBody, _id: mediaVersionDocId(hostDocId, PROMPT_KEY, seq) }));
+                    };
+                    const movePointerTo = async (seq) => {
+                        const freshPointerRead = await loadMediaDocs();
+                        const freshCurrentSeq = findPointerDoc(freshPointerRead, myHandle)?.currentSeq ?? 0;
+                        if (seq <= freshCurrentSeq)
+                            return;
+                        const pointerBody = buildMediaPointerDoc({
+                            hostDocId,
+                            promptKey: PROMPT_KEY,
+                            authorHandle: generationHandle,
+                            currentSeq: seq,
+                        });
+                        await mediaDb.put({ ...pointerBody, _id: mediaPointerDocId(hostDocId, generationHandle) });
+                    };
+                    const nextFreeSeq = (...lanes) => {
+                        const seqs = lanes.flat().map((vd) => vd.seq);
+                        return seqs.length > 0 ? Math.max(...seqs) + 1 : 1;
+                    };
+                    let latestRead = await loadMediaDocs();
+                    let freshVersions = sortVersionDocs(latestRead);
+                    let serverVersions = [];
+                    if (confirmedMediaProbe !== undefined && confirmedMediaProbe !== null) {
+                        const rServer = await probeWithDeadline(confirmedMediaProbe, dbName, hostDocId);
+                        if (rServer.isOk())
+                            serverVersions = sortVersionDocs(rServer.Ok().mediaDocs);
+                        else
+                            vibe.log("warn", "imggen-seq-probe-failed", {
+                                docId: hostDocId,
+                                dbName,
+                                deadlineMs: imgGenProbeDeadlineMs,
+                                message: rServer.Err().message,
+                            });
+                    }
+                    if (holdsUpload([...freshVersions, ...serverVersions], fileMeta.uploadId, false)) {
+                        await showCommitted(fileMeta.uploadId);
+                        return;
+                    }
+                    let committedSeq;
+                    let adopted = false;
+                    let terminalError;
+                    for (let attempt = 0; attempt < 3; attempt++) {
+                        const nextSeq = nextFreeSeq(freshVersions, serverVersions);
+                        const rPut = await putVersionAt(nextSeq);
+                        if (rPut.isOk()) {
+                            committedSeq = nextSeq;
+                            break;
+                        }
+                        if (isConflictClassPutError(rPut.Err()) === false) {
+                            terminalError = rPut.Err();
                             break;
-                        collided = true;
-                        rekeeps++;
-                        vibe.log("warn", "imggen-version-seq-taken", { docId: hostDocId, dbName, seq: ourSeq });
-                        const rekept = await clientWrite.rekeep(localVersions);
-                        if (rekept === undefined) {
-                            outcome = { kind: "done", value: "unkept" };
+                        }
+                        latestRead = await loadMediaDocs();
+                        freshVersions = sortVersionDocs(latestRead);
+                        if (holdsUpload(freshVersions, fileMeta.uploadId, false)) {
+                            adopted = true;
                             break;
                         }
-                        ourSeq = rekept;
-                        after = await loadMediaDocs();
-                        outcome = await readBack();
                     }
-                    if (outcome.kind === "lost" || (outcome.kind === "done" && outcome.value === "shown"))
-                        return;
-                    const latest = await loadMediaDocs();
-                    if (stillOurs() === false)
-                        return;
-                    commitProbeInFlightRef.current = null;
-                    const shownFiles = (documentRef.current?._files ?? {});
-                    if (Object.values(shownFiles).some((f) => f.uploadId === uploadId && f.url !== undefined))
-                        return;
-                    const lostAtOurSeq = ourSeq !== undefined &&
-                        sortVersionDocs(latest).some((vd) => vd.seq === ourSeq && holdsUpload([vd], uploadId, false) === false);
-                    if ((outcome.kind === "done" && outcome.value === "unkept") || lostAtOurSeq) {
-                        vibe.log("warn", "imggen-version-unkept", { docId: hostDocId, dbName, uploadId, rekeeps, collided });
-                        setDocument(composeDocument({
-                            hostDocId,
-                            versionDocs: sortVersionDocs(latest),
-                            pointer: findPointerDoc(latest, myHandle),
-                            legacyDoc,
-                        }));
-                        setError(new Error(IMG_GEN_UNKEPT_MESSAGE));
-                        setPending(false);
+                    if (committedSeq === undefined && adopted === false) {
+                        setError(terminalError ?? new Error("Image generated but could not be saved after repeated write conflicts — please try again"));
                         setLoading(false);
                         currentGenRef.current = null;
                         return;
                     }
-                    waitForSync(latest);
-                };
-                if (docWritten === true) {
-                    await showCommitted(file.uploadId);
-                    return;
-                }
-                const fileMeta = {
-                    uploadId: file.uploadId,
-                    type: file.mimeType,
-                    size: file.size,
-                    lastModified: Date.now(),
-                    ...(temporaryDraft && file.url !== undefined ? { url: file.url } : {}),
-                };
-                const putVersionAt = (seq) => {
-                    const versionBody = buildMediaVersionDoc({
-                        hostDocId,
-                        promptKey: PROMPT_KEY,
-                        seq,
-                        authorHandle: myHandle,
-                        files: { [`m${seq}`]: fileMeta },
-                        prompt: promptText,
-                        model,
-                        sourceKey: incomingSourceKey,
-                    });
-                    return exception2Result(() => mediaDb.put({ ...versionBody, _id: mediaVersionDocId(hostDocId, PROMPT_KEY, seq) }));
-                };
-                const movePointerTo = async (seq) => {
-                    const freshPointerRead = await loadMediaDocs();
-                    const freshCurrentSeq = findPointerDoc(freshPointerRead, myHandle)?.currentSeq ?? 0;
-                    if (seq <= freshCurrentSeq)
+                    if (committedSeq === undefined) {
+                        await showCommitted(fileMeta.uploadId);
                         return;
-                    const pointerBody = buildMediaPointerDoc({ hostDocId, promptKey: PROMPT_KEY, authorHandle: myHandle, currentSeq: seq });
-                    await mediaDb.put({ ...pointerBody, _id: mediaPointerDocId(hostDocId, myHandle) });
-                };
-                const nextFreeSeq = (...lanes) => {
-                    const seqs = lanes.flat().map((vd) => vd.seq);
-                    return seqs.length > 0 ? Math.max(...seqs) + 1 : 1;
-                };
-                let latestRead = await loadMediaDocs();
-                let freshVersions = sortVersionDocs(latestRead);
-                let serverVersions = [];
-                if (confirmedMediaProbe !== undefined && confirmedMediaProbe !== null) {
-                    const rServer = await probeWithDeadline(confirmedMediaProbe, dbName, hostDocId);
-                    if (rServer.isOk())
-                        serverVersions = sortVersionDocs(rServer.Ok().mediaDocs);
-                    else
-                        vibe.log("warn", "imggen-seq-probe-failed", {
-                            docId: hostDocId,
-                            dbName,
-                            deadlineMs: imgGenProbeDeadlineMs,
-                            message: rServer.Err().message,
-                        });
-                }
-                if (holdsUpload([...freshVersions, ...serverVersions], fileMeta.uploadId, false)) {
-                    await showCommitted(fileMeta.uploadId);
-                    return;
-                }
-                let committedSeq;
-                let adopted = false;
-                let terminalError;
-                for (let attempt = 0; attempt < 3; attempt++) {
-                    const nextSeq = nextFreeSeq(freshVersions, serverVersions);
-                    const rPut = await putVersionAt(nextSeq);
-                    if (rPut.isOk()) {
-                        committedSeq = nextSeq;
-                        break;
-                    }
-                    if (isConflictClassPutError(rPut.Err()) === false) {
-                        terminalError = rPut.Err();
-                        break;
                     }
-                    latestRead = await loadMediaDocs();
-                    freshVersions = sortVersionDocs(latestRead);
-                    if (holdsUpload(freshVersions, fileMeta.uploadId, false)) {
-                        adopted = true;
-                        break;
-                    }
-                }
-                if (committedSeq === undefined && adopted === false) {
-                    setError(terminalError ?? new Error("Image generated but could not be saved after repeated write conflicts — please try again"));
+                    await movePointerTo(committedSeq);
+                    await showCommitted(fileMeta.uploadId, {
+                        seq: committedSeq,
+                        rekeep: async (probedVersions) => {
+                            const seq = nextFreeSeq(sortVersionDocs(await loadMediaDocs()), probedVersions);
+                            const rPut = await putVersionAt(seq);
+                            if (rPut.isErr()) {
+                                vibe.log("warn", "imggen-rekeep-failed", { docId: hostDocId, dbName, seq, message: rPut.Err().message });
+                                return undefined;
+                            }
+                            await movePointerTo(seq);
+                            return seq;
+                        },
+                    });
+                });
+                if (rRun.isErr()) {
+                    setError(rRun.Err());
                     setLoading(false);
                     currentGenRef.current = null;
-                    return;
-                }
-                if (committedSeq === undefined) {
-                    await showCommitted(fileMeta.uploadId);
-                    return;
                 }
-                await movePointerTo(committedSeq);
-                await showCommitted(fileMeta.uploadId, {
-                    seq: committedSeq,
-                    rekeep: async (probedVersions) => {
-                        const seq = nextFreeSeq(sortVersionDocs(await loadMediaDocs()), probedVersions);
-                        const rPut = await putVersionAt(seq);
-                        if (rPut.isErr()) {
-                            vibe.log("warn", "imggen-rekeep-failed", { docId: hostDocId, dbName, seq, message: rPut.Err().message });
-                            return undefined;
-                        }
-                        await movePointerTo(seq);
-                        return seq;
-                    },
-                });
-            });
-            if (rRun.isErr()) {
-                setError(rRun.Err());
-                setLoading(false);
-                currentGenRef.current = null;
             }
+            await generate().finally(releaseLease);
         }
         run();
     }, [