@koda-sl/baker-cli 0.114.0-dev.249eaa8ed → 0.115.0

package/dist/cli.js

@@ -12,7 +12,7 @@ import {
   generateCatalog,
   resolveConcurrency,
   validateCanvasDeep
-} from "./chunk-5AWO4BHJ.js";
+} from "./chunk-ZWMMCLJ4.js";
 
 // src/cli.ts
 import { defineCommand as defineCommand157, runMain } from "citty";
@@ -4226,7 +4226,11 @@ var responsiveDisplayAdSchema = z8.object({
   longHeadline: z8.object({ text: z8.string().min(1).max(GOOGLE_ADS_LIMITS.responsiveDisplayAd.longHeadlineTextMax) }),
   descriptions: z8.array(z8.object({ text: z8.string().min(1).max(GOOGLE_ADS_LIMITS.responsiveDisplayAd.descriptionTextMax) })).min(1).max(5),
   businessName: z8.string().min(1).max(GOOGLE_ADS_LIMITS.responsiveDisplayAd.businessNameMax),
+  // A Responsive Display Ad's images are fields on the ad's own content (never campaign-level
+  // asset links). Google requires ≥1 landscape marketing image (1.91:1) AND ≥1 square marketing
+  // image (1:1) to serve; the logo images are optional.
   marketingImageAssets: z8.array(refSchema).optional(),
+  squareMarketingImageAssets: z8.array(refSchema).optional(),
   logoImageAssets: z8.array(refSchema).optional(),
   finalUrls: z8.array(httpsUrlSchema2).min(1)
 });
@@ -4411,7 +4415,11 @@ var adScheduleCriterionSchema = z8.object({
 var deviceCriterionSchema = z8.object({
   criterionType: z8.literal("device"),
   device: z8.enum(DEVICE_TYPES),
-  bidModifier: z8.number().min(0.1).max(10).optional()
+  // Google's `CampaignCriterion.bid_modifier`: "The modifier must be in the range 0.1 - 10.0. Use 0
+  // to opt out of a Device type." So 0 (exclude the device) and 0.1–10.0 are valid; the (0, 0.1) gap is not.
+  bidModifier: z8.number().min(0).max(10).optional().refine((v) => v === void 0 || v === 0 || v >= 0.1, {
+    message: "bid modifier must be 0 (exclude the device) or between 0.1 and 10.0"
+  })
 });
 var campaignCriterionAddSchema = z8.object({
   campaign: refSchema,
@@ -4422,6 +4430,15 @@ var campaignCriterionAddSchema = z8.object({
     adScheduleCriterionSchema,
     deviceCriterionSchema
   ])
+}).superRefine((val, ctx) => {
+  const c = val.criterion;
+  if (c.criterionType === "adSchedule" && c.endHour === 24 && c.endMinute !== "ZERO") {
+    ctx.addIssue({
+      code: z8.ZodIssueCode.custom,
+      message: "endHour 24 (midnight) cannot have a non-zero endMinute",
+      path: ["criterion", "endMinute"]
+    });
+  }
 });
 var GOOGLE_DRAFT_OP_KINDS = [
   "google.budget.create",
@@ -4595,7 +4612,8 @@ var googleDraftStatusNodeSchema = z9.lazy(
     operation: googleDraftChangeOperationSchema.optional(),
     existing: z9.boolean(),
     collections: z9.array(googleDraftStatusCollectionSchema),
-    children: z9.array(googleDraftStatusNodeSchema)
+    children: z9.array(googleDraftStatusNodeSchema),
+    warnings: z9.array(z9.string()).optional()
   })
 );
 var googleDraftListResponseSchema = z9.object({
@@ -4663,6 +4681,9 @@ function collectionLine(collection) {
 function renderNode(node, depth, lines) {
   const indent = "  ".repeat(depth);
   lines.push(`${indent}\u2022 ${node.name} \xB7 ${badge(node)}`);
+  for (const warning of node.warnings ?? []) {
+    lines.push(`${indent}    \u26A0 ${warning}`);
+  }
   for (const collection of node.collections) {
     const line = collectionLine(collection);
     if (line) {
@@ -5798,8 +5819,9 @@ function applyAutoFixes(query, limit) {
   if (/FROM\s+campaign_budget\b/i.test(corrected)) {
     const whereClause = corrected.split(/\bWHERE\b/i)[1] ?? "";
     const selectClause = corrected.split(/\bFROM\b/i)[0] ?? "";
+    const selectFields = new Set(selectClause.match(/campaign\.[\w.]+/g) ?? []);
     const missing = [...new Set(whereClause.match(/campaign\.[\w.]+/g) ?? [])].filter(
-      (field) => !selectClause.includes(field)
+      (field) => !selectFields.has(field)
     );
     if (missing.length > 0) {
       corrected = corrected.replace(/SELECT\s+/i, `SELECT ${missing.join(", ")}, `);
@@ -6654,6 +6676,52 @@ function rsaContentFromFlags(args) {
     finalUrls
   };
 }
+function rdaContentFromFlags(args, base) {
+  const content = {
+    format: "responsiveDisplay",
+    ...base !== null && typeof base === "object" && !Array.isArray(base) ? base : {}
+  };
+  const headlines = listFlag(args.headlines);
+  if (headlines) {
+    content.headlines = headlines.map((text) => ({ text }));
+  }
+  const descriptions = listFlag(args.descriptions);
+  if (descriptions) {
+    content.descriptions = descriptions.map((text) => ({ text }));
+  }
+  if (typeof args["long-headline"] === "string") {
+    content.longHeadline = { text: args["long-headline"] };
+  }
+  if (typeof args["business-name"] === "string") {
+    content.businessName = args["business-name"];
+  }
+  const finalUrls = listFlag(args["final-url"]);
+  if (finalUrls) {
+    content.finalUrls = finalUrls;
+  }
+  const marketing = listFlag(args["marketing-images"]);
+  if (marketing) {
+    content.marketingImageAssets = marketing;
+  }
+  const square = listFlag(args["square-marketing-images"]);
+  if (square) {
+    content.squareMarketingImageAssets = square;
+  }
+  const logos = listFlag(args["logo-images"]);
+  if (logos) {
+    content.logoImageAssets = logos;
+  }
+  return content;
+}
+function adContentFromFlags(args, format, fileContent) {
+  if (format === "responsiveSearch") {
+    return fileContent ?? rsaContentFromFlags(args);
+  }
+  if (format === "responsiveDisplay") {
+    return rdaContentFromFlags(args, fileContent);
+  }
+  return fileContent ?? failWriteValidation(`--format ${format} needs --file with the ad content`);
+}
 var adsCommand = defineCommand30({
   meta: { name: "ads", description: "Stage ad create/update/pause/resume/remove" },
   subCommands: {
@@ -6670,10 +6738,21 @@ var adsCommand = defineCommand30({
           type: "string",
           description: "responsiveSearch (default) | responsiveDisplay | performanceMaxAssetGroup | call | app | video | demandGen"
         },
-        headlines: { type: "string", description: "Comma-separated headlines (RSA)" },
-        descriptions: { type: "string", description: "Comma-separated descriptions (RSA)" },
+        headlines: { type: "string", description: "Comma-separated headlines (RSA/RDA)" },
+        descriptions: { type: "string", description: "Comma-separated descriptions (RSA/RDA)" },
         path1: { type: "string" },
         path2: { type: "string" },
+        "long-headline": { type: "string", description: "Long headline (responsiveDisplay)" },
+        "business-name": { type: "string", description: "Business name (responsiveDisplay)" },
+        "marketing-images": {
+          type: "string",
+          description: "Comma-separated marketing image asset refs (responsiveDisplay)"
+        },
+        "square-marketing-images": {
+          type: "string",
+          description: "Comma-separated square marketing image asset refs (responsiveDisplay)"
+        },
+        "logo-images": { type: "string", description: "Comma-separated logo image asset refs (responsiveDisplay)" },
         "final-url": { type: "string", description: "Comma-separated final URLs" },
         status: { type: "string" }
       },
@@ -6681,7 +6760,7 @@ var adsCommand = defineCommand30({
         const customerId = requireCustomerId(args);
         const file = loadJsonFileArg(args.file);
         const format = args.format ?? "responsiveSearch";
-        const content = file.content ?? (format === "responsiveSearch" ? rsaContentFromFlags(args) : failWriteValidation(`--format ${format} needs --file with the ad content`));
+        const content = adContentFromFlags(args, format, file.content);
         await stageCreate("google.ad.create", customerId, {
           adGroup: requireStringFlag(args["ad-group-ref"] ?? file.adGroup, "--ad-group-ref"),
           status: args.status ?? file.status,
@@ -12835,6 +12914,10 @@ var runCommand = defineCommand85({
       type: "string",
       description: "Max nodes per layer in flight at once (default 5; env BAKER_CANVAS_CONCURRENCY)"
     },
+    parallel: {
+      type: "string",
+      description: "Alias for --concurrency: independent clips (and every other same-layer node) already fan out in parallel up to this bound"
+    },
     "keep-runs": {
       type: "string",
       description: "After the run, prune old r_* run dirs, keeping the N newest (off by default)"
@@ -12884,7 +12967,8 @@ var runCommand = defineCommand85({
         run_id: args["run-id"] ? String(args["run-id"]) : void 0,
         cache_policy: policy,
         concurrency: resolveConcurrency(
-          args.concurrency !== void 0 ? String(args.concurrency) : void 0,
+          // --concurrency wins; --parallel is the discoverable alias for the same bound.
+          (args.concurrency ?? args.parallel) !== void 0 ? String(args.concurrency ?? args.parallel) : void 0,
           process.env.BAKER_CANVAS_CONCURRENCY
         )
       });
@@ -15844,7 +15928,8 @@ function scaffoldVideoCanvas(input, elementsInput, opts) {
   }
   const todo = {
     ...buildVideoTodo(videoReport(input, elementsInput), overlays.length, floating.length, opts, blueprint),
-    ...aspectRemapTodo(resolveAspect(blueprint.source?.aspect_ratio, opts.aspect, genAspectsFor(opts.videoModel)))
+    ...aspectRemapTodo(resolveAspect(blueprint.source?.aspect_ratio, opts.aspect, genAspectsFor(opts.videoModel))),
+    model_constraints: buildModelConstraints()
   };
   return {
     schema: "baker-canvas/1",
@@ -15855,21 +15940,58 @@ function scaffoldVideoCanvas(input, elementsInput, opts) {
       // The timing plan `baker canvas validate` checks before any billed render:
       // sequenced voiceover turns (no overlap), audio ≈ video length, and which
       // scenes must be lip-synced.
-      video: buildVideoMeta(blueprint, { vo_segments, talking_scenes })
+      video: buildVideoMeta(blueprint, { vo_segments, talking_scenes }, slots, nodes)
     },
     nodes,
     output: { node: videoNode, output: "video" }
   };
 }
-function buildVideoMeta(blueprint, meta) {
+function buildVideoMeta(blueprint, meta, slots, nodes) {
   return {
     duration_s: blueprint.source?.duration_s ?? lastSceneEnd(blueprint),
     vo_segments: [...meta.vo_segments].sort((a, b) => a.start_s - b.start_s),
     talking_scenes: meta.talking_scenes,
     lip_sync_caution: buildLipSyncCaution(meta.vo_segments),
-    motion_board: buildMotionBoard(blueprint)
+    motion_board: buildMotionBoard(blueprint),
+    // The wired recurring-element registry (the reference-completeness check reads
+    // `ref`/`label`/`type` to warn when a frame describes an element it doesn't wire).
+    elements: slots.map((s) => ({
+      ref: s.ref,
+      label: s.label,
+      type: s.type,
+      ...s.description ? { description: s.description } : {}
+    })),
+    clip_spans: buildClipSpans(blueprint, nodes)
   };
 }
+function buildModelConstraints() {
+  const models = {};
+  for (const [id, spec] of Object.entries(MODEL_REGISTRY.video_generate)) {
+    const p = spec.params;
+    models[id] = {
+      label: spec.label,
+      aspect_ratios: p.aspect_ratio?.enum ?? null,
+      durations_s: p.duration?.enum ?? null,
+      person_generation: p.person_generation?.enum ?? null
+    };
+  }
+  return {
+    note: "Switching a clip's video model has cross-node constraints. ALL video_generate nodes in one canvas MUST share ONE aspect_ratio (the composite silently crops otherwise). Each model's `duration` is a hard enum and differs per model \u2014 a scene longer than the model's max must be split. `person_generation` differs (Veo requires \"allow_all\"). `baker canvas validate` gates duration, aspect agreement, per-model params, AND a scene-span-vs-model-max advisory before any billed run \u2014 run it after every model edit.",
+    models
+  };
+}
+function buildClipSpans(blueprint, nodes) {
+  const spans = [];
+  for (const n of nodes) {
+    if (n.type !== "video_generate") continue;
+    const m = n.id.match(/^s(\d+)/);
+    const idx = m ? Number(m[1]) : Number.NaN;
+    const scene = Number.isInteger(idx) ? blueprint.scenes[idx] : void 0;
+    if (!scene) continue;
+    spans.push({ node: n.id, span_s: Math.round(sceneDurationS(scene) * 100) / 100 });
+  }
+  return spans;
+}
 function buildLipSyncCaution(segments) {
   const out = [];
   const byScene = /* @__PURE__ */ new Map();
@@ -16638,7 +16760,8 @@ var validateCommand = defineCommand89({
           ok: true,
           total_nodes: result.canvas.nodes.length,
           estimated_credits: result.estimatedCredits,
-          cost_preview: result.perNodeCredits ?? []
+          cost_preview: result.perNodeCredits ?? [],
+          warnings: result.warnings ?? []
         },
         null,
         2