@walkeros/cli 2.1.0 → 2.2.0-next-1772811722420

package/dist/index.js

@@ -1,11 +1,5 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __require = /* @__PURE__ */ ((x2) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x2, {
-  get: (a2, b2) => (typeof require !== "undefined" ? require : a2)[b2]
-}) : x2)(function(x2) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x2 + '" is not supported');
-});
 var __esm = (fn2, res) => function __init() {
   return fn2 && (res = (0, fn2[__getOwnPropNames(fn2)[0]])(fn2 = 0)), res;
 };
@@ -297,8 +291,8 @@ var init_heartbeat = __esm({
 
 // src/commands/bundle/index.ts
 init_cli_logger();
-import path10 from "path";
-import fs10 from "fs-extra";
+import path11 from "path";
+import fs11 from "fs-extra";
 import { getPlatform as getPlatform2 } from "@walkeros/core";
 
 // src/core/index.ts
@@ -661,8 +655,8 @@ function validateFlowSetup(data) {
   const result = safeParseSetup(data);
   if (!result.success) {
     const errors = result.error.issues.map((issue) => {
-      const path14 = issue.path.length > 0 ? issue.path.map(String).join(".") : "root";
-      return `  - ${path14}: ${issue.message}`;
+      const path15 = issue.path.length > 0 ? issue.path.map(String).join(".") : "root";
+      return `  - ${path15}: ${issue.message}`;
     }).join("\n");
     throw new Error(`Invalid configuration:
 ${errors}`);
@@ -1096,11 +1090,18 @@ async function copyIncludes(includes, sourceDir, outputDir, logger2) {
     const sourcePath = path9.resolve(sourceDir, include);
     const folderName = path9.basename(include);
     const destPath = path9.join(outputDir, folderName);
+    const resolvedOutput = path9.resolve(outputDir);
+    const resolvedSource = path9.resolve(sourcePath);
+    if (resolvedSource === resolvedOutput || resolvedOutput.startsWith(resolvedSource + path9.sep) || resolvedSource.startsWith(resolvedOutput + path9.sep)) {
+      throw new Error(
+        `Circular include detected: "${include}" resolves to "${resolvedSource}" which overlaps with output directory "${resolvedOutput}"`
+      );
+    }
     if (await fs8.pathExists(sourcePath)) {
       await fs8.copy(sourcePath, destPath);
       logger2.debug(`Copied ${include} to output`);
     } else {
-      logger2.debug(`Include folder not found: ${include}`);
+      logger2.warn(`Include folder not found: ${include}`);
     }
   }
 }
@@ -1449,6 +1450,18 @@ function detectTransformerPackages(flowConfig) {
   }
   return transformerPackages;
 }
+function detectStorePackages(flowConfig) {
+  const storePackages = /* @__PURE__ */ new Set();
+  const stores = flowConfig.stores;
+  if (stores) {
+    for (const [, storeConfig] of Object.entries(stores)) {
+      if (typeof storeConfig === "object" && storeConfig !== null && "package" in storeConfig && typeof storeConfig.package === "string") {
+        storePackages.add(storeConfig.package);
+      }
+    }
+  }
+  return storePackages;
+}
 function detectExplicitCodeImports(flowConfig) {
   const explicitCodeImports = /* @__PURE__ */ new Map();
   const destinations = flowConfig.destinations;
@@ -1504,15 +1517,30 @@ function detectExplicitCodeImports(flowConfig) {
       }
     }
   }
+  const stores = flowConfig.stores;
+  if (stores) {
+    for (const [, storeConfig] of Object.entries(stores)) {
+      if (typeof storeConfig === "object" && storeConfig !== null && "package" in storeConfig && typeof storeConfig.package === "string" && "code" in storeConfig && typeof storeConfig.code === "string") {
+        const isAutoGenerated = storeConfig.code.startsWith("_");
+        if (!isAutoGenerated) {
+          if (!explicitCodeImports.has(storeConfig.package)) {
+            explicitCodeImports.set(storeConfig.package, /* @__PURE__ */ new Set());
+          }
+          explicitCodeImports.get(storeConfig.package).add(storeConfig.code);
+        }
+      }
+    }
+  }
   return explicitCodeImports;
 }
-function generateImportStatements(packages, destinationPackages, sourcePackages, transformerPackages, explicitCodeImports) {
+function generateImportStatements(packages, destinationPackages, sourcePackages, transformerPackages, storePackages, explicitCodeImports) {
   const importStatements = [];
   const examplesMappings = [];
   const usedPackages = /* @__PURE__ */ new Set([
     ...destinationPackages,
     ...sourcePackages,
-    ...transformerPackages
+    ...transformerPackages,
+    ...storePackages
   ]);
   for (const [packageName, packageConfig] of Object.entries(packages)) {
     const isUsedByDestOrSource = usedPackages.has(packageName);
@@ -1568,16 +1596,74 @@ function generateImportStatements(packages, destinationPackages, sourcePackages,
   }
   return { importStatements, examplesMappings };
 }
+var VALID_JS_IDENTIFIER = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
+function validateComponentNames(components, section) {
+  for (const name of Object.keys(components)) {
+    if (!VALID_JS_IDENTIFIER.test(name)) {
+      throw new Error(
+        `Invalid ${section} name "${name}": must be a valid JavaScript identifier (use camelCase, e.g., "${name.replace(/-([a-z])/g, (_2, c2) => c2.toUpperCase())}")`
+      );
+    }
+  }
+}
+function validateStoreReferences(flowConfig, storeIds) {
+  const refs = [];
+  function collectRefs(obj, path15) {
+    if (typeof obj === "string" && obj.startsWith("$store:")) {
+      refs.push({ ref: obj.slice(7), location: path15 });
+    } else if (obj && typeof obj === "object") {
+      for (const [key, val] of Object.entries(obj)) {
+        collectRefs(val, `${path15}.${key}`);
+      }
+    }
+  }
+  for (const [section, components] of Object.entries({
+    sources: flowConfig.sources || {},
+    destinations: flowConfig.destinations || {},
+    transformers: flowConfig.transformers || {}
+  })) {
+    for (const [id, component] of Object.entries(
+      components
+    )) {
+      collectRefs(component, `${section}.${id}`);
+    }
+  }
+  for (const { ref, location } of refs) {
+    if (!storeIds.has(ref)) {
+      const available = storeIds.size > 0 ? `Available stores: ${Array.from(storeIds).join(", ")}` : "No stores defined";
+      throw new Error(
+        `Store reference "$store:${ref}" in ${location} \u2014 store "${ref}" not found. ${available}`
+      );
+    }
+  }
+}
 async function createEntryPoint(flowConfig, buildOptions, packagePaths) {
   const destinationPackages = detectDestinationPackages(flowConfig);
   const sourcePackages = detectSourcePackages(flowConfig);
   const transformerPackages = detectTransformerPackages(flowConfig);
+  const storePackages = detectStorePackages(flowConfig);
   const explicitCodeImports = detectExplicitCodeImports(flowConfig);
+  const storeIds = new Set(
+    Object.keys(
+      flowConfig.stores || {}
+    )
+  );
+  validateStoreReferences(flowConfig, storeIds);
+  const flowWithSections = flowConfig;
+  if (flowWithSections.sources)
+    validateComponentNames(flowWithSections.sources, "sources");
+  if (flowWithSections.destinations)
+    validateComponentNames(flowWithSections.destinations, "destinations");
+  if (flowWithSections.transformers)
+    validateComponentNames(flowWithSections.transformers, "transformers");
+  if (flowWithSections.stores)
+    validateComponentNames(flowWithSections.stores, "stores");
   const { importStatements } = generateImportStatements(
     buildOptions.packages,
     destinationPackages,
     sourcePackages,
     transformerPackages,
+    storePackages,
     explicitCodeImports
   );
   const importsCode = importStatements.join("\n");
@@ -1630,6 +1716,7 @@ function buildConfigObject(flowConfig, explicitCodeImports) {
   const sources = flowWithProps.sources || {};
   const destinations = flowWithProps.destinations || {};
   const transformers = flowWithProps.transformers || {};
+  const stores = flowWithProps.stores || {};
   Object.entries(sources).forEach(([name, source]) => {
     if (source.code !== true) {
       validateReference("Source", name, source);
@@ -1711,11 +1798,38 @@ function buildConfigObject(flowConfig, explicitCodeImports) {
       config: ${configStr}${envStr}${nextStr}
     }`;
   });
+  Object.entries(stores).forEach(([name, store]) => {
+    if (store.package || isInlineCode(store.code)) {
+      validateReference("Store", name, store);
+    }
+  });
+  const storesEntries = Object.entries(stores).filter(([, store]) => store.package || isInlineCode(store.code)).map(([key, store]) => {
+    if (isInlineCode(store.code)) {
+      return `    ${key}: ${generateInlineCode(store.code, store.config || {}, store.env)}`;
+    }
+    let codeVar;
+    if (store.code && typeof store.code === "string" && explicitCodeImports.has(store.package)) {
+      codeVar = store.code;
+    } else {
+      codeVar = packageNameToVariable(store.package);
+    }
+    const configStr = store.config ? processConfigValue(store.config) : "{}";
+    const envStr = store.env ? `,
+      env: ${processConfigValue(store.env)}` : "";
+    return `    ${key}: {
+      code: ${codeVar},
+      config: ${configStr}${envStr}
+    }`;
+  });
   const collectorStr = flowWithProps.collector ? `,
   ...${processConfigValue(flowWithProps.collector)}` : "";
   const transformersStr = transformersEntries.length > 0 ? `,
   transformers: {
 ${transformersEntries.join(",\n")}
+  }` : "";
+  const storesStr = storesEntries.length > 0 ? `,
+  stores: {
+${storesEntries.join(",\n")}
   }` : "";
   return `{
   sources: {
@@ -1723,7 +1837,7 @@ ${sourcesEntries.join(",\n")}
   },
   destinations: {
 ${destinationsEntries.join(",\n")}
-  }${transformersStr}${collectorStr}
+  }${transformersStr}${storesStr}${collectorStr}
 }`;
 }
 function processConfigValue(value) {
@@ -1733,6 +1847,10 @@ function serializeWithCode(value, indent) {
   const spaces = "  ".repeat(indent);
   const nextSpaces = "  ".repeat(indent + 1);
   if (typeof value === "string") {
+    if (value.startsWith("$store:")) {
+      const storeId = value.slice(7);
+      return `stores.${storeId}`;
+    }
     if (value.startsWith("$code:")) {
       return value.slice(6);
     }
@@ -1909,13 +2027,43 @@ function createApiClient() {
   });
 }
 
+// src/commands/bundle/dockerfile.ts
+import path10 from "path";
+import fs10 from "fs-extra";
+function buildDockerfileContent(platform, includedFolders) {
+  const bundleFile = platform === "web" ? "walker.js" : "bundle.mjs";
+  const lines = [
+    "# Generated by walkeros CLI",
+    "FROM walkeros/flow:latest",
+    "",
+    `COPY ${bundleFile} /app/flow/${bundleFile}`
+  ];
+  for (const folder of includedFolders) {
+    const name = path10.basename(folder);
+    lines.push(`COPY ${name}/ /app/flow/${name}/`);
+  }
+  lines.push("", `ENV BUNDLE=/app/flow/${bundleFile}`, "", "EXPOSE 8080", "");
+  return lines.join("\n");
+}
+async function generateDockerfile(outputDir, platform, logger2, customFile, includedFolders) {
+  const destPath = path10.join(outputDir, "Dockerfile");
+  if (customFile && await fs10.pathExists(customFile)) {
+    await fs10.copy(customFile, destPath);
+    logger2.info(`Dockerfile: ${destPath} (copied from ${customFile})`);
+    return;
+  }
+  const dockerfile = buildDockerfileContent(platform, includedFolders || []);
+  await fs10.writeFile(destPath, dockerfile);
+  logger2.info(`Dockerfile: ${destPath}`);
+}
+
 // src/commands/bundle/index.ts
 function resolveOutputPath(output, buildOptions) {
-  const resolved = path10.resolve(output);
-  const ext = path10.extname(resolved);
-  if (output.endsWith("/") || output.endsWith(path10.sep) || !ext) {
+  const resolved = path11.resolve(output);
+  const ext = path11.extname(resolved);
+  if (output.endsWith("/") || output.endsWith(path11.sep) || !ext) {
     const filename = buildOptions.platform === "browser" ? "walker.js" : "bundle.mjs";
-    return path10.join(resolved, filename);
+    return path11.join(resolved, filename);
   }
   return resolved;
 }
@@ -1945,7 +2093,7 @@ async function bundleCommand(options) {
       } catch {
         throw new Error("Invalid JSON received on stdin");
       }
-      configPath = path10.resolve(process.cwd(), "stdin.config.json");
+      configPath = path11.resolve(process.cwd(), "stdin.config.json");
     } else {
       const file = options.config || "bundle.config.json";
       configPath = resolveAsset(file, "config");
@@ -1999,21 +2147,27 @@ async function bundleCommand(options) {
         if (uploadUrl) {
           await uploadBundleToUrl(buildOptions.output, uploadUrl);
           logger2.info(`Uploaded to: ${sanitizeUrl(uploadUrl)}`);
-          await fs10.remove(buildOptions.output);
+          await fs11.remove(buildOptions.output);
         }
         if (!options.json && !options.all && options.stats && stats) {
           displayStats(stats, logger2);
         }
         if (writingToStdout && !options.json) {
-          const bundleContent = await fs10.readFile(buildOptions.output);
+          const bundleContent = await fs11.readFile(buildOptions.output);
           await writeResult(bundleContent, {});
         }
         if (options.dockerfile && options.output) {
           const platform = getPlatform2(flowConfig);
           if (platform) {
-            const outputDir = path10.dirname(buildOptions.output);
+            const outputDir = path11.dirname(buildOptions.output);
             const customFile = typeof options.dockerfile === "string" ? options.dockerfile : void 0;
-            await generateDockerfile(outputDir, platform, logger2, customFile);
+            await generateDockerfile(
+              outputDir,
+              platform,
+              logger2,
+              customFile,
+              buildOptions.include
+            );
           }
         }
       } catch (error) {
@@ -2076,7 +2230,7 @@ Build Summary: ${successCount}/${results.length} succeeded`
 }
 async function bundle(configOrPath, options = {}) {
   let rawConfig;
-  let configPath = path10.resolve(process.cwd(), "walkeros.config.json");
+  let configPath = path11.resolve(process.cwd(), "walkeros.config.json");
   if (typeof configOrPath === "string") {
     configPath = resolveAsset(configOrPath, "config");
     rawConfig = await loadJsonConfig(configPath);
@@ -2099,27 +2253,6 @@ async function bundle(configOrPath, options = {}) {
     options.stats ?? false
   );
 }
-async function generateDockerfile(outputDir, platform, logger2, customFile) {
-  const destPath = path10.join(outputDir, "Dockerfile");
-  if (customFile && await fs10.pathExists(customFile)) {
-    await fs10.copy(customFile, destPath);
-    logger2.info(`Dockerfile: ${destPath} (copied from ${customFile})`);
-    return;
-  }
-  const isWeb = platform === "web";
-  const bundleFile = isWeb ? "walker.js" : "bundle.mjs";
-  const dockerfile = `# Generated by walkeros CLI
-FROM walkeros/flow:latest
-
-COPY ${bundleFile} /app/flow/${bundleFile}
-
-ENV BUNDLE=/app/flow/${bundleFile}
-
-EXPOSE 8080
-`;
-  await fs10.writeFile(destPath, dockerfile);
-  logger2.info(`Dockerfile: ${destPath}`);
-}
 async function bundleRemote(options) {
   const client = createApiClient();
   const body = { flow: options.content };
@@ -2140,21 +2273,20 @@ async function bundleRemote(options) {
 }
 
 // src/commands/simulate/simulator.ts
-import fs11 from "fs-extra";
-import { Level as Level2 } from "@walkeros/core";
+import fs12 from "fs-extra";
 
 // ../collector/dist/index.mjs
 import { assign as o } from "@walkeros/core";
 import { assign as r, createLogger as i } from "@walkeros/core";
-import { assign as a, clone as c, debounce as u, getId as f, getGrantedConsent as l, isDefined as d, isFunction as g, isObject as m, processEventMapping as p, tryCatchAsync as h, useHooks as w } from "@walkeros/core";
+import { assign as a, clone as c, debounce as u, getId as f, getGrantedConsent as l, isDefined as g, isFunction as d, isObject as m, processEventMapping as p, tryCatchAsync as h, useHooks as w } from "@walkeros/core";
 import { isArray as y } from "@walkeros/core";
 import { tryCatch as b, tryCatchAsync as v } from "@walkeros/core";
 import { getMappingValue as k, tryCatchAsync as C } from "@walkeros/core";
 import { isObject as O, tryCatchAsync as q, useHooks as j } from "@walkeros/core";
-import { assign as M, getId as Q, isFunction as V, isString as K } from "@walkeros/core";
-import { isObject as X } from "@walkeros/core";
-import { getGrantedConsent as tn, processEventMapping as on, tryCatchAsync as sn, useHooks as rn } from "@walkeros/core";
-import { useHooks as cn, tryCatchAsync as un } from "@walkeros/core";
+import { assign as M, getId as Q, isFunction as V, isString as _ } from "@walkeros/core";
+import { isObject as K } from "@walkeros/core";
+import { getGrantedConsent as en, processEventMapping as tn, tryCatchAsync as on, useHooks as sn } from "@walkeros/core";
+import { useHooks as an, tryCatchAsync as cn } from "@walkeros/core";
 var e = { Action: "action", Actions: "actions", Config: "config", Consent: "consent", Context: "context", Custom: "custom", Destination: "destination", Elb: "elb", Globals: "globals", Hook: "hook", Init: "init", Link: "link", On: "on", Prefix: "data-elb", Ready: "ready", Run: "run", Session: "session", Shutdown: "shutdown", User: "user", Walker: "walker" };
 var t = { Commands: e, Utils: { Storage: { Cookie: "cookie", Local: "local", Session: "session" } } };
 function s(n, e2) {
@@ -2166,18 +2298,15 @@ function s(n, e2) {
   }), n.consent = o(n.consent, s2), { update: s2, runQueue: t2 };
 }
 function D(n) {
-  return null != n && false !== n && "object" == typeof n && true === n.__branch;
-}
-function A(n) {
   const e2 = {};
   for (const [t2, o2] of Object.entries(n)) o2.config?.next ? e2[t2] = { next: o2.config.next } : e2[t2] = {};
   return e2;
 }
-function E(n, e2) {
+function A(n, e2) {
   const t2 = n.config || {}, o2 = n[e2];
   return void 0 !== o2 ? { config: { ...t2, [e2]: o2 }, chainValue: o2 } : { config: t2, chainValue: void 0 };
 }
-function P(n, e2 = {}) {
+function E(n, e2 = {}) {
   if (!n) return [];
   if (Array.isArray(n)) return n;
   const t2 = [], o2 = /* @__PURE__ */ new Set();
@@ -2193,9 +2322,9 @@ function P(n, e2 = {}) {
   }
   return t2;
 }
-async function x(n, e2, t2) {
+async function P(n, e2, t2) {
   if (e2.init && !e2.config.init) {
-    const o2 = e2.type || "unknown", s2 = n.logger.scope(`transformer:${o2}`), r2 = { collector: n, logger: s2, id: t2, config: e2.config, env: R(e2.config.env) };
+    const o2 = e2.type || "unknown", s2 = n.logger.scope(`transformer:${o2}`), r2 = { collector: n, logger: s2, id: t2, config: e2.config, env: $(e2.config.env) };
     s2.debug("init");
     const i2 = await j(e2.init, "TransformerInit", n.hooks)(r2);
     if (false === i2) return false;
@@ -2203,47 +2332,50 @@ async function x(n, e2, t2) {
   }
   return true;
 }
-async function S(n, e2, t2, o2, s2, r2) {
-  const i2 = e2.type || "unknown", a2 = n.logger.scope(`transformer:${i2}`), c2 = { collector: n, logger: a2, id: t2, ingest: s2, config: e2.config, env: { ...R(e2.config.env), ...r2 ? { respond: r2 } : {} } };
+async function x(n, e2, t2, o2, s2, r2) {
+  const i2 = e2.type || "unknown", a2 = n.logger.scope(`transformer:${i2}`), c2 = { collector: n, logger: a2, id: t2, ingest: s2, config: e2.config, env: { ...$(e2.config.env), ...r2 ? { respond: r2 } : {} } };
   a2.debug("push", { event: o2.name });
   const u2 = await j(e2.push, "TransformerPush", n.hooks)(o2, c2);
   return a2.debug("push done"), u2;
 }
-async function $(n, e2, t2, o2, s2, r2) {
-  let i2 = o2;
+async function S(n, e2, t2, o2, s2, r2) {
+  let i2 = o2, a2 = r2;
   for (const o3 of t2) {
     const t3 = e2[o3];
     if (!t3) {
       n.logger.warn(`Transformer not found: ${o3}`);
       continue;
     }
-    if (!await q(x)(n, t3, o3)) return n.logger.error(`Transformer init failed: ${o3}`), null;
-    const a2 = await q(S, (e3) => (n.logger.scope(`transformer:${t3.type || "unknown"}`).error("Push failed", { error: e3 }), false))(n, t3, o3, i2, s2, r2);
-    if (false === a2) return null;
-    if (D(a2)) {
-      const t4 = P(a2.next, A(e2));
-      return t4.length > 0 ? $(n, e2, t4, a2.event, s2, r2) : (n.logger.warn(`Branch target not found: ${JSON.stringify(a2.next)}`), null);
+    if (!await q(P)(n, t3, o3)) return n.logger.error(`Transformer init failed: ${o3}`), null;
+    const r3 = await q(x, (e3) => (n.logger.scope(`transformer:${t3.type || "unknown"}`).error("Push failed", { error: e3 }), false))(n, t3, o3, i2, s2, a2);
+    if (false === r3) return null;
+    if (r3 && "object" == typeof r3) {
+      const { event: t4, respond: o4, next: c2 } = r3;
+      if (o4 && (a2 = o4), c2) {
+        const o5 = E(c2, D(e2));
+        return o5.length > 0 ? S(n, e2, o5, t4 || i2, s2, a2) : (n.logger.warn(`Branch target not found: ${JSON.stringify(c2)}`), null);
+      }
+      t4 && (i2 = t4);
     }
-    void 0 !== a2 && (i2 = a2);
   }
   return i2;
 }
-function R(n) {
+function $(n) {
   return n && O(n) ? n : {};
 }
-async function T(n, e2, t2) {
+async function R(n, e2, t2) {
   const { code: o2, config: s2 = {}, env: r2 = {}, primary: i2, next: a2 } = t2;
   let c2, u2;
-  const f2 = P(a2, A(n.transformers)), l2 = n.logger.scope("source").scope(e2), d2 = { push: (t3, o3 = {}) => n.push(t3, { ...o3, id: e2, ingest: c2, respond: u2, mapping: s2, preChain: f2 }), command: n.command, sources: n.sources, elb: n.sources.elb.push, logger: l2, ...r2 }, g2 = { collector: n, logger: l2, id: e2, config: s2, env: d2, setIngest: async (e3) => {
+  const f2 = E(a2, D(n.transformers)), l2 = n.logger.scope("source").scope(e2), g2 = { push: (t3, o3 = {}) => n.push(t3, { ...o3, id: e2, ingest: c2, respond: u2, mapping: s2, preChain: f2 }), command: n.command, sources: n.sources, elb: n.sources.elb.push, logger: l2, ...r2 }, d2 = { collector: n, logger: l2, id: e2, config: s2, env: g2, setIngest: async (e3) => {
     c2 = s2.ingest ? await k(e3, s2.ingest, { collector: n }) : void 0;
   }, setRespond: (n2) => {
     u2 = n2;
-  } }, m2 = await C(o2)(g2);
+  } }, m2 = await C(o2)(d2);
   if (!m2) return;
   const p2 = m2.type || "unknown", h2 = n.logger.scope(p2).scope(e2);
-  return d2.logger = h2, i2 && (m2.config = { ...m2.config, primary: i2 }), m2;
+  return g2.logger = h2, i2 && (m2.config = { ...m2.config, primary: i2 }), m2;
 }
-async function I(n, e2 = {}) {
+async function T(n, e2 = {}) {
   const t2 = {};
   for (const [o2, s2] of Object.entries(e2)) {
     const { config: e3 = {} } = s2;
@@ -2251,23 +2383,23 @@ async function I(n, e2 = {}) {
       n.pending.sources[o2] = s2;
       continue;
     }
-    const r2 = await T(n, o2, s2);
+    const r2 = await R(n, o2, s2);
     r2 && (t2[o2] = r2);
   }
   return t2;
 }
-async function B(n, e2, t2) {
+async function I(n, e2, t2) {
   const o2 = n.on, s2 = o2[e2] || [], r2 = y(t2) ? t2 : [t2];
   r2.forEach((n2) => {
     s2.push(n2);
-  }), o2[e2] = s2, await H(n, e2, r2);
+  }), o2[e2] = s2, await G(n, e2, r2);
 }
-function G(n, e2, t2, o2, s2) {
+function B(n, e2, t2, o2, s2) {
   if (!e2.on) return;
   const r2 = e2.type || "unknown", i2 = n.logger.scope(r2).scope("on").scope(o2), a2 = { collector: n, logger: i2, id: t2, config: e2.config, data: s2, env: L(e2.env, e2.config.env) };
   b(e2.on)(o2, a2);
 }
-async function H(n, e2, o2, s2) {
+async function G(n, e2, o2, s2) {
   let r2, i2 = o2 || [];
   switch (o2 || (i2 = n.on[e2] || []), e2) {
     case t.Commands.Consent:
@@ -2300,7 +2432,7 @@ async function H(n, e2, o2, s2) {
   if (Object.entries(n.destinations).forEach(([t2, o3]) => {
     if (o3.on) {
       if (!o3.config.init) return o3.queueOn = o3.queueOn || [], void o3.queueOn.push({ type: e2, data: r2 });
-      G(n, o3, t2, e2, r2);
+      B(n, o3, t2, e2, r2);
     }
   }), (Object.keys(n.pending.sources).length > 0 || Object.keys(n.pending.destinations).length > 0) && await (async function(n2, e3) {
     for (const [t2, o3] of Object.entries(n2.pending.sources)) {
@@ -2311,7 +2443,7 @@ async function H(n, e2, o2, s2) {
       if (-1 === r3) continue;
       if (s3.splice(r3, 1), s3.length > 0) continue;
       delete n2.pending.sources[t2];
-      const i3 = await T(n2, t2, o3);
+      const i3 = await R(n2, t2, o3);
       i3 && (n2.sources[t2] = i3);
     }
     for (const [t2, o3] of Object.entries(n2.pending.destinations)) {
@@ -2360,17 +2492,17 @@ async function H(n, e2, o2, s2) {
   }
   return !a2;
 }
-async function U(n, e2, t2) {
+async function H(n, e2, t2) {
   const { code: o2, config: s2 = {}, env: r2 = {}, before: i2 } = e2;
-  if (!g(o2.push)) return N({ ok: false, failed: { invalid: { type: "invalid", error: "Destination code must have a push method" } } });
+  if (!d(o2.push)) return N({ ok: false, failed: { invalid: { type: "invalid", error: "Destination code must have a push method" } } });
   const a2 = t2 || s2 || { init: false }, c2 = i2 ? { ...a2, before: i2 } : a2, u2 = { ...o2, config: c2, env: L(o2.env, r2) };
   let l2 = u2.config.id;
   if (!l2) do {
     l2 = f(4);
   } while (n.destinations[l2]);
-  return n.destinations[l2] = u2, false !== u2.config.queue && (u2.queuePush = [...n.queue]), _(n, void 0, {}, { [l2]: u2 });
+  return n.destinations[l2] = u2, false !== u2.config.queue && (u2.queuePush = [...n.queue]), U(n, void 0, {}, { [l2]: u2 });
 }
-async function _(n, e2, t2 = {}, o2) {
+async function U(n, e2, t2 = {}, o2) {
   const { allowed: s2, consent: r2, globals: i2, user: u2 } = n;
   if (!s2) return N({ ok: false });
   e2 && (n.queue.push(e2), n.status.in++), o2 || (o2 = n.destinations);
@@ -2385,24 +2517,24 @@ async function _(n, e2, t2 = {}, o2) {
       const e3 = await h(F)(n, s3, o3);
       return { id: o3, destination: s3, skipped: !e3 };
     }
-    const d3 = [], g3 = f3.filter((n2) => {
+    const g3 = [], d3 = f3.filter((n2) => {
       const e3 = l(s3.config.consent, r2, n2.consent);
-      return !e3 || (n2.consent = e3, d3.push(n2), false);
+      return !e3 || (n2.consent = e3, g3.push(n2), false);
     });
-    if (s3.queuePush.push(...g3), !d3.length) return { id: o3, destination: s3, queue: f3 };
+    if (s3.queuePush.push(...d3), !g3.length) return { id: o3, destination: s3, queue: f3 };
     if (!await h(F)(n, s3, o3)) return { id: o3, destination: s3, queue: f3 };
     let m3, p2;
     s3.dlq || (s3.dlq = []);
     const w2 = (function(n2, e3) {
       const t3 = n2.config.before;
-      return t3 ? P(t3, A(e3)) : [];
+      return t3 ? E(t3, D(e3)) : [];
     })(s3, n.transformers);
     let y2 = 0;
-    return await Promise.all(d3.map(async (e3) => {
+    return await Promise.all(g3.map(async (e3) => {
       e3.globals = a(i2, e3.globals), e3.user = a(u2, e3.user);
       let r3 = e3;
       if (w2.length > 0 && n.transformers && Object.keys(n.transformers).length > 0) {
-        const o4 = await $(n, n.transformers, w2, e3, t2.ingest, t2.respond);
+        const o4 = await S(n, n.transformers, w2, e3, t2.ingest, t2.respond);
         if (null === o4) return e3;
         r3 = o4;
       }
@@ -2412,15 +2544,15 @@ async function _(n, e2, t2 = {}, o2) {
       })(n, s3, o3, r3, t2.ingest, t2.respond);
       return y2 += Date.now() - c2, void 0 !== f4 && (p2 = f4), e3;
     })), { id: o3, destination: s3, error: m3, response: p2, totalDuration: y2 };
-  })), d2 = {}, g2 = {}, m2 = {};
+  })), g2 = {}, d2 = {}, m2 = {};
   for (const e3 of f2) {
     if (e3.skipped) continue;
     const t3 = e3.destination, o3 = { type: t3.type || "unknown", data: e3.response };
     n.status.destinations[e3.id] || (n.status.destinations[e3.id] = { count: 0, failed: 0, duration: 0 });
     const s3 = n.status.destinations[e3.id], r3 = Date.now();
-    e3.error ? (o3.error = e3.error, m2[e3.id] = o3, s3.failed++, s3.lastAt = r3, s3.duration += e3.totalDuration || 0, n.status.failed++) : e3.queue && e3.queue.length ? (t3.queuePush = (t3.queuePush || []).concat(e3.queue), g2[e3.id] = o3) : (d2[e3.id] = o3, s3.count++, s3.lastAt = r3, s3.duration += e3.totalDuration || 0, n.status.out++);
+    e3.error ? (o3.error = e3.error, m2[e3.id] = o3, s3.failed++, s3.lastAt = r3, s3.duration += e3.totalDuration || 0, n.status.failed++) : e3.queue && e3.queue.length ? (t3.queuePush = (t3.queuePush || []).concat(e3.queue), d2[e3.id] = o3) : (g2[e3.id] = o3, s3.count++, s3.lastAt = r3, s3.duration += e3.totalDuration || 0, n.status.out++);
   }
-  return N({ event: e2, ...Object.keys(d2).length && { done: d2 }, ...Object.keys(g2).length && { queued: g2 }, ...Object.keys(m2).length && { failed: m2 } });
+  return N({ event: e2, ...Object.keys(g2).length && { done: g2 }, ...Object.keys(d2).length && { queued: d2 }, ...Object.keys(m2).length && { failed: m2 } });
 }
 async function F(n, e2, t2) {
   if (e2.init && !e2.config.init) {
@@ -2431,7 +2563,7 @@ async function F(n, e2, t2) {
     if (e2.config = { ...i2 || e2.config, init: true }, e2.queueOn?.length) {
       const o3 = e2.queueOn;
       e2.queueOn = [];
-      for (const { type: s3, data: r3 } of o3) G(n, e2, t2, s3, r3);
+      for (const { type: s3, data: r3 } of o3) B(n, e2, t2, s3, r3);
     }
     s2.debug("init done");
   }
@@ -2440,8 +2572,8 @@ async function F(n, e2, t2) {
 async function J(n, e2, t2, o2, s2, r2) {
   const { config: i2 } = e2, a2 = await p(o2, i2, n);
   if (a2.ignore) return false;
-  const c2 = e2.type || "unknown", f2 = n.logger.scope(c2), l2 = { collector: n, logger: f2, id: t2, config: i2, data: a2.data, rule: a2.mapping, ingest: s2, env: { ...L(e2.env, i2.env), ...r2 ? { respond: r2 } : {} } }, g2 = a2.mapping, m2 = a2.mappingKey || "* *";
-  if (!g2?.batch || !e2.pushBatch) {
+  const c2 = e2.type || "unknown", f2 = n.logger.scope(c2), l2 = { collector: n, logger: f2, id: t2, config: i2, data: a2.data, rule: a2.mapping, ingest: s2, env: { ...L(e2.env, i2.env), ...r2 ? { respond: r2 } : {} } }, d2 = a2.mapping, m2 = a2.mappingKey || "* *";
+  if (!d2?.batch || !e2.pushBatch) {
     f2.debug("push", { event: a2.event.name });
     const t3 = await w(e2.push, "DestinationPush", n.hooks)(a2.event, l2);
     return f2.debug("push done"), t3;
@@ -2450,12 +2582,12 @@ async function J(n, e2, t2, o2, s2, r2) {
     if (e2.batches = e2.batches || {}, !e2.batches[m2]) {
       const o4 = { key: m2, events: [], data: [] };
       e2.batches[m2] = { batched: o4, batchFn: u(() => {
-        const o5 = e2.batches[m2].batched, a3 = { collector: n, logger: f2, id: t2, config: i2, data: void 0, rule: g2, ingest: s2, env: { ...L(e2.env, i2.env), ...r2 ? { respond: r2 } : {} } };
+        const o5 = e2.batches[m2].batched, a3 = { collector: n, logger: f2, id: t2, config: i2, data: void 0, rule: d2, ingest: s2, env: { ...L(e2.env, i2.env), ...r2 ? { respond: r2 } : {} } };
         f2.debug("push batch", { events: o5.events.length }), w(e2.pushBatch, "DestinationPushBatch", n.hooks)(o5, a3), f2.debug("push batch done"), o5.events = [], o5.data = [];
-      }, g2.batch) };
+      }, d2.batch) };
     }
     const o3 = e2.batches[m2];
-    o3.batched.events.push(a2.event), d(a2.data) && o3.batched.data.push(a2.data), o3.batchFn();
+    o3.batched.events.push(a2.event), g(a2.data) && o3.batched.data.push(a2.data), o3.batchFn();
   }
   return true;
 }
@@ -2463,7 +2595,7 @@ function N(n) {
   return { ok: !n?.failed, ...n };
 }
 function W(n) {
-  const { code: e2, config: t2 = {}, env: o2 = {} } = n, { config: s2 } = E(n, "before"), r2 = { ...e2.config, ...t2, ...s2 }, i2 = L(e2.env, o2);
+  const { code: e2, config: t2 = {}, env: o2 = {} } = n, { config: s2 } = A(n, "before"), r2 = { ...e2.config, ...t2, ...s2 }, i2 = L(e2.env, o2);
   return { ...e2, config: r2, env: i2 };
 }
 async function z(n, e2 = {}) {
@@ -2474,7 +2606,7 @@ async function z(n, e2 = {}) {
 function L(n, e2) {
   return n || e2 ? e2 ? n && m(n) && m(e2) ? { ...n, ...e2 } : e2 : n : {};
 }
-async function Y(n, e2, t2) {
+async function X(n, e2, t2) {
   const o2 = Object.entries(n).map(async ([n2, o3]) => {
     const s2 = o3.destroy;
     if (!s2) return;
@@ -2487,35 +2619,35 @@ async function Y(n, e2, t2) {
   });
   await Promise.allSettled(o2);
 }
-async function Z(n, e2, o2, r2) {
+async function Y(n, e2, o2, r2) {
   let i2, a2, c2 = false, u2 = false;
   switch (e2) {
     case t.Commands.Config:
-      X(o2) && (M(n.config, o2, { shallow: false }), a2 = o2, c2 = true);
+      K(o2) && (M(n.config, o2, { shallow: false }), a2 = o2, c2 = true);
       break;
     case t.Commands.Consent:
-      if (X(o2)) {
+      if (K(o2)) {
         const { update: e3, runQueue: t2 } = s(n, o2);
         a2 = e3, c2 = true, u2 = t2;
       }
       break;
     case t.Commands.Custom:
-      X(o2) && (n.custom = M(n.custom, o2), a2 = o2, c2 = true);
+      K(o2) && (n.custom = M(n.custom, o2), a2 = o2, c2 = true);
       break;
     case t.Commands.Destination:
-      X(o2) && ("code" in o2 && X(o2.code) ? i2 = await U(n, o2, r2) : V(o2.push) && (i2 = await U(n, { code: o2 }, r2)));
+      K(o2) && ("code" in o2 && K(o2.code) ? i2 = await H(n, o2, r2) : V(o2.push) && (i2 = await H(n, { code: o2 }, r2)));
       break;
     case t.Commands.Globals:
-      X(o2) && (n.globals = M(n.globals, o2), a2 = o2, c2 = true);
+      K(o2) && (n.globals = M(n.globals, o2), a2 = o2, c2 = true);
       break;
     case t.Commands.On:
-      K(o2) && await B(n, o2, r2);
+      _(o2) && await I(n, o2, r2);
       break;
     case t.Commands.Ready:
       c2 = true;
       break;
     case t.Commands.Run:
-      i2 = await en(n, o2), c2 = true;
+      i2 = await nn(n, o2), c2 = true;
       break;
     case t.Commands.Session:
       c2 = true;
@@ -2523,47 +2655,47 @@ async function Z(n, e2, o2, r2) {
     case t.Commands.Shutdown:
       await (async function(n2) {
         const e3 = n2.logger;
-        await Y(n2.sources, "source", e3), await Y(n2.destinations, "destination", e3), await Y(n2.transformers, "transformer", e3);
+        await X(n2.sources, "source", e3), await X(n2.destinations, "destination", e3), await X(n2.transformers, "transformer", e3), await X(n2.stores, "store", e3);
       })(n);
       break;
     case t.Commands.User:
-      X(o2) && (M(n.user, o2, { shallow: false }), a2 = o2, c2 = true);
+      K(o2) && (M(n.user, o2, { shallow: false }), a2 = o2, c2 = true);
   }
-  return c2 && await H(n, e2, void 0, a2), u2 && (i2 = await _(n)), i2 || N({ ok: true });
+  return c2 && await G(n, e2, void 0, a2), u2 && (i2 = await U(n)), i2 || N({ ok: true });
 }
-function nn(n, e2) {
+function Z(n, e2) {
   if (!e2.name) throw new Error("Event name is required");
   const [t2, o2] = e2.name.split(" ");
   if (!t2 || !o2) throw new Error("Event name is invalid");
   ++n.count;
-  const { timestamp: s2 = Date.now(), group: r2 = n.group, count: i2 = n.count } = e2, { name: a2 = `${t2} ${o2}`, data: c2 = {}, context: u2 = {}, globals: f2 = n.globals, custom: l2 = {}, user: d2 = n.user, nested: g2 = [], consent: m2 = n.consent, id: p2 = `${s2}-${r2}-${i2}`, trigger: h2 = "", entity: w2 = t2, action: y2 = o2, timing: b2 = 0, version: v2 = { source: n.version, tagging: n.config.tagging || 0 }, source: k2 = { type: "collector", id: "", previous_id: "" } } = e2;
-  return { name: a2, data: c2, context: u2, globals: f2, custom: l2, user: d2, nested: g2, consent: m2, id: p2, trigger: h2, entity: w2, action: y2, timestamp: s2, timing: b2, group: r2, count: i2, version: v2, source: k2 };
+  const { timestamp: s2 = Date.now(), group: r2 = n.group, count: i2 = n.count } = e2, { name: a2 = `${t2} ${o2}`, data: c2 = {}, context: u2 = {}, globals: f2 = n.globals, custom: l2 = {}, user: g2 = n.user, nested: d2 = [], consent: m2 = n.consent, id: p2 = `${s2}-${r2}-${i2}`, trigger: h2 = "", entity: w2 = t2, action: y2 = o2, timing: b2 = 0, version: v2 = { source: n.version, tagging: n.config.tagging || 0 }, source: k2 = { type: "collector", id: "", previous_id: "" } } = e2;
+  return { name: a2, data: c2, context: u2, globals: f2, custom: l2, user: g2, nested: d2, consent: m2, id: p2, trigger: h2, entity: w2, action: y2, timestamp: s2, timing: b2, group: r2, count: i2, version: v2, source: k2 };
 }
-async function en(n, e2) {
+async function nn(n, e2) {
   n.allowed = true, n.count = 0, n.group = Q(), n.timing = Date.now(), e2 && (e2.consent && (n.consent = M(n.consent, e2.consent)), e2.user && (n.user = M(n.user, e2.user)), e2.globals && (n.globals = M(n.config.globalsStatic || {}, e2.globals)), e2.custom && (n.custom = M(n.custom, e2.custom))), Object.values(n.destinations).forEach((n2) => {
     n2.queuePush = [];
   }), n.queue = [], n.round++;
-  return await _(n);
+  return await U(n);
 }
-function an(n, e2) {
-  return rn(async (t2, o2 = {}) => await sn(async () => {
+function rn(n, e2) {
+  return sn(async (t2, o2 = {}) => await on(async () => {
     const s2 = Date.now(), { id: r2, ingest: i2, respond: a2, mapping: c2, preChain: u2 } = o2;
     let f2 = t2;
     const l2 = i2 ? Object.freeze(i2) : void 0;
     if (c2) {
-      const e3 = await on(f2, c2, n);
+      const e3 = await tn(f2, c2, n);
       if (e3.ignore) return N({ ok: true });
       if (c2.consent) {
-        if (!tn(c2.consent, n.consent, e3.event.consent)) return N({ ok: true });
+        if (!en(c2.consent, n.consent, e3.event.consent)) return N({ ok: true });
       }
       f2 = e3.event;
     }
     if (u2?.length && n.transformers && Object.keys(n.transformers).length > 0) {
-      const e3 = await $(n, n.transformers, u2, f2, l2, a2);
+      const e3 = await S(n, n.transformers, u2, f2, l2, a2);
       if (null === e3) return N({ ok: true });
       f2 = e3;
     }
-    const d2 = e2(f2), g2 = nn(n, d2), m2 = await _(n, g2, { id: r2, ingest: l2, respond: a2 });
+    const g2 = e2(f2), d2 = Z(n, g2), m2 = await U(n, d2, { id: r2, ingest: l2, respond: a2 });
     if (r2) {
       n.status.sources[r2] || (n.status.sources[r2] = { count: 0, duration: 0 });
       const e3 = n.status.sources[r2];
@@ -2572,22 +2704,29 @@ function an(n, e2) {
     return m2;
   }, () => N({ ok: false }))(), "Push", n.hooks);
 }
-async function fn(n) {
-  const e2 = r({ globalsStatic: {}, sessionStatic: {}, tagging: 0, run: true }, n, { merge: false, extend: false }), t2 = { level: n.logger?.level, handler: n.logger?.handler }, o2 = i(t2), s2 = { ...e2.globalsStatic, ...n.globals }, a2 = { allowed: false, config: e2, consent: n.consent || {}, count: 0, custom: n.custom || {}, destinations: {}, transformers: {}, globals: s2, group: "", hooks: {}, logger: o2, on: {}, queue: [], round: 0, session: void 0, status: { startedAt: Date.now(), in: 0, out: 0, failed: 0, sources: {}, destinations: {} }, timing: Date.now(), user: n.user || {}, version: "2.0.1", sources: {}, pending: { sources: {}, destinations: {} }, push: void 0, command: void 0 };
-  return a2.push = an(a2, (n2) => ({ timing: Math.round((Date.now() - a2.timing) / 10) / 100, source: { type: "collector", id: "", previous_id: "" }, ...n2 })), a2.command = (function(n2, e3) {
-    return cn(async (t3, o3, s3) => await un(async () => await e3(n2, t3, o3, s3), () => N({ ok: false }))(), "Command", n2.hooks);
-  })(a2, Z), a2.destinations = await z(a2, n.destinations || {}), a2.transformers = await (async function(n2, e3 = {}) {
+async function un(n) {
+  const e2 = r({ globalsStatic: {}, sessionStatic: {}, tagging: 0, run: true }, n, { merge: false, extend: false }), t2 = { level: n.logger?.level, handler: n.logger?.handler }, o2 = i(t2), s2 = { ...e2.globalsStatic, ...n.globals }, a2 = { allowed: false, config: e2, consent: n.consent || {}, count: 0, custom: n.custom || {}, destinations: {}, transformers: {}, stores: {}, globals: s2, group: "", hooks: {}, logger: o2, on: {}, queue: [], round: 0, session: void 0, status: { startedAt: Date.now(), in: 0, out: 0, failed: 0, sources: {}, destinations: {} }, timing: Date.now(), user: n.user || {}, version: "2.1.1", sources: {}, pending: { sources: {}, destinations: {} }, push: void 0, command: void 0 };
+  return a2.push = rn(a2, (n2) => ({ timing: Math.round((Date.now() - a2.timing) / 10) / 100, source: { type: "collector", id: "", previous_id: "" }, ...n2 })), a2.command = (function(n2, e3) {
+    return an(async (t3, o3, s3) => await cn(async () => await e3(n2, t3, o3, s3), () => N({ ok: false }))(), "Command", n2.hooks);
+  })(a2, Y), a2.stores = await (async function(n2, e3 = {}) {
     const t3 = {};
     for (const [o3, s3] of Object.entries(e3)) {
-      const { code: e4, env: r2 = {} } = s3, { config: i2 } = E(s3, "next"), a3 = n2.logger.scope("transformer").scope(o3), c2 = { collector: n2, logger: a3, id: o3, config: i2, env: r2 }, u2 = await e4(c2);
+      const { code: e4, config: r2 = {}, env: i2 = {} } = s3, a3 = n2.logger.scope("store").scope(o3), c2 = { collector: n2, logger: a3, id: o3, config: r2, env: i2 }, u2 = await e4(c2);
+      t3[o3] = u2;
+    }
+    return t3;
+  })(a2, n.stores || {}), a2.destinations = await z(a2, n.destinations || {}), a2.transformers = await (async function(n2, e3 = {}) {
+    const t3 = {};
+    for (const [o3, s3] of Object.entries(e3)) {
+      const { code: e4, env: r2 = {} } = s3, { config: i2 } = A(s3, "next"), a3 = n2.logger.scope("transformer").scope(o3), c2 = { collector: n2, logger: a3, id: o3, config: i2, env: r2 }, u2 = await e4(c2);
       t3[o3] = u2;
     }
     return t3;
   })(a2, n.transformers || {}), a2;
 }
-async function ln(n) {
+async function fn(n) {
   n = n || {};
-  const e2 = await fn(n), t2 = (o2 = e2, { type: "elb", config: {}, push: async (n2, e3, t3, s3, r3, i3) => {
+  const e2 = await un(n), t2 = (o2 = e2, { type: "elb", config: {}, push: async (n2, e3, t3, s3, r3, i3) => {
     if ("string" == typeof n2 && n2.startsWith("walker ")) {
       const s4 = n2.replace("walker ", "");
       return o2.command(s4, e3, t3);
@@ -2602,7 +2741,7 @@ async function ln(n) {
   } });
   var o2;
   e2.sources.elb = t2;
-  const s2 = await I(e2, n.sources || {});
+  const s2 = await T(e2, n.sources || {});
   Object.assign(e2.sources, s2);
   const { consent: r2, user: i2, globals: a2, custom: c2 } = n;
   r2 && await e2.command("consent", r2), i2 && await e2.command("user", i2), a2 && Object.assign(e2.globals, a2), c2 && Object.assign(e2.custom, c2), e2.config.run && await e2.command("run");
@@ -2610,15 +2749,15 @@ async function ln(n) {
   const f2 = Object.values(e2.sources).filter((n2) => "elb" !== n2.type), l2 = f2.find((n2) => n2.config.primary);
   return l2 ? u2 = l2.push : f2.length > 0 && (u2 = f2[0].push), { collector: e2, elb: u2 };
 }
-function dn(n) {
+function ln(n) {
   if (null === n || "object" != typeof n) return n;
-  if (Array.isArray(n)) return n.map(dn);
+  if (Array.isArray(n)) return n.map(ln);
   const e2 = {};
-  for (const [t2, o2] of Object.entries(n)) e2[t2] = "function" == typeof o2 ? o2 : dn(o2);
+  for (const [t2, o2] of Object.entries(n)) e2[t2] = "function" == typeof o2 ? o2 : ln(o2);
   return e2;
 }
 function gn(n) {
-  const e2 = [], { simulation: t2, ...o2 } = n, s2 = dn(o2);
+  const e2 = [], { simulation: t2, ...o2 } = n, s2 = ln(o2);
   for (const n2 of t2) {
     const t3 = n2.startsWith("call:") ? n2.slice(5) : n2, o3 = t3.split(".");
     let r2 = s2;
@@ -2632,17 +2771,17 @@ function gn(n) {
   }
   return { wrappedEnv: s2, calls: e2 };
 }
-async function mn(n) {
+async function dn(n) {
   const e2 = Date.now();
   try {
     switch (n.step) {
       case "transformer":
         return await (async function(n2, e3) {
-          const { code: t2, config: o2 = {}, event: s2 } = n2, { collector: r2 } = await ln({ transformers: { sim: { code: t2, config: o2 } } }), i2 = r2.transformers?.sim;
+          const { code: t2, config: o2 = {}, event: s2 } = n2, { collector: r2 } = await fn({ transformers: { sim: { code: t2, config: o2 } } }), i2 = r2.transformers?.sim;
           if (!i2) throw new Error("Transformer failed to initialize");
           const a2 = await i2.push(s2, { collector: r2, logger: r2.logger.scope("transformer").scope("sim"), id: "sim", config: i2.config, env: i2.config?.env || {} });
           let c2;
-          c2 = false === a2 ? [] : null == a2 ? [s2] : [a2];
+          c2 = false === a2 ? [] : null == a2 ? [s2] : [a2.event || s2];
           return { step: "transformer", name: n2.name, events: c2, calls: [], duration: Date.now() - e3 };
         })(n, e2);
       case "source":
@@ -2653,7 +2792,7 @@ async function mn(n) {
             const n3 = s2(r2, i2);
             "function" == typeof n3 && (u2 = n3);
           }
-          const f2 = [], { collector: l2 } = await ln({ consent: a2 || c2, sources: { sim: { code: t2, config: o2, env: i2, next: "spy" } }, transformers: { spy: { code: () => ({ type: "spy", config: {}, push: (n3) => (f2.push(JSON.parse(JSON.stringify(n3))), n3) }) } } });
+          const f2 = [], { collector: l2 } = await fn({ consent: a2 || c2, sources: { sim: { code: t2, config: o2, env: i2, next: "spy" } }, transformers: { spy: { code: () => ({ type: "spy", config: {}, push: (n3) => (f2.push(JSON.parse(JSON.stringify(n3))), { event: n3 }) }) } } });
           u2 && u2();
           return { step: "source", name: n2.name, events: f2, calls: [], duration: Date.now() - e3 };
         })(n, e2);
@@ -2667,8 +2806,8 @@ async function mn(n) {
           }
           const l2 = { ...o2 };
           f2 && (l2.env = f2);
-          const { collector: d2 } = await ln({ consent: r2 || c2, destinations: { sim: { code: t2, config: l2 } } });
-          return await d2.push(s2), { step: "destination", name: n2.name, events: [], calls: u2, duration: Date.now() - e3 };
+          const { collector: g2 } = await fn({ consent: r2 || c2, destinations: { sim: { code: t2, config: l2 } } });
+          return await g2.push(s2), { step: "destination", name: n2.name, events: [], calls: u2, duration: Date.now() - e3 };
         })(n, e2);
     }
   } catch (t2) {
@@ -2708,21 +2847,6 @@ async function loadDestinationEnvs(destinations) {
 }
 
 // src/commands/simulate/simulator.ts
-function createCollectorLoggerConfigInline(logger2, verbose) {
-  return {
-    level: verbose ? Level2.DEBUG : Level2.ERROR,
-    handler: (level, message, context, scope) => {
-      const scopePath = scope.length > 0 ? `[${scope.join(":")}] ` : "";
-      const hasContext = Object.keys(context).length > 0;
-      const contextStr = hasContext ? ` ${JSON.stringify(context)}` : "";
-      if (level === Level2.ERROR) {
-        logger2.error(`${scopePath}${message}${contextStr}`);
-      } else {
-        logger2.debug(`${scopePath}${message}${contextStr}`);
-      }
-    }
-  };
-}
 function callsToUsage(destName, calls) {
   if (!calls.length) return {};
   return {
@@ -2745,7 +2869,6 @@ async function simulateCore(inputPath, event, options = {}) {
     const result = await executeSimulation(event, inputPath, options.platform, {
       flow: options.flow,
       step: options.step,
-      logger: logger2,
       verbose: options.verbose
     });
     return result;
@@ -2800,9 +2923,8 @@ function formatSimulationResult(result, options = {}) {
 async function executeSimulation(event, inputPath, platformOverride, options = {}) {
   const startTime = Date.now();
   const tempDir = getTmpPath();
-  const collectorLoggerConfig = options.logger ? createCollectorLoggerConfigInline(options.logger, options.verbose) : void 0;
   try {
-    await fs11.ensureDir(tempDir);
+    await fs12.ensureDir(tempDir);
     const detected = await detectInput(inputPath, platformOverride);
     if (!isObject(event) || !("name" in event) || typeof event.name !== "string") {
       throw new Error(
@@ -2821,7 +2943,6 @@ async function executeSimulation(event, inputPath, platformOverride, options = {
       typedEvent,
       tempDir,
       startTime,
-      collectorLoggerConfig,
       options.flow,
       options.step
     );
@@ -2834,7 +2955,7 @@ async function executeSimulation(event, inputPath, platformOverride, options = {
     };
   } finally {
     if (tempDir) {
-      await fs11.remove(tempDir).catch(() => {
+      await fs12.remove(tempDir).catch(() => {
       });
     }
   }
@@ -2863,7 +2984,7 @@ function parseStepTarget(stepTarget, flowConfig) {
   }
   throw new Error("No destination found in flow config");
 }
-async function executeConfigSimulation(_content, configPath, typedEvent, tempDir, startTime, loggerConfig2, flowName, stepTarget) {
+async function executeConfigSimulation(_content, configPath, typedEvent, tempDir, startTime, flowName, stepTarget) {
   const { flowConfig } = await loadFlowConfig(configPath, {
     flowName
   });
@@ -2881,7 +3002,7 @@ async function executeConfigSimulation(_content, configPath, typedEvent, tempDir
     const destinations = flowConfig.destinations;
     const envs = await loadDestinationEnvs(destinations || {});
     const destEnv = envs[step.name];
-    const result = await mn({
+    const result = await dn({
       step: "destination",
       name: step.name,
       code,
@@ -2906,7 +3027,7 @@ async function executeConfigSimulation(_content, configPath, typedEvent, tempDir
     }
     const mod = await import(packageName);
     const code = mod.default || Object.values(mod)[0];
-    const result = await mn({
+    const result = await dn({
       step: "transformer",
       name: step.name,
       code,
@@ -2978,7 +3099,7 @@ async function simulateSourceCLI(flowConfig, setupInput, options) {
       document: dom.window.document,
       localStorage: dom.window.localStorage
     };
-    const result = await mn({
+    const result = await dn({
       step: "source",
       name: options.sourceStep,
       code,
@@ -3116,129 +3237,33 @@ async function simulateCommand(options) {
     let config;
     if (isStdinPiped() && !options.config) {
       const stdinContent = await readStdin();
-      const fs14 = await import("fs-extra");
-      const path14 = await import("path");
+      const fs15 = await import("fs-extra");
+      const path15 = await import("path");
       const tmpPath = getTmpPath(void 0, "stdin-simulate.json");
-      await fs14.default.ensureDir(path14.default.dirname(tmpPath));
-      await fs14.default.writeFile(tmpPath, stdinContent, "utf-8");
+      await fs15.default.ensureDir(path15.default.dirname(tmpPath));
+      await fs15.default.writeFile(tmpPath, stdinContent, "utf-8");
       config = tmpPath;
     } else {
       config = options.config || "bundle.config.json";
     }
-    let event;
-    let exampleContext;
-    if (options.example) {
-      const rawConfig = await loadJsonConfig(config);
-      const setup = validateFlowSetup(rawConfig);
-      const flowNames = Object.keys(setup.flows);
-      let flowName = options.flow;
-      if (!flowName) {
-        if (flowNames.length === 1) {
-          flowName = flowNames[0];
-        } else {
-          throw new Error(
-            `Multiple flows found. Use --flow to specify which flow contains the example.
-Available flows: ${flowNames.join(", ")}`
-          );
-        }
-      }
-      const flowConfig = setup.flows[flowName];
-      if (!flowConfig) {
-        throw new Error(
-          `Flow "${flowName}" not found. Available: ${flowNames.join(", ")}`
-        );
-      }
-      const found = findExample(flowConfig, options.example, options.step);
-      if (found.example.in === void 0) {
-        throw new Error(
-          `Example "${options.example}" in ${found.stepType}.${found.stepName} has no "in" value`
-        );
-      }
-      event = found.example.in;
-      exampleContext = {
-        stepType: found.stepType,
-        stepName: found.stepName,
-        expected: found.example.out
-      };
-    } else {
-      event = await loadJsonFromSource(options.event, {
-        name: "event"
-      });
-    }
-    const isSourceSimulation = exampleContext?.stepType === "source" || options.step?.startsWith("source.");
-    let result;
-    if (isSourceSimulation) {
-      const rawConfig = await loadJsonConfig(config);
-      const setup = validateFlowSetup(rawConfig);
-      const flowNames = Object.keys(setup.flows);
-      const flowName = options.flow || (flowNames.length === 1 ? flowNames[0] : void 0);
-      if (!flowName) {
-        throw new Error(
-          `Multiple flows found. Use --flow to specify which flow.
-Available: ${flowNames.join(", ")}`
-        );
-      }
-      const flowConfig = setup.flows[flowName];
-      if (!flowConfig) {
-        throw new Error(
-          `Flow "${flowName}" not found. Available: ${flowNames.join(", ")}`
-        );
-      }
-      const sourceStep = exampleContext?.stepName || options.step.substring("source.".length);
-      result = await simulateSourceCLI(
-        flowConfig,
-        event,
-        {
-          flow: options.flow,
-          sourceStep,
-          json: options.json,
-          verbose: options.verbose,
-          silent: options.silent
-        }
-      );
-    } else {
-      const stepTarget = exampleContext ? `${exampleContext.stepType}.${exampleContext.stepName}` : options.step;
-      result = await simulateCore(config, event, {
-        flow: options.flow,
-        json: options.json,
-        verbose: options.verbose,
-        silent: options.silent,
-        step: stepTarget
-      });
-    }
-    let exampleMatch;
-    if (exampleContext && result.success) {
-      const stepKey = `${exampleContext.stepType}.${exampleContext.stepName}`;
-      if (exampleContext.expected === false) {
-        const calls = result.usage?.[exampleContext.stepName];
-        const wasFiltered = !calls || calls.length === 0;
-        exampleMatch = {
-          name: options.example,
-          step: stepKey,
-          expected: false,
-          actual: wasFiltered ? false : calls,
-          match: wasFiltered,
-          diff: wasFiltered ? void 0 : `Expected event to be filtered, but ${calls.length} API call(s) were made`
-        };
-      } else if (exampleContext.expected !== void 0) {
-        const actual = result.usage?.[exampleContext.stepName] ?? [];
-        exampleMatch = {
-          name: options.example,
-          step: stepKey,
-          ...compareOutput(exampleContext.expected, actual)
-        };
-      }
-    }
+    const result = await simulate(config, options.event, {
+      flow: options.flow,
+      json: options.json,
+      verbose: options.verbose,
+      silent: options.silent,
+      platform: options.platform,
+      example: options.example,
+      step: options.step
+    });
     const resultWithDuration = {
       ...result,
-      duration: (Date.now() - startTime) / 1e3,
-      ...exampleMatch ? { exampleMatch } : {}
+      duration: (Date.now() - startTime) / 1e3
     };
     const formatted = formatSimulationResult(resultWithDuration, {
       json: options.json
     });
     await writeResult(formatted + "\n", { output: options.output });
-    const exitCode = !result.success || exampleMatch && !exampleMatch.match ? 1 : 0;
+    const exitCode = !result.success || result.exampleMatch && !result.exampleMatch.match ? 1 : 0;
     process.exit(exitCode);
   } catch (error) {
     const errorMessage = getErrorMessage(error);
@@ -3266,6 +3291,9 @@ async function simulate(configOrPath, event, options = {}) {
     );
   }
   let resolvedEvent = event;
+  if (typeof event === "string") {
+    resolvedEvent = await loadJsonFromSource(event, { name: "event" });
+  }
   let exampleContext;
   if (options.example) {
     const rawConfig = await loadJsonConfig(configOrPath);
@@ -3301,12 +3329,48 @@ Available flows: ${flowNames.join(", ")}`
       expected: found.example.out
     };
   }
-  const result = await simulateCore(configOrPath, resolvedEvent, {
-    json: options.json ?? false,
-    verbose: options.verbose ?? false,
-    flow: options.flow,
-    platform: options.platform
-  });
+  const isSourceSimulation = exampleContext?.stepType === "source" || options.step?.startsWith("source.");
+  let result;
+  if (isSourceSimulation) {
+    const rawConfig = await loadJsonConfig(configOrPath);
+    const setup = validateFlowSetup(rawConfig);
+    const flowNames = Object.keys(setup.flows);
+    const flowName = options.flow || (flowNames.length === 1 ? flowNames[0] : void 0);
+    if (!flowName) {
+      throw new Error(
+        `Multiple flows found. Use --flow to specify which flow.
+Available: ${flowNames.join(", ")}`
+      );
+    }
+    const flowConfig = setup.flows[flowName];
+    if (!flowConfig) {
+      throw new Error(
+        `Flow "${flowName}" not found. Available: ${flowNames.join(", ")}`
+      );
+    }
+    const sourceStep = exampleContext?.stepName || options.step.substring("source.".length);
+    result = await simulateSourceCLI(
+      flowConfig,
+      resolvedEvent,
+      {
+        flow: options.flow,
+        sourceStep,
+        json: options.json,
+        verbose: options.verbose,
+        silent: options.silent
+      }
+    );
+  } else {
+    const stepTarget = exampleContext ? `${exampleContext.stepType}.${exampleContext.stepName}` : options.step;
+    result = await simulateCore(configOrPath, resolvedEvent, {
+      json: options.json ?? false,
+      verbose: options.verbose ?? false,
+      silent: options.silent ?? false,
+      flow: options.flow,
+      platform: options.platform,
+      step: stepTarget
+    });
+  }
   if (exampleContext && result.success) {
     const stepKey = `${exampleContext.stepType}.${exampleContext.stepName}`;
     if (exampleContext.expected === false) {
@@ -3334,27 +3398,12 @@ Available flows: ${flowNames.join(", ")}`
 
 // src/commands/push/index.ts
 init_cli_logger();
-import path11 from "path";
+import path12 from "path";
 import { JSDOM as JSDOM2, VirtualConsole as VirtualConsole2 } from "jsdom";
-import fs12 from "fs-extra";
+import fs13 from "fs-extra";
 import { getPlatform as getPlatform3 } from "@walkeros/core";
 import { schemas as schemas2 } from "@walkeros/core/dev";
-import { Level as Level3 } from "@walkeros/core";
-function createCollectorLoggerConfig(logger2, verbose) {
-  return {
-    level: verbose ? Level3.DEBUG : Level3.ERROR,
-    handler: (level, message, context, scope) => {
-      const scopePath = scope.length > 0 ? `[${scope.join(":")}] ` : "";
-      const hasContext = Object.keys(context).length > 0;
-      const contextStr = hasContext ? ` ${JSON.stringify(context)}` : "";
-      if (level === Level3.ERROR) {
-        logger2.error(`${scopePath}${message}${contextStr}`);
-      } else {
-        logger2.debug(`${scopePath}${message}${contextStr}`);
-      }
-    }
-  };
-}
+import { Level as Level2 } from "@walkeros/core";
 async function pushCore(inputPath, event, options = {}) {
   const logger2 = createCLILogger({
     silent: options.silent,
@@ -3363,11 +3412,7 @@ async function pushCore(inputPath, event, options = {}) {
   const startTime = Date.now();
   let tempDir;
   try {
-    let loadedEvent = event;
-    if (typeof event === "string") {
-      loadedEvent = await loadJsonFromSource(event, { name: "event" });
-    }
-    const eventResult = schemas2.PartialEventSchema.safeParse(loadedEvent);
+    const eventResult = schemas2.PartialEventSchema.safeParse(event);
     if (!eventResult.success) {
       const errors = eventResult.error.issues.map((issue) => `${String(issue.path.join("."))}: ${issue.message}`).join(", ");
       throw new Error(`Invalid event: ${errors}`);
@@ -3413,7 +3458,7 @@ async function pushCore(inputPath, event, options = {}) {
         (dir) => {
           tempDir = dir;
         },
-        { logger: createCollectorLoggerConfig(logger2, options.verbose) }
+        { logger: { level: options.verbose ? Level2.DEBUG : Level2.ERROR } }
       );
     }
     return result;
@@ -3425,7 +3470,7 @@ async function pushCore(inputPath, event, options = {}) {
     };
   } finally {
     if (tempDir) {
-      await fs12.remove(tempDir).catch(() => {
+      await fs13.remove(tempDir).catch(() => {
       });
     }
   }
@@ -3438,14 +3483,13 @@ async function pushCommand(options) {
     if (isStdinPiped() && !options.config) {
       const stdinContent = await readStdin();
       const tmpPath = getTmpPath(void 0, "stdin-push.json");
-      await fs12.ensureDir(path11.dirname(tmpPath));
-      await fs12.writeFile(tmpPath, stdinContent, "utf-8");
+      await fs13.ensureDir(path12.dirname(tmpPath));
+      await fs13.writeFile(tmpPath, stdinContent, "utf-8");
       config = tmpPath;
     } else {
       config = options.config || "bundle.config.json";
     }
-    const event = await loadJsonFromSource(options.event, { name: "event" });
-    const result = await pushCore(config, event, {
+    const result = await push(config, options.event, {
       flow: options.flow,
       json: options.json,
       verbose: options.verbose,
@@ -3507,9 +3551,14 @@ async function push(configOrPath, event, options = {}) {
       "push() currently only supports config file paths. Config object support will be added in a future version. Please provide a path to a configuration file."
     );
   }
-  return await pushCore(configOrPath, event, {
+  let resolvedEvent = event;
+  if (typeof event === "string") {
+    resolvedEvent = await loadJsonFromSource(event, { name: "event" });
+  }
+  return await pushCore(configOrPath, resolvedEvent, {
     json: options.json ?? false,
     verbose: options.verbose ?? false,
+    silent: options.silent ?? false,
     flow: options.flow,
     platform: options.platform
   });
@@ -3528,8 +3577,8 @@ async function executeConfigPush(options, validatedEvent, logger2, setTempDir) {
     `push-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`
   );
   setTempDir(tempDir);
-  await fs12.ensureDir(tempDir);
-  const tempPath = path11.join(
+  await fs13.ensureDir(tempDir);
+  const tempPath = path12.join(
     tempDir,
     `bundle.${platform === "web" ? "js" : "mjs"}`
   );
@@ -3551,7 +3600,7 @@ async function executeConfigPush(options, validatedEvent, logger2, setTempDir) {
   } else if (platform === "server") {
     logger2.debug("Executing in server environment (Node.js)");
     return executeServerPush(tempPath, validatedEvent, logger2, 6e4, {
-      logger: createCollectorLoggerConfig(logger2, options.verbose)
+      logger: { level: options.verbose ? Level2.DEBUG : Level2.ERROR }
     });
   } else {
     throw new Error(`Unsupported platform: ${platform}`);
@@ -3563,12 +3612,12 @@ async function executeBundlePush(bundleContent, platform, validatedEvent, logger
     `push-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`
   );
   setTempDir(tempDir);
-  await fs12.ensureDir(tempDir);
-  const tempPath = path11.join(
+  await fs13.ensureDir(tempDir);
+  const tempPath = path12.join(
     tempDir,
     `bundle.${platform === "server" ? "mjs" : "js"}`
   );
-  await fs12.writeFile(tempPath, bundleContent, "utf8");
+  await fs13.writeFile(tempPath, bundleContent, "utf8");
   logger2.debug(`Bundle written to: ${tempPath}`);
   if (platform === "web") {
     logger2.debug("Executing in web environment (JSDOM)");
@@ -3590,7 +3639,7 @@ async function executeWebPush(bundlePath, event, logger2) {
     });
     const { window } = dom;
     logger2.debug("Loading bundle...");
-    const bundleCode = await fs12.readFile(bundlePath, "utf8");
+    const bundleCode = await fs13.readFile(bundlePath, "utf8");
     window.eval(bundleCode);
     logger2.debug("Waiting for collector...");
     await waitForWindowProperty(
@@ -3686,7 +3735,8 @@ function waitForWindowProperty(window, prop, timeout = 5e3) {
 
 // src/commands/run/index.ts
 init_cli_logger();
-import path13 from "path";
+import path14 from "path";
+import { createRequire } from "module";
 
 // src/commands/run/validators.ts
 import { existsSync as existsSync3 } from "fs";
@@ -3805,15 +3855,15 @@ function validatePort(port) {
 }
 
 // src/commands/run/utils.ts
-import path12 from "path";
-import fs13 from "fs-extra";
+import path13 from "path";
+import fs14 from "fs-extra";
 async function prepareBundleForRun(configPath, options) {
   const tempDir = getTmpPath(
     void 0,
     `run-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`
   );
-  await fs13.ensureDir(tempDir);
-  const tempPath = path12.join(tempDir, "bundle.mjs");
+  await fs14.ensureDir(tempDir);
+  const tempPath = path13.join(tempDir, "bundle.mjs");
   await bundle(configPath, {
     cache: true,
     verbose: options.verbose,
@@ -3832,7 +3882,7 @@ function isPreBuiltConfig(configPath) {
 }
 
 // src/commands/run/execution.ts
-import { createLogger as createLogger2, Level as Level4 } from "@walkeros/core";
+import { createLogger as createLogger2, Level as Level3 } from "@walkeros/core";
 
 // src/runtime/runner.ts
 import { pathToFileURL } from "url";
@@ -3917,7 +3967,7 @@ import { randomBytes } from "crypto";
 var instanceId = randomBytes(8).toString("hex");
 
 // src/commands/run/execution.ts
-var logLevel = process.env.VERBOSE === "true" ? Level4.DEBUG : Level4.INFO;
+var logLevel = process.env.VERBOSE === "true" ? Level3.DEBUG : Level3.INFO;
 var loggerConfig = { level: logLevel };
 var logger = createLogger2(loggerConfig);
 async function executeRunLocal(flowPath, options) {
@@ -3929,6 +3979,7 @@ async function executeRunLocal(flowPath, options) {
 }
 
 // src/commands/run/index.ts
+var esmRequire = createRequire(import.meta.url);
 async function runCommand(options) {
   const timer = createTimer();
   timer.start();
@@ -3941,7 +3992,7 @@ async function runCommand(options) {
     const runtimeDeps = ["express", "cors"];
     for (const dep of runtimeDeps) {
       try {
-        __require.resolve(dep);
+        esmRequire.resolve(dep);
       } catch {
         logger2.error(
           `Missing runtime dependency "${dep}"
@@ -3954,8 +4005,8 @@ Run: npm install express cors`
     const isPreBuilt = isPreBuiltConfig(configPath);
     let flowPath;
     if (isPreBuilt) {
-      flowPath = path13.resolve(configPath);
-      logger2.debug(`Using pre-built flow: ${path13.basename(flowPath)}`);
+      flowPath = path14.resolve(configPath);
+      logger2.debug(`Using pre-built flow: ${path14.basename(flowPath)}`);
     } else {
       logger2.debug("Building flow bundle");
       flowPath = await prepareBundleForRun(configPath, {
@@ -4009,7 +4060,7 @@ async function run(options) {
     const runtimeDeps = ["express", "cors"];
     for (const dep of runtimeDeps) {
       try {
-        __require.resolve(dep);
+        esmRequire.resolve(dep);
       } catch {
         throw new Error(
           `Missing runtime dependency "${dep}". Server flows require express and cors when running outside Docker. Run: npm install express cors`
@@ -4019,7 +4070,7 @@ async function run(options) {
     const isPreBuilt = isPreBuiltConfig(flowFile);
     let flowPath;
     if (isPreBuilt) {
-      flowPath = path13.resolve(flowFile);
+      flowPath = path14.resolve(flowFile);
     } else {
       flowPath = await prepareBundleForRun(flowFile, {
         verbose: options.verbose,
@@ -4174,10 +4225,10 @@ function validateEvent(input) {
   const zodResult = PartialEventSchema.safeParse(input);
   if (!zodResult.success) {
     for (const issue of zodResult.error.issues) {
-      const path14 = issue.path.join(".");
-      if (path14 === "name") continue;
+      const path15 = issue.path.join(".");
+      if (path15 === "name") continue;
       errors.push({
-        path: path14 || "root",
+        path: path15 || "root",
         message: issue.message,
         code: "SCHEMA_VALIDATION"
       });
@@ -4390,10 +4441,10 @@ function buildConnectionGraph(config) {
 function checkCompatibility(conn, errors, warnings) {
   const fromOuts = Object.entries(conn.from.examples).filter(([, ex]) => ex.out !== void 0 && ex.out !== false).map(([name, ex]) => ({ name, value: ex.out }));
   const toIns = Object.entries(conn.to.examples).filter(([, ex]) => ex.in !== void 0).map(([name, ex]) => ({ name, value: ex.in }));
-  const path14 = `${conn.from.type}.${conn.from.name} \u2192 ${conn.to.type}.${conn.to.name}`;
+  const path15 = `${conn.from.type}.${conn.from.name} \u2192 ${conn.to.type}.${conn.to.name}`;
   if (fromOuts.length === 0 || toIns.length === 0) {
     warnings.push({
-      path: path14,
+      path: path15,
       message: "Cannot check compatibility: missing out or in examples",
       suggestion: "Add out examples to the source step or in examples to the target step"
     });
@@ -4411,7 +4462,7 @@ function checkCompatibility(conn, errors, warnings) {
   }
   if (!hasMatch) {
     errors.push({
-      path: path14,
+      path: path15,
       message: "No compatible out/in pair found between connected steps",
       code: "INCOMPATIBLE_EXAMPLES"
     });
@@ -4507,13 +4558,13 @@ function validateMapping(input) {
 import Ajv from "ajv";
 import { fetchPackageSchema } from "@walkeros/core";
 var SECTIONS = ["destinations", "sources", "transformers"];
-function resolveEntry(path14, flowConfig) {
+function resolveEntry(path15, flowConfig) {
   const flows = flowConfig.flows;
   if (!flows || typeof flows !== "object") return "No flows found in config";
   const flowName = Object.keys(flows)[0];
   const flow = flows[flowName];
   if (!flow) return `Flow "${flowName}" is empty`;
-  const parts = path14.split(".");
+  const parts = path15.split(".");
   if (parts.length === 2) {
     const [section, key] = parts;
     if (!SECTIONS.includes(section)) {
@@ -4550,15 +4601,15 @@ function resolveEntry(path14, flowConfig) {
     }
     return { section: matches[0].section, key, entry: matches[0].entry };
   }
-  return `Invalid path "${path14}". Use "section.key" or just "key"`;
+  return `Invalid path "${path15}". Use "section.key" or just "key"`;
 }
-async function validateEntry(path14, flowConfig) {
-  const resolved = resolveEntry(path14, flowConfig);
+async function validateEntry(path15, flowConfig) {
+  const resolved = resolveEntry(path15, flowConfig);
   if (typeof resolved === "string") {
     return {
       valid: false,
       type: "entry",
-      errors: [{ path: path14, message: resolved, code: "ENTRY_VALIDATION" }],
+      errors: [{ path: path15, message: resolved, code: "ENTRY_VALIDATION" }],
       warnings: [],
       details: {}
     };
@@ -4589,7 +4640,7 @@ async function validateEntry(path14, flowConfig) {
       type: "entry",
       errors: [
         {
-          path: path14,
+          path: path15,
           message: error instanceof Error ? error.message : "Unknown error",
           code: "ENTRY_VALIDATION"
         }
@@ -4638,18 +4689,25 @@ async function validateEntry(path14, flowConfig) {
 
 // src/commands/validate/index.ts
 async function validate(type, input, options = {}) {
+  let resolved = input;
+  if (typeof input === "string") {
+    resolved = await loadJsonFromSource(input, {
+      name: type,
+      required: true
+    });
+  }
   if (options.path) {
-    return validateEntry(options.path, input);
+    return validateEntry(options.path, resolved);
   }
   switch (type) {
     case "contract":
-      return validateContract(input);
+      return validateContract(resolved);
     case "event":
-      return validateEvent(input);
+      return validateEvent(resolved);
     case "flow":
-      return validateFlow(input, { flow: options.flow });
+      return validateFlow(resolved, { flow: options.flow });
     case "mapping":
-      return validateMapping(input);
+      return validateMapping(resolved);
     default:
       throw new Error(`Unknown validation type: ${type}`);
   }
@@ -4700,10 +4758,7 @@ async function validateCommand(options) {
         throw new Error("Invalid JSON received on stdin");
       }
     } else {
-      input = await loadJsonFromSource(options.input, {
-        name: options.type,
-        required: true
-      });
+      input = options.input;
     }
     const result = await validate(options.type, input, {
       flow: options.flow,
@@ -4996,7 +5051,10 @@ async function getFlow(options) {
   const { data, error } = await client.GET(
     "/api/projects/{projectId}/flows/{flowId}",
     {
-      params: { path: { projectId: id, flowId: options.flowId } }
+      params: {
+        path: { projectId: id, flowId: options.flowId },
+        query: options.fields ? { fields: options.fields.join(",") } : {}
+      }
     }
   );
   if (error) throw new Error(error.error?.message || "Failed to get flow");
@@ -5024,7 +5082,10 @@ async function updateFlow(options) {
     {
       params: { path: { projectId: id, flowId: options.flowId } },
       // Dynamically constructed body; server validates the full schema
-      body
+      body,
+      ...options.mergePatch && {
+        headers: { "Content-Type": "application/merge-patch+json" }
+      }
     }
   );
   if (error) throw new Error(error.error?.message || "Failed to update flow");