@uniformdev/cli 20.50.2-alpha.149 → 20.50.2-alpha.180

package/dist/index.mjs

@@ -4,13 +4,11 @@ import {
   __require,
   applyDefaultSyncConfiguration,
   emitWithFormat,
-  exitOnCliError,
   getDirectoryOrFilename,
   getEntityBatchSize,
   getEntityOption,
   isPaginatedSyncEntity,
   isPathAPackageFile,
-  maskApiKey,
   nodeFetchProxy,
   package_default,
   paginateAsync,
@@ -23,11 +21,11 @@ import {
   withFormatOptions,
   withProjectOptions,
   withTeamOptions
-} from "./chunk-7P2U2VCH.mjs";
+} from "./chunk-YUQPI3H4.mjs";
 
 // src/index.ts
 import * as dotenv from "dotenv";
-import yargs43 from "yargs";
+import yargs42 from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // src/commands/ai/index.ts
@@ -144,7 +142,7 @@ var getLimitsSchema = z.object({
   })
 });
 var createClient = (baseUrl, authToken) => {
-  const request = async (path8, opts, allowedNon2xxStatusCodes = []) => {
+  const request2 = async (path8, opts, allowedNon2xxStatusCodes = []) => {
     const res = await fetch(makeUrl(baseUrl, path8), {
       ...opts,
       headers: { Authorization: `Bearer ${authToken}`, "User-Agent": CLI_USER_AGENT }
@@ -158,7 +156,7 @@ var createClient = (baseUrl, authToken) => {
     }
   };
   const requestJson = async (path8, opts, schema, allowedNon2xxStatusCodes = []) => {
-    const res = await request(path8, opts, allowedNon2xxStatusCodes);
+    const res = await request2(path8, opts, allowedNon2xxStatusCodes);
     const data = await res.json();
     const parseResult = schema.safeParse(data);
     if (parseResult.success) {
@@ -262,7 +260,7 @@ var createClient = (baseUrl, authToken) => {
     },
     installIntegration: async ({ projectId, type }) => {
       try {
-        await request("/api/v1/integration-installations", {
+        await request2("/api/v1/integration-installations", {
           method: "PUT",
           body: JSON.stringify({ projectId, type })
         });
@@ -497,7 +495,7 @@ var makeSpinner = () => {
   const spin = async (text) => {
     const spinner = ora(text).start();
     spinners.push(spinner);
-    const minWait = new Promise((resolve4) => setTimeout(resolve4, 500));
+    const minWait = new Promise((resolve2) => setTimeout(resolve2, 500));
     return async () => {
       await minWait;
       spinner.stop();
@@ -630,6 +628,9 @@ export default uniformConfig({
 `;
 
 // src/sync/fileSyncEngineDataSource.ts
+function isErrorWithCode(error, code) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === code;
+}
 async function createFileSyncEngineDataSource({
   directory,
   format = "yaml",
@@ -690,7 +691,7 @@ ${e?.message}`));
       }
       await unlink(providerId);
     },
-    writeObject: async (object4) => {
+    writeObject: async (object4, existingObject) => {
       const filename = selectFilename3 ? join(directory, `${selectFilename3(object4.object)}.${format}`) : getFullFilename(object4.id);
       let contents = object4.object;
       if (selectSchemaUrl2) {
@@ -703,6 +704,18 @@ ${e?.message}`));
         console.log(`Writing file ${filename}`);
       }
       emitWithFormat(contents, format, filename);
+      if (existingObject?.providerId && existingObject.providerId !== filename) {
+        if (verbose) {
+          console.log(`Deleting file ${existingObject.providerId}`);
+        }
+        try {
+          await unlink(existingObject.providerId);
+        } catch (error) {
+          if (!isErrorWithCode(error, "ENOENT")) {
+            throw error;
+          }
+        }
+      }
     }
   };
 }
@@ -726,6 +739,7 @@ function writeUniformPackage(filename, packageContents) {
 // src/sync/syncEngine.ts
 import { diffJson, diffLines } from "diff";
 import mitt from "mitt";
+import PQueue from "p-queue";
 
 // src/sync/serializedDequal.ts
 var has = Object.prototype.hasOwnProperty;
@@ -792,7 +806,8 @@ async function syncEngine({
   onBeforeProcessObject,
   onBeforeCompareObjects,
   onBeforeWriteObject,
-  onError
+  onError,
+  actionConcurrency
   //verbose = false,
 }) {
   const status = new ReactiveStatusUpdate((status2) => syncEngineEvents.emit("statusUpdate", status2));
@@ -841,43 +856,46 @@ async function syncEngine({
     const ids = Array.isArray(sourceObject.id) ? sourceObject.id : [sourceObject.id];
     const targetObject = targetItems.get(ids[0]);
     status.compared++;
-    const invalidTargetObjects = ids.map((i) => targetItems.get(i)).filter((o) => o?.object !== targetObject?.object);
+    const invalidTargetObjects = ids.map((i) => targetItems.get(i)).filter(
+      (invalidTargetObject) => typeof invalidTargetObject !== "undefined" && invalidTargetObject.object !== targetObject?.object
+    );
+    const targetIds = Array.isArray(targetObject?.id) ? targetObject.id : [targetObject?.id];
+    const processedIds = new Set([...ids, ...targetIds].filter((id) => typeof id === "string"));
+    const processUpdate = async (sourceObject2, targetObject2) => {
+      try {
+        if (!whatIf) {
+          const finalSourceObject = onBeforeWriteObject ? await onBeforeWriteObject(sourceObject2, targetObject2) : sourceObject2;
+          await target.writeObject(finalSourceObject, targetObject2);
+          status.changesApplied++;
+        }
+      } catch (e) {
+        if (onError) {
+          onError(e, sourceObject2);
+        } else {
+          throw new SyncEngineError(e, sourceObject2);
+        }
+      } finally {
+        log2({
+          action: "update",
+          id: ids[0],
+          providerId: sourceObject2.providerId,
+          displayName: sourceObject2.displayName ?? sourceObject2.providerId,
+          whatIf,
+          diff: () => diffJson(targetObject2.object, sourceObject2.object)
+        });
+      }
+    };
     if (targetObject && invalidTargetObjects.length === 0) {
       sourceObject = onBeforeCompareObjects ? await onBeforeCompareObjects(sourceObject, targetObject) : sourceObject;
       const compareResult = compareContents(sourceObject, targetObject);
       if (!compareResult) {
         if (mode === "createOrUpdate" || mode === "mirror") {
           status.changeCount++;
-          const process2 = async (sourceObject2, targetObject2) => {
-            try {
-              if (!whatIf) {
-                const finalSourceObject = onBeforeWriteObject ? await onBeforeWriteObject(sourceObject2, targetObject2) : sourceObject2;
-                await target.writeObject(finalSourceObject, targetObject2);
-                status.changesApplied++;
-              }
-            } catch (e) {
-              if (onError) {
-                onError(e, sourceObject2);
-              } else {
-                throw new SyncEngineError(e, sourceObject2);
-              }
-            } finally {
-              log2({
-                action: "update",
-                id: ids[0],
-                providerId: sourceObject2.providerId,
-                displayName: sourceObject2.displayName ?? sourceObject2.providerId,
-                whatIf,
-                diff: () => diffJson(targetObject2.object, sourceObject2.object)
-              });
-            }
-          };
-          actions.push(() => process2(sourceObject, targetObject));
+          actions.push(() => processUpdate(sourceObject, targetObject));
         }
       }
-      ids.forEach((i) => targetItems.delete(i));
+      processedIds.forEach((i) => targetItems.delete(i));
     } else {
-      status.changeCount++;
       const processUpsert = async (sourceObject2, id) => {
         try {
           if (!whatIf) {
@@ -903,38 +921,73 @@ async function syncEngine({
         }
       };
       if (invalidTargetObjects.length > 0) {
+        if (mode === "createOrUpdate" && !targetObject && invalidTargetObjects.length === 1) {
+          const matchedTargetObject = invalidTargetObjects[0];
+          sourceObject = onBeforeCompareObjects ? await onBeforeCompareObjects(sourceObject, matchedTargetObject) : sourceObject;
+          const compareResult = compareContents(sourceObject, matchedTargetObject);
+          if (!compareResult) {
+            status.changeCount++;
+            actions.push(() => processUpdate(sourceObject, matchedTargetObject));
+          }
+          (Array.isArray(matchedTargetObject.id) ? matchedTargetObject.id : [matchedTargetObject.id]).forEach(
+            (i) => targetItems.delete(i)
+          );
+          continue;
+        }
+        if (mode !== "mirror") {
+          continue;
+        }
+        status.changeCount++;
         [...invalidTargetObjects, targetObject].forEach((o) => {
           (Array.isArray(o?.id) ? o?.id : [o?.id])?.forEach((i) => i && targetItems.delete(i));
         });
-        const deletes = invalidTargetObjects.filter((invalidTargetObject) => typeof invalidTargetObject !== "undefined").map((invalidTargetObject) => () => processDelete(invalidTargetObject));
+        const deletes = invalidTargetObjects.map(
+          (invalidTargetObject) => () => processDelete(invalidTargetObject)
+        );
         if (targetObject) {
           deletes.push(() => processDelete(targetObject));
         }
-        actions.push(
-          () => Promise.all(deletes.map((deleteFn) => deleteFn())).then(() => processUpsert(sourceObject, ids[0]))
-        );
+        actions.push(async () => {
+          for (const deleteFn of deletes) {
+            await deleteFn();
+          }
+          await processUpsert(sourceObject, ids[0]);
+        });
       } else {
+        status.changeCount++;
         actions.push(() => processUpsert(sourceObject, ids[0]));
       }
     }
   }
-  status.changeCount += targetItems.size;
-  status.compared += targetItems.size;
+  const orphanTargetObjects = new Set(targetItems.values());
   if (mode === "mirror") {
-    if (!sourceHasItems && !allowEmptySource && targetItems.size > 0) {
+    status.changeCount += orphanTargetObjects.size;
+    status.compared += orphanTargetObjects.size;
+    if (!sourceHasItems && !allowEmptySource && orphanTargetObjects.size > 0) {
       throw new Error(
         `Sync source (${source.name}) is empty and mode is mirror. This would cause deletion of everything in the target (${target.name}), and most likely indicates an error in source definition.`
       );
     }
     const deletes = [];
-    targetItems.forEach((object4) => {
+    orphanTargetObjects.forEach((object4) => {
       deletes.push(() => processDelete(object4));
     });
-    await Promise.all(deletes.map((d) => d()));
+    await runSyncActions(deletes, actionConcurrency);
   }
-  await Promise.all(actions.map((a) => a()));
+  await runSyncActions(actions, actionConcurrency);
   await Promise.all([source.onSyncComplete?.(false), target.onSyncComplete?.(true)]);
 }
+var runSyncActions = async (actions, actionConcurrency) => {
+  if (actions.length === 0) {
+    return;
+  }
+  if (typeof actionConcurrency === "undefined") {
+    await Promise.all(actions.map((action) => action()));
+    return;
+  }
+  const queue = new PQueue({ concurrency: actionConcurrency });
+  await queue.addAll(actions);
+};
 var SyncEngineError = class _SyncEngineError extends Error {
   constructor(innerError, sourceObject) {
     super(
@@ -1050,69 +1103,36 @@ async function chooseTeam(user, prompt, telemetry) {
 
 // src/auth/user-info.ts
 import { ProjectClient } from "@uniformdev/canvas";
+import { gql, request } from "graphql-request";
 import * as z2 from "zod";
-var memberProfileTeamSchema = z2.object({
-  id: z2.string().min(1),
-  name: z2.string()
-});
-var memberProfileSchema = z2.object({
-  id: z2.string().min(1),
-  name: z2.string(),
-  email_address: z2.string().optional(),
-  picture: z2.string().optional(),
-  emailHash: z2.string().optional(),
-  teams: z2.array(memberProfileTeamSchema).optional()
-});
-function buildAuthHeaders(auth) {
-  if (auth.apiKey) {
-    return { "x-api-key": auth.apiKey };
-  }
-  if (auth.bearerToken) {
-    return { Authorization: `Bearer ${auth.bearerToken}` };
-  }
-  throw new Error("Either apiKey or bearerToken is required.");
-}
-async function fetchMemberProfile({
-  baseUrl,
-  apiKey,
-  bearerToken,
-  withTeams,
-  fetch: customFetch = fetch
-}) {
-  const url = new URL(makeUrl(baseUrl, "/api/v1/member-profile"));
-  if (withTeams) {
-    url.searchParams.set("withTeams", "true");
-  }
-  const res = await customFetch(url, {
-    headers: {
-      ...buildAuthHeaders({ apiKey, bearerToken }),
-      "User-Agent": CLI_USER_AGENT
+var identityQuery = gql`
+  query GetUserIdentity($subject: String!) {
+    info: identities_by_pk(subject: $subject) {
+      name
+      email_address
     }
-  });
-  if (!res.ok) {
-    const body = await res.text();
-    throw new Error(
-      `Failed to fetch member profile: ${res.status} ${res.statusText}${body ? `
-  ${body}` : ""}`
-    );
-  }
-  const data = await res.json();
-  const parsed = memberProfileSchema.safeParse(data);
-  if (!parsed.success) {
-    throw new Error(`Invalid member profile response: ${parsed.error.message}`);
   }
-  return parsed.data;
-}
-var getUserInfo = async (baseUrl, authToken) => {
+`;
+var identitySchema = z2.object({
+  info: z2.object({
+    name: z2.string().min(1),
+    email_address: z2.string().min(1).nullable()
+  })
+});
+var getUserInfo = async (baseUrl, authToken, subject) => {
   try {
+    const headers = { Authorization: `Bearer ${authToken}`, "User-Agent": CLI_USER_AGENT };
     const projectClient = new ProjectClient({ apiHost: baseUrl, bearerToken: authToken });
-    const [profile, projectsRes] = await Promise.all([
-      fetchMemberProfile({ baseUrl, bearerToken: authToken }),
+    const [identityRes, projectsRes] = await Promise.all([
+      request(makeUrl(baseUrl, "/v1/graphql"), identityQuery, { subject }, headers),
       projectClient.getProjects()
     ]);
+    const identityParsed = identitySchema.safeParse(identityRes);
+    if (!identityParsed.success) {
+      throw new Error(`Invalid identity response: ${identityParsed.error.message}`);
+    }
     return {
-      name: profile.name,
-      email_address: profile.email_address,
+      ...identityParsed.data.info,
       teams: projectsRes.teams
     };
   } catch (err) {
@@ -1130,10 +1150,10 @@ async function fetchUserAndEnsureFirstTeamExists({
 }) {
   const uniformClient = createClient(baseUrl, authToken);
   const done = await spin("Fetching user information...");
-  let user = await getUserInfo(baseUrl, authToken);
+  let user = await getUserInfo(baseUrl, authToken, decoded.sub);
   if (user.teams.length < 1) {
     await uniformClient.createTeam(`${user.name}'s team`);
-    user = await getUserInfo(baseUrl, authToken);
+    user = await getUserInfo(baseUrl, authToken, decoded.sub);
   }
   await done();
   telemetry.login(decoded.sub, user);
@@ -1184,7 +1204,7 @@ var Telemetry = class {
     });
   }
   shutdown() {
-    this.send("exited", { exitCode: process.exitCode });
+    this.send("exited", { exitCode: process.exitCode ?? void 0 });
     return this.posthog?.shutdown();
   }
 };
@@ -1338,8 +1358,8 @@ function getExistingServers(config2) {
 var InstallMcpCommand = {
   command: "install",
   describe: "Install Uniform MCP server configuration (use --team, --project, and --apiKey for non-interactive mode)",
-  builder: (yargs44) => withConfiguration(
-    yargs44.option("agent", {
+  builder: (yargs43) => withConfiguration(
+    yargs43.option("agent", {
       alias: "a",
       describe: "Specify agent type (cursor, claude, copilot, other)",
       type: "string",
@@ -1539,7 +1559,7 @@ Selected agent: ${agentType}`));
 var McpCommand = {
   command: "mcp <command>",
   describe: "Uniform MCP server management commands",
-  builder: (yargs44) => yargs44.command(InstallMcpCommand).demandCommand(),
+  builder: (yargs43) => yargs43.command(InstallMcpCommand).demandCommand(),
   handler: () => {
     yargs.showHelp();
   }
@@ -2014,8 +2034,8 @@ ${gray2("Rules source:")} https://github.com/uniformdev/ai-rules`);
 var InstallRulesCommand = {
   command: "install",
   describe: "Install Uniform AI rules for your development assistant",
-  builder: (yargs44) => withConfiguration(
-    yargs44.option("agent", {
+  builder: (yargs43) => withConfiguration(
+    yargs43.option("agent", {
       alias: "a",
       describe: "Specify agent type (cursor, claude, copilot, other)",
       type: "string",
@@ -2053,7 +2073,7 @@ import { blue as blue4, bold as bold2, gray as gray3, green as green5, red as re
 var ListRulesCommand = {
   command: "list",
   describe: "List available Uniform AI rules",
-  builder: (yargs44) => withConfiguration(yargs44),
+  builder: (yargs43) => withConfiguration(yargs43),
   handler: async function() {
     const { stopAllSpinners, spin } = makeSpinner();
     try {
@@ -2082,7 +2102,7 @@ var ListRulesCommand = {
 var RulesCommand = {
   command: "rules <command>",
   describe: "Uniform AI rules management commands",
-  builder: (yargs44) => yargs44.command(InstallRulesCommand).command(ListRulesCommand).demandCommand(),
+  builder: (yargs43) => yargs43.command(InstallRulesCommand).command(ListRulesCommand).demandCommand(),
   handler: () => {
     yargs2.showHelp();
   }
@@ -2092,282 +2112,17 @@ var RulesCommand = {
 var AiCommand = {
   command: "ai <command>",
   describe: "Uniform AI development assistant commands",
-  builder: (yargs44) => yargs44.command(RulesCommand).command(McpCommand).demandCommand(),
+  builder: (yargs43) => yargs43.command(RulesCommand).command(McpCommand).demandCommand(),
   handler: () => {
     yargs3.showHelp();
   }
 };
 
-// src/commands/automation/index.ts
-import yargs4 from "yargs";
-
-// src/commands/automation/delete.ts
-import { AutomationsClient } from "@uniformdev/automations-sdk/api";
-
-// src/commands/automation/resolveAutomationPublicId.ts
-import { existsSync as existsSync4 } from "fs";
-import { basename, extname as extname2, resolve as resolve2 } from "path";
-function resolveAutomationPublicId(identifier) {
-  const absPath = resolve2(identifier);
-  if (existsSync4(absPath)) {
-    return basename(absPath, extname2(absPath));
-  }
-  return identifier;
-}
-
-// src/commands/automation/delete.ts
-var AutomationDeleteModule = {
-  command: "delete <identifier>",
-  describe: "Deletes an automation from a project.",
-  builder: (yargs44) => withConfiguration(
-    withApiOptions(
-      withProjectOptions(
-        yargs44.positional("identifier", {
-          demandOption: true,
-          type: "string",
-          describe: "Automation public ID, or path to a local automation source file (same as deploy)."
-        })
-      )
-    )
-  ),
-  handler: async ({ apiHost, apiKey, proxy, identifier, project: projectId }) => {
-    const fetch2 = nodeFetchProxy(proxy);
-    const client = new AutomationsClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const publicId = resolveAutomationPublicId(identifier);
-    try {
-      await client.remove(publicId);
-      console.log(`\u{1F5D1}\uFE0F  Deleted automation "${publicId}".`);
-    } catch (error) {
-      exitOnCliError(error);
-    }
-  }
-};
-
-// src/commands/automation/deploy.ts
-import { AutomationsClient as AutomationsClient2, formatAutomationWebhookUrl } from "@uniformdev/automations-sdk/api";
-
-// src/commands/automation/bundleAutomationForDeploy.ts
-import { mkdtempSync, readFileSync as readFileSync2, rmSync } from "fs";
-import { tmpdir } from "os";
-import { basename as basename2, join as join6, resolve as resolve3 } from "path";
-import { pathToFileURL } from "url";
-
-// src/commands/bundleWorkerCode.ts
-import esbuild from "esbuild";
-import path5 from "path";
-var INJECTED_ENV_PREFIX = "UNIFORM_ENV_";
-function buildInjectedEnvDefine() {
-  const define = {
-    // ensures that if no env vars are injected, that process.env is still defined so var access hits an object that exists
-    "process.env": "{}"
-  };
-  for (const [key, value] of Object.entries(process.env)) {
-    if (key.startsWith(INJECTED_ENV_PREFIX) && value !== void 0) {
-      define[`process.env.${key}`] = JSON.stringify(value);
-    }
-  }
-  return define;
-}
-function workerBundleBuildOptions(entryFile) {
-  return {
-    entryPoints: [entryFile],
-    bundle: true,
-    format: "esm",
-    target: "es2021",
-    platform: "browser",
-    minify: true,
-    external: [],
-    splitting: false,
-    sourcemap: false,
-    define: buildInjectedEnvDefine()
-  };
-}
-async function bundleWorkerCodeToFile(entryFile, outfile) {
-  await esbuild.build({
-    ...workerBundleBuildOptions(entryFile),
-    outfile,
-    logLevel: "silent"
-  });
-}
-async function bundleWorkerCode(entryFile) {
-  const result = await esbuild.build({
-    ...workerBundleBuildOptions(entryFile),
-    write: false
-  });
-  const outputFiles = result.outputFiles;
-  if (!outputFiles || outputFiles.length === 0) {
-    throw new Error(`No output generated for ${entryFile}`);
-  }
-  const outputFile = outputFiles[0];
-  const builtCode = outputFile.text;
-  console.log(
-    `\u2139\uFE0F ${path5.basename(entryFile)} was prepared with esbuild. Size: ${Math.round(
-      builtCode.length / 1024
-    )}kb (use --skipBundle to disable)`
-  );
-  return builtCode;
-}
-
-// src/commands/automation/toInputJsonSchema.ts
-import * as z3 from "zod";
-function isZodSchema(value) {
-  return typeof value === "object" && value !== null && "_zod" in value;
-}
-function isStandardSchema(value) {
-  return typeof value === "object" && value !== null && "~standard" in value;
-}
-function toInputJsonSchema(inputSchema) {
-  if (inputSchema === void 0 || inputSchema === null) {
-    throw new Error("An AI-tool automation must declare an `inputSchema` in its metadata.");
-  }
-  if (isZodSchema(inputSchema)) {
-    return z3.toJSONSchema(inputSchema);
-  }
-  if (isStandardSchema(inputSchema)) {
-    throw new Error(
-      "`inputSchema` is a Standard Schema but not a zod schema. Deploy-time conversion to JSON Schema currently supports zod only \u2014 provide a zod schema or a JSON Schema object."
-    );
-  }
-  if (typeof inputSchema === "object") {
-    return inputSchema;
-  }
-  throw new Error("`inputSchema` must be a zod schema or a JSON Schema object.");
-}
-
-// src/commands/automation/bundleAutomationForDeploy.ts
-async function readAutomationMetadataFromBundle(bundlePath, publicId) {
-  const automationModule = await import(pathToFileURL(bundlePath).href);
-  const automation = automationModule.default;
-  if (!automation?.metadata) {
-    throw new Error("Default export must be the return value of defineAutomation");
-  }
-  const metadata = automation.metadata;
-  const trigger = metadata.trigger?.type === "aiTool" ? { type: "aiTool", inputSchema: toInputJsonSchema(metadata.inputSchema) } : metadata.trigger;
-  return {
-    publicId,
-    name: metadata.name,
-    description: metadata.description,
-    trigger,
-    compatibilityDate: metadata.compatibilityDate,
-    permissions: metadata.permissions
-  };
-}
-async function bundleAutomationForDeploy(entryFile) {
-  const absEntry = resolve3(entryFile);
-  const publicId = resolveAutomationPublicId(absEntry);
-  const workDir = mkdtempSync(join6(tmpdir(), "uniform-automation-deploy-"));
-  const bundlePath = join6(workDir, "automation.mjs");
-  try {
-    await bundleWorkerCodeToFile(absEntry, bundlePath);
-    const metadata = await readAutomationMetadataFromBundle(bundlePath, publicId);
-    const code = readFileSync2(bundlePath, "utf8");
-    console.log(
-      `\u2139\uFE0F ${basename2(absEntry)} was prepared with esbuild. Size: ${Math.round(code.length / 1024)}kb`
-    );
-    return {
-      metadata,
-      code,
-      cleanup: () => rmSync(workDir, { recursive: true, force: true })
-    };
-  } catch (error) {
-    rmSync(workDir, { recursive: true, force: true });
-    throw error;
-  }
-}
-
-// src/commands/automation/deploy.ts
-var AutomationDeployModule = {
-  command: "deploy <filename>",
-  describe: "Deploys an automation to a project.",
-  builder: (yargs44) => withConfiguration(
-    withApiOptions(
-      withProjectOptions(
-        yargs44.positional("filename", {
-          demandOption: true,
-          describe: "Automation code file to deploy. The module must default-export the return value of defineAutomation."
-        }).option("compatibilityDate", {
-          type: "string",
-          describe: "Overrides the compatibility date in metadata. Format: YYYY-MM-DD."
-        })
-      )
-    )
-  ),
-  handler: async ({ apiHost, apiKey, proxy, filename, project: projectId, compatibilityDate }) => {
-    const fetch2 = nodeFetchProxy(proxy);
-    const client = new AutomationsClient2({ apiKey, apiHost, fetch: fetch2, projectId });
-    let cleanup;
-    try {
-      const bundled = await bundleAutomationForDeploy(filename);
-      cleanup = bundled.cleanup;
-      await client.deploy({
-        ...bundled.metadata,
-        code: bundled.code,
-        compatibilityDate: compatibilityDate ?? bundled.metadata.compatibilityDate
-      });
-      console.log(
-        `\u2705 Deployed automation "${bundled.metadata.publicId}" (${bundled.metadata.trigger.type}).`
-      );
-      if (bundled.metadata.trigger.type === "incomingWebhook") {
-        console.log(
-          `Webhook URL: ${formatAutomationWebhookUrl(apiHost, projectId, bundled.metadata.publicId)}`
-        );
-      }
-    } catch (error) {
-      exitOnCliError(error);
-    } finally {
-      cleanup?.();
-    }
-  }
-};
-
-// src/commands/automation/list.ts
-import { AutomationsClient as AutomationsClient3 } from "@uniformdev/automations-sdk/api";
-var AutomationListModule = {
-  command: "list",
-  aliases: ["ls"],
-  describe: "Lists the automations in a project.",
-  builder: (yargs44) => withConfiguration(withApiOptions(withProjectOptions(yargs44))),
-  handler: async ({ apiHost, apiKey, proxy, project: projectId }) => {
-    const fetch2 = nodeFetchProxy(proxy);
-    const client = new AutomationsClient3({ apiKey, apiHost, fetch: fetch2, projectId });
-    try {
-      const { automations } = await client.list();
-      if (!automations.length) {
-        console.log("No automations found in this project.");
-        return;
-      }
-      console.table(
-        automations.map((automation) => ({
-          publicId: automation.publicId,
-          name: automation.name,
-          trigger: automation.trigger.type,
-          enabled: automation.enabled,
-          lastDeployedAt: automation.lastDeployedAt,
-          lastDeployedBy: automation.lastDeployedBy
-        }))
-      );
-    } catch (error) {
-      exitOnCliError(error);
-    }
-  }
-};
-
-// src/commands/automation/index.ts
-var AutomationCommand = {
-  command: "automation <command>",
-  aliases: ["automations"],
-  describe: "Commands for managing Uniform Automations",
-  builder: (yargs44) => yargs44.command(AutomationDeployModule).command(AutomationDeleteModule).command(AutomationListModule).demandCommand(),
-  handler: () => {
-    yargs4.showHelp();
-  }
-};
-
 // src/commands/canvas/index.ts
-import yargs22 from "yargs";
+import yargs21 from "yargs";
 
 // src/commands/canvas/commands/asset.ts
-import yargs5 from "yargs";
+import yargs4 from "yargs";
 
 // src/commands/canvas/commands/asset/_util.ts
 import { UncachedAssetClient } from "@uniformdev/assets";
@@ -2396,12 +2151,12 @@ function getFileClient(options) {
 var AssetGetModule = {
   command: "get <id>",
   describe: "Get an asset",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
-            yargs44.positional("id", { demandOption: true, describe: "Asset ID to fetch" })
+            yargs43.positional("id", { demandOption: true, describe: "Asset ID to fetch" })
           )
         )
       )
@@ -2422,7 +2177,7 @@ var AssetGetModule = {
 var AssetListModule = {
   command: "list",
   describe: "List assets",
-  builder: (yargs44) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs44))))),
+  builder: (yargs43) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs43))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getAssetClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -2433,10 +2188,10 @@ var AssetListModule = {
 
 // src/files/deleteDownloadedFileByUrl.ts
 import fsj from "fs-jetpack";
-import { join as join8 } from "path";
+import { join as join7 } from "path";
 
 // src/files/urlToFileName.ts
-import { join as join7 } from "path";
+import { join as join6 } from "path";
 import { dirname } from "path";
 var FILES_DIRECTORY_NAME = "files";
 var getFilesDirectory = (directory) => {
@@ -2445,7 +2200,7 @@ var getFilesDirectory = (directory) => {
     // If we are syncing to a directory, we want to write all files into a
     // top-lvl folder. That way any entities that contain files will sync to the
     // same directory, so there is no duplication
-    join7(directory, "..")
+    join6(directory, "..")
   );
 };
 var urlToHash = (url) => {
@@ -2481,7 +2236,7 @@ var hashToPartialPathname = (hash) => {
 var deleteDownloadedFileByUrl = async (url, options) => {
   const writeDirectory = getFilesDirectory(options.directory);
   const fileName = urlToFileName(url);
-  const fileToDelete = join8(writeDirectory, FILES_DIRECTORY_NAME, fileName);
+  const fileToDelete = join7(writeDirectory, FILES_DIRECTORY_NAME, fileName);
   try {
     await fsj.removeAsync(fileToDelete);
   } catch {
@@ -2500,20 +2255,64 @@ import {
 } from "@uniformdev/canvas";
 import { isRichTextNodeType, isRichTextValue, walkRichTextTree } from "@uniformdev/richtext";
 import fsj4 from "fs-jetpack";
-import PQueue2 from "p-queue";
-import { join as join11 } from "path";
+import PQueue3 from "p-queue";
+import { join as join10 } from "path";
 
 // src/files/downloadFile.ts
+import { createWriteStream } from "fs";
 import fsj2 from "fs-jetpack";
-import { join as join9 } from "path";
+import { dirname as dirname2, join as join8 } from "path";
+import { Readable } from "stream";
+import { pipeline } from "stream/promises";
+var downloadedFilePathCacheByDirectory = /* @__PURE__ */ new Map();
+var tempDownloadFileCounter = 0;
+var getTempDownloadFilePath = (filePath) => {
+  tempDownloadFileCounter += 1;
+  return `${filePath}.${process.pid}.${Date.now()}.${tempDownloadFileCounter}.download`;
+};
+var getDownloadedFilePathCache = (filesDirectory) => {
+  const cached = downloadedFilePathCacheByDirectory.get(filesDirectory);
+  if (cached) {
+    return cached;
+  }
+  const cache = fsj2.cwd(filesDirectory).findAsync({ files: true, directories: false }).then((paths) => new Set(paths)).catch(() => /* @__PURE__ */ new Set());
+  downloadedFilePathCacheByDirectory.set(filesDirectory, cache);
+  return cache;
+};
+var filePathMatchesSourceId = (filePath, sourceId) => filePath === sourceId || filePath.startsWith(`${sourceId}.`);
+var hasFilePathMatchingSourceId = (filePaths, sourceId) => {
+  for (const filePath of filePaths) {
+    if (filePathMatchesSourceId(filePath, sourceId)) {
+      return true;
+    }
+  }
+  return false;
+};
+var writeResponseBodyToFile = async (response, filePath) => {
+  if (!response.body) {
+    throw new Error("Response does not contain a body");
+  }
+  const tempFilePath = getTempDownloadFilePath(filePath);
+  await fsj2.dirAsync(dirname2(filePath));
+  try {
+    const responseBody = response.body;
+    await pipeline(Readable.fromWeb(responseBody), createWriteStream(tempFilePath));
+    await fsj2.moveAsync(tempFilePath, filePath, { overwrite: true });
+  } catch (error) {
+    await fsj2.removeAsync(tempFilePath).catch(() => void 0);
+    throw error;
+  }
+};
 var downloadFile = async ({
   fileClient,
   fileUrl,
   directory
 }) => {
   const writeDirectory = getFilesDirectory(directory);
+  const filesDirectory = join8(writeDirectory, FILES_DIRECTORY_NAME);
   const fileName = urlToFileName(fileUrl.toString());
-  const fileAlreadyExists = await fsj2.existsAsync(join9(writeDirectory, FILES_DIRECTORY_NAME, fileName));
+  const filePath = join8(filesDirectory, fileName);
+  const fileAlreadyExists = await fsj2.existsAsync(filePath);
   if (fileAlreadyExists) {
     return { url: fileUrl };
   }
@@ -2523,11 +2322,10 @@ var downloadFile = async ({
     return null;
   }
   if (file.sourceId) {
+    const sourceId = file.sourceId;
     try {
-      const hashAlreadyExists = await fsj2.findAsync(join9(writeDirectory, FILES_DIRECTORY_NAME), {
-        matching: [file.sourceId, `${file.sourceId}.*`]
-      });
-      if (hashAlreadyExists.length > 0) {
+      const downloadedFilePaths = await getDownloadedFilePathCache(filesDirectory);
+      if (hasFilePathMatchingSourceId(downloadedFilePaths, sourceId)) {
         return { id: file.id, url: fileUrl };
       }
     } catch {
@@ -2538,8 +2336,12 @@ var downloadFile = async ({
   if (!response.ok) {
     return null;
   }
-  const fileBuffer = await response.arrayBuffer();
-  await fsj2.writeAsync(join9(writeDirectory, FILES_DIRECTORY_NAME, fileName), Buffer.from(fileBuffer));
+  await writeResponseBodyToFile(response, filePath);
+  const downloadedFilePathCache = downloadedFilePathCacheByDirectory.get(filesDirectory);
+  if (downloadedFilePathCache) {
+    const downloadedFilePaths = await downloadedFilePathCache;
+    downloadedFilePaths.add(fileName);
+  }
   return { id: file.id, url: fileUrl };
 };
 
@@ -2551,10 +2353,10 @@ import { createReadStream } from "fs";
 import fsj3 from "fs-jetpack";
 import { imageSizeFromFile } from "image-size/fromFile";
 import normalizeNewline from "normalize-newline";
-import PQueue from "p-queue";
-import { join as join10 } from "path";
+import PQueue2 from "p-queue";
+import { join as join9 } from "path";
 var uploadQueueByKey = /* @__PURE__ */ new Map();
-var fileUploadQueue = new PQueue({ concurrency: 10 });
+var fileUploadQueue = new PQueue2({ concurrency: 10 });
 var uploadFile = async ({
   fileClient,
   fileUrl,
@@ -2579,7 +2381,7 @@ var uploadFile = async ({
         return { id: file.id, url: file.url };
       }
       const localFileName = urlToFileName(fileUrl);
-      const expectedFilePath = join10(writeDirectory, FILES_DIRECTORY_NAME, localFileName);
+      const expectedFilePath = join9(writeDirectory, FILES_DIRECTORY_NAME, localFileName);
       const fileInspect = await fsj3.inspectAsync(expectedFilePath);
       if (fileInspect?.type !== "file") {
         console.warn(
@@ -2658,7 +2460,7 @@ var uploadFile = async ({
         }
         const file2 = await fileClient.get({ id });
         if (!file2 || file2.state !== FILE_READY_STATE || !file2.url) {
-          await new Promise((resolve4) => setTimeout(resolve4, 1e3));
+          await new Promise((resolve2) => setTimeout(resolve2, 1e3));
           return checkForFile();
         }
         return file2.url;
@@ -2734,9 +2536,9 @@ var walkFileUrlsForCompositionOrEntry = ({
 };
 
 // src/files/files.ts
-var fileDownloadQueue = new PQueue2({ concurrency: 10 });
-var fileUploadQueue2 = new PQueue2({ concurrency: 10 });
-var fileUrlReplacementQueue = new PQueue2({ concurrency: 10 });
+var fileDownloadQueue = new PQueue3({ concurrency: 10 });
+var fileUploadQueue2 = new PQueue3({ concurrency: 10 });
+var fileUrlReplacementQueue = new PQueue3({ concurrency: 10 });
 var downloadFileForAsset = async ({
   asset,
   directory,
@@ -2904,7 +2706,7 @@ var replaceRemoteUrlsWithLocalReferences = async ({
         try {
           const localFileName = urlToFileName(fileUrl);
           const fileExistsLocally = await fsj4.existsAsync(
-            join11(writeDirectory, FILES_DIRECTORY_NAME, localFileName)
+            join10(writeDirectory, FILES_DIRECTORY_NAME, localFileName)
           );
           if (fileExistsLocally) {
             return;
@@ -2987,8 +2789,8 @@ function prepCompositionForDisk(composition) {
   delete prepped.state;
   return prepped;
 }
-function withStateOptions(yargs44, defaultState = "preview") {
-  return yargs44.option("state", {
+function withStateOptions(yargs43, defaultState = "preview") {
+  return yargs43.option("state", {
     type: "string",
     describe: `State to fetch.`,
     choices: ["preview", "published"],
@@ -3063,16 +2865,17 @@ function writeCanvasPackage(filename, packageContents) {
 }
 
 // src/commands/canvas/commands/asset/pull.ts
+var ASSET_PULL_ACTION_CONCURRENCY = 10;
 var AssetPullModule = {
   command: "pull <directory>",
   describe: "Pulls all assets to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
             withBatchSizeOptions(
-              yargs44.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to save the assets to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
                 type: "string"
               }).option("format", {
@@ -3161,6 +2964,7 @@ var AssetPullModule = {
       target,
       mode,
       whatIf,
+      actionConcurrency: ASSET_PULL_ACTION_CONCURRENCY,
       allowEmptySource: allowEmptySource ?? true,
       log: createSyncEngineConsoleLogger({ diffMode }),
       onBeforeCompareObjects: async (sourceObject) => {
@@ -3188,16 +2992,17 @@ var AssetPullModule = {
 };
 
 // src/commands/canvas/commands/asset/push.ts
+var ASSET_PUSH_ACTION_CONCURRENCY = 10;
 var AssetPushModule = {
   command: "push <directory>",
   describe: "Pushes all assets from files in a directory to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
             withBatchSizeOptions(
-              yargs44.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to read the assets from. If a filename is used, a package will be read instead.",
                 type: "string"
               }).option("mode", {
@@ -3263,6 +3068,7 @@ var AssetPushModule = {
       target,
       mode,
       whatIf,
+      actionConcurrency: ASSET_PUSH_ACTION_CONCURRENCY,
       allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode }),
       onBeforeCompareObjects: async (sourceObject, targetObject) => {
@@ -3328,10 +3134,10 @@ var AssetRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an asset",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
-        withProjectOptions(yargs44.positional("id", { demandOption: true, describe: "Asset ID to delete" }))
+        withProjectOptions(yargs43.positional("id", { demandOption: true, describe: "Asset ID to delete" }))
       )
     )
   ),
@@ -3352,11 +3158,11 @@ var AssetUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an asset",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("filename", { demandOption: true, describe: "Asset file to put" })
+          yargs43.positional("filename", { demandOption: true, describe: "Asset file to put" })
         )
       )
     )
@@ -3382,14 +3188,14 @@ var AssetUpdateModule = {
 var AssetModule = {
   command: "asset <command>",
   describe: "Commands for Assets",
-  builder: (yargs44) => yargs44.command(AssetGetModule).command(AssetListModule).command(AssetRemoveModule).command(AssetUpdateModule).command(AssetPullModule).command(AssetPushModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(AssetGetModule).command(AssetListModule).command(AssetRemoveModule).command(AssetUpdateModule).command(AssetPullModule).command(AssetPushModule).demandCommand(),
   handler: () => {
-    yargs5.help();
+    yargs4.help();
   }
 };
 
 // src/commands/canvas/commands/category.ts
-import yargs6 from "yargs";
+import yargs5 from "yargs";
 
 // src/commands/canvas/commands/category/_util.ts
 import { UncachedCategoryClient } from "@uniformdev/canvas";
@@ -3403,12 +3209,12 @@ function getCategoryClient(options) {
 var CategoryGetModule = {
   command: "get <id>",
   describe: "Fetch a category",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs44.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
+            yargs43.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
           )
         )
       )
@@ -3433,8 +3239,8 @@ var CategoryListModule = {
   command: "list",
   describe: "List categories",
   aliases: ["ls"],
-  builder: (yargs44) => withConfiguration(
-    withFormatOptions(withDebugOptions(withApiOptions(withProjectOptions(yargs44.options({})))))
+  builder: (yargs43) => withConfiguration(
+    withFormatOptions(withDebugOptions(withApiOptions(withProjectOptions(yargs43.options({})))))
   ),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
@@ -3476,12 +3282,12 @@ function createCategoriesEngineDataSource({
 var CategoryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all categories to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
           withDebugOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the categories to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -3556,12 +3362,12 @@ var CategoryPullModule = {
 var CategoryPushModule = {
   command: "push <directory>",
   describe: "Pushes all categories from files in a directory to Uniform Canvas",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the categories from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -3625,11 +3431,11 @@ var CategoryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a category",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs44.positional("id", { demandOption: true, describe: "Category UUID to delete" })
+          yargs43.positional("id", { demandOption: true, describe: "Category UUID to delete" })
         )
       )
     )
@@ -3650,11 +3456,11 @@ var CategoryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a category",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs44.positional("filename", { demandOption: true, describe: "Category file to put" })
+          yargs43.positional("filename", { demandOption: true, describe: "Category file to put" })
         )
       )
     )
@@ -3676,14 +3482,14 @@ var CategoryModule = {
   command: "category <command>",
   aliases: ["cat"],
   describe: "Commands for Canvas categories",
-  builder: (yargs44) => yargs44.command(CategoryPullModule).command(CategoryPushModule).command(CategoryGetModule).command(CategoryRemoveModule).command(CategoryListModule).command(CategoryUpdateModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(CategoryPullModule).command(CategoryPushModule).command(CategoryGetModule).command(CategoryRemoveModule).command(CategoryListModule).command(CategoryUpdateModule).demandCommand(),
   handler: () => {
-    yargs6.help();
+    yargs5.help();
   }
 };
 
 // src/commands/canvas/commands/component.ts
-import yargs7 from "yargs";
+import yargs6 from "yargs";
 
 // src/commands/canvas/commands/component/_util.ts
 import { UncachedCanvasClient } from "@uniformdev/canvas";
@@ -3698,12 +3504,12 @@ function getCanvasClient(options) {
 var ComponentGetModule = {
   command: "get <id>",
   describe: "Fetch a component definition",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs44.positional("id", {
+            yargs43.positional("id", {
               demandOption: true,
               describe: "Component definition public ID to fetch"
             })
@@ -3737,12 +3543,12 @@ var ComponentListModule = {
   command: "list",
   describe: "List component definitions",
   aliases: ["ls"],
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs44.options({
+            yargs43.options({
               offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
               limit: { describe: "Number of rows to fetch", type: "number", default: 20 }
             })
@@ -3813,13 +3619,13 @@ function createComponentDefinitionEngineDataSource({
 var ComponentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all component definitions to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
             withBatchSizeOptions(
-              yargs44.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
                 type: "string"
               }).option("format", {
@@ -3902,13 +3708,13 @@ var ComponentPullModule = {
 var ComponentPushModule = {
   command: "push <directory>",
   describe: "Pushes all component definitions from files in a directory to Uniform Canvas",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
             withBatchSizeOptions(
-              yargs44.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to read the component definitions from. If a filename is used, a package will be read instead.",
                 type: "string"
               }).option("mode", {
@@ -3980,11 +3786,11 @@ var ComponentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a component definition",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("id", {
+          yargs43.positional("id", {
             demandOption: true,
             describe: "Component definition public ID to delete"
           })
@@ -4008,11 +3814,11 @@ var ComponentUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a component definition",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs44.positional("filename", { demandOption: true, describe: "Component definition file to put" })
+          yargs43.positional("filename", { demandOption: true, describe: "Component definition file to put" })
         )
       )
     )
@@ -4034,14 +3840,14 @@ var ComponentModule = {
   command: "component <command>",
   aliases: ["def"],
   describe: "Commands for Canvas component definitions",
-  builder: (yargs44) => yargs44.command(ComponentPullModule).command(ComponentPushModule).command(ComponentGetModule).command(ComponentRemoveModule).command(ComponentListModule).command(ComponentUpdateModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(ComponentPullModule).command(ComponentPushModule).command(ComponentGetModule).command(ComponentRemoveModule).command(ComponentListModule).command(ComponentUpdateModule).demandCommand(),
   handler: () => {
-    yargs7.help();
+    yargs6.help();
   }
 };
 
 // src/commands/canvas/commands/componentPattern.ts
-import yargs8 from "yargs";
+import yargs7 from "yargs";
 
 // src/commands/canvas/util/entityTypeValidation.ts
 import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE2 } from "@uniformdev/canvas";
@@ -4196,13 +4002,13 @@ function createCompositionGetHandler(expectedType) {
 var CompositionGetModule = {
   command: "get <id>",
   describe: "Fetch a composition",
-  builder: (yargs44) => withFormatOptions(
+  builder: (yargs43) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDebugOptions(
-              yargs44.positional("id", {
+              yargs43.positional("id", {
                 demandOption: true,
                 describe: "Composition public ID to fetch"
               }).option({
@@ -4258,13 +4064,13 @@ var CompositionListModule = {
   command: "list",
   describe: "List compositions",
   aliases: ["ls"],
-  builder: (yargs44) => withFormatOptions(
+  builder: (yargs43) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withDebugOptions(
             withStateOptions(
-              yargs44.options({
+              yargs43.options({
                 offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
                 limit: { describe: "Number of rows to fetch", type: "number", default: 20 },
                 search: { describe: "Search query", type: "string", default: "" },
@@ -4345,13 +4151,13 @@ var CompositionListModule = {
 var ComponentPatternListModule = {
   ...CompositionListModule,
   describe: "List component patterns",
-  builder: (yargs44) => withFormatOptions(
+  builder: (yargs43) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withDebugOptions(
           withProjectOptions(
             withStateOptions(
-              yargs44.options({
+              yargs43.options({
                 offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
                 limit: { describe: "Number of rows to fetch", type: "number", default: 20 },
                 resolvePatterns: {
@@ -4475,13 +4281,13 @@ function createComponentInstanceEngineDataSource({
 var CompositionPublishModule = {
   command: "publish [ids]",
   describe: "Publishes composition(s)",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDebugOptions(
           withDiffOptions(
             withBatchSizeOptions(
-              yargs44.positional("ids", {
+              yargs43.positional("ids", {
                 describe: "Publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
                 type: "string"
               }).option("all", {
@@ -4579,13 +4385,13 @@ var CompositionPublishModule = {
 var ComponentPatternPublishModule = {
   ...CompositionPublishModule,
   describe: "Publishes component pattern(s)",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
             withBatchSizeOptions(
-              yargs44.positional("ids", {
+              yargs43.positional("ids", {
                 describe: "Publishes component pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
                 type: "string"
               }).option("all", {
@@ -4627,14 +4433,14 @@ function componentInstancePullModuleFactory(type, entityType) {
   return {
     command: "pull <directory>",
     describe: "Pulls all compositions to local files in a directory",
-    builder: (yargs44) => withConfiguration(
+    builder: (yargs43) => withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDebugOptions(
               withDiffOptions(
                 withBatchSizeOptions(
-                  yargs44.positional("directory", {
+                  yargs43.positional("directory", {
                     describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
                     type: "string"
                   }).option("format", {
@@ -4753,13 +4559,13 @@ function componentInstancePullModuleFactory(type, entityType) {
 var ComponentPatternPullModule = {
   ...componentInstancePullModuleFactory("componentPatterns", "componentPattern"),
   describe: "Pulls all component patterns to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDebugOptions(
           withStateOptions(
             withDiffOptions(
-              yargs44.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
                 type: "string"
               }).option("format", {
@@ -4833,14 +4639,14 @@ function componentInstancePushModuleFactory(type, entityType) {
   return {
     command: "push <directory>",
     describe: "Pushes all compositions from files in a directory to Uniform Canvas",
-    builder: (yargs44) => withConfiguration(
+    builder: (yargs43) => withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDebugOptions(
               withDiffOptions(
                 withBatchSizeOptions(
-                  yargs44.positional("directory", {
+                  yargs43.positional("directory", {
                     describe: "Directory to read the compositions/patterns from. If a filename is used, a package will be read instead.",
                     type: "string"
                   }).option("mode", {
@@ -4958,13 +4764,13 @@ function componentInstancePushModuleFactory(type, entityType) {
 var ComponentPatternPushModule = {
   ...componentInstancePushModuleFactory("componentPatterns", "componentPattern"),
   describe: "Pushes all component patterns from files in a directory to Uniform Canvas",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
             withDebugOptions(
-              yargs44.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to read the compositions/component patterns from. If a filename is used, a package will be read instead.",
                 type: "string"
               }).option("mode", {
@@ -5029,11 +4835,11 @@ var CompositionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a composition",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs44.positional("id", {
+          yargs43.positional("id", {
             demandOption: true,
             describe: "Composition public ID to delete"
           })
@@ -5060,12 +4866,12 @@ import { diffJson as diffJson2 } from "diff";
 var CompositionUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a composition(s)",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withBatchSizeOptions(
-            yargs44.positional("ids", {
+            yargs43.positional("ids", {
               describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
               type: "string"
             }).option("all", {
@@ -5181,11 +4987,11 @@ var CompositionUnpublishModule = {
 var ComponentPatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a component pattern(s)",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs44.positional("ids", {
+          yargs43.positional("ids", {
             describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
             type: "string"
           }).option("all", {
@@ -5253,12 +5059,12 @@ var CompositionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a composition",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDebugOptions(
           withStateOptions(
-            yargs44.positional("filename", {
+            yargs43.positional("filename", {
               demandOption: true,
               describe: "Composition/pattern file to put"
             })
@@ -5281,26 +5087,26 @@ var ComponentPatternUpdateModule = {
 var ComponentPatternModule = {
   command: "component-pattern <command>",
   describe: "Commands for Canvas component patterns",
-  builder: (yargs44) => yargs44.command(ComponentPatternPullModule).command(ComponentPatternPushModule).command(ComponentPatternGetModule).command(ComponentPatternRemoveModule).command(ComponentPatternListModule).command(ComponentPatternUpdateModule).command(ComponentPatternPublishModule).command(ComponentPatternUnpublishModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(ComponentPatternPullModule).command(ComponentPatternPushModule).command(ComponentPatternGetModule).command(ComponentPatternRemoveModule).command(ComponentPatternListModule).command(ComponentPatternUpdateModule).command(ComponentPatternPublishModule).command(ComponentPatternUnpublishModule).demandCommand(),
   handler: () => {
-    yargs8.help();
+    yargs7.help();
   }
 };
 
 // src/commands/canvas/commands/composition.ts
-import yargs9 from "yargs";
+import yargs8 from "yargs";
 var CompositionModule = {
   command: "composition <command>",
   describe: "Commands for Canvas compositions",
   aliases: ["comp"],
-  builder: (yargs44) => yargs44.command(CompositionPullModule).command(CompositionPushModule).command(CompositionGetModule).command(CompositionRemoveModule).command(CompositionListModule).command(CompositionUpdateModule).command(CompositionPublishModule).command(CompositionUnpublishModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(CompositionPullModule).command(CompositionPushModule).command(CompositionGetModule).command(CompositionRemoveModule).command(CompositionListModule).command(CompositionUpdateModule).command(CompositionPublishModule).command(CompositionUnpublishModule).demandCommand(),
   handler: () => {
-    yargs9.help();
+    yargs8.help();
   }
 };
 
 // src/commands/canvas/commands/compositionPattern.ts
-import yargs10 from "yargs";
+import yargs9 from "yargs";
 
 // src/commands/canvas/commands/compositionPattern/get.ts
 var CompositionPatternGetModule = {
@@ -5313,13 +5119,13 @@ var CompositionPatternGetModule = {
 var CompositionPatternListModule = {
   ...CompositionListModule,
   describe: "List composition patterns",
-  builder: (yargs44) => withFormatOptions(
+  builder: (yargs43) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withDebugOptions(
           withProjectOptions(
             withStateOptions(
-              yargs44.options({
+              yargs43.options({
                 offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
                 limit: { describe: "Number of rows to fetch", type: "number", default: 20 },
                 resolvePatterns: {
@@ -5363,13 +5169,13 @@ var CompositionPatternListModule = {
 var CompositionPatternPublishModule = {
   ...CompositionPublishModule,
   describe: "Publishes composition pattern(s)",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
             withBatchSizeOptions(
-              yargs44.positional("ids", {
+              yargs43.positional("ids", {
                 describe: "Publishes composition pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
                 type: "string"
               }).option("all", {
@@ -5410,13 +5216,13 @@ var CompositionPatternPublishModule = {
 var CompositionPatternPullModule = {
   ...componentInstancePullModuleFactory("compositionPatterns", "compositionPattern"),
   describe: "Pulls all composition patterns to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              yargs44.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to save the composition patterns to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
                 type: "string"
               }).option("format", {
@@ -5454,13 +5260,13 @@ var CompositionPatternPullModule = {
 var CompositionPatternPushModule = {
   ...componentInstancePushModuleFactory("compositionPatterns", "compositionPattern"),
   describe: "Pushes all composition patterns from files in a directory to Uniform Canvas",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              yargs44.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to read the compositions patterns from. If a filename is used, a package will be read instead.",
                 type: "string"
               }).option("mode", {
@@ -5500,11 +5306,11 @@ var CompositionPatternRemoveModule = {
 var CompositionPatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a composition pattern(s)",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs44.positional("ids", {
+          yargs43.positional("ids", {
             describe: "Un-publishes composition pattern(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
             type: "string"
           }).option("all", {
@@ -5541,14 +5347,14 @@ var CompositionPatternUpdateModule = {
 var CompositionPatternModule = {
   command: "composition-pattern <command>",
   describe: "Commands for Canvas composition patterns",
-  builder: (yargs44) => yargs44.command(CompositionPatternPullModule).command(CompositionPatternPushModule).command(CompositionPatternGetModule).command(CompositionPatternRemoveModule).command(CompositionPatternListModule).command(CompositionPatternUpdateModule).command(CompositionPatternPublishModule).command(CompositionPatternUnpublishModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(CompositionPatternPullModule).command(CompositionPatternPushModule).command(CompositionPatternGetModule).command(CompositionPatternRemoveModule).command(CompositionPatternListModule).command(CompositionPatternUpdateModule).command(CompositionPatternPublishModule).command(CompositionPatternUnpublishModule).demandCommand(),
   handler: () => {
-    yargs10.help();
+    yargs9.help();
   }
 };
 
 // src/commands/canvas/commands/contentType.ts
-import yargs11 from "yargs";
+import yargs10 from "yargs";
 
 // src/commands/canvas/commands/contentType/_util.ts
 import { ContentClient } from "@uniformdev/canvas";
@@ -5562,12 +5368,12 @@ function getContentClient(options) {
 var ContentTypeGetModule = {
   command: "get <id>",
   describe: "Get a content type",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
-            yargs44.positional("id", {
+            yargs43.positional("id", {
               demandOption: true,
               describe: "Content type public ID to fetch"
             })
@@ -5592,7 +5398,7 @@ var ContentTypeGetModule = {
 var ContentTypeListModule = {
   command: "list",
   describe: "List content types",
-  builder: (yargs44) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs44))))),
+  builder: (yargs43) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs43))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getContentClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -5638,13 +5444,13 @@ function createContentTypeEngineDataSource({
 var ContentTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all content types to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
             withBatchSizeOptions(
-              yargs44.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to save the content types to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
                 type: "string"
               }).option("format", {
@@ -5731,13 +5537,13 @@ var ContentTypePullModule = {
 var ContentTypePushModule = {
   command: "push <directory>",
   describe: "Pushes all content types from files in a directory to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
             withBatchSizeOptions(
-              yargs44.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to read the content types from. If a filename is used, a package will be read instead.",
                 type: "string"
               }).option("what-if", {
@@ -5818,11 +5624,11 @@ var ContentTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a content type",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
+          yargs43.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
         )
       )
     )
@@ -5843,11 +5649,11 @@ var ContentTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a content type",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("filename", { demandOption: true, describe: "Content type file to put" })
+          yargs43.positional("filename", { demandOption: true, describe: "Content type file to put" })
         )
       )
     )
@@ -5869,14 +5675,14 @@ var ContentTypeModule = {
   command: "contenttype <command>",
   aliases: ["ct"],
   describe: "Commands for Content Types",
-  builder: (yargs44) => yargs44.command(ContentTypeGetModule).command(ContentTypeListModule).command(ContentTypeRemoveModule).command(ContentTypeUpdateModule).command(ContentTypePullModule).command(ContentTypePushModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(ContentTypeGetModule).command(ContentTypeListModule).command(ContentTypeRemoveModule).command(ContentTypeUpdateModule).command(ContentTypePullModule).command(ContentTypePushModule).demandCommand(),
   handler: () => {
-    yargs11.help();
+    yargs10.help();
   }
 };
 
 // src/commands/canvas/commands/dataSource.ts
-import yargs12 from "yargs";
+import yargs11 from "yargs";
 
 // src/commands/canvas/commands/dataSource/_util.ts
 import { DataSourceClient } from "@uniformdev/canvas";
@@ -5888,11 +5694,11 @@ function getDataSourceClient(options) {
 var DataSourceGetModule = {
   command: "get <id>",
   describe: "Get a data source by ID and writes to stdout. Please note this may contain secret data, use discretion.",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs44.positional("id", { demandOption: true, describe: "Data source public ID to fetch" })
+          yargs43.positional("id", { demandOption: true, describe: "Data source public ID to fetch" })
         )
       )
     )
@@ -5910,11 +5716,11 @@ var DataSourceRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a data source",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("id", { demandOption: true, describe: "Data source public ID to delete" })
+          yargs43.positional("id", { demandOption: true, describe: "Data source public ID to delete" })
         )
       )
     )
@@ -5935,11 +5741,11 @@ var DataSourceUpdateModule = {
   command: "update <dataSource>",
   aliases: ["put"],
   describe: "Insert or update a data source",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs44.positional("dataSource", { demandOption: true, describe: "Data source JSON to put" }).option("integrationType", {
+          yargs43.positional("dataSource", { demandOption: true, describe: "Data source JSON to put" }).option("integrationType", {
             describe: "Integration type that exposes the connector type for this data source (as defined in integration manifest).",
             type: "string",
             demandOption: true
@@ -5974,14 +5780,14 @@ var DataSourceModule = {
   command: "datasource <command>",
   aliases: ["ds"],
   describe: "Commands for Data Source definitions",
-  builder: (yargs44) => yargs44.command(DataSourceGetModule).command(DataSourceRemoveModule).command(DataSourceUpdateModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(DataSourceGetModule).command(DataSourceRemoveModule).command(DataSourceUpdateModule).demandCommand(),
   handler: () => {
-    yargs12.help();
+    yargs11.help();
   }
 };
 
 // src/commands/canvas/commands/dataType.ts
-import yargs13 from "yargs";
+import yargs12 from "yargs";
 
 // src/commands/canvas/commands/dataType/_util.ts
 import { DataTypeClient } from "@uniformdev/canvas";
@@ -5996,12 +5802,12 @@ var DataTypeGetModule = {
   command: "get <id>",
   describe: "Get a data type",
   aliases: ["ls"],
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs44.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
+            yargs43.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
           )
         )
       )
@@ -6024,7 +5830,7 @@ var DataTypeListModule = {
   command: "list",
   describe: "List data types",
   aliases: ["ls"],
-  builder: (yargs44) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs44))))),
+  builder: (yargs43) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs43))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getDataTypeClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -6067,12 +5873,12 @@ function createDataTypeEngineDataSource({
 var DataTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all data types to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the data types to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -6152,12 +5958,12 @@ var DataTypePullModule = {
 var DataTypePushModule = {
   command: "push <directory>",
   describe: "Pushes all data types from files in a directory to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the data types from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -6226,11 +6032,11 @@ var DataTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a data type",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
+          yargs43.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
         )
       )
     )
@@ -6251,11 +6057,11 @@ var DataTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a data type",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("filename", { demandOption: true, describe: "Data type file to put" })
+          yargs43.positional("filename", { demandOption: true, describe: "Data type file to put" })
         )
       )
     )
@@ -6277,14 +6083,14 @@ var DataTypeModule = {
   command: "datatype <command>",
   aliases: ["dt"],
   describe: "Commands for Data Type definitions",
-  builder: (yargs44) => yargs44.command(DataTypeGetModule).command(DataTypePullModule).command(DataTypePushModule).command(DataTypeRemoveModule).command(DataTypeListModule).command(DataTypeUpdateModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(DataTypeGetModule).command(DataTypePullModule).command(DataTypePushModule).command(DataTypeRemoveModule).command(DataTypeListModule).command(DataTypeUpdateModule).demandCommand(),
   handler: () => {
-    yargs13.help();
+    yargs12.help();
   }
 };
 
 // src/commands/canvas/commands/entry.ts
-import yargs14 from "yargs";
+import yargs13 from "yargs";
 
 // src/commands/canvas/commands/entry/get.ts
 function createEntryGetHandler(expectedType) {
@@ -6338,13 +6144,13 @@ function createEntryGetHandler(expectedType) {
 var EntryGetModule = {
   command: "get <id>",
   describe: "Get an entry",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
             withStateOptions(
-              yargs44.positional("id", { demandOption: true, describe: "Entry public ID to fetch" }).option({
+              yargs43.positional("id", { demandOption: true, describe: "Entry public ID to fetch" }).option({
                 resolveData: {
                   type: "boolean",
                   default: false,
@@ -6382,13 +6188,13 @@ var LEGACY_DEFAULT_LIMIT = 1e3;
 var EntryListModule = {
   command: "list",
   describe: "List entries",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
             withStateOptions(
-              yargs44.options({
+              yargs43.options({
                 offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
                 limit: {
                   describe: "Number of rows to fetch",
@@ -6525,13 +6331,13 @@ function createEntryEngineDataSource({
 var EntryPublishModule = {
   command: "publish [ids]",
   describe: "Publishes entry(ies)",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withDiffOptions(
         withApiOptions(
           withProjectOptions(
             withBatchSizeOptions(
-              yargs44.positional("ids", {
+              yargs43.positional("ids", {
                 describe: "Publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
                 type: "string"
               }).option("all", {
@@ -6611,14 +6417,14 @@ var EntryPublishModule = {
 var EntryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all entries to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
               withBatchSizeOptions(
-                yargs44.positional("directory", {
+                yargs43.positional("directory", {
                   describe: "Directory to save the entries to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
                   type: "string"
                 }).option("format", {
@@ -6727,14 +6533,14 @@ var EntryPullModule = {
 var EntryPushModule = {
   command: "push <directory>",
   describe: "Pushes all entries from files in a directory to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
               withBatchSizeOptions(
-                yargs44.positional("directory", {
+                yargs43.positional("directory", {
                   describe: "Directory to read the entries from. If a filename is used, a package will be read instead.",
                   type: "string"
                 }).option("mode", {
@@ -6873,11 +6679,11 @@ var EntryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an entry",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
+          yargs43.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
         )
       )
     )
@@ -6891,12 +6697,12 @@ import { diffJson as diffJson3 } from "diff";
 var EntryUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish an entry(ies)",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withBatchSizeOptions(
-            yargs44.positional("ids", {
+            yargs43.positional("ids", {
               describe: "Un-publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
               type: "string"
             }).option("all", {
@@ -7030,12 +6836,12 @@ var EntryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an entry",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs44.positional("filename", { demandOption: true, describe: "Entry file to put" })
+            yargs43.positional("filename", { demandOption: true, describe: "Entry file to put" })
           )
         )
       )
@@ -7048,26 +6854,26 @@ var EntryUpdateModule = {
 var EntryModule = {
   command: "entry <command>",
   describe: "Commands for Entries",
-  builder: (yargs44) => yargs44.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).command(EntryPublishModule).command(EntryUnpublishModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).command(EntryPublishModule).command(EntryUnpublishModule).demandCommand(),
   handler: () => {
-    yargs14.help();
+    yargs13.help();
   }
 };
 
 // src/commands/canvas/commands/entryPattern.ts
-import yargs15 from "yargs";
+import yargs14 from "yargs";
 
 // src/commands/canvas/commands/entryPattern/get.ts
 var EntryPatternGetModule = {
   command: "get <id>",
   describe: "Get an entry pattern",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
             withStateOptions(
-              yargs44.positional("id", { demandOption: true, describe: "Entry pattern public ID to fetch" }).option({
+              yargs43.positional("id", { demandOption: true, describe: "Entry pattern public ID to fetch" }).option({
                 resolveData: {
                   type: "boolean",
                   default: false,
@@ -7103,13 +6909,13 @@ var EntryPatternGetModule = {
 var EntryPatternListModule = {
   command: "list",
   describe: "List entry patterns",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
             withStateOptions(
-              yargs44.option({
+              yargs43.option({
                 withComponentIDs: {
                   type: "boolean",
                   default: false,
@@ -7155,13 +6961,13 @@ var EntryPatternListModule = {
 var EntryPatternPublishModule = {
   command: "publish [ids]",
   describe: "Publishes entry pattern(s)",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
             withBatchSizeOptions(
-              yargs44.positional("ids", {
+              yargs43.positional("ids", {
                 describe: "Publishes entry pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
                 type: "string"
               }).option("all", {
@@ -7241,14 +7047,14 @@ var EntryPatternPublishModule = {
 var EntryPatternPullModule = {
   command: "pull <directory>",
   describe: "Pulls all entry patterns to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
               withBatchSizeOptions(
-                yargs44.positional("directory", {
+                yargs43.positional("directory", {
                   describe: "Directory to save the entries to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
                   type: "string"
                 }).option("format", {
@@ -7357,14 +7163,14 @@ var EntryPatternPullModule = {
 var EntryPatternPushModule = {
   command: "push <directory>",
   describe: "Pushes all entry patterns from files in a directory to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
               withBatchSizeOptions(
-                yargs44.positional("directory", {
+                yargs43.positional("directory", {
                   describe: "Directory to read the entry patterns from. If a filename is used, a package will be read instead.",
                   type: "string"
                 }).option("what-if", {
@@ -7477,11 +7283,11 @@ var EntryPatternRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an entry pattern",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("id", { demandOption: true, describe: "Entry pattern public ID to delete" })
+          yargs43.positional("id", { demandOption: true, describe: "Entry pattern public ID to delete" })
         )
       )
     )
@@ -7495,12 +7301,12 @@ import { diffJson as diffJson4 } from "diff";
 var EntryPatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish entry pattern(s)",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withBatchSizeOptions(
-            yargs44.positional("ids", {
+            yargs43.positional("ids", {
               describe: "Un-publishes entry patterns by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
               type: "string"
             }).option("all", {
@@ -7599,12 +7405,12 @@ var EntryPatternUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an entry pattern",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs44.positional("filename", { demandOption: true, describe: "Entry pattern file to put" })
+            yargs43.positional("filename", { demandOption: true, describe: "Entry pattern file to put" })
           )
         )
       )
@@ -7617,14 +7423,14 @@ var EntryPatternUpdateModule = {
 var EntryPatternModule = {
   command: "entry-pattern <command>",
   describe: "Commands for Entry patterns",
-  builder: (yargs44) => yargs44.command(EntryPatternGetModule).command(EntryPatternListModule).command(EntryPatternRemoveModule).command(EntryPatternUpdateModule).command(EntryPatternPullModule).command(EntryPatternPushModule).command(EntryPatternPublishModule).command(EntryPatternUnpublishModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(EntryPatternGetModule).command(EntryPatternListModule).command(EntryPatternRemoveModule).command(EntryPatternUpdateModule).command(EntryPatternPullModule).command(EntryPatternPushModule).command(EntryPatternPublishModule).command(EntryPatternUnpublishModule).demandCommand(),
   handler: () => {
-    yargs15.help();
+    yargs14.help();
   }
 };
 
 // src/commands/canvas/commands/label.ts
-import yargs16 from "yargs";
+import yargs15 from "yargs";
 
 // src/commands/canvas/labelsEngineDataSource.ts
 function normalizeLabelForSync(label) {
@@ -7675,13 +7481,13 @@ function getLabelClient(options) {
 var LabelPullModule = {
   command: "pull <directory>",
   describe: "Pulls all labels to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
             withBatchSizeOptions(
-              yargs44.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to save the labels to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
                 type: "string"
               }).option("format", {
@@ -7770,13 +7576,13 @@ var __INTERNAL_MISSING_PARENT_LABEL_ERROR = "Parent label with public ID";
 var LabelPushModule = {
   command: "push <directory>",
   describe: "Pushes all labels from files in a directory to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
             withBatchSizeOptions(
-              yargs44.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to read the labels from. If a filename is used, a package will be read instead.",
                 type: "string"
               }).option("mode", {
@@ -7874,14 +7680,14 @@ var LabelPushModule = {
 var LabelModule = {
   command: "label <command>",
   describe: "Commands for label definitions",
-  builder: (yargs44) => yargs44.command(LabelPullModule).command(LabelPushModule),
+  builder: (yargs43) => yargs43.command(LabelPullModule).command(LabelPushModule),
   handler: () => {
-    yargs16.help();
+    yargs15.help();
   }
 };
 
 // src/commands/canvas/commands/locale.ts
-import yargs17 from "yargs";
+import yargs16 from "yargs";
 
 // src/commands/canvas/localesEngineDataSource.ts
 function createLocaleEngineDataSource({
@@ -7923,12 +7729,12 @@ function getLocaleClient(options) {
 var LocalePullModule = {
   command: "pull <directory>",
   describe: "Pulls all locales to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the locales to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -8008,12 +7814,12 @@ var LocalePullModule = {
 var LocalePushModule = {
   command: "push <directory>",
   describe: "Pushes all locales from files in a directory to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the locales from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -8081,14 +7887,14 @@ var LocalePushModule = {
 var LocaleModule = {
   command: "locale <command>",
   describe: "Commands for locale definitions",
-  builder: (yargs44) => yargs44.command(LocalePullModule).command(LocalePushModule),
+  builder: (yargs43) => yargs43.command(LocalePullModule).command(LocalePushModule),
   handler: () => {
-    yargs17.help();
+    yargs16.help();
   }
 };
 
 // src/commands/canvas/commands/previewUrl.ts
-import yargs18 from "yargs";
+import yargs17 from "yargs";
 
 // src/commands/canvas/commands/previewUrl/_util.ts
 import { PreviewClient } from "@uniformdev/canvas";
@@ -8102,12 +7908,12 @@ function getPreviewClient(options) {
 var PreviewUrlGetModule = {
   command: "get <id>",
   describe: "Fetch a preview URL",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs44.positional("id", { demandOption: true, describe: "Preview URL UUID to fetch" })
+            yargs43.positional("id", { demandOption: true, describe: "Preview URL UUID to fetch" })
           )
         )
       )
@@ -8131,8 +7937,8 @@ var PreviewUrlListModule = {
   command: "list",
   describe: "List preview URLs",
   aliases: ["ls"],
-  builder: (yargs44) => withConfiguration(
-    withFormatOptions(withApiOptions(withDebugOptions(withProjectOptions(yargs44.options({})))))
+  builder: (yargs43) => withConfiguration(
+    withFormatOptions(withApiOptions(withDebugOptions(withProjectOptions(yargs43.options({})))))
   ),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
@@ -8174,12 +7980,12 @@ function createPreviewUrlEngineDataSource({
 var PreviewUrlPullModule = {
   command: "pull <directory>",
   describe: "Pulls all preview urls to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDebugOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -8254,12 +8060,12 @@ var PreviewUrlPullModule = {
 var PreviewUrlPushModule = {
   command: "push <directory>",
   describe: "Pushes all preview urls from files in a directory to Uniform Canvas",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
           withDebugOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -8323,11 +8129,11 @@ var PreviewUrlRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a preview URL",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs44.positional("id", { demandOption: true, describe: "Preview URL UUID to delete" })
+          yargs43.positional("id", { demandOption: true, describe: "Preview URL UUID to delete" })
         )
       )
     )
@@ -8348,11 +8154,11 @@ var PreviewUrlUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a preview URL",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("filename", { demandOption: true, describe: "Category file to put" })
+          yargs43.positional("filename", { demandOption: true, describe: "Category file to put" })
         )
       )
     )
@@ -8374,25 +8180,25 @@ var PreviewUrlModule = {
   command: "preview-url <command>",
   aliases: ["pu"],
   describe: "Commands for Canvas preview urls",
-  builder: (yargs44) => yargs44.command(PreviewUrlPullModule).command(PreviewUrlPushModule).command(PreviewUrlGetModule).command(PreviewUrlRemoveModule).command(PreviewUrlListModule).command(PreviewUrlUpdateModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(PreviewUrlPullModule).command(PreviewUrlPushModule).command(PreviewUrlGetModule).command(PreviewUrlRemoveModule).command(PreviewUrlListModule).command(PreviewUrlUpdateModule).demandCommand(),
   handler: () => {
-    yargs18.help();
+    yargs17.help();
   }
 };
 
 // src/commands/canvas/commands/previewViewport.ts
-import yargs19 from "yargs";
+import yargs18 from "yargs";
 
 // src/commands/canvas/commands/previewViewport/get.ts
 var PreviewViewportGetModule = {
   command: "get <id>",
   describe: "Fetch a preview viewport",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs44.positional("id", { demandOption: true, describe: "Preview viewport UUID to fetch" })
+            yargs43.positional("id", { demandOption: true, describe: "Preview viewport UUID to fetch" })
           )
         )
       )
@@ -8416,8 +8222,8 @@ var PreviewViewportListModule = {
   command: "list",
   describe: "List preview viewports",
   aliases: ["ls"],
-  builder: (yargs44) => withConfiguration(
-    withFormatOptions(withDebugOptions(withApiOptions(withProjectOptions(yargs44.options({})))))
+  builder: (yargs43) => withConfiguration(
+    withFormatOptions(withDebugOptions(withApiOptions(withProjectOptions(yargs43.options({})))))
   ),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
@@ -8463,12 +8269,12 @@ function createPreviewViewportEngineDataSource({
 var PreviewViewportPullModule = {
   command: "pull <directory>",
   describe: "Pulls all preview viewports to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDebugOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -8543,12 +8349,12 @@ var PreviewViewportPullModule = {
 var PreviewViewportPushModule = {
   command: "push <directory>",
   describe: "Pushes all preview viewports from files in a directory to Uniform Canvas",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
           withDebugOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -8612,11 +8418,11 @@ var PreviewViewportRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a preview viewport",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs44.positional("id", { demandOption: true, describe: "Preview viewport UUID to delete" })
+          yargs43.positional("id", { demandOption: true, describe: "Preview viewport UUID to delete" })
         )
       )
     )
@@ -8637,11 +8443,11 @@ var PreviewViewportUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a preview viewport",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("filename", { demandOption: true, describe: "Preview viewport file to put" })
+          yargs43.positional("filename", { demandOption: true, describe: "Preview viewport file to put" })
         )
       )
     )
@@ -8663,14 +8469,14 @@ var PreviewViewportModule = {
   command: "preview-viewport <command>",
   aliases: ["pv"],
   describe: "Commands for Canvas preview viewports",
-  builder: (yargs44) => yargs44.command(PreviewViewportPullModule).command(PreviewViewportPushModule).command(PreviewViewportGetModule).command(PreviewViewportRemoveModule).command(PreviewViewportListModule).command(PreviewViewportUpdateModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(PreviewViewportPullModule).command(PreviewViewportPushModule).command(PreviewViewportGetModule).command(PreviewViewportRemoveModule).command(PreviewViewportListModule).command(PreviewViewportUpdateModule).demandCommand(),
   handler: () => {
-    yargs19.help();
+    yargs18.help();
   }
 };
 
 // src/commands/canvas/commands/prompts.ts
-import yargs20 from "yargs";
+import yargs19 from "yargs";
 
 // src/commands/canvas/commands/prompts/_util.ts
 import { PromptClient } from "@uniformdev/canvas";
@@ -8682,12 +8488,12 @@ var getPromptClient = (options) => new PromptClient({ ...options, bypassCache: t
 var PromptGetModule = {
   command: "get <id>",
   describe: "Get a prompt",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
-            yargs44.positional("id", { demandOption: true, describe: "Prompt ID to fetch" })
+            yargs43.positional("id", { demandOption: true, describe: "Prompt ID to fetch" })
           )
         )
       )
@@ -8708,7 +8514,7 @@ var PromptGetModule = {
 var PromptListModule = {
   command: "list",
   describe: "List prompts",
-  builder: (yargs44) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs44))))),
+  builder: (yargs43) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs43))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getPromptClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -8749,13 +8555,13 @@ function createPromptEngineDataSource({
 var PromptPullModule = {
   command: "pull <directory>",
   describe: "Pulls all prompts to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              yargs44.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to save the prompts to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
                 type: "string"
               }).option("format", {
@@ -8836,12 +8642,12 @@ var PromptPullModule = {
 var PromptPushModule = {
   command: "push <directory>",
   describe: "Pushes all prompts from files in a directory to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the prompts from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -8910,10 +8716,10 @@ var PromptRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a prompt",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
-        withProjectOptions(yargs44.positional("id", { demandOption: true, describe: "Prompt ID to delete" }))
+        withProjectOptions(yargs43.positional("id", { demandOption: true, describe: "Prompt ID to delete" }))
       )
     )
   ),
@@ -8933,11 +8739,11 @@ var PromptUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a prompt",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("filename", { demandOption: true, describe: "Prompt file to put" })
+          yargs43.positional("filename", { demandOption: true, describe: "Prompt file to put" })
         )
       )
     )
@@ -8959,14 +8765,14 @@ var PromptModule = {
   command: "prompt <command>",
   aliases: ["dt"],
   describe: "Commands for AI Prompt definitions",
-  builder: (yargs44) => yargs44.command(PromptGetModule).command(PromptListModule).command(PromptPullModule).command(PromptPushModule).command(PromptRemoveModule).command(PromptUpdateModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(PromptGetModule).command(PromptListModule).command(PromptPullModule).command(PromptPushModule).command(PromptRemoveModule).command(PromptUpdateModule).demandCommand(),
   handler: () => {
-    yargs20.help();
+    yargs19.help();
   }
 };
 
 // src/commands/canvas/commands/workflow.ts
-import yargs21 from "yargs";
+import yargs20 from "yargs";
 
 // src/commands/canvas/commands/workflow/_util.ts
 import { WorkflowClient } from "@uniformdev/canvas";
@@ -9013,13 +8819,13 @@ function createWorkflowEngineDataSource({
 var WorkflowPullModule = {
   command: "pull <directory>",
   describe: "Pulls all workflows to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
             withBatchSizeOptions(
-              yargs44.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to save to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
                 type: "string"
               }).option("format", {
@@ -9101,13 +8907,13 @@ var WorkflowPullModule = {
 var WorkflowPushModule = {
   command: "push <directory>",
   describe: "Pushes all workflows from files in a directory to Uniform Canvas",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
             withBatchSizeOptions(
-              yargs44.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to read from. If a filename is used, a package will be read instead.",
                 type: "string"
               }).option("mode", {
@@ -9178,9 +8984,9 @@ var WorkflowModule = {
   command: "workflow <command>",
   aliases: ["wf"],
   describe: "Commands for Canvas workflows",
-  builder: (yargs44) => yargs44.command(WorkflowPullModule).command(WorkflowPushModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(WorkflowPullModule).command(WorkflowPushModule).demandCommand(),
   handler: () => {
-    yargs21.help();
+    yargs20.help();
   }
 };
 
@@ -9189,17 +8995,17 @@ var CanvasCommand = {
   command: "canvas <command>",
   aliases: ["cv", "pm", "presentation"],
   describe: "Uniform Canvas commands",
-  builder: (yargs44) => yargs44.command(CompositionModule).command(ComponentModule).command(DataTypeModule).command(DataSourceModule).command(CategoryModule).command(ComponentPatternModule).command(CompositionPatternModule).command(ContentTypeModule).command(EntryModule).command(EntryPatternModule).command(PromptModule).command(AssetModule).command(LabelModule).command(LocaleModule).command(WorkflowModule).command(PreviewUrlModule).command(PreviewViewportModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(CompositionModule).command(ComponentModule).command(DataTypeModule).command(DataSourceModule).command(CategoryModule).command(ComponentPatternModule).command(CompositionPatternModule).command(ContentTypeModule).command(EntryModule).command(EntryPatternModule).command(PromptModule).command(AssetModule).command(LabelModule).command(LocaleModule).command(WorkflowModule).command(PreviewUrlModule).command(PreviewViewportModule).demandCommand(),
   handler: () => {
-    yargs22.showHelp();
+    yargs21.showHelp();
   }
 };
 
 // src/commands/context/index.ts
-import yargs29 from "yargs";
+import yargs28 from "yargs";
 
 // src/commands/context/commands/aggregate.ts
-import yargs23 from "yargs";
+import yargs22 from "yargs";
 
 // src/commands/context/commands/aggregate/_util.ts
 import { AggregateClient } from "@uniformdev/context/api";
@@ -9211,11 +9017,11 @@ var getAggregateClient = (options) => new AggregateClient({ ...options, bypassCa
 var AggregateGetModule = {
   command: "get <id>",
   describe: "Fetch an aggregate",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
+          yargs43.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
         )
       )
     )
@@ -9238,7 +9044,7 @@ var AggregateListModule = {
   command: "list",
   describe: "List aggregates",
   aliases: ["ls"],
-  builder: (yargs44) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs44)))),
+  builder: (yargs43) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = getAggregateClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -9301,12 +9107,12 @@ function writeContextPackage(filename, packageContents) {
 var AggregatePullModule = {
   command: "pull <directory>",
   describe: "Pulls all aggregates to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the aggregates to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -9381,12 +9187,12 @@ var AggregatePullModule = {
 var AggregatePushModule = {
   command: "push <directory>",
   describe: "Pushes all aggregates from files in a directory or package to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
           withDebugOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the aggregates from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -9451,10 +9257,10 @@ var AggregateRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an aggregate",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs44.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
+        yargs43.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
       )
     )
   ),
@@ -9470,10 +9276,10 @@ var AggregateUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an aggregate",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs44.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
+        yargs43.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
       )
     )
   ),
@@ -9490,14 +9296,14 @@ var AggregateModule = {
   command: "aggregate <command>",
   aliases: ["agg", "intent", "audience"],
   describe: "Commands for Context aggregates (intents, audiences)",
-  builder: (yargs44) => yargs44.command(AggregatePullModule).command(AggregatePushModule).command(AggregateGetModule).command(AggregateRemoveModule).command(AggregateListModule).command(AggregateUpdateModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(AggregatePullModule).command(AggregatePushModule).command(AggregateGetModule).command(AggregateRemoveModule).command(AggregateListModule).command(AggregateUpdateModule).demandCommand(),
   handler: () => {
-    yargs23.help();
+    yargs22.help();
   }
 };
 
 // src/commands/context/commands/enrichment.ts
-import yargs24 from "yargs";
+import yargs23 from "yargs";
 
 // src/commands/context/commands/enrichment/_util.ts
 import { UncachedEnrichmentClient } from "@uniformdev/context/api";
@@ -9511,11 +9317,11 @@ function getEnrichmentClient(options) {
 var EnrichmentGetModule = {
   command: "get <id>",
   describe: "Fetch an enrichment category and its values",
-  builder: (yargs44) => withFormatOptions(
+  builder: (yargs43) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
+          yargs43.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
         )
       )
     )
@@ -9538,7 +9344,7 @@ var EnrichmentListModule = {
   command: "list",
   describe: "List enrichments",
   aliases: ["ls"],
-  builder: (yargs44) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs44)))),
+  builder: (yargs43) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = getEnrichmentClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -9633,12 +9439,12 @@ var createEnrichmentValueEngineDataSource = ({
 var EnrichmentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all enrichments to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the enrichments to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -9713,11 +9519,11 @@ var EnrichmentPullModule = {
 var EnrichmentPushModule = {
   command: "push <directory>",
   describe: "Pushes all enrichments from files in a directory or package to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs44.positional("directory", {
+          yargs43.positional("directory", {
             describe: "Directory to read the enrichments from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("mode", {
@@ -9780,10 +9586,10 @@ var EnrichmentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an enrichment category and its values",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs44.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
+        yargs43.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
       )
     )
   ),
@@ -9799,14 +9605,14 @@ var EnrichmentModule = {
   command: "enrichment <command>",
   aliases: ["enr"],
   describe: "Commands for Context enrichments",
-  builder: (yargs44) => yargs44.command(EnrichmentPullModule).command(EnrichmentPushModule).command(EnrichmentGetModule).command(EnrichmentRemoveModule).command(EnrichmentListModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(EnrichmentPullModule).command(EnrichmentPushModule).command(EnrichmentGetModule).command(EnrichmentRemoveModule).command(EnrichmentListModule).demandCommand(),
   handler: () => {
-    yargs24.help();
+    yargs23.help();
   }
 };
 
 // src/commands/context/commands/manifest.ts
-import yargs25 from "yargs";
+import yargs24 from "yargs";
 
 // src/commands/context/commands/manifest/get.ts
 import { ApiClientError as ApiClientError5, UncachedManifestClient } from "@uniformdev/context/api";
@@ -9817,10 +9623,10 @@ var ManifestGetModule = {
   command: "get [output]",
   aliases: ["dl", "download"],
   describe: "Download the Uniform Context manifest for a project",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs44.option("preview", {
+        yargs43.option("preview", {
           describe: "If set, fetches the unpublished preview manifest (The API key must have permission)",
           default: false,
           type: "boolean",
@@ -9882,7 +9688,7 @@ import { exit as exit2 } from "process";
 var ManifestPublishModule = {
   command: "publish",
   describe: "Publish the Uniform Context manifest for a project",
-  builder: (yargs44) => withConfiguration(withApiOptions(withProjectOptions(yargs44))),
+  builder: (yargs43) => withConfiguration(withApiOptions(withProjectOptions(yargs43))),
   handler: async ({ apiKey, apiHost, proxy, project }) => {
     const fetch2 = nodeFetchProxy(proxy);
     try {
@@ -9915,25 +9721,25 @@ var ManifestModule = {
   command: "manifest <command>",
   describe: "Commands for context manifests",
   aliases: ["man"],
-  builder: (yargs44) => yargs44.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
   handler: () => {
-    yargs25.help();
+    yargs24.help();
   }
 };
 
 // src/commands/context/commands/quirk.ts
-import yargs26 from "yargs";
+import yargs25 from "yargs";
 
 // src/commands/context/commands/quirk/get.ts
 import { UncachedQuirkClient } from "@uniformdev/context/api";
 var QuirkGetModule = {
   command: "get <id>",
   describe: "Fetch a quirk",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
+          yargs43.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
         )
       )
     )
@@ -9957,11 +9763,11 @@ var QuirkListModule = {
   command: "list",
   describe: "List quirks",
   aliases: ["ls"],
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.option("withIntegrations", {
+          yargs43.option("withIntegrations", {
             alias: ["i"],
             describe: "Whether to include meta-quirks created by integrations in the list. Defaults to false.",
             type: "boolean"
@@ -10019,12 +9825,12 @@ function createQuirkEngineDataSource({
 var QuirkPullModule = {
   command: "pull <directory>",
   describe: "Pulls all quirks to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the quirks to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -10100,12 +9906,12 @@ import { UncachedQuirkClient as UncachedQuirkClient4 } from "@uniformdev/context
 var QuirkPushModule = {
   command: "push <directory>",
   describe: "Pushes all quirks from files in a directory or package to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the quirks from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -10170,10 +9976,10 @@ var QuirkRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a quirk",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs44.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
+        yargs43.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
       )
     )
   ),
@@ -10190,10 +9996,10 @@ var QuirkUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a quirk",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs44.positional("filename", { demandOption: true, describe: "Quirk file to put" })
+        yargs43.positional("filename", { demandOption: true, describe: "Quirk file to put" })
       )
     )
   ),
@@ -10210,25 +10016,25 @@ var QuirkModule = {
   command: "quirk <command>",
   aliases: ["qk"],
   describe: "Commands for Context quirks",
-  builder: (yargs44) => yargs44.command(QuirkPullModule).command(QuirkPushModule).command(QuirkGetModule).command(QuirkRemoveModule).command(QuirkListModule).command(QuirkUpdateModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(QuirkPullModule).command(QuirkPushModule).command(QuirkGetModule).command(QuirkRemoveModule).command(QuirkListModule).command(QuirkUpdateModule).demandCommand(),
   handler: () => {
-    yargs26.help();
+    yargs25.help();
   }
 };
 
 // src/commands/context/commands/signal.ts
-import yargs27 from "yargs";
+import yargs26 from "yargs";
 
 // src/commands/context/commands/signal/get.ts
 import { UncachedSignalClient } from "@uniformdev/context/api";
 var SignalGetModule = {
   command: "get <id>",
   describe: "Fetch a signal",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
+          yargs43.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
         )
       )
     )
@@ -10252,7 +10058,7 @@ var SignalListModule = {
   command: "list",
   describe: "List signals",
   aliases: ["ls"],
-  builder: (yargs44) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs44)))),
+  builder: (yargs43) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new UncachedSignalClient2({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -10302,12 +10108,12 @@ function createSignalEngineDataSource({
 var SignalPullModule = {
   command: "pull <directory>",
   describe: "Pulls all signals to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the signals to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -10383,12 +10189,12 @@ import { UncachedSignalClient as UncachedSignalClient4 } from "@uniformdev/conte
 var SignalPushModule = {
   command: "push <directory>",
   describe: "Pushes all signals from files in a directory or package to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the signals from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -10453,10 +10259,10 @@ var SignalRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a signal",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs44.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
+        yargs43.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
       )
     )
   ),
@@ -10473,10 +10279,10 @@ var SignalUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a signal",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs44.positional("filename", { demandOption: true, describe: "Signal file to put" })
+        yargs43.positional("filename", { demandOption: true, describe: "Signal file to put" })
       )
     )
   ),
@@ -10493,25 +10299,25 @@ var SignalModule = {
   command: "signal <command>",
   aliases: ["sig"],
   describe: "Commands for Context signals",
-  builder: (yargs44) => yargs44.command(SignalPullModule).command(SignalPushModule).command(SignalGetModule).command(SignalRemoveModule).command(SignalListModule).command(SignalUpdateModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(SignalPullModule).command(SignalPushModule).command(SignalGetModule).command(SignalRemoveModule).command(SignalListModule).command(SignalUpdateModule).demandCommand(),
   handler: () => {
-    yargs27.help();
+    yargs26.help();
   }
 };
 
 // src/commands/context/commands/test.ts
-import yargs28 from "yargs";
+import yargs27 from "yargs";
 
 // src/commands/context/commands/test/get.ts
 import { UncachedTestClient } from "@uniformdev/context/api";
 var TestGetModule = {
   command: "get <id>",
   describe: "Fetch a test",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
+          yargs43.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
         )
       )
     )
@@ -10535,7 +10341,7 @@ var TestListModule = {
   command: "list",
   describe: "List tests",
   aliases: ["ls"],
-  builder: (yargs44) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs44)))),
+  builder: (yargs43) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new UncachedTestClient2({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -10585,12 +10391,12 @@ function createTestEngineDataSource({
 var TestPullModule = {
   command: "pull <directory>",
   describe: "Pulls all tests to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the tests to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -10666,12 +10472,12 @@ import { UncachedTestClient as UncachedTestClient4 } from "@uniformdev/context/a
 var TestPushModule = {
   command: "push <directory>",
   describe: "Pushes all tests from files in a directory or package to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the tests from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -10736,10 +10542,10 @@ var TestRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a test",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs44.positional("id", { demandOption: true, describe: "Test public ID to delete" })
+        yargs43.positional("id", { demandOption: true, describe: "Test public ID to delete" })
       )
     )
   ),
@@ -10756,9 +10562,9 @@ var TestUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a test",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs44.positional("filename", { demandOption: true, describe: "Test file to put" }))
+      withProjectOptions(yargs43.positional("filename", { demandOption: true, describe: "Test file to put" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
@@ -10773,9 +10579,9 @@ var TestUpdateModule = {
 var TestModule = {
   command: "test <command>",
   describe: "Commands for Context A/B tests",
-  builder: (yargs44) => yargs44.command(TestPullModule).command(TestPushModule).command(TestGetModule).command(TestRemoveModule).command(TestListModule).command(TestUpdateModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(TestPullModule).command(TestPushModule).command(TestGetModule).command(TestRemoveModule).command(TestListModule).command(TestUpdateModule).demandCommand(),
   handler: () => {
-    yargs28.help();
+    yargs27.help();
   }
 };
 
@@ -10784,23 +10590,56 @@ var ContextCommand = {
   command: "context <command>",
   aliases: ["ctx"],
   describe: "Uniform Context commands",
-  builder: (yargs44) => yargs44.command(ManifestModule).command(SignalModule).command(EnrichmentModule).command(AggregateModule).command(QuirkModule).command(TestModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(ManifestModule).command(SignalModule).command(EnrichmentModule).command(AggregateModule).command(QuirkModule).command(TestModule).demandCommand(),
   handler: () => {
-    yargs29.showHelp();
+    yargs28.showHelp();
   }
 };
 
 // src/commands/integration/index.ts
-import yargs34 from "yargs";
+import yargs33 from "yargs";
 
 // src/commands/integration/commands/definition.ts
-import yargs33 from "yargs";
+import yargs32 from "yargs";
 
 // src/commands/integration/commands/definition/dataResourceEditor/dataResourceEditor.ts
-import yargs30 from "yargs";
+import yargs29 from "yargs";
 
 // src/commands/integration/commands/definition/dataResourceEditor/deploy.ts
-import { readFileSync as readFileSync3 } from "fs";
+import { readFileSync as readFileSync2 } from "fs";
+
+// src/commands/integration/commands/definition/bundleWorkerCode.ts
+import esbuild from "esbuild";
+import path5 from "path";
+async function bundleWorkerCode(entryFile) {
+  const result = await esbuild.build({
+    entryPoints: [entryFile],
+    bundle: true,
+    // Don't write to disk, build to memory
+    write: false,
+    format: "esm",
+    target: "es2021",
+    platform: "browser",
+    minify: true,
+    // Force inlining of all dependencies
+    external: [],
+    // Ensure single file output
+    splitting: false,
+    sourcemap: false
+  });
+  const outputFiles = result.outputFiles;
+  if (!outputFiles || outputFiles.length === 0) {
+    throw new Error(`No output generated for ${entryFile}`);
+  }
+  const outputFile = outputFiles[0];
+  const builtCode = outputFile.text;
+  console.log(
+    `\u2139\uFE0F ${path5.basename(entryFile)} was prepared with esbuild. Size: ${Math.round(
+      builtCode.length / 1024
+    )}kb (use --skipBundle to disable)`
+  );
+  return builtCode;
+}
 
 // src/commands/integration/commands/definition/edgehancer/EdgehancerClient.ts
 import { createLimitPolicy as createLimitPolicy2 } from "@uniformdev/canvas";
@@ -10835,8 +10674,8 @@ var EdgehancerClient = class extends ApiClient {
 };
 
 // src/commands/integration/commands/definition/dataResourceEditor/util.ts
-function withDataResourceEditorIdOptions(yargs44) {
-  return yargs44.option("connectorType", {
+function withDataResourceEditorIdOptions(yargs43) {
+  return yargs43.option("connectorType", {
     describe: "Integration data connector type to attach the data resource editor to, as defined in the integration manifest file.",
     demandOption: true,
     type: "string"
@@ -10856,11 +10695,11 @@ function withDataResourceEditorIdOptions(yargs44) {
 var IntegrationDataResourceEditorDeployModule = {
   command: "deploy <filename>",
   describe: "Deploys a custom AI data resource editor hook to run when AI edits data resources of a specific archetype. The API key used must have team admin permissions.",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withTeamOptions(
         withDataResourceEditorIdOptions(
-          yargs44.positional("filename", {
+          yargs43.positional("filename", {
             demandOption: true,
             describe: "ESM code file to run for the target data resource editor hook. Refer to the documentation for expected types."
           }).option("compatibilityDate", {
@@ -10891,7 +10730,7 @@ var IntegrationDataResourceEditorDeployModule = {
     const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch2, teamId });
     let code;
     if (skipBundle) {
-      code = readFileSync3(filename, "utf8");
+      code = readFileSync2(filename, "utf8");
     } else {
       code = await bundleWorkerCode(filename);
     }
@@ -10903,7 +10742,7 @@ var IntegrationDataResourceEditorDeployModule = {
 var IntegrationDataResourceEditorRemoveModule = {
   command: "remove",
   describe: "Removes a custom AI data resource editor hook from a data resource archetype. The API key used must have team admin permissions.",
-  builder: (yargs44) => withConfiguration(withApiOptions(withTeamOptions(withDataResourceEditorIdOptions(yargs44)))),
+  builder: (yargs43) => withConfiguration(withApiOptions(withTeamOptions(withDataResourceEditorIdOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, team: teamId, connectorType, archetype, hook }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch2, teamId });
@@ -10915,21 +10754,21 @@ var IntegrationDataResourceEditorRemoveModule = {
 var IntegrationDataResourceEditorModule = {
   command: "dataResourceEditor <command>",
   describe: "Commands for managing custom AI data resource editors at the team level.",
-  builder: (yargs44) => yargs44.command(IntegrationDataResourceEditorDeployModule).command(IntegrationDataResourceEditorRemoveModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(IntegrationDataResourceEditorDeployModule).command(IntegrationDataResourceEditorRemoveModule).demandCommand(),
   handler: () => {
-    yargs30.help();
+    yargs29.help();
   }
 };
 
 // src/commands/integration/commands/definition/edgehancer/edgehancer.ts
-import yargs31 from "yargs";
+import yargs30 from "yargs";
 
 // src/commands/integration/commands/definition/edgehancer/deploy.ts
-import { readFileSync as readFileSync4 } from "fs";
+import { readFileSync as readFileSync3 } from "fs";
 
 // src/commands/integration/commands/definition/edgehancer/util.ts
-function withEdgehancerIdOptions(yargs44) {
-  return yargs44.option("connectorType", {
+function withEdgehancerIdOptions(yargs43) {
+  return yargs43.option("connectorType", {
     describe: "Integration data connector type to edgehance, as defined in the integration manifest file.",
     demandOption: true,
     type: "string"
@@ -10949,11 +10788,11 @@ function withEdgehancerIdOptions(yargs44) {
 var IntegrationEdgehancerDeployModule = {
   command: "deploy <filename>",
   describe: "Deploys a custom edgehancer hook to run when a data resource of a specific archetype is fetched. The API key used must have team admin permissions.",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withTeamOptions(
         withEdgehancerIdOptions(
-          yargs44.positional("filename", {
+          yargs43.positional("filename", {
             demandOption: true,
             describe: "ESM code file to run for the target edgehancer hook. Refer to the documentation for expected types."
           }).option("compatibilityDate", {
@@ -10984,7 +10823,7 @@ var IntegrationEdgehancerDeployModule = {
     const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch2, teamId });
     let code;
     if (skipBundle) {
-      code = readFileSync4(filename, "utf8");
+      code = readFileSync3(filename, "utf8");
     } else {
       code = await bundleWorkerCode(filename);
     }
@@ -10996,7 +10835,7 @@ var IntegrationEdgehancerDeployModule = {
 var IntegrationEdgehancerRemoveModule = {
   command: "remove",
   describe: "Deletes a custom edgehancer hook from a data connector archetype. The API key used must have team admin permissions.",
-  builder: (yargs44) => withConfiguration(withApiOptions(withTeamOptions(withEdgehancerIdOptions(yargs44)))),
+  builder: (yargs43) => withConfiguration(withApiOptions(withTeamOptions(withEdgehancerIdOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, team: teamId, archetype, connectorType, hook }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch2, teamId });
@@ -11008,22 +10847,22 @@ var IntegrationEdgehancerRemoveModule = {
 var IntegrationEdgehancerModule = {
   command: "edgehancer <command>",
   describe: "Commands for managing custom integration edgehancers at the team level.",
-  builder: (yargs44) => yargs44.command(IntegrationEdgehancerDeployModule).command(IntegrationEdgehancerRemoveModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(IntegrationEdgehancerDeployModule).command(IntegrationEdgehancerRemoveModule).demandCommand(),
   handler: () => {
-    yargs31.help();
+    yargs30.help();
   }
 };
 
 // src/commands/integration/commands/definition/propertyEditor/propertyEditor.ts
-import yargs32 from "yargs";
+import yargs31 from "yargs";
 
 // src/commands/integration/commands/definition/propertyEditor/deploy.ts
 import { IntegrationPropertyEditorsClient } from "@uniformdev/canvas";
-import { readFileSync as readFileSync5 } from "fs";
+import { readFileSync as readFileSync4 } from "fs";
 
 // src/commands/integration/commands/definition/propertyEditor/util.ts
-function withPropertyEditorIdOptions(yargs44) {
-  return yargs44.option("propertyType", {
+function withPropertyEditorIdOptions(yargs43) {
+  return yargs43.option("propertyType", {
     describe: "Property type to attach the editor to.",
     demandOption: true,
     type: "string"
@@ -11039,11 +10878,11 @@ function withPropertyEditorIdOptions(yargs44) {
 var IntegrationPropertyEditorDeployModule = {
   command: "deploy <filename>",
   describe: "Deploys a custom AI property editor hook to run when a property of a specific type is edited. The API key used must have team admin permissions.",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withTeamOptions(
         withPropertyEditorIdOptions(
-          yargs44.positional("filename", {
+          yargs43.positional("filename", {
             demandOption: true,
             describe: "ESM code file to run for the target property editor hook. Refer to the documentation for expected types."
           }).option("compatibilityDate", {
@@ -11073,7 +10912,7 @@ var IntegrationPropertyEditorDeployModule = {
     const client = new IntegrationPropertyEditorsClient({ apiKey, apiHost, fetch: fetch2, teamId });
     let code;
     if (skipBundle) {
-      code = readFileSync5(filename, "utf8");
+      code = readFileSync4(filename, "utf8");
     } else {
       code = await bundleWorkerCode(filename);
     }
@@ -11086,7 +10925,7 @@ import { IntegrationPropertyEditorsClient as IntegrationPropertyEditorsClient2 }
 var IntegrationPropertyEditorRemoveModule = {
   command: "remove",
   describe: "Deletes a custom AI property editor hook from a property type. The API key used must have team admin permissions.",
-  builder: (yargs44) => withConfiguration(withApiOptions(withTeamOptions(withPropertyEditorIdOptions(yargs44)))),
+  builder: (yargs43) => withConfiguration(withApiOptions(withTeamOptions(withPropertyEditorIdOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, team: teamId, propertyType, hook }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new IntegrationPropertyEditorsClient2({ apiKey, apiHost, fetch: fetch2, teamId });
@@ -11098,9 +10937,9 @@ var IntegrationPropertyEditorRemoveModule = {
 var IntegrationPropertyEditorModule = {
   command: "propertyEditor <command>",
   describe: "Commands for managing custom AI property editors at the team level.",
-  builder: (yargs44) => yargs44.command(IntegrationPropertyEditorDeployModule).command(IntegrationPropertyEditorRemoveModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(IntegrationPropertyEditorDeployModule).command(IntegrationPropertyEditorRemoveModule).demandCommand(),
   handler: () => {
-    yargs32.help();
+    yargs31.help();
   }
 };
 
@@ -11140,10 +10979,10 @@ var DefinitionClient = class extends ApiClient2 {
 var IntegrationDefinitionRegisterModule = {
   command: "register <filename>",
   describe: "Registers a custom integration definition on a team. The API key used must have team admin permissions.",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withTeamOptions(
-        yargs44.positional("filename", {
+        yargs43.positional("filename", {
           demandOption: true,
           describe: "Integration definition manifest to register"
         })
@@ -11162,10 +11001,10 @@ var IntegrationDefinitionRegisterModule = {
 var IntegrationDefinitionRemoveModule = {
   command: "remove <type>",
   describe: "Deletes a custom integration definition from a team. This will uninstall it on any active projects. Existing usages of the integration may break. The API key used must have team admin permissions.",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withTeamOptions(
-        yargs44.positional("type", {
+        yargs43.positional("type", {
           demandOption: true,
           describe: "Integration type (from its manifest) to remove."
         })
@@ -11183,9 +11022,9 @@ var IntegrationDefinitionRemoveModule = {
 var IntegrationDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for managing custom integration definitions at the team level.",
-  builder: (yargs44) => yargs44.command(IntegrationDefinitionRemoveModule).command(IntegrationDefinitionRegisterModule).command(IntegrationEdgehancerModule).command(IntegrationDataResourceEditorModule).command(IntegrationPropertyEditorModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(IntegrationDefinitionRemoveModule).command(IntegrationDefinitionRegisterModule).command(IntegrationEdgehancerModule).command(IntegrationDataResourceEditorModule).command(IntegrationPropertyEditorModule).demandCommand(),
   handler: () => {
-    yargs33.help();
+    yargs32.help();
   }
 };
 
@@ -11225,10 +11064,10 @@ var InstallClient = class extends ApiClient3 {
 var IntegrationInstallModule = {
   command: "install <type>",
   describe: "Installs an integration to a project. The integration may be built-in or custom. Custom integrations must be registered to the parent team first.",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs44.positional("type", {
+        yargs43.positional("type", {
           demandOption: true,
           describe: "Integration type to install (as defined in its manifest)"
         }).option("configuration", {
@@ -11250,10 +11089,10 @@ var IntegrationInstallModule = {
 var IntegrationUninstallModule = {
   command: "uninstall <type>",
   describe: "Uninstalls an integration from a project. Existing usages of the integration may break.",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs44.positional("type", {
+        yargs43.positional("type", {
           demandOption: true,
           describe: "Integration type to uninstall (as defined in its manifest)"
         })
@@ -11271,9 +11110,9 @@ var IntegrationUninstallModule = {
 var IntegrationCommand = {
   command: "integration <command>",
   describe: "Integration management commands",
-  builder: (yargs44) => yargs44.command(IntegrationDefinitionModule).command(IntegrationInstallModule).command(IntegrationUninstallModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(IntegrationDefinitionModule).command(IntegrationInstallModule).command(IntegrationUninstallModule).demandCommand(),
   handler: () => {
-    yargs34.showHelp();
+    yargs33.showHelp();
   }
 };
 
@@ -11521,7 +11360,7 @@ npm run dev
 
 // src/commands/new/commands/new-mesh-integration.ts
 import { input as input2 } from "@inquirer/prompts";
-import { existsSync as existsSync5, mkdirSync as mkdirSync3, readdirSync, readFileSync as readFileSync6, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync4, mkdirSync as mkdirSync3, readdirSync, readFileSync as readFileSync5, writeFileSync as writeFileSync2 } from "fs";
 import path7 from "path";
 import slugify2 from "slugify";
 async function newMeshIntegrationHandler({
@@ -11570,16 +11409,16 @@ async function newMeshIntegrationHandler({
   });
   let done = await spin("Registering integration to team...");
   const pathToManifest = path7.resolve(targetDir, "mesh-manifest.json");
-  if (!existsSync5(pathToManifest)) {
+  if (!existsSync4(pathToManifest)) {
     throw new Error("Invalid integration starter cloned: missing `mesh-manifest.json`");
   }
-  const manifestContents = readFileSync6(pathToManifest, "utf-8");
+  const manifestContents = readFileSync5(pathToManifest, "utf-8");
   const manifestJson = JSON.parse(manifestContents);
   manifestJson.type = typeSlug;
   manifestJson.displayName = name;
   writeFileSync2(pathToManifest, JSON.stringify(manifestJson, null, 2), "utf-8");
   const packageJsonPath = path7.resolve(targetDir, "package.json");
-  const packageJson = JSON.parse(readFileSync6(packageJsonPath, "utf-8"));
+  const packageJson = JSON.parse(readFileSync5(packageJsonPath, "utf-8"));
   packageJson.name = typeSlug;
   writeFileSync2(packageJsonPath, JSON.stringify(packageJson, null, 2), "utf-8");
   const fullMeshAppKey = await uniformClient.registerMeshIntegration({ teamId, manifest: manifestJson });
@@ -11624,12 +11463,12 @@ function validateIntegrationName(integrationName, explicitOutputPath) {
     throw new Error("Integration name cannot be shorter than 6 characters.");
   }
   let targetDir = explicitOutputPath ?? process.cwd();
-  if (!existsSync5(targetDir)) {
+  if (!existsSync4(targetDir)) {
     mkdirSync3(targetDir, { recursive: true });
   }
   if (readdirSync(targetDir).length > 0) {
     targetDir = path7.resolve(targetDir, typeSlug);
-    if (existsSync5(targetDir)) {
+    if (existsSync4(targetDir)) {
       throw new Error(`${targetDir} directory already exists, choose a different name.`);
     }
   }
@@ -11738,14 +11577,14 @@ var NewMeshCmd = {
 };
 
 // src/commands/policy-documents/index.ts
-import yargs35 from "yargs";
+import yargs34 from "yargs";
 
 // src/commands/policy-documents/commands/list.ts
 var PolicyDocumentsListModule = {
   command: "list",
   describe: "List policy documents for a project",
   aliases: ["ls"],
-  builder: (yargs44) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs44)))),
+  builder: (yargs43) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const url = new URL(`/api/v1/policy-documents`, apiHost);
@@ -11830,12 +11669,12 @@ var selectDisplayName13 = (policyDoc) => `Policy document for role ${policyDoc.r
 var PolicyDocumentsPullModule = {
   command: "pull <directory>",
   describe: "Pulls all policy documents to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save to. Each policy document will be saved as a separate file named by role ID.",
               type: "string"
             }).option("format", {
@@ -11890,19 +11729,19 @@ var PolicyDocumentsPullModule = {
 };
 
 // src/commands/policy-documents/commands/push.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync4 } from "fs";
+import { existsSync as existsSync5, mkdirSync as mkdirSync4 } from "fs";
 import { readdir as readdir2 } from "fs/promises";
-import { extname as extname3, join as join12 } from "path";
+import { extname as extname2, join as join11 } from "path";
 async function readLocalPolicyDocuments(directory, format, verbose) {
   const files = await readdir2(directory);
   const policyDocuments = {};
   const errors = [];
   for (const filename of files) {
-    const ext = extname3(filename);
+    const ext = extname2(filename);
     if (ext !== `.${format}` && ext !== ".yaml" && ext !== ".yml" && ext !== ".json") {
       continue;
     }
-    const filePath = join12(directory, filename);
+    const filePath = join11(directory, filename);
     try {
       let roleId = filename.replace(ext, "");
       const fileContent = readFileToObject(filePath);
@@ -11969,12 +11808,12 @@ function mergePolicyDocuments(localDocs, remoteDocs, mode) {
 var PolicyDocumentsPushModule = {
   command: "push <directory>",
   describe: "Pushes policy documents from local files to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory containing policy document files (one file per role ID).",
               type: "string"
             }).option("format", {
@@ -12008,7 +11847,7 @@ var PolicyDocumentsPushModule = {
     allowEmptySource,
     verbose
   }) => {
-    if (!existsSync6(directory)) {
+    if (!existsSync5(directory)) {
       if (verbose) {
         console.log(`Creating directory ${directory}`);
       }
@@ -12070,17 +11909,17 @@ var PolicyDocumentsCommand = {
   command: "policy-documents <command>",
   aliases: ["policy", "policies"],
   describe: "Uniform Policy Documents commands",
-  builder: (yargs44) => yargs44.command(PolicyDocumentsListModule).command(PolicyDocumentsPullModule).command(PolicyDocumentsPushModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(PolicyDocumentsListModule).command(PolicyDocumentsPullModule).command(PolicyDocumentsPushModule).demandCommand(),
   handler: () => {
-    yargs35.showHelp();
+    yargs34.showHelp();
   }
 };
 
 // src/commands/project-map/index.ts
-import yargs38 from "yargs";
+import yargs37 from "yargs";
 
 // src/commands/project-map/commands/projectMapDefinition.ts
-import yargs36 from "yargs";
+import yargs35 from "yargs";
 
 // src/commands/project-map/commands/ProjectMapDefinition/_util.ts
 import { UncachedProjectMapClient } from "@uniformdev/project-map";
@@ -12094,11 +11933,11 @@ function getProjectMapClient(options) {
 var ProjectMapDefinitionGetModule = {
   command: "get <id>",
   describe: "Fetch a project map",
-  builder: (yargs44) => withFormatOptions(
+  builder: (yargs43) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
+          yargs43.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
         )
       )
     )
@@ -12121,7 +11960,7 @@ var ProjectMapDefinitionListModule = {
   command: "list",
   describe: "List of project maps",
   aliases: ["ls"],
-  builder: (yargs44) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs44)))),
+  builder: (yargs43) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = getProjectMapClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -12175,12 +12014,12 @@ function createProjectMapDefinitionEngineDataSource({
 var ProjectMapDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save project maps to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -12255,12 +12094,12 @@ var ProjectMapDefinitionPullModule = {
 var ProjectMapDefinitionPushModule = {
   command: "push <directory>",
   describe: "Pushes all project maps from files in a directory or package to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read project maps from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -12324,9 +12163,9 @@ var ProjectMapDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs44.positional("id", { demandOption: true, describe: " UUID to delete" }))
+      withProjectOptions(yargs43.positional("id", { demandOption: true, describe: " UUID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -12341,10 +12180,10 @@ var ProjectMapDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a project map",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs44.positional("filename", { demandOption: true, describe: "Project map file to put" })
+        yargs43.positional("filename", { demandOption: true, describe: "Project map file to put" })
       )
     )
   ),
@@ -12360,24 +12199,24 @@ var ProjectMapDefinitionUpdateModule = {
 var ProjectMapDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for ProjectMap Definitions",
-  builder: (yargs44) => yargs44.command(ProjectMapDefinitionPullModule).command(ProjectMapDefinitionPushModule).command(ProjectMapDefinitionGetModule).command(ProjectMapDefinitionRemoveModule).command(ProjectMapDefinitionListModule).command(ProjectMapDefinitionUpdateModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(ProjectMapDefinitionPullModule).command(ProjectMapDefinitionPushModule).command(ProjectMapDefinitionGetModule).command(ProjectMapDefinitionRemoveModule).command(ProjectMapDefinitionListModule).command(ProjectMapDefinitionUpdateModule).demandCommand(),
   handler: () => {
-    yargs36.help();
+    yargs35.help();
   }
 };
 
 // src/commands/project-map/commands/projectMapNode.ts
-import yargs37 from "yargs";
+import yargs36 from "yargs";
 
 // src/commands/project-map/commands/ProjectMapNode/get.ts
 var ProjectMapNodeGetModule = {
   command: "get <id> <projectMapId>",
   describe: "Fetch a project map node",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to fetch" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to fetch from" })
+          yargs43.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to fetch" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to fetch from" })
         )
       )
     )
@@ -12401,12 +12240,12 @@ var ProjectMapNodeListModule = {
   command: "list <projectMapId>",
   describe: "List project map nodes",
   aliases: ["ls"],
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs44.positional("projectMapId", {
+            yargs43.positional("projectMapId", {
               demandOption: true,
               describe: "ProjectMap UUID to fetch from"
             })
@@ -12430,6 +12269,20 @@ var selectIdentifier15 = (source, projectId) => [
 ];
 var selectFilename = (source) => cleanFileName(`${source.pathSegment}_${source.id}`);
 var selectDisplayName15 = (source) => `${source.name} (pid: ${source.id})`;
+function alignProjectMapNodeWithTargetIdentifier(sourceObject, targetObject) {
+  if (!targetObject) {
+    return sourceObject;
+  }
+  return {
+    ...sourceObject,
+    id: targetObject.id,
+    providerId: targetObject.providerId,
+    object: {
+      ...sourceObject.object,
+      id: targetObject.object.id
+    }
+  };
+}
 
 // src/commands/project-map/ProjectMapNodeEngineDataSource.ts
 function createProjectMapNodeEngineDataSource({
@@ -12484,12 +12337,12 @@ function createProjectMapNodeEngineDataSource({
 var ProjectMapNodePullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps nodes to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save project maps to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -12571,12 +12424,12 @@ import {
 var ProjectMapNodePushModule = {
   command: "push <directory>",
   describe: "Pushes all project maps nodes from files in a directory or package to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read project maps from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -12646,6 +12499,12 @@ var ProjectMapNodePushModule = {
         whatIf,
         allowEmptySource,
         log: createSyncEngineConsoleLogger({ diffMode }),
+        onBeforeCompareObjects: async (sourceObject, targetObject) => {
+          return alignProjectMapNodeWithTargetIdentifier(sourceObject, targetObject);
+        },
+        onBeforeWriteObject: async (sourceObject, targetObject) => {
+          return alignProjectMapNodeWithTargetIdentifier(sourceObject, targetObject);
+        },
         onError: (error, object4) => {
           if (error.message.includes(__INTERNAL_MISSING_PARENT_NODE_ERROR)) {
             nodesFailedDueToMissingParent.add(object4.object);
@@ -12678,10 +12537,10 @@ var ProjectMapNodeRemoveModule = {
   command: "remove <id> <projectMapId>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map node",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs44.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to delete" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to delete from" })
+        yargs43.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to delete" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to delete from" })
       )
     )
   ),
@@ -12697,10 +12556,10 @@ var ProjectMapNodeUpdateModule = {
   command: "update <filename> <projectMapId>",
   aliases: ["put"],
   describe: "Insert or update a project map node",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs44.positional("filename", { demandOption: true, describe: "ProjectMap node file with nodes data" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to put into" })
+        yargs43.positional("filename", { demandOption: true, describe: "ProjectMap node file with nodes data" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to put into" })
       )
     )
   ),
@@ -12716,9 +12575,9 @@ var ProjectMapNodeUpdateModule = {
 var ProjectMapNodeModule = {
   command: "node <command>",
   describe: "Commands for ProjectMap Nodes",
-  builder: (yargs44) => yargs44.command(ProjectMapNodePullModule).command(ProjectMapNodePushModule).command(ProjectMapNodeGetModule).command(ProjectMapNodeRemoveModule).command(ProjectMapNodeListModule).command(ProjectMapNodeUpdateModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(ProjectMapNodePullModule).command(ProjectMapNodePushModule).command(ProjectMapNodeGetModule).command(ProjectMapNodeRemoveModule).command(ProjectMapNodeListModule).command(ProjectMapNodeUpdateModule).demandCommand(),
   handler: () => {
-    yargs37.help();
+    yargs36.help();
   }
 };
 
@@ -12727,17 +12586,17 @@ var ProjectMapCommand = {
   command: "project-map <command>",
   aliases: ["prm"],
   describe: "Uniform ProjectMap commands",
-  builder: (yargs44) => yargs44.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
   handler: () => {
-    yargs38.showHelp();
+    yargs37.showHelp();
   }
 };
 
 // src/commands/redirect/index.ts
-import yargs40 from "yargs";
+import yargs39 from "yargs";
 
 // src/commands/redirect/commands/redirect.ts
-import yargs39 from "yargs";
+import yargs38 from "yargs";
 
 // src/commands/redirect/commands/RedirectDefinition/_util.ts
 import { UncachedRedirectClient } from "@uniformdev/redirect";
@@ -12762,11 +12621,11 @@ function getRedirectClient(options) {
 var RedirectDefinitionGetModule = {
   command: "get <id>",
   describe: "Fetch a redirect",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs44.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
+          yargs43.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
         )
       )
     )
@@ -12789,7 +12648,7 @@ var RedirectDefinitionListModule = {
   command: "list",
   describe: "List of redirects",
   aliases: ["ls"],
-  builder: (yargs44) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs44)))),
+  builder: (yargs43) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = getRedirectClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -12841,12 +12700,12 @@ function createRedirectDefinitionEngineDataSource({
 var RedirectDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all redirects to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save redirects to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -12922,12 +12781,12 @@ var RedirectDefinitionPullModule = {
 var RedirectDefinitionPushModule = {
   command: "push <directory>",
   describe: "Pushes all redirects from files in a directory or package to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read redirects from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -12991,9 +12850,9 @@ var RedirectDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a redirect",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs44.positional("id", { demandOption: true, describe: " UUID to delete" }))
+      withProjectOptions(yargs43.positional("id", { demandOption: true, describe: " UUID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -13008,10 +12867,10 @@ var RedirectDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a redirect",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs44.positional("filename", { demandOption: true, describe: "Redirect file to put" })
+        yargs43.positional("filename", { demandOption: true, describe: "Redirect file to put" })
       )
     )
   ),
@@ -13027,9 +12886,9 @@ var RedirectDefinitionUpdateModule = {
 var RedirectDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for Redirect Definitions",
-  builder: (yargs44) => yargs44.command(RedirectDefinitionPullModule).command(RedirectDefinitionPushModule).command(RedirectDefinitionGetModule).command(RedirectDefinitionRemoveModule).command(RedirectDefinitionListModule).command(RedirectDefinitionUpdateModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(RedirectDefinitionPullModule).command(RedirectDefinitionPushModule).command(RedirectDefinitionGetModule).command(RedirectDefinitionRemoveModule).command(RedirectDefinitionListModule).command(RedirectDefinitionUpdateModule).demandCommand(),
   handler: () => {
-    yargs39.help();
+    yargs38.help();
   }
 };
 
@@ -13038,20 +12897,20 @@ var RedirectCommand = {
   command: "redirect <command>",
   aliases: ["red"],
   describe: "Uniform Redirect commands",
-  builder: (yargs44) => yargs44.command(RedirectDefinitionModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(RedirectDefinitionModule).demandCommand(),
   handler: () => {
-    yargs40.showHelp();
+    yargs39.showHelp();
   }
 };
 
 // src/commands/sync/index.ts
-import yargs41 from "yargs";
+import yargs40 from "yargs";
 
 // src/webhooksClient.ts
 import { ApiClient as ApiClient4 } from "@uniformdev/context/api";
-import PQueue3 from "p-queue";
+import PQueue4 from "p-queue";
 import { Svix } from "svix";
-import * as z4 from "zod";
+import * as z3 from "zod";
 var WEBHOOKS_DASHBOARD_BASE_PATH = "/api/v1/svix-dashboard";
 var WebhooksClient = class extends ApiClient4 {
   constructor(options) {
@@ -13071,14 +12930,14 @@ var WebhooksClient = class extends ApiClient4 {
     if (!key) {
       throw new Error("Failed to get webhooks token");
     }
-    const keySchema = z4.object({
-      appId: z4.string(),
-      oneTimeToken: z4.string(),
-      region: z4.enum(["us", "eu"])
+    const keySchema = z3.object({
+      appId: z3.string(),
+      oneTimeToken: z3.string(),
+      region: z3.enum(["us", "eu"])
     });
     const { appId, oneTimeToken, region } = keySchema.parse(JSON.parse(atob(key)));
-    const tokenSchema = z4.object({
-      token: z4.string()
+    const tokenSchema = z3.object({
+      token: z3.string()
     });
     const tokenResponse = await fetch(`https://api.${region}.svix.com/api/v1/auth/one-time-token`, {
       method: "POST",
@@ -13097,7 +12956,7 @@ var WebhooksClient = class extends ApiClient4 {
     };
   }
   async get() {
-    const webhooksAPIQueue = new PQueue3({ concurrency: 10 });
+    const webhooksAPIQueue = new PQueue4({ concurrency: 10 });
     const { appId, token } = await this.getToken();
     const svix = new Svix(token);
     const getEndpoints = async ({
@@ -13239,12 +13098,12 @@ function createWebhookEngineDataSource({
 var WebhookPullModule = {
   command: "pull <directory>",
   describe: "Pulls all webhooks to local files in a directory",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -13430,7 +13289,7 @@ function numPad(num, spaces = 6) {
 var SyncPullModule = {
   command: "pull",
   describe: "Pulls whole project to local files in a directory",
-  builder: (yargs44) => withConfiguration(withApiOptions(withProjectOptions(withDebugOptions(withDiffOptions(yargs44))))),
+  builder: (yargs43) => withConfiguration(withApiOptions(withProjectOptions(withDebugOptions(withDiffOptions(yargs43))))),
   handler: async ({ serialization, ...otherParams }) => {
     const config2 = serialization;
     const enabledEntities = Object.entries({
@@ -13531,12 +13390,12 @@ var getFormat = (entityType, config2) => {
 var WebhookPushModule = {
   command: "push <directory>",
   describe: "Pushes all webhooks from files in a directory to Uniform",
-  builder: (yargs44) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs44.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -13600,7 +13459,7 @@ var WebhookPushModule = {
 var SyncPushModule = {
   command: "push",
   describe: "Pushes whole project data from files in a directory or package to Uniform",
-  builder: (yargs44) => withConfiguration(withApiOptions(withProjectOptions(withDiffOptions(withDebugOptions(yargs44))))),
+  builder: (yargs43) => withConfiguration(withApiOptions(withProjectOptions(withDiffOptions(withDebugOptions(yargs43))))),
   handler: async ({ serialization, ...otherParams }) => {
     const config2 = serialization;
     const enabledEntities = Object.entries({
@@ -13822,63 +13681,21 @@ var getFormat2 = (entityType, config2) => {
 var SyncCommand = {
   command: "sync <command>",
   describe: "Uniform Sync commands",
-  builder: (yargs44) => yargs44.command(SyncPullModule).command(SyncPushModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(SyncPullModule).command(SyncPushModule).demandCommand(),
   handler: () => {
-    yargs41.showHelp();
+    yargs40.showHelp();
   }
 };
 
 // src/commands/webhook/index.ts
-import yargs42 from "yargs";
+import yargs41 from "yargs";
 var WebhookCommand = {
   command: "webhook <command>",
   aliases: ["wh"],
   describe: "Commands for webhooks",
-  builder: (yargs44) => yargs44.command(WebhookPullModule).command(WebhookPushModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(WebhookPullModule).command(WebhookPushModule).demandCommand(),
   handler: () => {
-    yargs42.help();
-  }
-};
-
-// src/commands/whoami/index.ts
-import { ProjectClient as ProjectClient2 } from "@uniformdev/canvas";
-var WhoamiCommand = {
-  command: "whoami",
-  describe: "Prints configured identity and connection context.",
-  builder: (yargs44) => withConfiguration(
-    withFormatOptions(withApiOptions(yargs44)).option("project", {
-      describe: "Uniform project ID. Defaults to UNIFORM_CLI_PROJECT_ID or UNIFORM_PROJECT_ID env. Supports dotenv.",
-      default: process.env.UNIFORM_CLI_PROJECT_ID ?? process.env.UNIFORM_PROJECT_ID,
-      type: "string",
-      alias: ["p"]
-    })
-  ),
-  handler: async ({ apiHost, edgeApiHost, apiKey, project, proxy, format, filename }) => {
-    const fetch2 = nodeFetchProxy(proxy);
-    try {
-      const [profile, projectInfo] = await Promise.all([
-        fetchMemberProfile({ baseUrl: apiHost, apiKey, fetch: fetch2 }),
-        project ? new ProjectClient2({ apiHost, apiKey, fetch: fetch2 }).get({ projectId: project }) : void 0
-      ]);
-      emitWithFormat(
-        {
-          apiHost,
-          edgeApiHost,
-          apiKey: apiKey ? maskApiKey(apiKey) : null,
-          apiKeyName: profile.name,
-          ...projectInfo ? {
-            projectId: project,
-            projectName: projectInfo.name,
-            teamId: projectInfo.teamId,
-            teamName: projectInfo.teamName
-          } : {}
-        },
-        format,
-        filename
-      );
-    } catch (error) {
-      exitOnCliError(error);
-    }
+    yargs41.help();
   }
 };
 
@@ -13886,29 +13703,29 @@ var WhoamiCommand = {
 import { bold as bold3, gray as gray6, green as green7 } from "colorette";
 
 // src/updateCheck.ts
-import { existsSync as existsSync7, promises as fs8 } from "fs";
+import { existsSync as existsSync6, promises as fs8 } from "fs";
 import { get as getHttp } from "http";
 import { get as getHttps } from "https";
-import { tmpdir as tmpdir2 } from "os";
-import { join as join13 } from "path";
+import { tmpdir } from "os";
+import { join as join12 } from "path";
 import registryUrl from "registry-url";
 import { URL as URL2 } from "url";
 var compareVersions = (a, b) => a.localeCompare(b, "en-US", { numeric: true });
 var encode = (value) => encodeURIComponent(value).replace(/^%40/, "@");
 var getFile = async (details, distTag) => {
-  const rootDir = tmpdir2();
-  const subDir = join13(rootDir, "update-check");
-  if (!existsSync7(subDir)) {
+  const rootDir = tmpdir();
+  const subDir = join12(rootDir, "update-check");
+  if (!existsSync6(subDir)) {
     await fs8.mkdir(subDir);
   }
   let name = `${details.name}-${distTag}.json`;
   if (details.scope) {
     name = `${details.scope}-${name}`;
   }
-  return join13(subDir, name);
+  return join12(subDir, name);
 };
 var evaluateCache = async (file, time, interval) => {
-  if (existsSync7(file)) {
+  if (existsSync6(file)) {
     const content = await fs8.readFile(file, "utf8");
     const { lastUpdate, latest } = JSON.parse(content);
     const nextCheck = lastUpdate + interval;
@@ -13931,7 +13748,7 @@ var updateCache = async (file, latest, lastUpdate) => {
   });
   await fs8.writeFile(file, content, "utf8");
 };
-var loadPackage = ({ url, timeout }, authInfo) => new Promise((resolve4, reject) => {
+var loadPackage = ({ url, timeout }, authInfo) => new Promise((resolve2, reject) => {
   const options = {
     host: url.hostname,
     path: url.pathname,
@@ -13962,7 +13779,7 @@ var loadPackage = ({ url, timeout }, authInfo) => new Promise((resolve4, reject)
     response.on("end", () => {
       try {
         const parsedData = JSON.parse(rawData);
-        resolve4(parsedData);
+        resolve2(parsedData);
       } catch (e) {
         reject(e);
       }
@@ -14060,7 +13877,7 @@ var checkForUpdateMiddleware = async ({ verbose }) => {
 
 // src/middleware/checkLocalDepsVersionsMiddleware.ts
 import { magenta, red as red8 } from "colorette";
-import { join as join14 } from "path";
+import { join as join13 } from "path";
 var uniformStrictVersions = [
   "@uniformdev/canvas",
   "@uniformdev/canvas-next",
@@ -14082,7 +13899,7 @@ var checkLocalDepsVersions = async (args) => {
   try {
     let isOutside = false;
     let warning = `${magenta("Warning:")} Installed Uniform packages should be the same version`;
-    const localPackages = await tryReadJSON(join14(process.cwd(), "package.json"));
+    const localPackages = await tryReadJSON(join13(process.cwd(), "package.json"));
     if (!localPackages) return;
     let firstVersion;
     const allDependencies = {
@@ -14113,11 +13930,11 @@ First found was: v${firstVersion}`;
 
 // src/index.ts
 dotenv.config();
-var yarggery = yargs43(hideBin(process.argv));
+var yarggery = yargs42(hideBin(process.argv));
 var useDefaultConfig = !process.argv.includes("--config");
 var defaultConfig2 = useDefaultConfig ? loadConfig(null) : {};
 yarggery.option("verbose", {
   describe: "Include verbose logging",
   default: false,
   type: "boolean"
-}).scriptName("uniform").config(defaultConfig2).config("config", "Specify a custom Uniform CLI config file", (configPath) => loadConfig(configPath)).command(AiCommand).command(AutomationCommand).command(CanvasCommand).command(ContextCommand).command(ProjectMapCommand).command(PolicyDocumentsCommand).command(RedirectCommand).command(WebhookCommand).command(SyncCommand).command(NewCmd).command(NewMeshCmd).command(IntegrationCommand).command(WhoamiCommand).recommendCommands().demandCommand(1, "").strict().help().middleware([checkForUpdateMiddleware, checkLocalDepsVersions]).parse();
+}).scriptName("uniform").config(defaultConfig2).config("config", "Specify a custom Uniform CLI config file", (configPath) => loadConfig(configPath)).command(AiCommand).command(CanvasCommand).command(ContextCommand).command(ProjectMapCommand).command(PolicyDocumentsCommand).command(RedirectCommand).command(WebhookCommand).command(SyncCommand).command(NewCmd).command(NewMeshCmd).command(IntegrationCommand).recommendCommands().demandCommand(1, "").strict().help().middleware([checkForUpdateMiddleware, checkLocalDepsVersions]).parse();