@koda-sl/baker-cli 0.360.0 → 0.361.0-dev.0306d9ad9

package/dist/cli.js

@@ -69,7 +69,7 @@ import {
   validateCanvasDeep,
   withoutCastName,
   ytDlpBlockSignal
-} from "./chunk-AI4HWQVN.js";
+} from "./chunk-K2IKLMCM.js";
 import {
   csvOrJson,
   daysAgoIso,
@@ -40880,6 +40880,7 @@ async function clearCreativeDirty(slug, base) {
 }
 
 // src/commands/canvas/run-resume.ts
+import { readFileSync as readFileSync14 } from "fs";
 import { mkdir as mkdir4, readFile as readFile9, rm as rm4, writeFile as writeFile6 } from "fs/promises";
 import path13 from "path";
 function markerKey(canvasPath) {
@@ -40902,9 +40903,12 @@ function classifyRemoteRun(run, now) {
 }
 async function resolveRunId(opts) {
   if (opts.explicitRunId) return { runId: opts.explicitRunId, resumed: false };
+  const existing = await readMarker(opts.outputsDir, opts.canvasPath);
+  if (existing?.pid !== void 0 && existing.pid !== process.pid && (opts.isRendering ?? isRenderProcess)(existing.pid)) {
+    return { runId: existing.runId, resumed: false, rendering: { runId: existing.runId, pid: existing.pid } };
+  }
   if (!opts.fresh) {
-    const existing = await readMarkerRunId(opts.outputsDir, opts.canvasPath);
-    if (existing) return { runId: existing, resumed: true, source: "local" };
+    if (existing) return { runId: existing.runId, resumed: true, source: "local" };
     if (opts.remote) {
       try {
         const active = await opts.remote.getActiveRun(opts.remote.creativeSlug, opts.remote.canvasSha);
@@ -40924,22 +40928,31 @@ async function resolveRunId(opts) {
   }
   return { runId: `r_${ulid()}`, resumed: false };
 }
-async function readMarkerRunId(outputsDir, canvasPath) {
+async function readMarker(outputsDir, canvasPath) {
   for (const key of [markerKey(canvasPath), legacyMarkerKey(canvasPath)]) {
     try {
       const raw = await readFile9(markerFile(outputsDir, key), "utf8");
       const parsed = JSON.parse(raw);
-      if (typeof parsed.runId === "string" && parsed.runId.length > 0) return parsed.runId;
+      if (typeof parsed.runId === "string" && parsed.runId.length > 0) {
+        return { runId: parsed.runId, ...Number.isInteger(parsed.pid) ? { pid: parsed.pid } : {} };
+      }
     } catch {
     }
   }
   return null;
 }
+function isRenderProcess(pid) {
+  try {
+    return readFileSync14(`/proc/${pid}/cmdline`, "utf8").includes("canvas");
+  } catch {
+    return false;
+  }
+}
 async function markRunInFlight(outputsDir, canvasPath, runId) {
   try {
     const file = markerFile(outputsDir, markerKey(canvasPath));
     await mkdir4(path13.dirname(file), { recursive: true });
-    await writeFile6(file, JSON.stringify({ runId, canvasPath: path13.resolve(canvasPath), startedAt: Date.now() }));
+    await writeFile6(file, JSON.stringify({ runId, pid: process.pid, canvasPath: path13.resolve(canvasPath), startedAt: Date.now() }));
   } catch {
   }
 }
@@ -41897,13 +41910,31 @@ ${describeRewrites(healed.rewrites)}
   const creativeSlug = creativeSlugFromCanvasPath(filePath) ?? void 0;
   const client = opts.record === false ? null : buildBackendClient();
   const outputsDir = opts.outputsDir ? path16.resolve(opts.outputsDir) : path16.resolve("canvas");
-  const { runId, resumed, source, concurrentRunId } = await resolveRunId({
+  const { runId, resumed, source, concurrentRunId, rendering } = await resolveRunId({
     explicitRunId: opts.runId,
     fresh: opts.fresh === true,
     outputsDir,
     canvasPath: filePath,
     remote: client && creativeSlug ? { creativeSlug, canvasSha, getActiveRun: (slug, sha) => client.getActiveRun(slug, sha) } : void 0
   });
+  if (rendering) {
+    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}).`,
+            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."
+          }
+        },
+        null,
+        2
+      )}
+`
+    );
+    process.exit(2);
+  }
   if (resumed) {
     process.stdout.write(
       `[resume] continuing interrupted run ${runId}${source === "remote" ? " (adopted from run history)" : ""} \u2014 in-flight jobs re-attach, cached nodes skip
@@ -48257,11 +48288,11 @@ var addSideEffectCommand = defineCommand125({
 });
 
 // src/commands/flows/map.ts
-import { readFileSync as readFileSync15 } from "fs";
+import { readFileSync as readFileSync16 } from "fs";
 import { defineCommand as defineCommand126 } from "citty";
 
 // src/commands/flows/value-expression.ts
-import { existsSync as existsSync6, readFileSync as readFileSync14 } from "fs";
+import { existsSync as existsSync6, readFileSync as readFileSync15 } from "fs";
 import { join as join4 } from "path";
 var PREFIXES2 = ["field", "tracking", "global", "code"];
 function splitParts(raw) {
@@ -48348,7 +48379,7 @@ function trackingFieldIds() {
   const path48 = join4(flowsDir(), "..", "tracking.ts");
   if (!existsSync6(path48)) return null;
   try {
-    const source = readFileSync14(path48, "utf-8");
+    const source = readFileSync15(path48, "utf-8");
     const block2 = source.match(/TRACKING_FIELD_IDS\s*=\s*\[([\s\S]*?)\]\s*as const/)?.[1];
     if (!block2) return null;
     const ids = [...block2.matchAll(/"(tracking\.[a-z0-9_]+)"/g)].map((match) => match[1]);
@@ -48925,7 +48956,7 @@ function specsFromFile(parsed) {
 function readSpecFile(path48) {
   let raw;
   try {
-    raw = path48 === "-" ? readFileSync15(0, "utf-8") : readFileSync15(path48, "utf-8");
+    raw = path48 === "-" ? readFileSync16(0, "utf-8") : readFileSync16(path48, "utf-8");
   } catch (error) {
     refuse(
       `Could not read ${path48 === "-" ? "the mapping from stdin" : `"${path48}"`}: ${error instanceof Error ? error.message : String(error)}`
@@ -49624,7 +49655,7 @@ Full guide: __tooling__/docs/tools/baker/flows.md`
 });
 
 // src/commands/funnel/index.ts
-import { readFileSync as readFileSync16 } from "fs";
+import { readFileSync as readFileSync17 } from "fs";
 import { defineCommand as defineCommand130 } from "citty";
 
 // src/commands/funnel/formMoments.ts
@@ -50420,7 +50451,7 @@ function workspaceForms() {
   const forms = [];
   for (const slug of listFlowSlugs()) {
     try {
-      forms.push({ slug, tree: JSON.parse(readFileSync16(flowDataPath(slug), "utf-8")) });
+      forms.push({ slug, tree: JSON.parse(readFileSync17(flowDataPath(slug), "utf-8")) });
     } catch {
     }
   }
@@ -50555,7 +50586,7 @@ Examples:
 import { defineCommand as defineCommand132 } from "citty";
 
 // src/commands/ga4/shared.ts
-import { readFileSync as readFileSync17 } from "fs";
+import { readFileSync as readFileSync18 } from "fs";
 function failValidation3(message) {
   writeJsonEnvelope({ ok: false, error: { code: "VALIDATION_ERROR", message } });
   process.exit(1);
@@ -50571,7 +50602,7 @@ function requireTarget5(args5, entity) {
 function readJsonSource(args5, flag) {
   const inline = args5[flag];
   const file = args5.file;
-  const raw = typeof file === "string" && file.length > 0 ? readFileSync17(file, "utf8") : typeof inline === "string" && inline.length > 0 ? inline : void 0;
+  const raw = typeof file === "string" && file.length > 0 ? readFileSync18(file, "utf8") : typeof inline === "string" && inline.length > 0 ? inline : void 0;
   if (raw === void 0) {
     failValidation3(`pass --${flag} with inline JSON or --file with a path to a JSON file`);
   }
@@ -50922,7 +50953,7 @@ Examples:
 });
 
 // src/commands/ga4/query.ts
-import { appendFileSync as appendFileSync2, existsSync as existsSync7, readFileSync as readFileSync18, writeFileSync as writeFileSync4 } from "fs";
+import { appendFileSync as appendFileSync2, existsSync as existsSync7, readFileSync as readFileSync19, writeFileSync as writeFileSync4 } from "fs";
 import { resolve as resolve2 } from "path";
 import { defineCommand as defineCommand135 } from "citty";
 
@@ -51013,7 +51044,7 @@ function writeRowsToFile2(filePath, rows, append) {
       writeFileSync4(filePath, content, "utf-8");
     }
   } else if (append && existsSync7(filePath)) {
-    const existing = JSON.parse(readFileSync18(filePath, "utf-8"));
+    const existing = JSON.parse(readFileSync19(filePath, "utf-8"));
     writeFileSync4(filePath, JSON.stringify([...existing, ...rows], null, 2), "utf-8");
   } else {
     writeFileSync4(filePath, JSON.stringify(rows, null, 2), "utf-8");
@@ -51865,7 +51896,7 @@ Full guide: __tooling__/docs/tools/baker/ga4.md`
 import { defineCommand as defineCommand141 } from "citty";
 
 // src/commands/gsc/query.ts
-import { appendFileSync as appendFileSync3, existsSync as existsSync8, readFileSync as readFileSync19, writeFileSync as writeFileSync5 } from "fs";
+import { appendFileSync as appendFileSync3, existsSync as existsSync8, readFileSync as readFileSync20, writeFileSync as writeFileSync5 } from "fs";
 import { resolve as resolve3 } from "path";
 import { defineCommand as defineCommand138 } from "citty";
 
@@ -52013,7 +52044,7 @@ function writeRowsToFile3(filePath, rows, append) {
       writeFileSync5(filePath, content, "utf-8");
     }
   } else if (append && existsSync8(filePath)) {
-    const existing = JSON.parse(readFileSync19(filePath, "utf-8"));
+    const existing = JSON.parse(readFileSync20(filePath, "utf-8"));
     writeFileSync5(filePath, JSON.stringify([...existing, ...rows], null, 2), "utf-8");
   } else {
     writeFileSync5(filePath, JSON.stringify(rows, null, 2), "utf-8");
@@ -65647,7 +65678,7 @@ import { defineCommand as defineCommand221 } from "citty";
 import { defineCommand as defineCommand218 } from "citty";
 
 // src/commands/tag-manager/shared.ts
-import { readFileSync as readFileSync20 } from "fs";
+import { readFileSync as readFileSync21 } from "fs";
 function failValidation5(message) {
   writeJsonEnvelope({ ok: false, error: { code: "VALIDATION_ERROR", message } });
   process.exit(1);
@@ -65663,7 +65694,7 @@ function requireTarget6(args5, entity) {
 function loadJsonArg2(args5, flag = "json") {
   const inline = args5[flag];
   const file = args5.file;
-  const raw = typeof file === "string" && file.length > 0 ? readFileSync20(file, "utf8") : typeof inline === "string" && inline.length > 0 ? inline : void 0;
+  const raw = typeof file === "string" && file.length > 0 ? readFileSync21(file, "utf8") : typeof inline === "string" && inline.length > 0 ? inline : void 0;
   if (raw === void 0) {
     failValidation5(`pass --${flag} with inline JSON or --file with a path to a JSON file`);
   }
@@ -69066,7 +69097,7 @@ function outputFlagForCommand(root, argv) {
 }
 
 // src/version.ts
-import { readFileSync as readFileSync21 } from "fs";
+import { readFileSync as readFileSync22 } from "fs";
 function packageJsonUrl() {
   return new URL("../package.json", import.meta.url);
 }
@@ -69078,7 +69109,7 @@ function parsePackageVersion(raw) {
   throw new Error("Invalid CLI package.json: missing version");
 }
 function getCliVersion() {
-  return parsePackageVersion(readFileSync21(packageJsonUrl(), "utf8"));
+  return parsePackageVersion(readFileSync22(packageJsonUrl(), "utf8"));
 }
 
 // src/cli.ts