@koda-sl/baker-cli 0.355.0-dev.c2de9a6fe → 0.356.0

package/dist/cli.js

@@ -28,6 +28,7 @@ import {
   clipDurationsFor,
   clipParamRecipe,
   clipProfileFor,
+  coercePathUrlToUrl,
   collectAssetRefLikes,
   createEngineFromEnv,
   defaultRegistry,
@@ -68,7 +69,7 @@ import {
   validateCanvasDeep,
   withoutCastName,
   ytDlpBlockSignal
-} from "./chunk-B7MLH3K6.js";
+} from "./chunk-H3SAAHZA.js";
 import {
   csvOrJson,
   daysAgoIso,
@@ -33563,6 +33564,19 @@ function pageOf(args5) {
     ...size ? { pageSize: Number(size) } : {}
   };
 }
+function isWholePositive(raw) {
+  return /^[1-9]\d*$/.test(String(raw));
+}
+function paginationError(args5) {
+  if (args5.page !== void 0 && !isWholePositive(args5.page)) {
+    return `--page takes a page number of a list report (1, 2, \u2026), not "${String(args5.page)}". To narrow a report to one page of the site, pass --landing <internalId> (from \`baker analytics landings\`), or read one path with \`baker analytics page --path /pricing\`.`;
+  }
+  const size = args5["page-size"];
+  if (size !== void 0 && !isWholePositive(size)) {
+    return `--page-size takes a number of rows (1 to 200), not "${String(size)}".`;
+  }
+  return null;
+}
 function requestBody(args5, options) {
   const candidates = {
     preset: options.preset,
@@ -33627,6 +33641,11 @@ async function runPreset(args5, options) {
     });
     process.exit(1);
   }
+  const pagination = paginationError(args5);
+  if (pagination) {
+    writeJsonEnvelope({ ok: false, error: { code: "VALIDATION_ERROR", message: pagination } });
+    process.exit(1);
+  }
   try {
     const response = await apiPost("/api/analytics/query", requestBody(args5, options));
     const requestedPlatform = args5.platform === void 0 ? "" : String(args5.platform);
@@ -36791,7 +36810,7 @@ function rewriteTarget(value, workspaceRoot) {
   }
   return null;
 }
-function normalizeAbsoluteCanvasPaths(canvas, canvasDir, workspaceRoot) {
+function normalizeCanvasPaths(canvas, canvasDir, workspaceRoot) {
   if (!canvas || typeof canvas !== "object") return { canvas, rewrites: [] };
   const c = canvas;
   if (!Array.isArray(c.nodes)) return { canvas, rewrites: [] };
@@ -36804,6 +36823,10 @@ function normalizeAbsoluteCanvasPaths(canvas, canvasDir, workspaceRoot) {
     const params = n.params;
     if (!params || typeof params !== "object") return node;
     const nodeId = typeof n.id === "string" ? n.id : "?";
+    if (n.type === "ingest" && params.source === "path" && looksLikeHttpUrl(params.path)) {
+      rewrites.push({ nodeId, param: "source", from: "path", to: "url" });
+      return { ...node, params: coercePathUrlToUrl(params) };
+    }
     const key = n.type === "ingest" && params.source === "path" ? "path" : n.type === "hyperframe_render" ? "composition" : null;
     if (!key) return node;
     const target2 = rewriteTarget(params[key], root);
@@ -36814,11 +36837,11 @@ function normalizeAbsoluteCanvasPaths(canvas, canvasDir, workspaceRoot) {
   });
   return rewrites.length === 0 ? { canvas, rewrites } : { canvas: { ...canvas, nodes }, rewrites };
 }
-async function healAbsoluteCanvasPaths(filePath, canvas) {
+async function healCanvasPaths(filePath, canvas) {
   const canvasDir = path5.dirname(filePath);
   const workspaceRoot = findWorkspaceRoot(canvasDir);
   if (!workspaceRoot) return { canvas, rewrites: [], text: null };
-  const normalized = normalizeAbsoluteCanvasPaths(canvas, canvasDir, workspaceRoot);
+  const normalized = normalizeCanvasPaths(canvas, canvasDir, workspaceRoot);
   if (normalized.rewrites.length === 0) return { ...normalized, text: null };
   const text2 = `${JSON.stringify(normalized.canvas, null, 2)}
 `;
@@ -39896,18 +39919,10 @@ function dropUncastVoices(nodes) {
     if (node && node.type === "voice_select" && !referenced.has(node.id)) nodes.splice(i, 1);
   }
 }
-function framesReuseRefusal(blueprint, elements, requested) {
-  if (requested !== "reuse") return void 0;
-  const showsPeople = (blueprint.global?.cast ?? []).length > 0 || elements.some((e) => e.type.toLowerCase() === "person");
-  if (!showsPeople) return void 0;
-  return "--frames reuse was not applied: this video shows people, and reusing its frames would put the source's actors into our ad. Every frame is generated instead, recast to the el_* references. Reuse applies only to a video with nobody in it.";
-}
-function scaffoldVideoCanvas(input, elementsInput, requested) {
+function scaffoldVideoCanvas(input, elementsInput, opts) {
   const blueprint = VideoBlueprint.parse(input);
   injectHookPhysicality(blueprint);
   const elements = RecurringElements.parse(elementsInput);
-  const reuseRefused = framesReuseRefusal(blueprint, elements, requested.frames);
-  const opts = reuseRefused ? { ...requested, frames: "generate" } : requested;
   const clock = spineClockFor(blueprint);
   const nodes = [];
   emitBlueprintIngests(opts, nodes);
@@ -40014,7 +40029,6 @@ function scaffoldVideoCanvas(input, elementsInput, requested) {
   }
   const todo = {
     ...buildVideoTodo(videoReport(input, elementsInput), overlays.length, floating.length, opts, blueprint),
-    ...reuseRefused ? { frames_reuse_refused: reuseRefused } : {},
     ...aspectRemapTodo(resolveAspect(blueprint.source?.aspect_ratio, opts.aspect, genAspectsFor(opts.videoModel))),
     model_constraints: buildModelConstraints()
   };
@@ -41769,12 +41783,12 @@ async function executeCanvasRun(opts) {
   }
   const attemptedSlug = creativeSlugFromCanvasPath(filePath);
   if (attemptedSlug) await clearCreativeDirty(attemptedSlug);
-  const healed = await healAbsoluteCanvasPaths(filePath, parsed);
+  const healed = await healCanvasPaths(filePath, parsed);
   parsed = healed.canvas;
   const canvasText = healed.text ?? raw;
   if (healed.rewrites.length > 0) {
     process.stderr.write(
-      `[canvas] rewrote ${healed.rewrites.length} absolute asset path(s) to canvas-relative \u2014 they resolve only in this workspace:
+      `[canvas] rewrote ${healed.rewrites.length} asset reference(s) in the canvas file so it says what runs (absolute paths \u2192 canvas-relative, a URL in an ingest path \u2192 source "url"):
 ${describeRewrites(healed.rewrites)}
 `
     );
@@ -44822,12 +44836,6 @@ function videoDefinitionDescription(blueprint) {
   const product = g.branding?.product;
   return typeof product === "string" && product.trim() ? product.trim() : void 0;
 }
-function framesModeReport(canvas, requested) {
-  const todo = canvas.metadata?.todo;
-  const mode = typeof todo?.frames_mode === "string" ? todo.frames_mode : requested;
-  const refused = typeof todo?.frames_reuse_refused === "string" ? todo.frames_reuse_refused : void 0;
-  return { frames_mode: mode, ...refused ? { frames_reuse_refused: refused } : {} };
-}
 async function materializeReferenceVideo(fileArg2) {
   if (!/^https?:\/\//i.test(fileArg2)) return path26.resolve(fileArg2);
   let bytes;
@@ -44985,10 +44993,7 @@ var scaffoldVideoCommand = defineCommand116({
       type: "string",
       description: "Creative slug \u2014 writes the canvas to src/creatives/<slug>/<slug>.canvas.json (repo convention)"
     },
-    frames: {
-      type: "string",
-      description: `"generate" (default, every frame regenerated for our ad) or "reuse" (wire the source's real frames in). Reuse applies only to a video with nobody in it \u2014 on a video showing people it is refused and every frame is generated, so the source's actors never reach our ad.`
-    },
+    frames: { type: "string", description: '"generate" (default, anchored regen) or "reuse" (wire real frames in)' },
     ambient: {
       type: "boolean",
       description: "Give silent b-roll scenes native diegetic ambient mixed deep under the music bed (off by default)"
@@ -45176,7 +45181,6 @@ var scaffoldVideoCommand = defineCommand116({
             error: { code: "validation", issues: validation.issues },
             canvas_path: outPath,
             prompt_path: blueprintPath,
-            ...framesModeReport(canvas, frames),
             note: "The canvas WAS written despite the blocking issue(s) \u2014 fix them in place, then `baker canvas validate` before running."
           },
           null,
@@ -45226,7 +45230,7 @@ var scaffoldVideoCommand = defineCommand116({
           source_reference: sourceRef.url,
           composition_dir: compositionDest,
           output: canvas.output,
-          ...framesModeReport(canvas, frames),
+          frames_mode: frames,
           models: {
             deconstruct: deconstructModel,
             select: selectModel,
@@ -45377,7 +45381,7 @@ var validateCommand = defineCommand118({
 `);
       process.exit(2);
     }
-    const healed = await healAbsoluteCanvasPaths(filePath, parsed);
+    const healed = await healCanvasPaths(filePath, parsed);
     parsed = healed.canvas;
     parsed = resolveRelativeCanvasPaths(parsed, path28.dirname(filePath));
     let styleProjection = "not_applicable";
@@ -68791,19 +68795,36 @@ function findUnknownFlags(root, argv) {
   }
   return unknown;
 }
+var SYNONYMS = {
+  from: ["start-date", "start", "since"],
+  since: ["start-date", "start"],
+  start: ["start-date", "since"],
+  to: ["end-date", "end", "until"],
+  until: ["end-date", "end"],
+  end: ["end-date", "until"],
+  path: ["landing"],
+  url: ["landing"]
+};
 function closestFlag(unknown, command) {
   const accepted = acceptedNames(command);
   if (!accepted) {
     return null;
   }
   const name = unknown.replace(/^--/, "").split("=")[0] ?? "";
+  const synonym = SYNONYMS[name]?.find((candidate) => accepted.has(candidate));
+  if (synonym) {
+    return `--${synonym}`;
+  }
   const scored = [...accepted].filter((candidate) => !ALWAYS_ACCEPTED.has(candidate)).map((candidate) => ({
     candidate,
     prefix: sharedPrefix(name, candidate),
     distance: editDistance(name, candidate)
-  })).filter(({ prefix, distance }) => prefix >= 4 || distance <= 3).sort((a, b) => b.prefix - a.prefix || a.distance - b.distance);
+  })).filter(({ prefix, distance }) => prefix >= 4 || distance <= typoBudget(name)).sort((a, b) => b.prefix - a.prefix || a.distance - b.distance);
   return scored[0] ? `--${scored[0].candidate}` : null;
 }
+function typoBudget(name) {
+  return Math.max(1, Math.floor(name.length / 3));
+}
 function sharedPrefix(a, b) {
   let i = 0;
   while (i < a.length && i < b.length && a[i] === b[i]) {
@@ -68827,6 +68848,24 @@ function commandFor(root, argv) {
   const { command, resolved } = resolveCommand2(root, argv);
   return resolved ? command : null;
 }
+function suggestFlag(unknown, command) {
+  const flag = closestFlag(unknown, command);
+  if (!flag) {
+    return null;
+  }
+  const args5 = argsOf(command) ?? {};
+  const name = flag.slice(2);
+  const def = args5[name] ?? args5[camel(name)];
+  const described = def && typeof def === "object" ? def.description : void 0;
+  const description = typeof described === "string" ? described.split(/(?<!\b(?:e\.g|i\.e|vs))\.\s/)[0]?.trim().replace(/\.$/, "") : "";
+  return description ? { flag, description } : { flag };
+}
+function suggestionText(suggestion) {
+  if (!suggestion) {
+    return "";
+  }
+  return suggestion.description ? `Did you mean ${suggestion.flag}? It is described as: ${suggestion.description}. ` : `Did you mean ${suggestion.flag}? `;
+}
 var OUTPUT_EXPLANATION = "This command has no --output option: `--output json` is accepted by every command that prints the JSON envelope, and md or files only where `baker schema` lists `output`. Drop the option and read the default output. ";
 function unknownFlagEnvelope(unknown, commandPath, suggestion, hasSchema) {
   const list = unknown.join(", ");
@@ -68837,7 +68876,7 @@ function unknownFlagEnvelope(unknown, commandPath, suggestion, hasSchema) {
       message: `${list} ${unknown.length > 1 ? "are not options" : "is not an option"} of \`baker ${commandPath}\`.`,
       fix: {
         action: hasSchema ? "check_schema" : "check_help",
-        explanation: (unknown.some((flag) => flag === "--output" || flag.startsWith("--output=")) ? OUTPUT_EXPLANATION : "") + (suggestion ? `Did you mean ${suggestion}? ` : "") + `Run \`${hasSchema ? `baker schema ${commandPath}` : `baker ${commandPath} --help`}\` to see every option this command takes. Do not re-run the same call: until this version an unrecognised option was accepted and ignored, so a command that looked like it had filtered or narrowed the result was in fact answering the unfiltered question.`
+        explanation: (unknown.some((flag) => flag === "--output" || flag.startsWith("--output=")) ? OUTPUT_EXPLANATION : "") + suggestionText(suggestion) + `Run \`${hasSchema ? `baker schema ${commandPath}` : `baker ${commandPath} --help`}\` to see every option this command takes. Do not re-run the same call: until this version an unrecognised option was accepted and ignored, so a command that looked like it had filtered or narrowed the result was in fact answering the unfiltered question.`
       },
       retryable: false
     }
@@ -68867,7 +68906,7 @@ function refuseUnknownFlags(root, argv) {
   }
   const command = commandFor(root, argv);
   const first = unknown[0];
-  const suggestion = command && first ? closestFlag(first, command) : null;
+  const suggestion = command && first ? suggestFlag(first, command) : null;
   const path48 = commandPathOf(root, argv);
   process.stdout.write(
     `${JSON.stringify(unknownFlagEnvelope(unknown, path48, suggestion, findSchema(path48.split(" ")) !== void 0), null, 2)}