@koda-sl/baker-cli 0.118.0 → 0.120.0-dev.3b02f951b

package/dist/{chunk-MF34WJ7M.js → chunk-AWSEBYP4.js}

@@ -1,32 +1,11 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
+import {
+  __commonJS,
+  __toESM
+} from "./chunk-5WRI5ZAA.js";
 
-// ../../node_modules/.pnpm/safe-stable-stringify@2.5.0/node_modules/safe-stable-stringify/index.js
+// ../../.pnpm-store/v10/links/@/safe-stable-stringify/2.5.0/810146e81bae4e3a061fe487864f2fde80c4b03b886877dc0f1fffbc6480b67e/node_modules/safe-stable-stringify/index.js
 var require_safe_stable_stringify = __commonJS({
-  "../../node_modules/.pnpm/safe-stable-stringify@2.5.0/node_modules/safe-stable-stringify/index.js"(exports, module) {
+  "../../.pnpm-store/v10/links/@/safe-stable-stringify/2.5.0/810146e81bae4e3a061fe487864f2fde80c4b03b886877dc0f1fffbc6480b67e/node_modules/safe-stable-stringify/index.js"(exports, module) {
     "use strict";
     var { hasOwnProperty } = Object.prototype;
     var stringify = configure2();
@@ -159,9 +138,9 @@ var require_safe_stable_stringify = __commonJS({
         }
         if (value) {
           return (value2) => {
-            let message = `Object can not safely be stringified. Received type ${typeof value2}`;
-            if (typeof value2 !== "function") message += ` (${value2.toString()})`;
-            throw new Error(message);
+            let message2 = `Object can not safely be stringified. Received type ${typeof value2}`;
+            if (typeof value2 !== "function") message2 += ` (${value2.toString()})`;
+            throw new Error(message2);
           };
         }
       }
@@ -673,6 +652,9 @@ var HttpClient = class {
   async postJson(path16, body, signal) {
     return await this.requestJson("POST", path16, body, signal);
   }
+  async putJson(path16, body, signal) {
+    return await this.requestJson("PUT", path16, body, signal);
+  }
   async getJson(path16, signal) {
     return await this.requestJson("GET", path16, void 0, signal);
   }
@@ -700,8 +682,8 @@ var HttpClient = class {
     try {
       const res = await this.fetchFn(url, {
         method,
-        headers: method === "POST" ? { "Content-Type": "application/json", Authorization: `Bearer ${this.apiKey}` } : { Authorization: `Bearer ${this.apiKey}` },
-        body: method === "POST" ? JSON.stringify(body) : void 0,
+        headers: method === "GET" ? { Authorization: `Bearer ${this.apiKey}` } : { "Content-Type": "application/json", Authorization: `Bearer ${this.apiKey}` },
+        body: method === "GET" ? void 0 : JSON.stringify(body),
         signal: controller.signal
       });
       if (res.ok) return { kind: "value", value: await res.json() };
@@ -738,33 +720,33 @@ async function parseErrorBody(res) {
   const errObj = body.error ?? {};
   return classifyHttpError(res.status, errObj, errObj.message ?? `HTTP ${res.status}`);
 }
-function classifyHttpError(status, errObj, message) {
+function classifyHttpError(status, errObj, message2) {
   if (errObj.code === CONTENT_POLICY_CODE) {
-    return { kind: "content_policy", status, provider: errObj.provider, message };
+    return { kind: "content_policy", status, provider: errObj.provider, message: message2 };
   }
   if (status === 401 || status === 403) {
-    return { kind: "unauthorized", status, message };
+    return { kind: "unauthorized", status, message: message2 };
   }
   if (status === 400 || status === 422) {
-    return { kind: "validation", status, message, details: errObj.details };
+    return { kind: "validation", status, message: message2, details: errObj.details };
   }
   if (status === 502 || status === 504) {
     if (errObj.code === "provider_timeout" || status === 504) {
-      return { kind: "timeout", provider: errObj.provider, message };
+      return { kind: "timeout", provider: errObj.provider, message: message2 };
     }
     return {
       kind: "provider",
       status,
       provider: errObj.provider,
       code: errObj.code ?? "provider_error",
-      message,
+      message: message2,
       retryable: errObj.retryable ?? true
     };
   }
   if (status >= 500 || status === 429) {
-    return { kind: "server", status, message };
+    return { kind: "server", status, message: message2 };
   }
-  return { kind: "validation", status, message, details: errObj.details };
+  return { kind: "validation", status, message: message2, details: errObj.details };
 }
 function backoffMs(attempt) {
   return 1e3 * 2 ** attempt;
@@ -835,6 +817,27 @@ var BackendClient = class {
       signal
     );
   }
+  /** Remote cache lookup. A miss (404) — or an old backend without the route — returns null. */
+  async getCacheEntry(cacheKey, signal) {
+    try {
+      const res = await this.http.getJson(`/api/canvas/cache/${encodeURIComponent(cacheKey)}`, signal);
+      return res.entry;
+    } catch (e) {
+      if (e instanceof BackendHttpError && "status" in e.detail && e.detail.status === 404) return null;
+      throw e;
+    }
+  }
+  async putCacheEntry(entry, signal) {
+    await this.http.putJson(
+      `/api/canvas/cache/${encodeURIComponent(entry.cacheKey)}`,
+      entry,
+      signal
+    );
+  }
+  /** Durable run-history record — POST /api/canvas/runs (idempotent server-side on runId). */
+  async recordRun(payload, signal) {
+    await this.http.postJson("/api/canvas/runs", payload, signal);
+  }
   getArtifact(kind, name, version, signal) {
     const path16 = version ? `/api/canvas/artifacts/${encodeURIComponent(kind)}/${encodeURIComponent(name)}/${encodeURIComponent(version)}` : `/api/canvas/artifacts/${encodeURIComponent(kind)}/${encodeURIComponent(name)}`;
     return this.http.getJson(path16, signal);
@@ -858,14 +861,17 @@ function requireCredentialsFromEnv(env = process.env) {
   }
   return c;
 }
+function remoteCacheEnabledFromEnv(env = process.env) {
+  return env.BAKER_CANVAS_REMOTE_CACHE !== "off";
+}
 
 // src/engine/engine/errors.ts
 function isBlocking(issue) {
   return issue.severity !== "warning";
 }
 var CanvasError = class extends Error {
-  constructor(message) {
-    super(message);
+  constructor(message2) {
+    super(message2);
     this.name = "CanvasError";
   }
 };
@@ -922,7 +928,7 @@ function describeCause(c) {
   }
 }
 
-// ../../node_modules/.pnpm/safe-stable-stringify@2.5.0/node_modules/safe-stable-stringify/esm/wrapper.js
+// ../../.pnpm-store/v10/links/@/safe-stable-stringify/2.5.0/810146e81bae4e3a061fe487864f2fde80c4b03b886877dc0f1fffbc6480b67e/node_modules/safe-stable-stringify/esm/wrapper.js
 var import__ = __toESM(require_safe_stable_stringify(), 1);
 var configure = import__.default.configure;
 var wrapper_default = import__.default;
@@ -1583,6 +1589,160 @@ function encodeRandom() {
   return out;
 }
 
+// src/engine/storage/remote-cache-store.ts
+var CANVAS_ASSETS_URL_SEGMENT = "/canvas-assets/";
+function isPersistedAssetRef(ref) {
+  const { url, sha256 } = ref;
+  if (typeof url !== "string" || typeof sha256 !== "string") return false;
+  return url.includes(`${CANVAS_ASSETS_URL_SEGMENT}${sha256.slice(0, 2)}/${sha256}`) || url.includes(`${CANVAS_ASSETS_URL_SEGMENT}${sha256}`);
+}
+function isAssetRefLike(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) && typeof value.sha256 === "string" && typeof value.mime === "string";
+}
+function collectAssetRefLikes(value, out = []) {
+  if (Array.isArray(value)) {
+    for (const item of value) collectAssetRefLikes(item, out);
+    return out;
+  }
+  if (typeof value !== "object" || value === null) return out;
+  if (isAssetRefLike(value)) {
+    out.push(value);
+  }
+  for (const item of Object.values(value)) collectAssetRefLikes(item, out);
+  return out;
+}
+function entryFullyPersisted(entry) {
+  return collectAssetRefLikes(entry.outputs).every((ref) => isPersistedAssetRef(ref));
+}
+function stripLocalFields(entry) {
+  const clone = JSON.parse(JSON.stringify(entry));
+  for (const ref of collectAssetRefLikes(clone.outputs)) {
+    delete ref.path;
+    delete ref.bytes;
+  }
+  return clone;
+}
+var RemoteCacheStore = class {
+  client;
+  log;
+  constructor(client, log) {
+    this.client = client;
+    this.log = log ?? (() => void 0);
+  }
+  async get(cacheKey) {
+    return await this.client.getCacheEntry(cacheKey);
+  }
+  async put(entry) {
+    if (!entryFullyPersisted(entry)) {
+      this.log(`[cache   ] ${entry.cacheKey.slice(0, 12)}\u2026 has local-only assets, kept local`);
+      return;
+    }
+    const stripped = stripLocalFields(entry);
+    if (stripped.refs.length > MAX_REMOTE_REFS) {
+      stripped.refs = stripped.refs.slice(0, MAX_REMOTE_REFS);
+    }
+    await this.client.putCacheEntry(stripped);
+  }
+};
+var MAX_REMOTE_REFS = 512;
+var LayeredCacheStore = class {
+  rootDir;
+  local;
+  remote;
+  assets;
+  log;
+  constructor(opts) {
+    this.local = opts.local;
+    this.remote = opts.remote;
+    this.assets = opts.assets;
+    this.rootDir = opts.local.rootDir;
+    this.log = opts.log ?? (() => void 0);
+  }
+  async get(cacheKey) {
+    const localHit = await this.local.get(cacheKey);
+    if (localHit) return localHit;
+    let remoteEntry;
+    try {
+      remoteEntry = await this.remote.get(cacheKey);
+    } catch (e) {
+      this.log(`[cache   ] remote lookup failed (${message(e)}) \u2014 treating as miss`);
+      return null;
+    }
+    if (!remoteEntry) return null;
+    let rehydrated;
+    try {
+      rehydrated = await this.rehydrate(remoteEntry);
+    } catch (e) {
+      this.log(`[cache   ] ${cacheKey.slice(0, 12)}\u2026 rehydration failed (${message(e)}) \u2014 treating as miss`);
+      return null;
+    }
+    await this.local.put(rehydrated);
+    return rehydrated;
+  }
+  async put(entry) {
+    await this.local.put(entry);
+    try {
+      await this.remote.put(entry);
+    } catch (e) {
+      this.log(`[cache   ] remote write failed (${message(e)}) \u2014 entry kept local`);
+    }
+  }
+  /**
+   * Download every referenced asset into the local content-addressed store
+   * (sha-verified) and stamp fresh local paths. Any ref that cannot be
+   * rehydrated fails the WHOLE entry — a partially-hydrated cache hit would
+   * crash materialization later with a far less actionable error.
+   */
+  async rehydrate(entry) {
+    const clone = JSON.parse(JSON.stringify(entry));
+    for (const ref of collectAssetRefLikes(clone.outputs)) {
+      if (!isPersistedAssetRef(ref)) {
+        throw new Error(`ref ${ref.sha256.slice(0, 12)}\u2026 has no persisted url`);
+      }
+      const ingested = await this.assets.ingestRemote({
+        kind: typeof ref.kind === "string" ? ref.kind : "json",
+        url: ref.url,
+        sha256: ref.sha256,
+        mime: ref.mime,
+        metadata: ref.metadata ?? void 0
+      });
+      ref.path = ingested.path;
+    }
+    return clone;
+  }
+};
+function message(e) {
+  return e instanceof Error ? e.message : String(e);
+}
+
+// src/engine/nodes/remote/upload.ts
+async function presignAndPut(args) {
+  const { putUrl, publicUrl } = await args.ctx.client.presignAssetUpload(args.sha256, args.mime, args.ctx.signal);
+  const putRes = await fetch(putUrl, {
+    method: "PUT",
+    body: new Uint8Array(args.bytes),
+    headers: { "Content-Type": args.mime },
+    signal: args.ctx.signal
+  });
+  if (!putRes.ok) {
+    throw new Error(`upload: presigned PUT failed ${putRes.status} ${putRes.statusText}`);
+  }
+  return publicUrl;
+}
+async function ensureUploaded(ref, ctx) {
+  if (ref.url) return ref;
+  const bytes = await ctx.assets.readBytes(ref.sha256, ref.mime);
+  const url = await presignAndPut({ bytes, sha256: ref.sha256, mime: ref.mime, ctx });
+  return { ...ref, url };
+}
+async function persistOutputAssetUrls(outputs, ctx) {
+  for (const ref of collectAssetRefLikes(outputs)) {
+    if (isPersistedAssetRef(ref)) continue;
+    const bytes = await ctx.assets.readBytes(ref.sha256, ref.mime);
+    ref.url = await presignAndPut({ bytes, sha256: ref.sha256, mime: ref.mime, ctx });
+  }
+}
+
 // src/engine/schema/canvas.ts
 import { z } from "zod";
 var REF_PREFIX = "$ref:";
@@ -2862,6 +3022,7 @@ var Engine = class {
   cache;
   outputsDir;
   log;
+  persistAssets;
   constructor(opts) {
     this.registry = opts.registry;
     this.client = opts.client;
@@ -2869,6 +3030,7 @@ var Engine = class {
     this.cache = opts.cache;
     this.outputsDir = opts.outputsDir;
     this.log = opts.log ?? (() => void 0);
+    this.persistAssets = opts.persistAssets ?? false;
   }
   validate(canvas) {
     return validateCanvas(canvas, this.registry);
@@ -2915,7 +3077,7 @@ var Engine = class {
       `[done    ] ${stats.cached_nodes}/${stats.total_nodes} cached, ${stats.total_credits} credits, ${stats.duration_ms}ms`
     );
     this.log(`outputs in: ${writer.runDir}`);
-    return { run_id: runId, output, outputs_by_node: outputs, stats, outputs_dir: writer.runDir };
+    return { run_id: runId, output, outputs_by_node: outputs, stats, outputs_dir: writer.runDir, node_runs: nodeRuns };
   }
   async runLayers(canvas, outputs, runId, writer, opts, counters, nodeRuns) {
     const layers = topologicalLayers(this.pruneToOutput(canvas, buildGraph(canvas)));
@@ -3012,6 +3174,14 @@ var Engine = class {
     const credits = def.cost ? def.cost({ params: parsedParams }).credits : 0;
     const outputsObj = result;
     outputs[node.id] = outputsObj;
+    if (this.persistAssets) {
+      try {
+        await persistOutputAssetUrls(outputsObj, ctx);
+      } catch (e) {
+        const msg = e instanceof Error ? e.message : String(e);
+        this.log(`[warn    ] ${node.id}: asset persistence failed (${msg}) \u2014 outputs stay local-only`);
+      }
+    }
     if (policy === "read_write") {
       await this.cache.put({
         cacheKey: prepared.cacheKey,
@@ -3330,27 +3500,6 @@ var FontRef = BaseAssetRef.extend({
 });
 var AssetRef = z4.discriminatedUnion("kind", [ImageRef, VideoRef, AudioRef, JsonRef, TextRef, FontRef]);
 
-// src/engine/nodes/remote/upload.ts
-async function presignAndPut(args) {
-  const { putUrl, publicUrl } = await args.ctx.client.presignAssetUpload(args.sha256, args.mime, args.ctx.signal);
-  const putRes = await fetch(putUrl, {
-    method: "PUT",
-    body: new Uint8Array(args.bytes),
-    headers: { "Content-Type": args.mime },
-    signal: args.ctx.signal
-  });
-  if (!putRes.ok) {
-    throw new Error(`upload: presigned PUT failed ${putRes.status} ${putRes.statusText}`);
-  }
-  return publicUrl;
-}
-async function ensureUploaded(ref, ctx) {
-  if (ref.url) return ref;
-  const bytes = await ctx.assets.readBytes(ref.sha256, ref.mime);
-  const url = await presignAndPut({ bytes, sha256: ref.sha256, mime: ref.mime, ctx });
-  return { ...ref, url };
-}
-
 // src/engine/nodes/remote/delegate.ts
 function delegated(spec) {
   return {
@@ -3745,10 +3894,10 @@ function inferKindFromMime(mime) {
   if (mime.startsWith("font/")) return "font";
   return null;
 }
-function localExecError(ctx, message) {
+function localExecError(ctx, message2) {
   return new NodeExecutionError(ctx.nodeId, ctx.nodeType, {
     kind: "local",
-    cause: new Error(`ingest: ${message}`)
+    cause: new Error(`ingest: ${message2}`)
   });
 }
 async function execLocalFile(params, ctx) {
@@ -4415,7 +4564,7 @@ async function refToUrl(ref) {
   return `data:${ref.mime};base64,${bytes.toString("base64")}`;
 }
 var ASSET_KINDS = /* @__PURE__ */ new Set(["image", "video", "audio", "json", "text", "font"]);
-function isAssetRefLike(value) {
+function isAssetRefLike2(value) {
   if (!value || typeof value !== "object") return false;
   const v = value;
   return typeof v.kind === "string" && ASSET_KINDS.has(v.kind) && typeof v.mime === "string" && typeof v.sha256 === "string" && (typeof v.url === "string" || typeof v.path === "string");
@@ -4787,8 +4936,8 @@ var NEVER_BLOCK = [
   /text[_-]?occluded/i
 ];
 var UNAVAILABLE = /unknown command|command not found|not found|Did you mean|Unknown argument|ENOENT/i;
-function isAdvisory(code, message) {
-  const hay = `${code} ${message}`;
+function isAdvisory(code, message2) {
+  const hay = `${code} ${message2}`;
   return NEVER_BLOCK.some((re) => re.test(hay));
 }
 function parseCheckJson(raw) {
@@ -4816,10 +4965,10 @@ function classifyLint(json) {
   for (const f of findings) {
     const rec = f;
     const code = String(rec?.code ?? "");
-    const message = String(rec?.message ?? "");
+    const message2 = String(rec?.message ?? "");
     const severity = String(rec?.severity ?? "info");
-    const blocking = severity === "error" && !isAdvisory(code, message);
-    out.push({ source: "lint", code, message, severity: blocking ? "blocking" : "warning" });
+    const blocking = severity === "error" && !isAdvisory(code, message2);
+    out.push({ source: "lint", code, message: message2, severity: blocking ? "blocking" : "warning" });
   }
   return out;
 }
@@ -4831,9 +4980,9 @@ function classifyInspect(json) {
   for (const iss of issues) {
     const rec = iss;
     const code = String(rec?.code ?? rec?.type ?? "overflow");
-    const message = String(rec?.message ?? rec?.detail ?? JSON.stringify(iss));
+    const message2 = String(rec?.message ?? rec?.detail ?? JSON.stringify(iss));
     const severity = rec?.severity ? String(rec.severity) : obj?.ok === false ? "error" : "warning";
-    out.push({ source: "inspect", code, message, severity: severity === "error" ? "blocking" : "warning" });
+    out.push({ source: "inspect", code, message: message2, severity: severity === "error" ? "blocking" : "warning" });
   }
   return out;
 }
@@ -5278,7 +5427,7 @@ async function buildSubstitutionValues(compositionParams, meta, duration) {
 }
 function coerceImageParam(value) {
   if (typeof value === "string") return Promise.resolve(value);
-  if (isAssetRefLike(value)) return refToUrl(value);
+  if (isAssetRefLike2(value)) return refToUrl(value);
   throw new Error("hyperframe_render: image param must be a URL string or AssetRef");
 }
 async function substituteCompositionFiles(tmp, values) {
@@ -5508,7 +5657,7 @@ async function buildSubstitutionValues2(compositionParams, meta) {
 }
 function coerceImageParam2(value) {
   if (typeof value === "string") return Promise.resolve(value);
-  if (isAssetRefLike(value)) return refToUrl(value);
+  if (isAssetRefLike2(value)) return refToUrl(value);
   throw new Error("hyperframe_snapshot: image param must be a URL string or AssetRef");
 }
 async function substituteCompositionFiles2(tmp, values) {
@@ -6534,17 +6683,29 @@ function createEngineFromEnv(opts = {}) {
   const cacheDir = opts.cacheDir ?? path15.join(cwd, "canvas", ".cache");
   const outputsDir = opts.outputsDir ?? path15.join(cwd, "canvas");
   const creds = requireCredentialsFromEnv();
+  const client = new BackendClient({ baseUrl: creds.url, apiKey: creds.apiKey });
+  const assets = new LocalAssetStore(path15.join(cacheDir, "assets"));
+  const localCache = new LocalCacheStore(path15.join(cacheDir, "index"));
+  const remoteCacheEnabled = opts.remoteCache ?? remoteCacheEnabledFromEnv();
+  const cache = remoteCacheEnabled ? new LayeredCacheStore({
+    local: localCache,
+    remote: new RemoteCacheStore(client, opts.log),
+    assets,
+    log: opts.log
+  }) : localCache;
   return new Engine({
     registry: defaultRegistry(),
-    client: new BackendClient({ baseUrl: creds.url, apiKey: creds.apiKey }),
-    assets: new LocalAssetStore(path15.join(cacheDir, "assets")),
-    cache: new LocalCacheStore(path15.join(cacheDir, "index")),
+    client,
+    assets,
+    cache,
     outputsDir,
-    log: opts.log
+    log: opts.log,
+    persistAssets: remoteCacheEnabled
   });
 }
 
 export {
+  requireCredentialsFromEnv,
   LayerExecutionError,
   describeFailureReason,
   SEEDANCE_DURATIONS,
@@ -6552,6 +6713,10 @@ export {
   IMAGE_GENERATE_MODELS,
   MODEL_REGISTRY,
   resolveConcurrency,
+  ulid,
+  isPersistedAssetRef,
+  collectAssetRefLikes,
+  sha256Hex,
   elementMentionKeywords,
   BackendClient2 as BackendClient,
   Engine2 as Engine,
@@ -6563,4 +6728,4 @@ export {
   defaultRegistry,
   createEngineFromEnv
 };
-//# sourceMappingURL=chunk-MF34WJ7M.js.map
+//# sourceMappingURL=chunk-AWSEBYP4.js.map