@koda-sl/baker-cli 0.419.0 → 0.420.0

package/dist/cli.js

@@ -262,7 +262,7 @@ import {
   wordCount,
   xDraftOpInputSchema,
   ytDlpBlockSignal
-} from "./chunk-IS5ERYGR.js";
+} from "./chunk-M2E2OYY6.js";
 import {
   NAME_CONTAINS_ARG,
   csvOrJson,
@@ -59684,7 +59684,8 @@ function plannedBand(nodes, format, model) {
 }
 function unnamedReference(id, taken) {
   const [prefix, role] = /person|avatar/.test(id) ? ["PERSON", "identity"] : /_sheet$|animal|dog|cat|pet|hero/.test(id) ? ["ANIMAL", "identity"] : /product|package|bottle|box/.test(id) ? ["PRODUCT", "product"] : ["PROP", "prop"];
-  const n = taken.filter((r) => r.id.startsWith(`${prefix}_`)).length + 1;
+  let n = 1;
+  while (taken.some((r) => r.id === `${prefix}_${n}`)) n++;
   return {
     id: `${prefix}_${n}`,
     role,
@@ -61654,14 +61655,17 @@ async function resolveRunId(opts) {
   }
   if (opts.explicitRunId) return { runId: opts.explicitRunId, resumed: false };
   if (!opts.fresh) {
-    if (existing) return { runId: existing.runId, resumed: true, source: "local" };
-    if (opts.adoptedRunId) return { runId: opts.adoptedRunId, resumed: true, source: "remote" };
+    if (existing) {
+      const sameSource = existing.sourceSha !== void 0 && existing.sourceSha === opts.sourceSha;
+      return { runId: existing.runId, resumed: true, source: "local", sameSource };
+    }
+    if (opts.adoptedRunId) return { runId: opts.adoptedRunId, resumed: true, source: "remote", sameSource: true };
     if (opts.remote) {
       try {
         const active = await opts.remote.getActiveRun(opts.remote.creativeSlug, opts.remote.sourceSha);
         if (active) {
           const decision = classifyRemoteRun(active);
-          if (decision === "adopt") return { runId: active.runId, resumed: true, source: "remote" };
+          if (decision === "adopt") return { runId: active.runId, resumed: true, source: "remote", sameSource: true };
           if (decision === "concurrent") {
             return { runId: `r_${ulid()}`, resumed: false, concurrentRunId: active.runId };
           }
@@ -61685,19 +61689,28 @@ async function readMarker(outputsDir, canvasPath) {
       ...Number.isInteger(parsed.pid) ? { pid: parsed.pid } : {},
       ...typeof parsed.token === "string" ? { token: parsed.token } : {},
       ...num4(parsed.startedAt) !== void 0 ? { startedAt: num4(parsed.startedAt) } : {},
-      ...num4(parsed.heartbeatAt) !== void 0 ? { heartbeatAt: num4(parsed.heartbeatAt) } : {}
+      ...num4(parsed.heartbeatAt) !== void 0 ? { heartbeatAt: num4(parsed.heartbeatAt) } : {},
+      ...typeof parsed.sourceSha === "string" ? { sourceSha: parsed.sourceSha } : {}
     };
   } catch {
     return null;
   }
 }
-async function markRunInFlight(outputsDir, canvasPath, runId) {
+async function markRunInFlight(outputsDir, canvasPath, runId, sourceSha) {
   const file = markerFile(outputsDir, canvasPath);
   const token = randomUUID();
   const startedAt = Date.now();
   const write = (heartbeatAt) => writeFile8(
     file,
-    JSON.stringify({ runId, pid: process.pid, token, canvasPath: path18.resolve(canvasPath), startedAt, heartbeatAt })
+    JSON.stringify({
+      runId,
+      pid: process.pid,
+      token,
+      canvasPath: path18.resolve(canvasPath),
+      startedAt,
+      heartbeatAt,
+      ...sourceSha ? { sourceSha } : {}
+    })
   );
   try {
     await mkdir4(path18.dirname(file), { recursive: true });
@@ -62256,12 +62269,25 @@ async function takeUnbilledSpend(cacheDir) {
 async function sendBillingSpend(cacheDir, usage, send) {
   try {
     await send();
+    return null;
   } catch (e) {
     await holdUnbilledSpend(cacheDir, usage).catch(() => {
     });
-    throw e;
+    return e instanceof Error ? e.message : String(e);
   }
 }
+function holdWhenSettled(cacheDir, spendOf) {
+  const pending = [];
+  return {
+    settled: (run2, outputs) => {
+      pending.push(holdUnbilledSpend(cacheDir, spendOf(run2, outputs)).catch(() => {
+      }));
+    },
+    drained: async () => {
+      await Promise.all(pending);
+    }
+  };
+}
 
 // src/commands/canvas/viewer-check.ts
 var VIEWER_QUESTIONS = ["offer", "for_whom", "next_step"];
@@ -63215,12 +63241,13 @@ ${describeRewrites(prepared.rewrites)}
   const sourceSha = prepared.sourceSha;
   const client = opts.record === false ? null : buildBackendClient();
   const outputsDir = opts.outputsDir ? path25.resolve(opts.outputsDir) : canvasRoot;
-  const { runId, resumed, source, concurrentRunId, rendering } = await resolveRunId({
+  const { runId, resumed, source, sameSource, concurrentRunId, rendering } = await resolveRunId({
     explicitRunId: opts.runId,
     adoptedRunId: adoptRunId,
     fresh: opts.fresh === true || opts.fix !== void 0 || opts.useVariant !== void 0 || relaidFrom !== void 0,
     outputsDir,
     canvasPath: filePath,
+    sourceSha,
     remote: client && creativeSlug && sourceSha ? { creativeSlug, sourceSha, getActiveRun: (slug, sha) => client.getActiveRun(slug, sha) } : void 0
   });
   if (rendering) {
@@ -63246,7 +63273,7 @@ ${describeRewrites(prepared.rewrites)}
     creativeDir: path25.dirname(filePath),
     cacheDir,
     slug: creativeSlug,
-    skip: opts.fix !== void 0 || opts.useVariant !== void 0 || relaidFrom !== void 0 ? "fix" : resumed ? "resume" : opts.skipViewerCheck ? "asked" : null,
+    skip: opts.fix !== void 0 || opts.useVariant !== void 0 || relaidFrom !== void 0 ? "fix" : resumed && sameSource ? "resume" : opts.skipViewerCheck ? "asked" : null,
     lookups: liveViewerLookups(path25.dirname(canvasRoot)),
     model: VIEWER_CHECK_MODEL,
     ask: gatewayViewerModel(VIEWER_CHECK_MODEL, (usage) => viewerUsage.push(usage))
@@ -63293,7 +63320,7 @@ ${describeRewrites(prepared.rewrites)}
       abort.abort(new Error(`aborted by ${signalName}`));
     });
   }
-  const inFlight = await markRunInFlight(outputsDir, filePath, runId);
+  const inFlight = await markRunInFlight(outputsDir, filePath, runId, sourceSha);
   const clearMarker = () => {
     inFlight.stop();
     return clearRunMarker(outputsDir, filePath, inFlight.token);
@@ -63328,15 +63355,20 @@ ${describeRewrites(prepared.rewrites)}
       );
     }
   }
-  const record = client ? recordVia(client) : null;
+  const record = client ? (payload) => client.recordRun(payload) : null;
   const finalLabels = finalOutputLabelsFromCanvas(parsed) ?? void 0;
   const progress = record ? new RunProgressTracker(runId, recordMeta, finalLabels) : null;
   const poster = record ? new RunRecordPoster(record) : null;
-  const flushBilled = (p, payload) => sendBillingSpend(cacheDir, payload.reviewUsage ?? [], () => p.flush(payload));
+  const flushBilled = async (p, payload) => {
+    const failure = await sendBillingSpend(cacheDir, payload.reviewUsage ?? [], () => p.flush(payload));
+    if (failure !== null) process.stderr.write(`[warn] run record not persisted (${failure})
+`);
+  };
   if (progress && poster) {
     poster.startKeepalive(() => progress.hasPlan() ? progress.snapshot() : null);
   }
   const frameUrls = [];
+  const readerSpend = holdWhenSettled(cacheDir, (run2, outputs) => prefilterSpend(parsed, { [run2.node_id]: outputs }, [run2]));
   const isFrameNode = (id) => parsed.nodes?.find((n) => n.id === id)?.type === "image_generate";
   try {
     const policy = opts.cachePolicy ?? "read_write";
@@ -63351,6 +63383,7 @@ ${describeRewrites(prepared.rewrites)}
       // reporting progress to a backend — without it a checkpoint stops with nothing to
       // show, which is the only thing a checkpoint is for.
       onProgress: (event) => {
+        if (event.kind === "node_settled") readerSpend.settled(event.run, event.outputs);
         if (event.kind === "node_settled" && isFrameNode(event.run.node_id)) {
           for (const out of Object.values(event.outputs ?? {})) {
             const url = out?.url;
@@ -63373,6 +63406,7 @@ ${describeRewrites(prepared.rewrites)}
     if (round4?.allowed && creativeSlug) await settleSpentRender(canvasRoot, creativeSlug, optionalChatId() ?? null);
     const roundAfter = round4 ? { renders: round4.renders, of: RENDERS_PER_ROUND } : null;
     const reviewable = videoPathFromOutput(result.output);
+    await readerSpend.drained();
     const reviewUsage = poster ? await takeUnbilledSpend(cacheDir) : [];
     const review = reviewable ? await reviewRenderedVideo({
       video: reviewable,
@@ -63389,7 +63423,6 @@ ${describeRewrites(prepared.rewrites)}
       round: roundAfter,
       viewer: viewerCheck?.viewer ?? null
     });
-    if (staticReview) reviewUsage.push(...prefilterSpend(parsed, result.outputs_by_node, result.node_runs));
     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.`,
       ...review.map((f) => `${f.severity === "blocking" ? "Must fix" : "Should fix"} \u2014 ${f.what}`),
@@ -63444,6 +63477,7 @@ ${describeRewrites(prepared.rewrites)}
     );
   } catch (e) {
     const failedPayload = async (message) => {
+      await readerSpend.drained();
       const payload = progress?.hasPlan() ? progress.failedSnapshot(message) : buildFailedRunRecord(runId, message, recordMeta);
       const held = await takeUnbilledSpend(cacheDir);
       return held.length > 0 ? { ...payload, reviewUsage: held } : payload;
@@ -63525,17 +63559,6 @@ function buildBackendClient() {
     return null;
   }
 }
-function recordVia(client) {
-  return async (payload) => {
-    try {
-      await client.recordRun(payload);
-    } catch (e) {
-      const msg = e instanceof Error ? e.message : String(e);
-      process.stderr.write(`[warn] run record not persisted (${msg})
-`);
-    }
-  };
-}
 var sleep2 = (ms) => new Promise((resolve5) => setTimeout(resolve5, ms));
 async function postInitialRunRecord(client, payload) {
   for (let attempt = 0; attempt < 3; attempt++) {