@koda-sl/baker-cli 0.449.0-dev.b6179c7f5 → 0.452.0-dev.63867ce0e

package/dist/cli.js

@@ -201,7 +201,7 @@ import {
   withoutCastName,
   wordCount,
   ytDlpBlockSignal
-} from "./chunk-Y33XAZ5M.js";
+} from "./chunk-Q2ZO6I47.js";
 import {
   NAME_CONTAINS_ARG,
   csvOrJson,
@@ -67690,11 +67690,15 @@ function unsourcedFigureLines(spec, knowledge2) {
   const records = withDigits(knowledge2);
   const lower = knowledge2.toLowerCase();
   return spec.copy.flatMap((line) => {
-    const figure = [...withDigits(line.text).matchAll(CLAIMED_FIGURE)].some((m) => !figureSourced(m, records));
-    const superlative = [...line.text.matchAll(SUPERLATIVE)].some((m) => !lower.includes(m[0].toLowerCase()));
-    return figure || superlative ? [line.text] : [];
+    const figures = [...withDigits(line.text).matchAll(CLAIMED_FIGURE)].filter((m) => !figureSourced(m, records));
+    const superlatives = [...line.text.matchAll(SUPERLATIVE)].filter((m) => !lower.includes(m[0].toLowerCase()));
+    const claims = [...new Set([...superlatives, ...figures].map((m) => m[0].trim()))];
+    return claims.length > 0 ? [{ text: line.text, claims }] : [];
   });
 }
+function claimsWithoutSource(spec, knowledge2) {
+  return [...new Set(unsourcedFigureLines(spec, knowledge2).flatMap((l) => l.claims))];
+}
 function proofProblems(spec, knowledge2) {
   const problems = [];
   const named = /* @__PURE__ */ new Set();
@@ -67713,9 +67717,10 @@ function proofProblems(spec, knowledge2) {
       );
     }
   }
-  for (const text3 of unsourcedFigureLines(spec, knowledge2)) {
+  for (const { text: text3, claims } of unsourcedFigureLines(spec, knowledge2)) {
+    const named2 = claims.map((c) => `"${c}"`).join(", ");
     problems.push(
-      `"${text3}" promises a figure or a superlative ("the only", "the fastest") the company's records (src/content, COMPANY.md) do not hold: say only what they record, or drop it.`
+      `${claims.length === 1 && claims[0] === text3.trim() ? named2 : `${named2} in "${text3}"`}: the company's records (src/content, COMPANY.md) do not hold it, so the line promises what nobody wrote. Say only what they record, or drop ${claims.length === 1 ? "it" : "them"}.`
     );
   }
   return problems;
@@ -71253,11 +71258,28 @@ function repeatedFailure(idea, failed) {
   );
   return lost ? [`says what "${lost.id}" said, and that idea failed in the account: change the message, not just the picture`] : [];
 }
+function likelyMeant(id, insights) {
+  const words2 = (text3) => new Set(
+    text3.toLowerCase().split(/[^\p{L}\p{N}]+/u).filter((w) => w.length >= 3)
+  );
+  const wanted = words2(id);
+  let best;
+  for (const insight of insights.values()) {
+    const said = words2(`${insight.id} ${insight.quote}`);
+    const shared = [...wanted].filter((w) => said.has(w)).length;
+    if (shared > 0 && shared > (best?.shared ?? 0)) best = { id: insight.id, shared };
+  }
+  return best?.id;
+}
 function backingOf(idea, insights, problems) {
   const backing = idea.evidence.flatMap((id) => {
     const insight = insights.get(id);
-    if (!insight)
-      problems.push(`evidence "${id}" is not in src/content/insights/: name an insight on file or leave it out`);
+    if (!insight) {
+      const meant = likelyMeant(id, insights);
+      problems.push(
+        `evidence "${id}" is not in src/content/insights/: ${meant ? `did you mean "${meant}"? ` : ""}name an insight on file by its id, or leave it out`
+      );
+    }
     return insight ? [insight] : [];
   });
   return [...backing].sort((a, b) => EVIDENCE_WEIGHT[b.status] - EVIDENCE_WEIGHT[a.status])[0];
@@ -71761,11 +71783,15 @@ async function staticSpecGate(canvas, canvasDir) {
     {
       code: "proof_without_source",
       problems: proofProblems(spec, records),
-      fix: "Wire the badge or drop the claim in prompt.json, everywhere it appears (copy and scene)."
+      fix: proofFix(claimsWithoutSource(spec, records))
     }
   ];
   return oneRefusal(gates.filter((g) => g.problems.length > 0));
 }
+function proofFix(claims) {
+  const named = claims.length > 0 ? `drop ${claims.map((c) => `"${c}"`).join(", ")} or source it in the Knowledge, and ` : "";
+  return `In prompt.json, ${named}wire the badge or drop any other claim named above, everywhere it appears (copy and scene).`;
+}
 function oneRefusal(gates) {
   const first = gates[0];
   if (!first) return null;
@@ -72751,6 +72777,7 @@ async function pruneOldRuns(outputsDir, keep, currentRunId, log) {
 
 // src/commands/canvas/run-resume.ts
 import { randomUUID } from "crypto";
+import { rmSync } from "fs";
 import { mkdir as mkdir4, readFile as readFile17, rm as rm4, writeFile as writeFile9 } from "fs/promises";
 import path22 from "path";
 function markerKey(canvasPath) {
@@ -72854,6 +72881,40 @@ async function markRunInFlight(outputsDir, canvasPath, runId, sourceSha) {
   timer.unref();
   return { token, stop: () => clearInterval(timer) };
 }
+function busyFile(outputsDir, canvasPath) {
+  return path22.join(outputsDir, ".inflight", `${markerKey(canvasPath)}.busy.json`);
+}
+async function markCanvasBusy(outputsDir, canvasPath, runId, pid = process.pid) {
+  const file = busyFile(outputsDir, canvasPath);
+  const write = () => writeFile9(file, JSON.stringify({ runId, pid, heartbeatAt: Date.now() }));
+  try {
+    await mkdir4(path22.dirname(file), { recursive: true });
+    await write();
+  } catch {
+  }
+  const timer = setInterval(() => void write().catch(() => void 0), HEARTBEAT_MS);
+  timer.unref();
+  let released = false;
+  const release = () => {
+    if (released) return;
+    released = true;
+    clearInterval(timer);
+    try {
+      rmSync(file, { force: true });
+    } catch {
+    }
+  };
+  return { release };
+}
+async function canvasBusyElsewhere(outputsDir, canvasPath, now = Date.now()) {
+  try {
+    const held = JSON.parse(await readFile17(busyFile(outputsDir, canvasPath), "utf8"));
+    if (typeof held.runId !== "string" || held.pid === void 0 || held.pid === process.pid) return null;
+    return isLiveRender(held, now) ? { runId: held.runId, pid: held.pid } : null;
+  } catch {
+    return null;
+  }
+}
 async function clearRunMarker(outputsDir, canvasPath, token) {
   try {
     if (token !== void 0) {
@@ -73573,7 +73634,7 @@ var sizesOf = (what) => what.match(/^(\d+(?:\.\d+)?:\d+(?:\.\d+)?(?:,\s*\d+(?:\.
 function carryUnchanged(now, prior, unchanged) {
   const settled = (f) => {
     const sizes = sizesOf(f.what);
-    return sizes.length > 0 && sizes.every((s) => unchanged.includes(s));
+    return sizes.length > 0 && sizes.every((s) => unchanged.includes(s)) && !SIZES_FINDING.test(withoutSize(f.what));
   };
   return [...now.filter((f) => !settled(f)), ...prior.filter(settled)];
 }
@@ -73657,7 +73718,12 @@ function autoFixStep(canvas, review, opts = {}) {
     if (ids2.length > 0) return { kind: "relayout", ids: ids2, edits, ...placing };
     return extend.length > 0 ? { kind: "extend", sizes: extend } : null;
   };
-  const pictureFindings = opts.previous === "relayout" || opts.previous === "extend" ? [] : rest.filter((f) => !at(f));
+  const onSeveralSizes = (f) => {
+    const what = withoutSize(f.what);
+    return new Set(rest.filter((g) => withoutSize(g.what) === what).flatMap((g) => sizesOf(g.what))).size >= 2;
+  };
+  const settledPicture = opts.previous === "relayout" || opts.previous === "extend";
+  const pictureFindings = rest.filter((f) => !at(f) && (!settledPicture || onSeveralSizes(f)));
   const onPicture = unique(pictureFindings.map((f) => withoutSize(f.what)));
   if (onPicture.length === 0) return sizesOnly();
   const every = unique([...extend, ...deliveredSizes(canvas)]);
@@ -75390,6 +75456,7 @@ async function canvasFileFor(opts) {
     throw e;
   }
 }
+var canvasHeld = false;
 async function executeCanvasRun(opts) {
   const { canvasPath: filePath, adoptRunId } = await canvasFileFor(opts);
   const canvasRoot = canvasOutputsRoot(filePath);
@@ -75647,14 +75714,15 @@ ${describeRewrites(prepared.rewrites)}
     sourceSha,
     remote: client && creativeSlug && sourceSha ? { creativeSlug, sourceSha, getActiveRun: (slug, sha) => client.getActiveRun(slug, sha) } : void 0
   });
-  if (rendering) {
+  const holder = rendering ?? await canvasBusyElsewhere(outputsDir, filePath);
+  if (holder) {
     process.stderr.write(
       `${JSON.stringify(
         {
           ok: false,
           error: {
             code: "CONFLICT",
-            message: `This canvas is already rendering in another process (run ${rendering.runId}, pid ${rendering.pid}).`,
+            message: `This canvas is already rendering in another process (run ${holder.runId}, pid ${holder.pid}).`,
             fix: "Wait for that render to finish and use its result instead of starting a second one: two renders of one canvas share a run and overwrite each other. If you started it in the background, read its output when it completes."
           }
         },
@@ -75717,6 +75785,11 @@ ${describeRewrites(prepared.rewrites)}
     });
   }
   const inFlight = await markRunInFlight(outputsDir, filePath, runId, sourceSha);
+  if (!canvasHeld) {
+    const held = await markCanvasBusy(outputsDir, filePath, runId);
+    canvasHeld = true;
+    process.once("exit", held.release);
+  }
   const clearMarker = () => {
     inFlight.stop();
     return clearRunMarker(outputsDir, filePath, inFlight.token);
@@ -81381,10 +81454,12 @@ async function readViewer(root, adSet) {
 }
 var MARKET_ADS = 40;
 var MARKET_FALLBACK_ADS = 15;
-var MARKET_SEARCH_MS = 1e4;
+var MARKET_SEARCH_MS = 12e3;
+var MARKET_QUERY_WORDS = 6;
 function marketQuery(companyDoc) {
-  const prose = companyDoc.split("\n").filter((line) => line.trim() && !line.startsWith("#")).join(" ").replace(/\s+/g, " ");
-  return prose.slice(0, 240);
+  const first = companyDoc.split("\n").find((line) => line.trim() && !line.trim().startsWith("#")) ?? "";
+  const what = first.replace(/^\s*[-*]\s+/, "").replace(/^\*\*[^*]+\*\*\s*[—–:-]?\s*/, "").split(/\s+for\s+|[,.;:(]|\s[—–-]\s/)[0];
+  return (what ?? "").trim().split(/\s+/).filter(Boolean).slice(0, MARKET_QUERY_WORDS).join(" ");
 }
 async function readMarket(root) {
   const query = marketQuery(await readFile36(path44.join(root, "COMPANY.md"), "utf8").catch(() => ""));
@@ -81397,14 +81472,14 @@ async function readMarket(root) {
     }
     throw err;
   });
-  const followed = await search(
-    buildSearchBody({ scope: "followed", platform: "meta", limit: MARKET_ADS, maxPerAdvertiser: 8 })
-  );
-  if (followed.results.length > 0) return marketMap(followed.results, "followed");
-  const all = await search(
-    buildSearchBody({ query, scope: "all", platform: "meta", limit: MARKET_FALLBACK_ADS, maxPerAdvertiser: 3 })
-  );
-  return all.results.length > 0 ? marketMap(all.results, "library") : null;
+  const [followed, all] = await Promise.allSettled([
+    search(buildSearchBody({ scope: "followed", platform: "meta", limit: MARKET_ADS, maxPerAdvertiser: 8 })),
+    search(buildSearchBody({ query, scope: "all", platform: "meta", limit: MARKET_FALLBACK_ADS, maxPerAdvertiser: 3 }))
+  ]);
+  if (followed.status === "fulfilled" && followed.value.results.length > 0)
+    return marketMap(followed.value.results, "followed");
+  if (all.status === "rejected") throw all.reason;
+  return all.value.results.length > 0 ? marketMap(all.value.results, "library") : null;
 }
 async function metaAccountId(given) {
   if (given) return given.startsWith("act_") ? given : `act_${given}`;