@koda-sl/baker-cli 0.446.0-dev.c97e2d09a → 0.447.0-dev.f5788a631

package/dist/{chunk-JSN6LLHX.js → chunk-HYUUH4BE.js}

@@ -1,9 +1,9 @@
 import {
   outputRatioWarningsFor
-} from "./chunk-DIY6QR3E.js";
+} from "./chunk-HDWKLFF5.js";
 import {
   nodeParamsPreview
-} from "./chunk-EZUG6WE2.js";
+} from "./chunk-NSA6HRG6.js";
 import {
   waitForSheet
 } from "./chunk-WN4KX7GE.js";
@@ -19,6 +19,7 @@ import {
 } from "./chunk-3ACMDRSE.js";
 import {
   correctedPicture,
+  ingestedNow,
   isStaticAdCanvas,
   keepsChosen,
   pictureRecord,
@@ -30,8 +31,9 @@ import {
   seriesMembers,
   seriesRunHints,
   variantImage,
+  versionRun,
   writeSeriesMemberCanvas
-} from "./chunk-7H2VLDYU.js";
+} from "./chunk-VJZHVOA4.js";
 import {
   buildFailedRunRecord,
   buildInitialRunRecord,
@@ -40,7 +42,7 @@ import {
   finalFiles,
   finalOutputLabelsFromCanvas,
   nodeOutputsToRecord
-} from "./chunk-XZPREXCE.js";
+} from "./chunk-ACFWVULZ.js";
 import {
   clearLegacyDirtyMarker,
   readRenderState,
@@ -49,17 +51,19 @@ import {
   recordReviewOutcome,
   recordSeriesLeadRun,
   recordSnapshot
-} from "./chunk-ZN63N3EP.js";
+} from "./chunk-6TCDQSM7.js";
 import {
   BRAND_LOGO_ROLE,
   CLAIMS_MODEL,
   CLAIMS_REQUEST,
   CanvasPrepareError,
+  GLOBAL_PROMPT_FILE,
   PEOPLE_PROMPT_VERSION,
   REBUILD_FILE,
   computeSourceSha,
   exitOnPrepareError,
   findBrandRoot,
+  fixBriefNode,
   fixStaticAd,
   formatOfAdaptId,
   isNativeCanvas,
@@ -75,7 +79,7 @@ import {
   uncastPeople,
   wireNamedPeople,
   wireProofBadges
-} from "./chunk-NEZLPWD4.js";
+} from "./chunk-IH4UQ2OK.js";
 import {
   ViewerAnswerSchema,
   describeViewer,
@@ -84,6 +88,7 @@ import {
   judgeViewerAnswer,
   liveViewerLookups,
   marketQuery,
+  mayBeCorrection,
   misreadings,
   readTurnRenders,
   recordTurnRender,
@@ -95,25 +100,25 @@ import {
   viewerCheckBeforeRender,
   viewerCheckSkip,
   viewerChecksSpent
-} from "./chunk-HXTGYOQC.js";
+} from "./chunk-H2QNBOPS.js";
 import {
   holdUnbilledSpend,
   holdWhenSettled,
   sendBillingSpend,
   takeUnbilledSpend
-} from "./chunk-K3PN7TN5.js";
+} from "./chunk-WTOYCUKH.js";
 import {
   canvasOutputsRoot,
   describeRewrites,
   findWorkspaceRoot,
   localPathParam
-} from "./chunk-HIPDMQZ6.js";
+} from "./chunk-DZSIUEGH.js";
 import {
   ValidationError,
   createEngineFromEnv,
   resolveConcurrency,
   ulid
-} from "./chunk-HMEFD2CG.js";
+} from "./chunk-XDNEG2H6.js";
 import {
   BackendClient,
   LOGO_COMPOSITE_ROLE,
@@ -135,7 +140,7 @@ import {
   regenerateTargets,
   rolesById,
   staticMasterFormat
-} from "./chunk-RRUJQVWA.js";
+} from "./chunk-RCQJHKK5.js";
 import {
   requireCredentialsFromEnv
 } from "./chunk-W3B4BHQU.js";
@@ -165,6 +170,7 @@ import {
 import {
   GLANCE_CHECK_MODEL,
   VIEWER_CHECK_MODEL,
+  canonicalize,
   nearestSupportedAspectRatio
 } from "./chunk-OBDAYP2P.js";
 import {
@@ -186,13 +192,17 @@ import {
   describeFailureReason,
   runFailureCode,
   sha256Hex
-} from "./chunk-OTFHEHIU.js";
+} from "./chunk-HRYOZUSK.js";
+import {
+  apiPost
+} from "./chunk-XBOK23HI.js";
 import {
   optionalChatId,
   optionalTurnId
 } from "./chunk-NAWWC5I3.js";
 
 // src/commands/canvas/run.ts
+import { readFile as readFile6 } from "fs/promises";
 import path7 from "path";
 import { defineCommand } from "citty";
 
@@ -690,6 +700,19 @@ async function uploadRunSnapshot(client, opts) {
     return null;
   }
 }
+var MAX_GRAPH_BYTES = 4 * 1024 * 1024;
+async function uploadRunGraph(client, graph, signal) {
+  try {
+    const bytes = Buffer.from(JSON.stringify(graph));
+    if (bytes.length > MAX_GRAPH_BYTES) return null;
+    return (await putContentAddressed(client, bytes, "application/json", signal)).url;
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    process.stderr.write(`[warn] run graph not kept (${msg}) \u2014 a correction from another workspace starts from its picture
+`);
+    return null;
+  }
+}
 async function putContentAddressed(client, bytes, mime, signal) {
   const sha256 = sha256Hex(bytes);
   const { putUrl, publicUrl } = await client.presignAssetUpload(sha256, mime, signal, "blueprint");
@@ -762,6 +785,171 @@ async function restoreRunSnapshot(manifest, targetDir, opts = {}) {
   return { canvasPath: path3.resolve(resolvedTarget, manifest.canvas.path), restored, upToDate };
 }
 
+// src/engine/scaffold/static-history.ts
+var PICTURE_ROLES = /* @__PURE__ */ new Set([
+  STATIC_VARIANT_CALL_ROLE,
+  STATIC_VARIANTS_ROLE,
+  VARIANT_PREFILTER_ROLE,
+  STATIC_PICK_ROLE,
+  STATIC_FIX_ROLE,
+  SERIES_LEAD_ROLE
+]);
+var EDIT_ID = /^edit_(\d+)$/;
+function refNode(ref) {
+  return typeof ref === "string" ? ref.match(/^\$ref:([a-z][a-z0-9_]*)\./)?.[1] ?? null : null;
+}
+function depsOf(node) {
+  const found = [];
+  const walk = (v) => {
+    if (typeof v === "string") {
+      const id = refNode(v);
+      if (id) found.push(id);
+    } else if (Array.isArray(v)) v.forEach(walk);
+    else if (v && typeof v === "object") Object.values(v).forEach(walk);
+  };
+  walk(node.inputs);
+  walk(node.params);
+  return found;
+}
+function ancestors(nodes, id) {
+  const byId = new Map(nodes.map((n) => [n.id, n]));
+  const seen = /* @__PURE__ */ new Set();
+  const visit = (at) => {
+    const n = byId.get(at);
+    if (!n || seen.has(at)) return;
+    seen.add(at);
+    for (const dep of depsOf(n)) visit(dep);
+  };
+  visit(id);
+  return nodes.filter((n) => seen.has(n.id));
+}
+var isPicture = (n) => PICTURE_ROLES.has(n.tags?.role ?? "");
+function framingPrefilter(nodes, master) {
+  const reads = JSON.stringify(master.inputs ?? {});
+  return nodes.find((n) => n.tags?.role === VARIANT_PREFILTER_ROLE && reads.includes(`$ref:${n.id}.`));
+}
+function frameNode(prefilter, id, image) {
+  if (!prefilter) return null;
+  const { judge_model: _judge, judge_prompt: _prompt, ...params } = prefilter.params ?? {};
+  return { ...prefilter, id, inputs: { ...prefilter.inputs, images: [image] }, params };
+}
+function variantIndex(outputs, sha) {
+  const images = Array.isArray(outputs?.images) ? outputs.images : [];
+  const want = sha.trim().toLowerCase();
+  if (!/^[0-9a-f]{8,64}$/.test(want)) return null;
+  const hits = images.flatMap((img, i) => typeof img?.sha256 === "string" && img.sha256.startsWith(want) ? [i] : []);
+  return hits.length === 1 ? hits[0] ?? null : null;
+}
+function variantSources(nodes) {
+  const calls = nodes.filter((n) => n.tags?.role === STATIC_VARIANT_CALL_ROLE);
+  const ids = new Set(calls.flatMap((call) => ancestors(nodes, call.id).map((n) => n.id)));
+  return nodes.filter((n) => ids.has(n.id));
+}
+function variantFiles(canvas) {
+  return variantSources(canvas.nodes).flatMap((n) => {
+    const { source, path: path8, expect } = n.params ?? {};
+    return n.type === "ingest" && source === "path" && typeof path8 === "string" ? [{ id: n.id, path: path8, expect: String(expect ?? "") }] : [];
+  });
+}
+function declared(n) {
+  const { path: _where, ...params } = n.params ?? {};
+  const own = n.type === "ingest" && n.params?.source === "path" ? params : n.params ?? {};
+  return canonicalize({ type: n.type, inputs: n.inputs ?? {}, params: own });
+}
+function makesSameVariants(current, version, ingested) {
+  const sources = variantSources(current.nodes);
+  if (sources.length === 0) return false;
+  const was = new Map(version.canvas.nodes.map((n) => [n.id, n]));
+  const sameDeclaration = sources.every((n) => {
+    const before = was.get(n.id);
+    return before !== void 0 && declared(before) === declared(n);
+  });
+  return sameDeclaration && variantFiles(current).every((file) => {
+    const asset = version.outputs[file.id]?.asset;
+    return typeof asset?.sha256 === "string" && (ingested[file.id] ?? []).includes(asset.sha256);
+  });
+}
+function madeThisRun(grown) {
+  const master = grown.canvas.nodes.find((n) => n.tags?.role === STATIC_MASTER_ROLE);
+  const head = refNode(master?.inputs?.image);
+  const nodes = grown.canvas.nodes.filter((n) => !(n.id in grown.pinned) || n.id === head);
+  return { ...grown.canvas, nodes };
+}
+function growFromVersion(current, version, growth) {
+  const master = current.nodes.find((n) => n.tags?.role === STATIC_MASTER_ROLE);
+  const history = master ? versionHistory(current, version, growth) : null;
+  if (!master || !history) return null;
+  const { kept, pinned } = history;
+  const keptIds = new Set(kept.map((n) => n.id));
+  const stage = new Set(
+    ancestors(current.nodes, master.id).filter((n) => n.id !== master.id && isPicture(n)).map((n) => n.id)
+  );
+  const rest = current.nodes.filter((n) => !stage.has(n.id) && !keptIds.has(n.id));
+  const top = stepsOnTop({ current, master, kept, rest }, history.picture, growth);
+  if (!top) return null;
+  const at = rest.findIndex((n) => n.id === master.id);
+  const nodes = rest.map((n) => n.id === master.id ? { ...n, inputs: { ...n.inputs, image: top.picture } } : n);
+  return {
+    canvas: { ...current, nodes: [...nodes.slice(0, at), ...kept, ...top.added, ...nodes.slice(at)] },
+    pinned
+  };
+}
+function versionHistory(current, version, growth) {
+  const was = version.canvas.nodes;
+  const image = was.find((n) => n.tags?.role === STATIC_MASTER_ROLE)?.inputs?.image;
+  if (typeof image !== "string") return null;
+  let picture = image;
+  let from = refNode(image) ?? "";
+  if (growth.kind === "variant") {
+    const variants = was.find((n) => n.tags?.role === STATIC_VARIANTS_ROLE);
+    const at = variants ? variantIndex(version.outputs[variants.id], growth.sha256) : null;
+    if (!variants || at === null) return null;
+    picture = `$ref:${variants.id}.images#${at}`;
+    from = variants.id;
+  }
+  const own = new Set(current.nodes.map((n) => n.id));
+  const kept = ancestors(was, from).filter((n) => isPicture(n) || !own.has(n.id));
+  const pinned = {};
+  for (const n of kept) {
+    const outputs = version.outputs[n.id];
+    if (!outputs) return null;
+    pinned[n.id] = outputs;
+  }
+  return { kept, pinned, picture };
+}
+function stepsOnTop(at, picture, growth) {
+  if (growth.kind === "keep") return { added: [], picture };
+  const prefilter = framingPrefilter(at.current.nodes, at.master);
+  const step = growth.kind === "edit" ? editStep(at, picture, growth) : chosenStep(picture);
+  if (!step) return null;
+  const frame2 = frameNode(prefilter, `${step.id}_frame`, `$ref:${step.id}.images#0`);
+  return frame2 ? { added: [step, frame2], picture: `$ref:${frame2.id}.image` } : { added: [step], picture: `$ref:${step.id}.images#0` };
+}
+function editStep(at, picture, growth) {
+  const n = 1 + Math.max(0, ...at.kept.map((k) => Number(k.id.match(EDIT_ID)?.[1] ?? 0)));
+  const template = at.current.nodes.find(
+    (v) => v.type === "image_generate" && [STATIC_VARIANT_CALL_ROLE, STATIC_VARIANTS_ROLE].includes(v.tags?.role ?? "")
+  );
+  if (!template) return null;
+  const masterFormat = staticMasterFormat(at.current);
+  const brief = fixBriefNode({ nodes: [...at.kept, ...at.rest] }, template, growth.promptJson, {
+    instruction: growth.instruction,
+    previous: picture,
+    ...masterFormat ? { format: masterFormat } : {}
+  });
+  const { n: _n, ...params } = brief.params ?? {};
+  return {
+    id: `edit_${n}`,
+    type: brief.type,
+    ...brief.inputs ? { inputs: brief.inputs } : {},
+    params,
+    tags: { role: STATIC_FIX_ROLE }
+  };
+}
+function chosenStep(picture) {
+  return { id: "chosen", type: "collect", inputs: { images: [picture] }, tags: { role: STATIC_PICK_ROLE } };
+}
+
 // src/commands/canvas/named-people-read.ts
 import { createHash } from "crypto";
 import { mkdir as mkdir3, readFile as readFile3, writeFile as writeFile3 } from "fs/promises";
@@ -1380,13 +1568,50 @@ function withDeliveredSizes(canvas, last) {
   };
 }
 
+// src/commands/canvas/shown-version.ts
+import { z } from "zod";
+var ShownResponse = z.object({
+  data: z.object({
+    runId: z.string(),
+    sourceSha: z.string().optional(),
+    createdAt: z.number(),
+    canvasSnapshotUrl: z.string().optional()
+  })
+});
+var SnapshotFiles = z.object({ files: z.array(z.object({ path: z.string(), url: z.string() })) });
+var HISTORY = {
+  shown: async (slug) => ShownResponse.parse(await apiPost("/api/creatives/run", { slug })).data,
+  file: async (url) => {
+    const res = await fetch(url);
+    return res.ok ? res.json() : null;
+  }
+};
+async function shownVersion(canvasRoot, slug, sources = HISTORY) {
+  const here = await readRenderState(canvasRoot, slug);
+  if (here.rendered) return here;
+  const run = await sources.shown(slug).catch(() => null);
+  if (!run) return here;
+  const prompt = run.canvasSnapshotUrl ? await drawnPrompt(run.canvasSnapshotUrl, sources) : void 0;
+  return {
+    ...here,
+    rendered: { sourceSha: run.sourceSha ?? "", runId: run.runId, at: run.createdAt },
+    ...prompt !== void 0 ? { prompt } : {}
+  };
+}
+async function drawnPrompt(manifestUrl, sources) {
+  const manifest = SnapshotFiles.safeParse(await sources.file(manifestUrl).catch(() => null));
+  const entry = manifest.success ? manifest.data.files.find((f) => f.path === GLOBAL_PROMPT_FILE) : void 0;
+  if (!entry) return void 0;
+  return await sources.file(entry.url).catch(() => null) ?? void 0;
+}
+
 // src/commands/canvas/static-run-review.ts
 import { readFile as readFile4 } from "fs/promises";
 import path6 from "path";
 
 // src/commands/canvas/glance-check.ts
 import sharp from "sharp";
-import { z } from "zod";
+import { z as z2 } from "zod";
 var GLANCE_REQUIRED = {
   offer: "guess",
   for_whom: "unclear",
@@ -1395,9 +1620,9 @@ var GLANCE_REQUIRED = {
 var GLANCE_WIDTH = 400;
 var GlanceAnswerSchema = ViewerAnswerSchema.extend({
   /** What kind of product or service they take it for (D4). */
-  category: z.object({ answer: z.string().default(""), clarity: z.enum(["clear", "guess", "unclear"]).default("unclear") }).default({ answer: "", clarity: "unclear" }),
-  stopped: z.string().default(""),
-  me: z.enum(["yes", "no", "unsure"]).default("unsure")
+  category: z2.object({ answer: z2.string().default(""), clarity: z2.enum(["clear", "guess", "unclear"]).default("unclear") }).default({ answer: "", clarity: "unclear" }),
+  stopped: z2.string().default(""),
+  me: z2.enum(["yes", "no", "unsure"]).default("unsure")
 });
 function wherePhrase(placements) {
   const fullScreen = placements.length === 0 || placements.some((p) => /automatic|stor|reel/i.test(p));
@@ -1849,10 +2074,10 @@ function variantHints(judge, prefilter) {
 // src/commands/canvas/static-spec-repair.ts
 import { readFile as readFile5, writeFile as writeFile4 } from "fs/promises";
 import sharp2 from "sharp";
-import { z as z2 } from "zod";
-var Answer = z2.object({
-  changed: z2.string().min(1),
-  set: z2.array(z2.object({ path: z2.string().min(1), value: z2.unknown() }))
+import { z as z3 } from "zod";
+var Answer = z3.object({
+  changed: z3.string().min(1),
+  set: z3.array(z3.object({ path: z3.string().min(1), value: z3.unknown() }))
 });
 function withValueAt(root, path8, value) {
   const [key, ...rest] = path8;
@@ -1956,11 +2181,11 @@ var runCommand = defineCommand({
     "run-id": { type: "string", description: "Override run id (also resumes that run, re-attaching its in-flight jobs)" },
     fix: {
       type: "string",
-      description: `Static ad only: correct a finished version instead of rendering a new one. One render takes that version as its first reference and changes only what you say here ("the CTA sits in the Stories band: move it up", "'Analitica' is missing its accent"), keeping the picture, layout and every other word; every size is made again from it (each other size re-laid out from it, one request each) and the review follows as usual. The version is the creative's last render, or --from <run_id>.`
+      description: `Static ad only: correct a finished version instead of rendering a new one. One render takes that version as its first reference and changes only what you say here ("the CTA sits in the Stories band: move it up", "'Analitica' is missing its accent"), keeping the picture, layout and every other word. It is added on top of that version: its options, pick and earlier corrections are kept as they were made (free), the edit after them. Every size is made again from it (each other size re-laid out from it, one request each) and the review follows as usual. The version is the creative's last render, or --from <run_id>.`
     },
     from: {
       type: "string",
-      description: "With --fix, --use-variant or a --regenerate of sizes only: the run id of the version (default: the creative's last render)"
+      description: "With --fix, --use-variant or a --regenerate of sizes only: the run id of the version (default: the one the creative shows, its last render here, or in a new chat the version chosen, else its newest)"
     },
     "use-variant": {
       type: "string",
@@ -2134,16 +2359,19 @@ async function executeCanvasRun(opts) {
   if (creativeSlug) await clearLegacyDirtyMarker(canvasRoot, creativeSlug);
   const turnId = optionalTurnId();
   const turnCache = opts.cacheDir ?? path7.join(canvasRoot, ".cache");
-  if (creativeSlug && (opts.autoFixRound ?? 0) === 0) {
-    const refusal = turnRenderRefusal(await readTurnRenders(turnCache), turnId, creativeSlug);
-    if (refusal) {
-      process.stderr.write(
-        `${JSON.stringify({ ok: false, error: { code: refusal.code, message: refusal.message, fix: refusal.fix } }, null, 2)}
+  const refuseTurnRender = async (correction) => {
+    if (!creativeSlug || (opts.autoFixRound ?? 0) > 0) return;
+    const refusal = turnRenderRefusal(await readTurnRenders(turnCache), turnId, creativeSlug, { correction });
+    if (!refusal) return;
+    process.stderr.write(
+      `${JSON.stringify({ ok: false, error: { code: refusal.code, message: refusal.message, fix: refusal.fix } }, null, 2)}
 `
-      );
-      process.exit(2);
-    }
-  }
+    );
+    process.exit(2);
+  };
+  const shown = creativeSlug ? await shownVersion(canvasRoot, creativeSlug) : {};
+  const promptOnDisk = await readFile6(path7.join(path7.dirname(filePath), "prompt.json"), "utf8").then((text) => JSON.parse(text)).catch(() => null);
+  await refuseTurnRender(mayBeCorrection(opts, shown.prompt, promptOnDisk));
   const citing = [];
   await wireProofBadges(
     path7.join(path7.dirname(filePath), "prompt.json"),
@@ -2185,7 +2413,6 @@ ${describeRewrites(prepared.rewrites)}
     );
   }
   let parsed = prepared.canvas;
-  const shown = creativeSlug ? await readRenderState(canvasRoot, creativeSlug) : {};
   const promptNow = isStaticAdCanvas(parsed) ? await readStaticPromptJson(parsed).catch(() => null) : null;
   const native = isNativeCanvas(parsed);
   if (native && (opts.fix !== void 0 || opts.useVariant !== void 0)) {
@@ -2214,6 +2441,10 @@ ${describeRewrites(prepared.rewrites)}
 `);
   }
   const fixInstruction = opts.fix ?? editInstruction ?? void 0;
+  const requested = opts.regenerate?.split(",").map((id) => id.trim()) ?? [];
+  await refuseTurnRender(
+    fixInstruction !== void 0 || requested.length > 0 && isStaticAdCanvas(parsed) && relaysSizesOnly(parsed, regenerateTargets(parsed, requested).ids)
+  );
   const fromRun = opts.from ?? shown.rendered?.runId;
   const memory = fixMemoryOf(shown, opts.from);
   if (opts.fix !== void 0 && repeatsFailedFix(memory.lastFix, opts.fix)) {
@@ -2235,6 +2466,11 @@ ${describeRewrites(prepared.rewrites)}
     );
     process.exit(2);
   }
+  let grown = null;
+  const growOn = async (from, growth) => {
+    const version = await versionRun(canvasRoot, from);
+    return version ? growFromVersion(parsed, version, growth) : null;
+  };
   if (fixInstruction !== void 0) {
     const instruction = fixInstruction.trim();
     const from = opts.from ?? shown.rendered?.runId;
@@ -2245,7 +2481,8 @@ ${describeRewrites(prepared.rewrites)}
 `);
       process.exit(2);
     }
-    parsed = fixStaticAd(parsed, { instruction, previous, promptJson: promptNow });
+    grown = await growOn(from, { kind: "edit", instruction, promptJson: promptNow });
+    parsed = grown ? grown.canvas : fixStaticAd(parsed, { instruction, previous, promptJson: promptNow });
     const labels = finalOutputLabelsFromCanvas(parsed);
     const delivered = await previousDelivered(canvasRoot, from, labels?.nodeId ?? "final", labels?.labels ?? [], {
       prefer: "url"
@@ -2272,36 +2509,62 @@ ${describeRewrites(prepared.rewrites)}
   }
   if (opts.useVariant !== void 0 && opts.fix === void 0) {
     const sha = opts.useVariant.trim();
-    const from = opts.from ?? (creativeSlug ? (await readRenderState(canvasRoot, creativeSlug)).rendered?.runId : void 0);
-    const url = from && isStaticAdCanvas(parsed) ? await variantImage(canvasRoot, from, sha, void 0, rolesById(parsed)) : null;
-    if (!from || !url) {
+    const from = opts.from ?? shown.rendered?.runId;
+    grown = from && isStaticAdCanvas(parsed) ? await growOn(from, { kind: "variant", sha256: sha }) : null;
+    const url = from && !grown && isStaticAdCanvas(parsed) ? await variantImage(canvasRoot, from, sha, void 0, rolesById(parsed)) : null;
+    if (!from || !grown && !url) {
       const message = !isStaticAdCanvas(parsed) ? "--use-variant re-makes the sizes of a static ad; this canvas is not one." : !from ? "--use-variant needs the version the variant belongs to: this creative has no recorded render here. Pass --from <run_id>." : `--use-variant found no variant ${sha} in run ${from}: pass the sha256 \`baker creatives feedback --slug <slug>\` prints, and --from with that version's run.`;
       process.stderr.write(`${JSON.stringify({ ok: false, error: { code: "no_such_variant", message } }, null, 2)}
 `);
       process.exit(2);
     }
-    parsed = rederiveFromVariant(parsed, { url });
+    if (grown) parsed = grown.canvas;
+    else if (url) parsed = rederiveFromVariant(parsed, { url });
     process.stdout.write(`[variant] making every size of run ${from} again from the chosen variant ${sha.slice(0, 12)}
 `);
   }
   let relaidFrom;
   if (opts.regenerate !== void 0 && opts.fix === void 0 && opts.useVariant === void 0 && isStaticAdCanvas(parsed)) {
-    const requested = opts.regenerate.split(",").map((id) => id.trim());
-    const from = opts.from ?? (creativeSlug ? (await readRenderState(canvasRoot, creativeSlug)).rendered?.runId : void 0);
-    const url = from && relaysSizesOnly(parsed, regenerateTargets(parsed, requested).ids) ? await correctedPicture(canvasRoot, from) ?? (shown.picture?.redrawn && shown.picture.runId === from ? await previousAdImage(canvasRoot, from, void 0, rolesById(parsed)) : null) : null;
-    if (from && url) {
+    const requested2 = opts.regenerate.split(",").map((id) => id.trim());
+    const from = opts.from ?? shown.rendered?.runId;
+    const sizesOnly = relaysSizesOnly(parsed, regenerateTargets(parsed, requested2).ids);
+    grown = from && sizesOnly ? await growOn(from, { kind: "keep" }) : null;
+    const url = from && sizesOnly && !grown ? await correctedPicture(canvasRoot, from) ?? (shown.picture?.redrawn && shown.picture.runId === from ? await previousAdImage(canvasRoot, from, void 0, rolesById(parsed)) : null) : null;
+    if (from && grown) {
+      parsed = grown.canvas;
+      relaidFrom = from;
+      process.stdout.write(`[regenerate] re-laying out from the picture run ${from} shows, kept as it was made
+`);
+    } else if (from && url) {
       parsed = rederiveFromVariant(parsed, { url });
       relaidFrom = from;
       process.stdout.write(`[regenerate] re-laying out from the picture run ${from} shows (its correction or the person's choice)
 `);
     }
   }
+  const plain = fixInstruction === void 0 && opts.useVariant === void 0 && opts.regenerate === void 0 && (opts.extendSizes?.length ?? 0) === 0;
+  if (plain && fromRun && !native && isStaticAdCanvas(parsed) && !seriesOf(parsed)) {
+    const version = await versionRun(canvasRoot, fromRun);
+    const same = version && makesSameVariants(parsed, version, await ingestedNow(variantFiles(parsed), path7.dirname(filePath)));
+    grown = version && same ? growFromVersion(parsed, version, { kind: "keep" }) : null;
+    if (grown) {
+      parsed = grown.canvas;
+      relaidFrom = fromRun;
+      process.stdout.write(`[version] nothing the variants are made from changed: keeping the picture of run ${fromRun}
+`);
+    }
+  }
+  if (grown) {
+    const kept = Object.keys(grown.pinned);
+    process.stdout.write(`[version] built on top of the version before: ${kept.join(", ")} kept as they were made (free)
+`);
+  }
   const canvasText = prepared.text;
   let regenerate;
   if (opts.regenerate !== void 0) {
-    const requested = opts.regenerate.split(",").map((id) => id.trim()).filter((id) => id.length > 0);
+    const requested2 = opts.regenerate.split(",").map((id) => id.trim()).filter((id) => id.length > 0);
     const known = new Set(canvasNodeIds(parsed));
-    const { ids: resolved, unknown } = regenerateTargets(parsed, requested);
+    const { ids: resolved, unknown } = regenerateTargets(parsed, requested2);
     if (unknown.length > 0) {
       process.stderr.write(
         `${JSON.stringify(
@@ -2479,6 +2742,7 @@ ${describeRewrites(prepared.rewrites)}
     previous: (await readRenderState(canvasRoot, creativeSlug)).snapshot
   }) : null;
   if (snapshot && creativeSlug) await recordSnapshot(canvasRoot, creativeSlug, snapshot);
+  const graphUrl = client && creativeSlug && isStaticAdCanvas(parsed) ? await uploadRunGraph(client, parsed) : null;
   const recordMeta = {
     creativeSlug,
     canvasPath: path7.relative(path7.dirname(canvasRoot), filePath) || void 0,
@@ -2489,6 +2753,7 @@ ${describeRewrites(prepared.rewrites)}
     sourceSha,
     chatId: optionalChatId(),
     canvasSnapshotUrl: snapshot?.url,
+    ...graphUrl ? { graphUrl } : {},
     ...newAsk ? { newAsk: true } : {}
   };
   if (client) {
@@ -2515,7 +2780,8 @@ ${describeRewrites(prepared.rewrites)}
   }
   const frameUrls = [];
   let next = null;
-  const readerSpend = holdWhenSettled(cacheDir, (run, outputs) => prefilterSpend(parsed, { [run.node_id]: outputs }, [run]));
+  const madeHere = grown ? madeThisRun({ canvas: parsed, pinned: grown.pinned }) : parsed;
+  const readerSpend = holdWhenSettled(cacheDir, (run, outputs) => prefilterSpend(madeHere, { [run.node_id]: outputs }, [run]));
   const isFrameNode = (id) => parsed.nodes?.find((n) => n.id === id)?.type === "image_generate";
   try {
     const policy = opts.cachePolicy ?? "read_write";
@@ -2526,6 +2792,7 @@ ${describeRewrites(prepared.rewrites)}
       ...stopBeforeKinds(opts.until) ? { stop_before_kinds: stopBeforeKinds(opts.until) } : {},
       concurrency: resolveConcurrency(opts.concurrency, process.env.BAKER_CANVAS_CONCURRENCY),
       regenerate,
+      ...grown ? { pinned: grown.pinned } : {},
       // Always set, because the frame collector has to run whether or not this run is
       // reporting progress to a backend — without it a checkpoint stops with nothing to
       // show, which is the only thing a checkpoint is for.
@@ -2544,7 +2811,7 @@ ${describeRewrites(prepared.rewrites)}
       }
     });
     await clearMarker();
-    const beforeRunId = creativeSlug ? (await readRenderState(canvasRoot, creativeSlug)).rendered?.runId : void 0;
+    const beforeRunId = shown.rendered?.runId;
     if (creativeSlug) {
       await recordRendered(canvasRoot, creativeSlug, sourceSha, result.run_id, {
         ...promptNow ? { prompt: promptNow } : {},
@@ -2580,7 +2847,7 @@ ${describeRewrites(prepared.rewrites)}
       sizesOnly: relaidFrom !== void 0 || opts.extendOnly === true || regenerate !== void 0 && relaysSizesOnly(parsed, [...regenerate])
     };
     const staticReview = reviewable ? null : await reviewStaticRun({
-      parsed,
+      parsed: madeHere,
       output: result.output,
       outputsByNode: result.outputs_by_node,
       onSpend: (usage) => reviewUsage.push(usage),
@@ -2879,4 +3146,4 @@ export {
   executeCanvasRun,
   buildBackendClient
 };
-//# sourceMappingURL=chunk-JSN6LLHX.js.map
+//# sourceMappingURL=chunk-HYUUH4BE.js.map