@koda-sl/baker-cli 0.358.0 → 0.359.0-dev.5dbf6338c

package/dist/cli.js

@@ -69,7 +69,7 @@ import {
   validateCanvasDeep,
   withoutCastName,
   ytDlpBlockSignal
-} from "./chunk-AI4HWQVN.js";
+} from "./chunk-K2IKLMCM.js";
 import {
   csvOrJson,
   daysAgoIso,
@@ -36644,9 +36644,134 @@ var critiqueCommand = defineCommand109({
 // src/commands/canvas/inspect.ts
 import { execFile } from "child_process";
 import { readdir as readdir2, readFile as readFile4, stat } from "fs/promises";
-import path4 from "path";
+import path6 from "path";
 import { promisify } from "util";
 import { defineCommand as defineCommand110 } from "citty";
+
+// src/commands/canvas/normalize-paths.ts
+import { existsSync as existsSync4, realpathSync } from "fs";
+import { writeFile as writeFile2 } from "fs/promises";
+import path5 from "path";
+
+// src/commands/canvas/resolve-paths.ts
+import path4 from "path";
+function resolveRelativeCanvasPaths(canvas, baseDir) {
+  if (!canvas || typeof canvas !== "object") return canvas;
+  const c = canvas;
+  if (!Array.isArray(c.nodes)) return canvas;
+  return { ...canvas, nodes: c.nodes.map((n) => resolveNode(n, baseDir)) };
+}
+function localPathParam(node) {
+  if (node.type === "ingest") return node.params?.source === "path" ? "path" : null;
+  if (node.type === "hyperframe_render" || node.type === "hyperframe_snapshot") return "composition";
+  return null;
+}
+function resolveNode(node, baseDir) {
+  if (!node || typeof node !== "object") return node;
+  const n = node;
+  const params = n.params;
+  if (!params || typeof params !== "object") return node;
+  const key = localPathParam(n);
+  if (key && isResolvableRelative(params[key])) {
+    return { ...node, params: { ...params, [key]: path4.resolve(baseDir, params[key]) } };
+  }
+  return node;
+}
+function isResolvableRelative(value) {
+  return typeof value === "string" && value.length > 0 && !value.includes("[TODO") && !looksLikeHttpUrl(value) && !path4.isAbsolute(value);
+}
+
+// src/commands/canvas/normalize-paths.ts
+function findWorkspaceRoot(startDir, exists2 = existsSync4, maxDepth = 12) {
+  let dir = path5.resolve(startDir);
+  for (let i = 0; i < maxDepth; i++) {
+    if (exists2(path5.join(dir, "package.json"))) return dir;
+    const parent = path5.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return null;
+}
+function canvasOutputsRoot(canvasFile, cwd = process.cwd(), exists2 = existsSync4) {
+  const root = findWorkspaceRoot(path5.dirname(path5.resolve(cwd, canvasFile)), exists2) ?? cwd;
+  return path5.join(root, "canvas");
+}
+function canonicalize(target2) {
+  const abs = path5.resolve(target2);
+  let dir = abs;
+  for (; ; ) {
+    try {
+      const real = realpathSync(dir);
+      return dir === abs ? real : path5.join(real, path5.relative(dir, abs));
+    } catch {
+      const parent = path5.dirname(dir);
+      if (parent === dir) return abs;
+      dir = parent;
+    }
+  }
+}
+function isInside(root, target2) {
+  const rel = path5.relative(root, target2);
+  return rel !== "" && !rel.startsWith("..") && !path5.isAbsolute(rel);
+}
+function toCanvasRelative(canvasDir, target2) {
+  return path5.relative(canvasDir, target2).split(path5.sep).join("/");
+}
+var RUNTIME_WORKSPACE_ROOT = "/home/user/repo";
+function rewriteTarget(value, workspaceRoot) {
+  if (typeof value !== "string" || value.length === 0) return null;
+  if (value.includes("[TODO") || looksLikeHttpUrl(value) || !path5.isAbsolute(value)) return null;
+  const target2 = canonicalize(value);
+  if (isInside(workspaceRoot, target2)) return target2;
+  const fromRuntime = path5.relative(RUNTIME_WORKSPACE_ROOT, path5.normalize(value));
+  if (fromRuntime !== "" && !fromRuntime.startsWith("..") && !path5.isAbsolute(fromRuntime)) {
+    return path5.join(workspaceRoot, fromRuntime);
+  }
+  return null;
+}
+function normalizeCanvasPaths(canvas, canvasDir, workspaceRoot) {
+  if (!canvas || typeof canvas !== "object") return { canvas, rewrites: [] };
+  const c = canvas;
+  if (!Array.isArray(c.nodes)) return { canvas, rewrites: [] };
+  const root = canonicalize(workspaceRoot);
+  const dir = canonicalize(canvasDir);
+  const rewrites = [];
+  const nodes = c.nodes.map((node) => {
+    if (!node || typeof node !== "object") return node;
+    const n = node;
+    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 = localPathParam(n);
+    if (!key) return node;
+    const target2 = rewriteTarget(params[key], root);
+    if (target2 === null) return node;
+    const to = toCanvasRelative(dir, target2);
+    rewrites.push({ nodeId, param: key, from: params[key], to });
+    return { ...node, params: { ...params, [key]: to } };
+  });
+  return rewrites.length === 0 ? { canvas, rewrites } : { canvas: { ...canvas, nodes }, rewrites };
+}
+async function healCanvasPaths(filePath, canvas) {
+  const canvasDir = path5.dirname(filePath);
+  const workspaceRoot = findWorkspaceRoot(canvasDir);
+  if (!workspaceRoot) return { canvas, rewrites: [], text: null };
+  const normalized = normalizeCanvasPaths(canvas, canvasDir, workspaceRoot);
+  if (normalized.rewrites.length === 0) return { ...normalized, text: null };
+  const text2 = `${JSON.stringify(normalized.canvas, null, 2)}
+`;
+  await writeFile2(filePath, text2, "utf8");
+  return { ...normalized, text: text2 };
+}
+function describeRewrites(rewrites) {
+  return rewrites.map((r) => `  ${r.nodeId}.${r.param}: ${r.from} \u2192 ${r.to}`).join("\n");
+}
+
+// src/commands/canvas/inspect.ts
 var execFileAsync = promisify(execFile);
 var inspectCommand = defineCommand110({
   meta: {
@@ -36655,14 +36780,15 @@ var inspectCommand = defineCommand110({
   },
   args: {
     run: { type: "positional", required: true, description: "Run id (e.g. r_01K...) or absolute run directory" },
-    "outputs-dir": { type: "string", description: "Per-run outputs root (default ./canvas)" },
+    "outputs-dir": { type: "string", description: "Per-run outputs root (default <workspace root>/canvas, where `canvas run` writes)" },
     thumbnails: {
       type: "boolean",
       description: "Extract start/middle/end frames from every video output (requires ffmpeg)"
     }
   },
   async run({ args: args5 }) {
-    const outputsDir = path4.resolve(String(args5["outputs-dir"] ?? "canvas"));
+    const cwd = process.cwd();
+    const outputsDir = args5["outputs-dir"] ? path6.resolve(String(args5["outputs-dir"])) : path6.join(findWorkspaceRoot(cwd) ?? cwd, "canvas");
     const runArg = String(args5.run);
     const runDir = await resolveRunDir(runArg, outputsDir);
     const manifest = await loadManifest(runDir);
@@ -36674,7 +36800,7 @@ var inspectCommand = defineCommand110({
     }
     const summary = {
       ok: true,
-      run_id: manifest.run_id ?? path4.basename(runDir),
+      run_id: manifest.run_id ?? path6.basename(runDir),
       run_dir: runDir,
       stats: manifest.stats ?? null,
       output: manifest.output ?? null,
@@ -36687,18 +36813,18 @@ var inspectCommand = defineCommand110({
   }
 });
 async function resolveRunDir(run, outputsDir) {
-  if (path4.isAbsolute(run)) {
+  if (path6.isAbsolute(run)) {
     const s2 = await stat(run).catch(() => null);
     if (s2?.isDirectory()) return run;
     throw new Error(`inspect: ${run} is not a directory`);
   }
-  const candidate = path4.join(outputsDir, run);
+  const candidate = path6.join(outputsDir, run);
   const s = await stat(candidate).catch(() => null);
   if (s?.isDirectory()) return candidate;
   throw new Error(`inspect: no run directory at ${candidate}`);
 }
 async function loadManifest(runDir) {
-  const manifestPath = path4.join(runDir, "manifest.json");
+  const manifestPath = path6.join(runDir, "manifest.json");
   try {
     const raw = await readFile4(manifestPath, "utf-8");
     return JSON.parse(raw);
@@ -36710,7 +36836,7 @@ async function listRunFiles(runDir) {
   const out = [];
   const names = await readdir2(runDir);
   for (const name of names) {
-    const abs = path4.join(runDir, name);
+    const abs = path6.join(runDir, name);
     const s = await stat(abs).catch(() => null);
     if (!s?.isFile()) continue;
     out.push({ name, path: abs, size: s.size });
@@ -36763,95 +36889,6 @@ import { readFile as readFile12 } from "fs/promises";
 import path16 from "path";
 import { defineCommand as defineCommand111 } from "citty";
 
-// src/commands/canvas/normalize-paths.ts
-import { existsSync as existsSync4, realpathSync } from "fs";
-import { writeFile as writeFile2 } from "fs/promises";
-import path5 from "path";
-function findWorkspaceRoot(startDir, exists2 = existsSync4, maxDepth = 12) {
-  let dir = path5.resolve(startDir);
-  for (let i = 0; i < maxDepth; i++) {
-    if (exists2(path5.join(dir, "package.json"))) return dir;
-    const parent = path5.dirname(dir);
-    if (parent === dir) break;
-    dir = parent;
-  }
-  return null;
-}
-function canonicalize(target2) {
-  const abs = path5.resolve(target2);
-  let dir = abs;
-  for (; ; ) {
-    try {
-      const real = realpathSync(dir);
-      return dir === abs ? real : path5.join(real, path5.relative(dir, abs));
-    } catch {
-      const parent = path5.dirname(dir);
-      if (parent === dir) return abs;
-      dir = parent;
-    }
-  }
-}
-function isInside(root, target2) {
-  const rel = path5.relative(root, target2);
-  return rel !== "" && !rel.startsWith("..") && !path5.isAbsolute(rel);
-}
-function toCanvasRelative(canvasDir, target2) {
-  return path5.relative(canvasDir, target2).split(path5.sep).join("/");
-}
-var RUNTIME_WORKSPACE_ROOT = "/home/user/repo";
-function rewriteTarget(value, workspaceRoot) {
-  if (typeof value !== "string" || value.length === 0) return null;
-  if (value.includes("[TODO") || looksLikeHttpUrl(value) || !path5.isAbsolute(value)) return null;
-  const target2 = canonicalize(value);
-  if (isInside(workspaceRoot, target2)) return target2;
-  const fromRuntime = path5.relative(RUNTIME_WORKSPACE_ROOT, path5.normalize(value));
-  if (fromRuntime !== "" && !fromRuntime.startsWith("..") && !path5.isAbsolute(fromRuntime)) {
-    return path5.join(workspaceRoot, fromRuntime);
-  }
-  return null;
-}
-function normalizeCanvasPaths(canvas, canvasDir, workspaceRoot) {
-  if (!canvas || typeof canvas !== "object") return { canvas, rewrites: [] };
-  const c = canvas;
-  if (!Array.isArray(c.nodes)) return { canvas, rewrites: [] };
-  const root = canonicalize(workspaceRoot);
-  const dir = canonicalize(canvasDir);
-  const rewrites = [];
-  const nodes = c.nodes.map((node) => {
-    if (!node || typeof node !== "object") return node;
-    const n = node;
-    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);
-    if (target2 === null) return node;
-    const to = toCanvasRelative(dir, target2);
-    rewrites.push({ nodeId, param: key, from: params[key], to });
-    return { ...node, params: { ...params, [key]: to } };
-  });
-  return rewrites.length === 0 ? { canvas, rewrites } : { canvas: { ...canvas, nodes }, rewrites };
-}
-async function healCanvasPaths(filePath, canvas) {
-  const canvasDir = path5.dirname(filePath);
-  const workspaceRoot = findWorkspaceRoot(canvasDir);
-  if (!workspaceRoot) return { canvas, rewrites: [], text: null };
-  const normalized = normalizeCanvasPaths(canvas, canvasDir, workspaceRoot);
-  if (normalized.rewrites.length === 0) return { ...normalized, text: null };
-  const text2 = `${JSON.stringify(normalized.canvas, null, 2)}
-`;
-  await writeFile2(filePath, text2, "utf8");
-  return { ...normalized, text: text2 };
-}
-function describeRewrites(rewrites) {
-  return rewrites.map((r) => `  ${r.nodeId}.${r.param}: ${r.from} \u2192 ${r.to}`).join("\n");
-}
-
 // src/commands/canvas/placeholders.ts
 function unsuppliedPlaceholderAssets(canvas) {
   const nodes = canvas?.nodes;
@@ -36868,31 +36905,6 @@ function unsuppliedPlaceholderAssets(canvas) {
   return out;
 }
 
-// src/commands/canvas/resolve-paths.ts
-import path6 from "path";
-function resolveRelativeCanvasPaths(canvas, baseDir) {
-  if (!canvas || typeof canvas !== "object") return canvas;
-  const c = canvas;
-  if (!Array.isArray(c.nodes)) return canvas;
-  return { ...canvas, nodes: c.nodes.map((n) => resolveNode(n, baseDir)) };
-}
-function resolveNode(node, baseDir) {
-  if (!node || typeof node !== "object") return node;
-  const n = node;
-  const params = n.params;
-  if (!params || typeof params !== "object") return node;
-  if (n.type === "ingest" && params.source === "path" && isResolvableRelative(params.path)) {
-    return { ...node, params: { ...params, path: path6.resolve(baseDir, params.path) } };
-  }
-  if (n.type === "hyperframe_render" && isResolvableRelative(params.composition)) {
-    return { ...node, params: { ...params, composition: path6.resolve(baseDir, params.composition) } };
-  }
-  return node;
-}
-function isResolvableRelative(value) {
-  return typeof value === "string" && value.length > 0 && !value.includes("[TODO") && !looksLikeHttpUrl(value) && !path6.isAbsolute(value);
-}
-
 // src/commands/canvas/source-version.ts
 import { readFile as readFile6 } from "fs/promises";
 import path8 from "path";
@@ -41002,12 +41014,9 @@ function localPathRefsFromCanvas(parsed) {
     const n = node;
     const params = n.params;
     if (!params || typeof params !== "object") continue;
-    if (n.type === "ingest" && params.source === "path" && isSnapshotablePath(params.path)) {
-      refs.add(params.path);
-    }
-    if (n.type === "hyperframe_render" && isSnapshotablePath(params.composition)) {
-      refs.add(params.composition);
-    }
+    const key = localPathParam(n);
+    const value = key ? params[key] : void 0;
+    if (isSnapshotablePath(value)) refs.add(value);
   }
   return [...refs];
 }
@@ -41692,8 +41701,8 @@ var runCommand = defineCommand111({
       type: "string",
       description: "What the person asked for, IN THEIR OWN WORDS \u2014 paste their message, do not summarise it. The review compares the finished video against this and reports what they asked for that is missing or contradicted. Without it the review can only say whether the video is well made, not whether it is the one they wanted: every other check grades the render against the spec, and a spec that misread the request agrees with itself."
     },
-    "cache-dir": { type: "string", description: "Cache root (default ./canvas/.cache)" },
-    "outputs-dir": { type: "string", description: "Per-run outputs root (default ./canvas)" },
+    "cache-dir": { type: "string", description: "Cache root (default <workspace root>/canvas/.cache, whatever directory you run from)" },
+    "outputs-dir": { type: "string", description: "Per-run outputs root (default <workspace root>/canvas, whatever directory you run from)" },
     "run-id": { type: "string", description: "Override run id (also resumes that run, re-attaching its in-flight jobs)" },
     fresh: {
       type: "boolean",
@@ -41771,6 +41780,7 @@ function stopBeforeKinds(until) {
 }
 async function executeCanvasRun(opts) {
   const filePath = path16.resolve(opts.file);
+  const canvasRoot = canvasOutputsRoot(filePath);
   const raw = await readFile12(filePath, "utf8");
   let parsed;
   try {
@@ -41782,7 +41792,7 @@ async function executeCanvasRun(opts) {
     process.exit(2);
   }
   const attemptedSlug = creativeSlugFromCanvasPath(filePath);
-  if (attemptedSlug) await clearCreativeDirty(attemptedSlug);
+  if (attemptedSlug) await clearCreativeDirty(attemptedSlug, path16.join(canvasRoot, ".dirty"));
   const healed = await healCanvasPaths(filePath, parsed);
   parsed = healed.canvas;
   const canvasText = healed.text ?? raw;
@@ -41878,8 +41888,8 @@ ${describeRewrites(healed.rewrites)}
     }
   }
   const engine = createEngineFromEnv({
-    cacheDir: opts.cacheDir,
-    outputsDir: opts.outputsDir,
+    cacheDir: opts.cacheDir ?? path16.join(canvasRoot, ".cache"),
+    outputsDir: opts.outputsDir ?? canvasRoot,
     log: (line) => process.stdout.write(`${line}
 `),
     remoteCache: opts.remoteCache
@@ -41899,7 +41909,7 @@ ${describeRewrites(healed.rewrites)}
   const canvasSha = sha256Hex(Buffer.from(canvasText));
   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 outputsDir = opts.outputsDir ? path16.resolve(opts.outputsDir) : canvasRoot;
   const { runId, resumed, source, concurrentRunId } = await resolveRunId({
     explicitRunId: opts.runId,
     fresh: opts.fresh === true,
@@ -41933,7 +41943,7 @@ ${describeRewrites(healed.rewrites)}
   const canvasSnapshotUrl = client && creativeSlug ? await uploadRunSnapshot(client, { canvasPath: filePath, raw: canvasText, creativeSlug, parsed }) ?? void 0 : void 0;
   const recordMeta = {
     creativeSlug,
-    canvasPath: path16.relative(process.cwd(), filePath) || void 0,
+    canvasPath: path16.relative(path16.dirname(canvasRoot), filePath) || void 0,
     canvasSha,
     // The fingerprint the dashboard compares against the current source to flag
     // "edited since last render". Computed from the on-disk canvas.json +