@koda-sl/baker-cli 0.376.0 → 0.377.0

package/README.md

@@ -5452,7 +5452,7 @@ Validate, then execute the graph. Blocks until done. Logs one line per node. Ret
 
 **Run history streams live.** The run posts its plan (every node + its dependency edges) the moment validation passes, then re-posts a progress snapshot as each node starts and settles — the dashboard's creative workflow graph shows nodes flipping pending → running → done in real time, with each node's outputs attached as they land. A failed run keeps its per-node trail (what completed, what died). All best-effort: an unreachable backend never changes the run's outcome.
 
-**Failures don't abandon sibling work.** Nodes in a layer run under the concurrency cap and every one **settles** — a failed clip no longer kills its in-flight siblings, whose finished results still land in the content-addressed cache. One failure re-throws as-is; several are reported together (each failed node named). Re-running `baker canvas run` resumes from the cache and re-executes **only** the failed nodes and their descendants — never hand-orchestrate per-node renders. Long `video_generate` clips execute as **backend jobs** (the CLI polls; a CDN/proxy timeout can no longer kill a generation mid-flight).
+**Failures don't abandon sibling work.** Nodes in a layer run under the concurrency cap and every one **settles** — a failed clip no longer kills its in-flight siblings, whose finished results still land in the content-addressed cache. One failure re-throws as-is; several are reported together (each failed node named). Re-running `baker canvas run` resumes from the cache and re-executes **only** the failed nodes and their descendants — never hand-orchestrate per-node renders. **One render per canvas at a time:** a `run` of a canvas that another live process in the same workspace is still rendering (a backgrounded render, or a subagent's) is refused with `CONFLICT` instead of sharing its run, `--run-id` included — wait for it and use its result. Long `video_generate` clips execute as **backend jobs** (the CLI polls; a CDN/proxy timeout can no longer kill a generation mid-flight).
 
 #### `baker canvas scaffold-video <video> [flags]`
 

package/dist/cli.js

@@ -41621,6 +41621,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) {
@@ -41642,10 +41643,13 @@ function classifyRemoteRun(run, now) {
   return age > REMOTE_ADOPT_STALE_MS ? "adopt" : "concurrent";
 }
 async function resolveRunId(opts) {
+  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.explicitRunId) return { runId: opts.explicitRunId, resumed: false };
   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);
@@ -41665,22 +41669,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 {
   }
 }
@@ -42636,13 +42649,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) : canvasRoot;
-  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
@@ -49102,11 +49133,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) {
@@ -49193,7 +49224,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]);
@@ -49770,7 +49801,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)}`
@@ -50469,7 +50500,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
@@ -51265,7 +51296,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 {
     }
   }
@@ -51400,7 +51431,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);
@@ -51416,7 +51447,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`);
   }
@@ -51767,7 +51798,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";
 
@@ -51858,7 +51889,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");
@@ -52710,7 +52741,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";
 
@@ -52858,7 +52889,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");
@@ -66583,7 +66614,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);
@@ -66599,7 +66630,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`);
   }
@@ -69747,7 +69778,7 @@ Full guide: __tooling__/docs/tools/baker/winning-ads.md`
 });
 
 // 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);
 }
@@ -69759,7 +69790,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