@koda-sl/baker-cli 0.434.0-dev.b788a58e0 → 0.434.0-dev.ec5c827fe

package/dist/cli.js

@@ -202,7 +202,7 @@ import {
   withoutCastName,
   wordCount,
   ytDlpBlockSignal
-} from "./chunk-ENTQULTV.js";
+} from "./chunk-7I73A72J.js";
 import {
   NAME_CONTAINS_ARG,
   csvOrJson,
@@ -70716,12 +70716,7 @@ function seriesMemberAd(input, lead) {
       ...canvas.metadata,
       name: "static ad of a series",
       description: `The next ad of the series led by \`${lead.slug}\`: the lead's finished picture (\`lead_ad\`) with only its words changed to the copy in this ad's \`prompt.json\`, every other size the lead's own size with the same words changed. Edit only the copy in \`prompt.json\`, then \`baker canvas run\`. Change the lead to change the design of the whole series.`,
-      series: {
-        lead: lead.slug,
-        run_id: lead.runId,
-        copy: lead.copy.map((l) => ({ ...l })),
-        ...lead.design ? { design: lead.design } : {}
-      }
+      series: { lead: lead.slug, run_id: lead.runId, copy: lead.copy.map((l) => ({ ...l })) }
     },
     nodes
   };
@@ -75621,8 +75616,7 @@ async function recordRendered(canvasRoot, slug, sourceSha, runId, drawn = {}) {
     rendered: { sourceSha, runId, at: Date.now() },
     ...drawn.prompt !== void 0 ? { prompt: drawn.prompt } : {},
     lastFix: drawn.lastFix,
-    picture: drawn.picture,
-    ...drawn.seriesLeadRun ? { seriesLeadRun: drawn.seriesLeadRun } : {}
+    picture: drawn.picture
   });
 }
 async function recordReviewOutcome(canvasRoot, slug, outcome2) {
@@ -77146,33 +77140,6 @@ function rebaseLeadPaths(canvas, leadDir, memberDir) {
   }
   return out;
 }
-var DESIGN_FIELDS = [
-  "scene",
-  "brand",
-  "colors",
-  "references",
-  "logo",
-  "logo_position",
-  "third_party_brands",
-  "formats",
-  "direction"
-];
-function seriesDesignOf(spec) {
-  try {
-    const read = readAdSpec(spec);
-    return JSON.stringify(DESIGN_FIELDS.map((key) => read[key] ?? null));
-  } catch {
-    return null;
-  }
-}
-function withLeadDesign(memberSpec, leadSpec) {
-  const out = { ...memberSpec };
-  for (const key of DESIGN_FIELDS) {
-    if (key in leadSpec) out[key] = leadSpec[key];
-    else delete out[key];
-  }
-  return out;
-}
 function unchangedCopyRefusal(lead, memberSpec) {
   const words2 = (copy2) => copy2.map((l) => l.text.trim()).join("\n");
   let copy;
@@ -77194,51 +77161,16 @@ async function writeSeriesMemberCanvas(root, slug, opts = {}) {
   const version = await leadVersion(root, lead, opts.fetchRecord);
   if ("refused" in version) return version;
   const dir = creativeDir(root, slug);
-  const promptPath = path26.join(dir, "prompt.json");
-  let memberSpec = JSON.parse(await readFile20(promptPath, "utf8").catch(() => "null"));
+  const memberSpec = JSON.parse(await readFile20(path26.join(dir, "prompt.json"), "utf8").catch(() => "null"));
   const unchanged = opts.leadWords ? null : unchangedCopyRefusal(version.lead, memberSpec);
   if (unchanged) return unchanged;
-  const file = canvasFile(root, slug);
-  const before = await readFile20(file, "utf8").catch(() => null);
-  const leadDesign = seriesDesignOf(version.spec);
-  const ownDesign = seriesDesignOf(memberSpec);
-  const previous = before ? JSON.parse(before).metadata?.series : void 0;
-  const synced = previous?.design;
-  let designFromLead = false;
-  if (leadDesign !== null && ownDesign !== null && ownDesign !== leadDesign) {
-    if (!opts.takeLeadDesign && ownDesign !== synced) {
-      return refusal(
-        "series_design_changed",
-        `This ad's design (its scene, colours, pictures or logo in prompt.json) was changed on the ad itself, but every ad of the series has the design of its lead "${lead}".`,
-        `Make the change once, on the lead: edit src/creatives/${lead}/prompt.json (or baker canvas run --slug ${lead} --fix "<the change>"), then baker canvas run --series ${lead}: every ad takes the lead's new design, its own words kept. Only this ad's copy belongs in its own prompt.json.`
-      );
-    }
-    memberSpec = withLeadDesign(memberSpec, version.spec);
-    await writeFile11(promptPath, `${JSON.stringify(memberSpec, null, 2)}
-`, "utf8");
-    designFromLead = true;
-  }
-  const canvas = seriesMemberAd(rebaseLeadPaths(version.canvas, creativeDir(root, lead), dir), {
-    ...version.lead,
-    ...leadDesign !== null ? { design: leadDesign } : {}
-  });
+  const canvas = seriesMemberAd(rebaseLeadPaths(version.canvas, creativeDir(root, lead), dir), version.lead);
   const text4 = `${JSON.stringify(canvas, null, 2)}
 `;
+  const file = canvasFile(root, slug);
+  const before = await readFile20(file, "utf8").catch(() => null);
   if (before !== text4) await writeFile11(file, text4, "utf8");
-  const madeFrom = (await readRenderState(path26.join(root, "canvas"), slug)).seriesLeadRun;
-  const newLeadVersion = madeFrom !== void 0 && madeFrom !== version.lead.runId;
-  return { lead, leadRunId: version.lead.runId, canvasPath: file, written: before !== text4, designFromLead, newLeadVersion };
-}
-function seriesRunHints(slug, series) {
-  if (series.lead) {
-    return [
-      `This ad is one of the series led by ${series.lead}: its picture is the lead's with its own words. A change to what every ad shares (the picture, colours, layout, logo) is made once, on the lead (src/creatives/${series.lead}/prompt.json, or baker canvas run --slug ${series.lead} --fix "<the change>"), then baker canvas run --series ${series.lead}. Correct only this ad's own words or its own defect here.`
-    ];
-  }
-  if (series.members.length === 0) return [];
-  return [
-    `This ad leads a series of ${series.members.length + 1}: baker canvas run --series ${slug} makes ${series.members.join(", ")} again from this version, each with its own words. Until then they show the lead's earlier version.`
-  ];
+  return { lead, leadRunId: version.lead.runId, canvasPath: file, written: before !== text4 };
 }
 
 // src/commands/canvas/series-run.ts
@@ -79205,11 +79137,9 @@ async function executeSeriesRun(lead) {
 `);
   const results = await runSeries(members, {
     plan: async (slug) => {
-      const made = await writeSeriesMemberCanvas(root, slug, { takeLeadDesign: true });
+      const made = await writeSeriesMemberCanvas(root, slug);
       if (made === null) return { refused: { code: "not_in_series", message: `${slug} is no ad of this series.`, fix: "" } };
       if ("refused" in made) return made;
-      if (made.designFromLead) process.stdout.write(`[series] ${slug} takes the lead's design, its own words kept
-`);
       try {
         const prepared = await prepareCanvas(made.canvasPath, { write: false });
         const state = await readRenderState(canvasRoot, slug);
@@ -79233,22 +79163,21 @@ async function executeSeriesRun(lead) {
 }
 async function refreshSeriesAd(opts) {
   const slug = opts.slug ?? (opts.file ? creativeSlugFromCanvasPath(path32.resolve(opts.file)) : null);
-  if (!slug) return false;
+  if (!slug) return;
   const root = findWorkspaceRoot(opts.file ? path32.dirname(path32.resolve(opts.file)) : process.cwd());
-  if (!root) return false;
+  if (!root) return;
   const made = await writeSeriesMemberCanvas(root, slug);
-  if (made === null) return false;
+  if (made === null) return;
   if ("refused" in made) failPreflight3(made.refused.code, made.refused.message, made.refused.fix);
   process.stdout.write(
     `[series] ${slug} is the lead ${made.lead}'s version ${made.leadRunId} with this ad's words${made.written ? " (canvas written)" : ""}
 `
   );
-  return made.newLeadVersion;
 }
 var canvasHeld = false;
 async function executeCanvasRun(opts) {
   const startedAt = opts.autoFixStartedAt ?? Date.now();
-  const newAsk = (opts.autoFixRound ?? 0) === 0 ? await refreshSeriesAd(opts) : false;
+  if ((opts.autoFixRound ?? 0) === 0) await refreshSeriesAd(opts);
   const { canvasPath: filePath, adoptRunId } = await canvasFileFor(opts);
   const canvasRoot = canvasOutputsRoot(filePath);
   const creativeSlug = creativeSlugFromCanvasPath(filePath) ?? void 0;
@@ -79602,8 +79531,7 @@ ${describeRewrites(prepared.rewrites)}
     // taken after the preflight wrote the projected graph, so the two are comparable.
     sourceSha,
     chatId: optionalChatId(),
-    canvasSnapshotUrl: snapshot?.url,
-    ...newAsk ? { newAsk: true } : {}
+    canvasSnapshotUrl: snapshot?.url
   };
   if (client) {
     const registered = await postInitialRunRecord(client, buildInitialRunRecord(runId, recordMeta));
@@ -79660,7 +79588,6 @@ ${describeRewrites(prepared.rewrites)}
     if (creativeSlug) {
       await recordRendered(canvasRoot, creativeSlug, sourceSha, result.run_id, {
         ...promptNow ? { prompt: promptNow } : {},
-        ...seriesOf(parsed)?.run_id ? { seriesLeadRun: seriesOf(parsed)?.run_id } : {},
         picture: pictureRecord(result.run_id, {
           chose: opts.useVariant !== void 0,
           of: shown.picture,
@@ -79720,18 +79647,12 @@ ${describeRewrites(prepared.rewrites)}
     }
     const costHint = staticReview ? runCostHint(result.stats, paidFor(runShape)) : null;
     const corrected = opts.autoFixed ?? [];
-    const seriesRoot = creativeSlug && staticReview ? findWorkspaceRoot(path32.dirname(filePath)) : null;
-    const seriesHints = seriesRoot && creativeSlug ? seriesRunHints(creativeSlug, {
-      lead: await seriesLeadOf(seriesRoot, creativeSlug),
-      members: await seriesMembers(seriesRoot, creativeSlug)
-    }) : [];
     const hints2 = staticReview ? [
       ...corrected.length > 0 ? [
         `Corrected automatically before this result, ${corrected.length} more render${corrected.length === 1 ? "" : "s"}: ${corrected.join(" Then ")} What follows is the review of the corrected version.`
       ] : [],
       ...staticReview.hints,
       ...costHint ? [costHint] : [],
-      ...seriesHints,
       ...stillThere.length > 0 ? [
         `The fix did not remove ${stillThere.length === 1 ? "this" : "these"}: ${stillThere.join(" | ")}. The same instruction will not run again; change the approach (edit prompt.json so it cannot happen, or re-lay out only that size).`
       ] : []