@koda-sl/baker-cli 0.404.0 → 0.405.0

package/dist/cli.js

@@ -98,7 +98,7 @@ import {
   withoutCastName,
   wordCount,
   ytDlpBlockSignal
-} from "./chunk-KE6GXLDE.js";
+} from "./chunk-DGZ5DLXK.js";
 import {
   NAME_CONTAINS_ARG,
   csvOrJson,
@@ -71092,11 +71092,23 @@ async function restoreRunSnapshot(manifest, targetDir, opts = {}) {
 import { mkdir as mkdir7, readFile as readFile20, rm as rm5, writeFile as writeFile12 } from "fs/promises";
 import path23 from "path";
 var RENDERS_PER_ROUND = 3;
+var REDRAWS_PER_ROUND = 4;
+var redrawsOf = (ledger) => ledger.redraws ?? 0;
 function claimRender(ledger, chatId) {
   const current = ledger && ledger.chatId === chatId ? ledger : { chatId, renders: 0 };
-  if (current.renders >= RENDERS_PER_ROUND) return { allowed: false, renders: current.renders, ledger: current };
-  const next = { chatId, renders: current.renders + 1 };
-  return { allowed: true, renders: next.renders, ledger: next };
+  if (current.renders < RENDERS_PER_ROUND) {
+    const next = { ...current, renders: current.renders + 1 };
+    return { allowed: true, kind: "pictures", renders: next.renders, redraws: redrawsOf(next), ledger: next };
+  }
+  if (redrawsOf(current) < REDRAWS_PER_ROUND) {
+    const next = { ...current, redraws: redrawsOf(current) + 1 };
+    return { allowed: true, kind: "redraw", renders: next.renders, redraws: redrawsOf(next), ledger: next };
+  }
+  return { allowed: false, kind: "redraw", renders: current.renders, redraws: redrawsOf(current), ledger: current };
+}
+function settleRender(ledger, kind, painted) {
+  if (kind !== "pictures" || painted || redrawsOf(ledger) >= REDRAWS_PER_ROUND || ledger.renders <= 0) return ledger;
+  return { ...ledger, renders: ledger.renders - 1, redraws: redrawsOf(ledger) + 1 };
 }
 function ledgerFile(canvasRoot, slug) {
   return path23.join(canvasRoot, ".render-budget", `${slug}.json`);
@@ -71104,28 +71116,55 @@ function ledgerFile(canvasRoot, slug) {
 async function readLedger(canvasRoot, slug) {
   try {
     const raw = JSON.parse(await readFile20(ledgerFile(canvasRoot, slug), "utf8"));
-    return typeof raw.renders === "number" ? { chatId: raw.chatId ?? null, renders: raw.renders } : null;
+    if (typeof raw.renders !== "number") return null;
+    const inFlight = raw.inFlight && typeof raw.inFlight.runId === "string" && (raw.inFlight.kind === "pictures" || raw.inFlight.kind === "redraw") ? { inFlight: { runId: raw.inFlight.runId, kind: raw.inFlight.kind } } : {};
+    return {
+      chatId: raw.chatId ?? null,
+      renders: raw.renders,
+      ...typeof raw.redraws === "number" ? { redraws: raw.redraws } : {},
+      ...inFlight
+    };
   } catch {
     return null;
   }
 }
-async function spendRender(canvasRoot, slug, chatId) {
+async function writeLedger(canvasRoot, slug, ledger) {
+  try {
+    await mkdir7(path23.dirname(ledgerFile(canvasRoot, slug)), { recursive: true });
+    await writeFile12(ledgerFile(canvasRoot, slug), JSON.stringify(ledger));
+  } catch {
+  }
+}
+async function spendRender(canvasRoot, slug, chatId, runId) {
   const claim = claimRender(await readLedger(canvasRoot, slug), chatId);
   if (claim.allowed) {
-    try {
-      await mkdir7(path23.dirname(ledgerFile(canvasRoot, slug)), { recursive: true });
-      await writeFile12(ledgerFile(canvasRoot, slug), JSON.stringify(claim.ledger));
-    } catch {
-    }
+    const { inFlight: _previous, ...ledger } = claim.ledger;
+    await writeLedger(canvasRoot, slug, runId ? { ...ledger, inFlight: { runId, kind: claim.kind } } : ledger);
   }
-  return { allowed: claim.allowed, renders: claim.renders };
+  return { allowed: claim.allowed, kind: claim.kind, renders: claim.renders, redraws: claim.redraws };
 }
-async function refundRender(canvasRoot, slug, chatId) {
+async function resumedRender(canvasRoot, slug, chatId, runId) {
   const ledger = await readLedger(canvasRoot, slug);
-  if (!ledger || ledger.chatId !== chatId || ledger.renders <= 0) return;
-  await writeFile12(ledgerFile(canvasRoot, slug), JSON.stringify({ chatId, renders: ledger.renders - 1 })).catch(
-    () => void 0
-  );
+  if (!ledger || ledger.chatId !== chatId || ledger.inFlight?.runId !== runId) return null;
+  return { allowed: true, kind: ledger.inFlight.kind, renders: ledger.renders, redraws: redrawsOf(ledger) };
+}
+function landed(ledger) {
+  const { inFlight: _done, ...rest } = ledger;
+  return rest;
+}
+async function settleSpentRender(canvasRoot, slug, chatId, kind, painted) {
+  const ledger = await readLedger(canvasRoot, slug);
+  if (!ledger || ledger.chatId !== chatId) return null;
+  const next = landed(settleRender(ledger, kind, painted));
+  await writeLedger(canvasRoot, slug, next);
+  return { renders: next.renders, redraws: redrawsOf(next) };
+}
+async function refundRender(canvasRoot, slug, chatId, kind) {
+  const found = await readLedger(canvasRoot, slug);
+  if (!found || found.chatId !== chatId) return;
+  const ledger = landed(found);
+  if (kind === "pictures") await writeLedger(canvasRoot, slug, { ...ledger, renders: Math.max(0, ledger.renders - 1) });
+  else await writeLedger(canvasRoot, slug, { ...ledger, redraws: Math.max(0, redrawsOf(ledger) - 1) });
 }
 async function openRenderRound(canvasRoot, slug) {
   await rm5(ledgerFile(canvasRoot, slug), { force: true }).catch(() => void 0);
@@ -71134,6 +71173,16 @@ async function openRenderRoundInWorkspace(slug) {
   const cwd = process.cwd();
   await openRenderRound(canvasOutputsRoot(path23.join(cwd, "src", "creatives", slug, "canvas.json"), cwd), slug);
 }
+function redrawNeedsPicturesRefusal(slug) {
+  return {
+    ok: false,
+    error: {
+      code: "RENDER_BUDGET",
+      message: `${slug} has painted this round's ${RENDERS_PER_ROUND} pictures, and this change would paint new ones. Nothing was billed, and the re-draw was not counted.`,
+      fix: "Change only what re-draws from the pictures already made: a line's `size`, a `treatment` of `highlight` or `sticker`, or shorter words. Or stop and show the person the best version, and ask what to change; recording their answer (baker creatives feedback record) opens a new round with new pictures."
+    }
+  };
+}
 function isStaticAdCanvas(parsed) {
   const nodes = parsed?.nodes;
   return Array.isArray(nodes) && nodes.some((n) => n?.id === "compose_spec" && n?.type === "ingest");
@@ -71143,7 +71192,7 @@ function renderBudgetRefusal(slug) {
     ok: false,
     error: {
       code: "RENDER_BUDGET",
-      message: `${slug} has been rendered ${RENDERS_PER_ROUND} times in this chat since the person last reacted to it. It is not rendered again until they do.`,
+      message: `${slug} has used this round's ${RENDERS_PER_ROUND} pictures and ${REDRAWS_PER_ROUND} re-draws in this chat since the person last reacted to it. It is not rendered again until they do.`,
       fix: `Stop fixing. Show the person the best version you have (the run with the fewest blocking problems), say in one line what is still wrong, and ask whether to keep it or what to change. When they answer, record it with baker creatives feedback record --slug ${slug} --run <run_id> (or baker creatives select --slug ${slug} --run <run_id>), which opens a new round of ${RENDERS_PER_ROUND} renders. Working as a subagent: return now with the best run id and what is left.`
     }
   };
@@ -71993,9 +72042,15 @@ async function textOf(ref2) {
 var LAYOUT_FIX = "Overlapping or unreadable copy is a layout fix, not a new picture. In prompt.json make the line smaller (`size` in its layout region's `text`), give the line in `text_content` a `treatment` of `highlight` or `sticker` (a solid fill behind the words), or shorten it (in `text_content` and in its layout region, the same words in both). Those re-draw only the formats from the cached pictures. Moving a region (`x_pct`/`y_pct`) or editing the scene re-paints all three pictures.";
 function verdictHints(verdict, round4) {
   if (verdict === "needs_fixes") {
+    if (round4 && round4.renders >= round4.of && round4.redraws >= round4.redrawsOf) {
+      return [
+        `NOT READY, and this round's ${round4.of} pictures and ${round4.redrawsOf} re-draws for this creative are spent before the person sees it: stop fixing. Show them the best version you have (this one or an earlier run), say in one line what is still wrong, and ask whether to keep it or what to change. Record their answer with baker creatives feedback record; that opens a new round.`
+      ];
+    }
     if (round4 && round4.renders >= round4.of) {
       return [
-        `NOT READY, and this was render ${round4.renders} of ${round4.of} for this creative before the person sees it: stop fixing. Show them the best version you have (this one or an earlier run), say in one line what is still wrong, and ask whether to keep it or what to change. Record their answer with baker creatives feedback record; that opens a new round.`
+        `NOT READY, and the ${round4.of} pictures of this round are painted: ${round4.redrawsOf - round4.redraws} free re-draws left, from the pictures already made. Fix only what re-draws from them, the smallest edit, and re-run; a change that needs new pictures (moving a region, editing the scene) is refused until the person reacts.`,
+        LAYOUT_FIX
       ];
     }
     return [
@@ -72278,7 +72333,7 @@ ${describeRewrites(prepared.rewrites)}
     );
     process.exit(2);
   }
-  const round4 = creativeSlug && !resumed && isStaticAdCanvas(parsed) ? await spendRender(canvasRoot, creativeSlug, optionalChatId() ?? null) : null;
+  const round4 = creativeSlug && isStaticAdCanvas(parsed) ? resumed ? await resumedRender(canvasRoot, creativeSlug, optionalChatId() ?? null, runId) : await spendRender(canvasRoot, creativeSlug, optionalChatId() ?? null, runId) : null;
   if (round4 && !round4.allowed && creativeSlug) {
     process.stderr.write(`${JSON.stringify(renderBudgetRefusal(creativeSlug), null, 2)}
 `);
@@ -72354,6 +72409,7 @@ ${describeRewrites(prepared.rewrites)}
       signal: abort.signal,
       cache_policy: policy,
       max_credits: opts.maxCredits,
+      ...round4?.kind === "redraw" ? { billed_from_cache_only: true } : {},
       ...stopBeforeKinds(opts.until) ? { stop_before_kinds: stopBeforeKinds(opts.until) } : {},
       concurrency: resolveConcurrency(opts.concurrency, process.env.BAKER_CANVAS_CONCURRENCY),
       regenerate,
@@ -72380,6 +72436,13 @@ ${describeRewrites(prepared.rewrites)}
       await pruneOldRuns(outputsDir, keepRuns, result.run_id, (line) => process.stdout.write(`${line}
 `));
     }
+    const settled = round4?.allowed && creativeSlug ? await settleSpentRender(canvasRoot, creativeSlug, optionalChatId() ?? null, round4.kind, result.stats.total_credits > 0) : null;
+    const roundAfter = round4 ? {
+      renders: settled?.renders ?? round4.renders,
+      of: RENDERS_PER_ROUND,
+      redraws: settled?.redraws ?? round4.redraws,
+      redrawsOf: REDRAWS_PER_ROUND
+    } : null;
     const reviewable = videoPathFromOutput(result.output);
     const reviewUsage = [];
     const review = reviewable ? await reviewRenderedVideo({
@@ -72394,7 +72457,7 @@ ${describeRewrites(prepared.rewrites)}
       output: result.output,
       outputsByNode: result.outputs_by_node,
       onSpend: (usage) => reviewUsage.push(usage),
-      round: round4 ? { renders: round4.renders, of: RENDERS_PER_ROUND } : null
+      round: roundAfter
     });
     const hints2 = staticReview ? staticReview.hints : reviewable ? review === null ? [RENDER_REVIEW_UNAVAILABLE] : review.length === 0 ? ["Reviewed the finished video frame by frame \u2014 nothing to report."] : [
       `Reviewed the finished video and found ${review.length} thing${review.length === 1 ? "" : "s"} to fix. Show the user what is wrong before you show them the ad.`,
@@ -72475,6 +72538,14 @@ ${describeRewrites(prepared.rewrites)}
       );
       process.exit(0);
     }
+    if (e instanceof RunAbortedError && e.reason === "cache_only" && creativeSlug) {
+      await clearMarker();
+      await refundRender(canvasRoot, creativeSlug, optionalChatId() ?? null, "redraw");
+      if (poster) await poster.flush(failedPayload(e.message));
+      process.stderr.write(`${JSON.stringify(redrawNeedsPicturesRefusal(creativeSlug), null, 2)}
+`);
+      process.exit(2);
+    }
     if (e instanceof RunAbortedError && e.reason === "cost_cap") {
       await clearMarker();
       if (poster) await poster.flush(failedPayload(e.message));
@@ -72484,7 +72555,7 @@ ${describeRewrites(prepared.rewrites)}
     }
     await clearMarker();
     if (round4?.allowed && creativeSlug && failedOnlyOnTransientErrors(e)) {
-      await refundRender(canvasRoot, creativeSlug, optionalChatId() ?? null);
+      await refundRender(canvasRoot, creativeSlug, optionalChatId() ?? null, round4.kind);
     }
     if (e instanceof ValidationError) {
       process.stderr.write(