@uniformdev/cli 20.50.1 → 20.50.2-alpha.109

package/dist/index.mjs

@@ -1,12 +1,15 @@
 #!/usr/bin/env node
 import {
+  CLI_USER_AGENT,
   __require,
   applyDefaultSyncConfiguration,
   emitWithFormat,
+  exitOnCliError,
   getDirectoryOrFilename,
   getEntityOption,
   isPathAPackageFile,
   nodeFetchProxy,
+  package_default,
   paginateAsync,
   readFileToObject,
   withApiOptions,
@@ -16,11 +19,11 @@ import {
   withFormatOptions,
   withProjectOptions,
   withTeamOptions
-} from "./chunk-SRP5OQEZ.mjs";
+} from "./chunk-UQFYUBTM.mjs";
 
 // src/index.ts
 import * as dotenv from "dotenv";
-import yargs41 from "yargs";
+import yargs43 from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // src/commands/ai/index.ts
@@ -72,7 +75,7 @@ async function getBearerToken(baseUrl) {
 }
 
 // src/client.ts
-import * as z from "zod/v3";
+import * as z from "zod";
 
 // src/auth/api-key.ts
 var READ_PERMISSIONS = ["PROJECT", "UPM_PUB", "OPT_PUB", "OPT_READ", "UPM_READ"];
@@ -140,7 +143,7 @@ var createClient = (baseUrl, authToken) => {
   const request2 = async (path8, opts, allowedNon2xxStatusCodes = []) => {
     const res = await fetch(makeUrl(baseUrl, path8), {
       ...opts,
-      headers: { Authorization: `Bearer ${authToken}` }
+      headers: { Authorization: `Bearer ${authToken}`, "User-Agent": CLI_USER_AGENT }
     });
     if (res.ok || allowedNon2xxStatusCodes.includes(res.status)) {
       return res;
@@ -150,10 +153,10 @@ var createClient = (baseUrl, authToken) => {
       );
     }
   };
-  const requestJson = async (path8, opts, schema2, allowedNon2xxStatusCodes = []) => {
+  const requestJson = async (path8, opts, schema, allowedNon2xxStatusCodes = []) => {
     const res = await request2(path8, opts, allowedNon2xxStatusCodes);
     const data = await res.json();
-    const parseResult = schema2.safeParse(data);
+    const parseResult = schema.safeParse(data);
     if (parseResult.success) {
       return parseResult.data;
     } else {
@@ -324,8 +327,8 @@ async function readJSON(path8) {
 }
 async function tryReadJSON(path8, missingValue = null) {
   try {
-    const stat2 = await fs.stat(path8);
-    return stat2.isFile() ? await readJSON(path8) : missingValue;
+    const stat = await fs.stat(path8);
+    return stat.isFile() ? await readJSON(path8) : missingValue;
   } catch {
     return missingValue;
   }
@@ -447,7 +450,7 @@ async function chooseExistingProject({
   teamId,
   user
 }) {
-  const projects = (user.teams.find((t) => t.team.id === teamId)?.team.sites ?? []).map((t) => ({
+  const projects = (user.teams.find((t) => t.id === teamId)?.projects ?? []).map((t) => ({
     name: t.name,
     value: t.id
   }));
@@ -490,7 +493,7 @@ var makeSpinner = () => {
   const spin = async (text) => {
     const spinner = ora(text).start();
     spinners.push(spinner);
-    const minWait = new Promise((resolve2) => setTimeout(resolve2, 500));
+    const minWait = new Promise((resolve4) => setTimeout(resolve4, 500));
     return async () => {
       await minWait;
       spinner.stop();
@@ -722,7 +725,7 @@ import mitt from "mitt";
 
 // src/sync/serializedDequal.ts
 var has = Object.prototype.hasOwnProperty;
-var ignoredProperties = /* @__PURE__ */ new Set(["created", "modified", "updated"]);
+var ignoredProperties = /* @__PURE__ */ new Set(["created", "modified", "updated", "createdBy", "modifiedBy", "updatedBy"]);
 function serializedDequal(foo, bar) {
   let ctor, len;
   if (foo === bar) {
@@ -1033,8 +1036,8 @@ async function chooseTeam(user, prompt, telemetry) {
   const teamId = await select3({
     message: prompt,
     choices: user.teams.map((team) => ({
-      name: team.team.name,
-      value: team.team.id
+      name: team.name,
+      value: team.id
     }))
   });
   telemetry.send("team picked", { teamId });
@@ -1042,56 +1045,39 @@ 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/v3";
-var query = gql`
-  query GetUserInfo($subject: String!) {
+import * as z2 from "zod";
+var identityQuery = gql`
+  query GetUserIdentity($subject: String!) {
     info: identities_by_pk(subject: $subject) {
       name
       email_address
-      teams: organizations_identities(order_by: { organization: { name: asc } }) {
-        team: organization {
-          name
-          id
-          sites {
-            name
-            id
-          }
-        }
-      }
     }
   }
 `;
-var schema = z2.object({
+var identitySchema = z2.object({
   info: z2.object({
     name: z2.string().min(1),
-    email_address: z2.string().min(1).nullable(),
-    teams: z2.array(
-      z2.object({
-        team: z2.object({
-          name: z2.string().min(1),
-          id: z2.string().min(1),
-          sites: z2.array(
-            z2.object({
-              name: z2.string().min(1),
-              id: z2.string().min(1)
-            })
-          )
-        })
-      })
-    )
+    email_address: z2.string().min(1).nullable()
   })
 });
 var getUserInfo = async (baseUrl, authToken, subject) => {
   try {
-    const endpoint = makeUrl(baseUrl, "/v1/graphql");
-    const res = await request(endpoint, query, { subject }, { Authorization: `Bearer ${authToken}` });
-    const parseResult = schema.safeParse(res);
-    if (parseResult.success) {
-      return parseResult.data.info;
-    } else {
-      throw new Error(`Invalid GraphQL response: ${parseResult.error.message}`);
+    const headers = { Authorization: `Bearer ${authToken}`, "User-Agent": CLI_USER_AGENT };
+    const projectClient = new ProjectClient({ apiHost: 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 {
+      ...identityParsed.data.info,
+      teams: projectsRes.teams
+    };
   } catch (err) {
     throw new Error(`Failed to fetch user account:
   ${err.message}`);
@@ -1120,94 +1106,6 @@ async function fetchUserAndEnsureFirstTeamExists({
 // src/telemetry/telemetry.ts
 import crypto from "crypto";
 import { PostHog } from "posthog-node";
-
-// package.json
-var package_default = {
-  name: "@uniformdev/cli",
-  version: "20.50.1",
-  description: "Uniform command line interface tool",
-  license: "SEE LICENSE IN LICENSE.txt",
-  main: "./cli.js",
-  exports: {
-    ".": {
-      types: "./dist/index.d.mts",
-      default: "./cli.js"
-    },
-    "./config": {
-      types: "./dist/defaultConfig.d.mts",
-      default: "./dist/defaultConfig.mjs"
-    }
-  },
-  types: "./dist/index.d.mts",
-  sideEffects: false,
-  scripts: {
-    uniform: "node ./cli.js",
-    build: "tsc --noEmit && tsup",
-    dev: "tsup --watch",
-    clean: "rimraf dist",
-    test: "jest --maxWorkers=1 --passWithNoTests",
-    lint: 'eslint "src/**/*.{js,ts,tsx}"',
-    format: 'prettier --write "src/**/*.{js,ts,tsx}"'
-  },
-  dependencies: {
-    "@inquirer/prompts": "^7.10.1",
-    "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "workspace:*",
-    "@uniformdev/canvas": "workspace:*",
-    "@uniformdev/context": "workspace:*",
-    "@uniformdev/files": "workspace:*",
-    "@uniformdev/project-map": "workspace:*",
-    "@uniformdev/redirect": "workspace:*",
-    "@uniformdev/richtext": "workspace:*",
-    "call-bind": "^1.0.2",
-    colorette: "2.0.20",
-    cosmiconfig: "9.0.0",
-    "cosmiconfig-typescript-loader": "5.0.0",
-    diff: "^5.0.0",
-    dotenv: "^16.4.7",
-    esbuild: "0.25.0",
-    execa: "5.1.1",
-    "file-type": "^20.0.0",
-    "fs-jetpack": "5.1.0",
-    graphql: "16.9.0",
-    "graphql-request": "6.1.0",
-    "image-size": "^1.2.1",
-    "isomorphic-git": "1.35.0",
-    "js-yaml": "^4.1.0",
-    jsonwebtoken: "9.0.3",
-    mitt: "^3.0.1",
-    "normalize-newline": "^4.1.0",
-    open: "10.2.0",
-    ora: "8.0.1",
-    "p-queue": "7.3.4",
-    "posthog-node": "5.10.3",
-    "registry-auth-token": "^5.0.0",
-    "registry-url": "^6.0.0",
-    slugify: "1.6.6",
-    svix: "^1.71.0",
-    undici: "^7.16.0",
-    yargs: "^17.6.2",
-    zod: "3.25.76"
-  },
-  devDependencies: {
-    "@types/diff": "5.0.9",
-    "@types/js-yaml": "4.0.9",
-    "@types/jsonwebtoken": "9.0.5",
-    "@types/node": "24.3.1",
-    "@types/yargs": "17.0.32"
-  },
-  bin: {
-    uniform: "./cli.js"
-  },
-  files: [
-    "/dist"
-  ],
-  publishConfig: {
-    access: "public"
-  }
-};
-
-// src/telemetry/telemetry.ts
 var POSTHOG_WRITE_ONLY_KEY = "phc_c8YoKI9984KOHBfNrCRfIKvL56aYd5OpYxOdYexRzH7";
 var Telemetry = class {
   constructor(prefix, disable = false) {
@@ -1403,8 +1301,8 @@ function getExistingServers(config2) {
 var InstallMcpCommand = {
   command: "install",
   describe: "Install Uniform MCP server configuration (use --team, --project, and --apiKey for non-interactive mode)",
-  builder: (yargs42) => withConfiguration(
-    yargs42.option("agent", {
+  builder: (yargs44) => withConfiguration(
+    yargs44.option("agent", {
       alias: "a",
       describe: "Specify agent type (cursor, claude, copilot, other)",
       type: "string",
@@ -1556,7 +1454,7 @@ Selected agent: ${agentType}`));
       if (isNonInteractive) {
         console.log(`\u{1F3E2} Team ID: ${teamId}`);
       } else {
-        console.log(`\u{1F3E2} Team: ${user.teams.find((t) => t.team.id === teamId)?.team.name}`);
+        console.log(`\u{1F3E2} Team: ${user.teams.find((t) => t.id === teamId)?.name}`);
       }
       console.log(`\u{1F4E6} Project: ${projectName} (${projectId})`);
       if (agentType === "cursor") {
@@ -1604,7 +1502,7 @@ Selected agent: ${agentType}`));
 var McpCommand = {
   command: "mcp <command>",
   describe: "Uniform MCP server management commands",
-  builder: (yargs42) => yargs42.command(InstallMcpCommand).demandCommand(),
+  builder: (yargs44) => yargs44.command(InstallMcpCommand).demandCommand(),
   handler: () => {
     yargs.showHelp();
   }
@@ -2079,8 +1977,8 @@ ${gray2("Rules source:")} https://github.com/uniformdev/ai-rules`);
 var InstallRulesCommand = {
   command: "install",
   describe: "Install Uniform AI rules for your development assistant",
-  builder: (yargs42) => withConfiguration(
-    yargs42.option("agent", {
+  builder: (yargs44) => withConfiguration(
+    yargs44.option("agent", {
       alias: "a",
       describe: "Specify agent type (cursor, claude, copilot, other)",
       type: "string",
@@ -2118,7 +2016,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: (yargs42) => withConfiguration(yargs42),
+  builder: (yargs44) => withConfiguration(yargs44),
   handler: async function() {
     const { stopAllSpinners, spin } = makeSpinner();
     try {
@@ -2147,7 +2045,7 @@ var ListRulesCommand = {
 var RulesCommand = {
   command: "rules <command>",
   describe: "Uniform AI rules management commands",
-  builder: (yargs42) => yargs42.command(InstallRulesCommand).command(ListRulesCommand).demandCommand(),
+  builder: (yargs44) => yargs44.command(InstallRulesCommand).command(ListRulesCommand).demandCommand(),
   handler: () => {
     yargs2.showHelp();
   }
@@ -2157,17 +2055,279 @@ var RulesCommand = {
 var AiCommand = {
   command: "ai <command>",
   describe: "Uniform AI development assistant commands",
-  builder: (yargs42) => yargs42.command(RulesCommand).command(McpCommand).demandCommand(),
+  builder: (yargs44) => yargs44.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 = {};
+  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 yargs20 from "yargs";
+import yargs22 from "yargs";
 
 // src/commands/canvas/commands/asset.ts
-import yargs4 from "yargs";
+import yargs5 from "yargs";
 
 // src/commands/canvas/commands/asset/_util.ts
 import { UncachedAssetClient } from "@uniformdev/assets";
@@ -2196,12 +2356,12 @@ function getFileClient(options) {
 var AssetGetModule = {
   command: "get <id>",
   describe: "Get an asset",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.positional("id", { demandOption: true, describe: "Asset ID to fetch" })
+            yargs44.positional("id", { demandOption: true, describe: "Asset ID to fetch" })
           )
         )
       )
@@ -2222,7 +2382,7 @@ var AssetGetModule = {
 var AssetListModule = {
   command: "list",
   describe: "List assets",
-  builder: (yargs42) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs42))))),
+  builder: (yargs44) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs44))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getAssetClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -2233,10 +2393,10 @@ var AssetListModule = {
 
 // src/files/deleteDownloadedFileByUrl.ts
 import fsj from "fs-jetpack";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 
 // src/files/urlToFileName.ts
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 import { dirname } from "path";
 var FILES_DIRECTORY_NAME = "files";
 var getFilesDirectory = (directory) => {
@@ -2245,7 +2405,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
-    join6(directory, "..")
+    join7(directory, "..")
   );
 };
 var urlToHash = (url) => {
@@ -2281,7 +2441,7 @@ var hashToPartialPathname = (hash) => {
 var deleteDownloadedFileByUrl = async (url, options) => {
   const writeDirectory = getFilesDirectory(options.directory);
   const fileName = urlToFileName(url);
-  const fileToDelete = join7(writeDirectory, FILES_DIRECTORY_NAME, fileName);
+  const fileToDelete = join8(writeDirectory, FILES_DIRECTORY_NAME, fileName);
   try {
     await fsj.removeAsync(fileToDelete);
   } catch {
@@ -2301,11 +2461,11 @@ import {
 import { isRichTextNodeType, isRichTextValue, walkRichTextTree } from "@uniformdev/richtext";
 import fsj4 from "fs-jetpack";
 import PQueue2 from "p-queue";
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 
 // src/files/downloadFile.ts
 import fsj2 from "fs-jetpack";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 var downloadFile = async ({
   fileClient,
   fileUrl,
@@ -2313,7 +2473,7 @@ var downloadFile = async ({
 }) => {
   const writeDirectory = getFilesDirectory(directory);
   const fileName = urlToFileName(fileUrl.toString());
-  const fileAlreadyExists = await fsj2.existsAsync(join8(writeDirectory, FILES_DIRECTORY_NAME, fileName));
+  const fileAlreadyExists = await fsj2.existsAsync(join9(writeDirectory, FILES_DIRECTORY_NAME, fileName));
   if (fileAlreadyExists) {
     return { url: fileUrl };
   }
@@ -2324,7 +2484,7 @@ var downloadFile = async ({
   }
   if (file.sourceId) {
     try {
-      const hashAlreadyExists = await fsj2.findAsync(join8(writeDirectory, FILES_DIRECTORY_NAME), {
+      const hashAlreadyExists = await fsj2.findAsync(join9(writeDirectory, FILES_DIRECTORY_NAME), {
         matching: [file.sourceId, `${file.sourceId}.*`]
       });
       if (hashAlreadyExists.length > 0) {
@@ -2339,19 +2499,20 @@ var downloadFile = async ({
     return null;
   }
   const fileBuffer = await response.arrayBuffer();
-  await fsj2.writeAsync(join8(writeDirectory, FILES_DIRECTORY_NAME, fileName), Buffer.from(fileBuffer));
+  await fsj2.writeAsync(join9(writeDirectory, FILES_DIRECTORY_NAME, fileName), Buffer.from(fileBuffer));
   return { id: file.id, url: fileUrl };
 };
 
 // src/files/uploadFile.ts
 import { preferredType } from "@thi.ng/mime";
 import { FILE_READY_STATE, getFileNameFromUrl } from "@uniformdev/files";
-import { fileTypeFromBuffer } from "file-type";
+import { fileTypeFromFile } from "file-type";
+import { createReadStream } from "fs";
 import fsj3 from "fs-jetpack";
-import sizeOf from "image-size";
+import { imageSizeFromFile } from "image-size/fromFile";
 import normalizeNewline from "normalize-newline";
 import PQueue from "p-queue";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 var uploadQueueByKey = /* @__PURE__ */ new Map();
 var fileUploadQueue = new PQueue({ concurrency: 10 });
 var uploadFile = async ({
@@ -2378,34 +2539,40 @@ var uploadFile = async ({
         return { id: file.id, url: file.url };
       }
       const localFileName = urlToFileName(fileUrl);
-      const expectedFilePath = join9(writeDirectory, FILES_DIRECTORY_NAME, localFileName);
-      const fileExistsLocally = await fsj3.existsAsync(expectedFilePath);
-      if (!fileExistsLocally) {
+      const expectedFilePath = join10(writeDirectory, FILES_DIRECTORY_NAME, localFileName);
+      const fileInspect = await fsj3.inspectAsync(expectedFilePath);
+      if (fileInspect?.type !== "file") {
         console.warn(
           `Skipping file ${fileUrl} as we couldn't find a local copy (looked at ${expectedFilePath})`
         );
         return null;
       }
-      let fileBuffer = await fsj3.readAsync(expectedFilePath, "buffer");
-      if (!fileBuffer) {
-        console.warn(`Skipping file ${fileUrl} (${expectedFilePath}) as we couldn't read it`);
-        return null;
-      }
       const fileName = getFileNameFromUrl(fileUrl);
-      let mimeType = expectedFilePath.endsWith(".svg") ? "image/svg+xml" : (await fileTypeFromBuffer(fileBuffer))?.mime;
+      let mimeType = expectedFilePath.endsWith(".svg") ? "image/svg+xml" : (await fileTypeFromFile(expectedFilePath))?.mime;
       if (!mimeType) {
         mimeType = preferredType(fileUrl.split(".").at(-1) ?? "");
       }
       if (mimeType === "audio/x-flac") {
         mimeType = "audio/flac";
       }
+      let uploadBody;
+      let uploadSize = fileInspect.size;
       if (mimeType === "image/svg+xml") {
+        const fileBuffer = await fsj3.readAsync(expectedFilePath, "buffer");
+        if (!fileBuffer) {
+          console.warn(`Skipping file ${fileUrl} (${expectedFilePath}) as we couldn't read it`);
+          return null;
+        }
+        uploadBody = fileBuffer;
         try {
-          fileBuffer = normalizeNewline(fileBuffer);
+          uploadBody = normalizeNewline(fileBuffer);
         } catch {
         }
+        uploadSize = uploadBody.length;
+      } else {
+        uploadBody = createReadStream(expectedFilePath);
       }
-      const { width, height } = (() => {
+      const { width, height } = await (async () => {
         if (!mimeType.startsWith("image/")) {
           return {
             width: void 0,
@@ -2413,7 +2580,7 @@ var uploadFile = async ({
           };
         }
         try {
-          return sizeOf(fileBuffer);
+          return await imageSizeFromFile(expectedFilePath);
         } catch {
           return {
             width: void 0,
@@ -2425,19 +2592,21 @@ var uploadFile = async ({
         id: fileId,
         name: fileName,
         mediaType: mimeType,
-        size: fileBuffer.length,
+        size: uploadSize,
         width,
         height,
         sourceId: hash
       });
-      const uploadResponse = await fetch(uploadUrl, {
+      const uploadRequest = {
         method,
-        body: fileBuffer,
+        body: uploadBody,
+        duplex: "half",
         headers: {
           "Content-Type": mimeType,
-          "Content-Length": fileBuffer.length.toString()
+          "Content-Length": uploadSize.toString()
         }
-      });
+      };
+      const uploadResponse = await fetch(uploadUrl, uploadRequest);
       if (!uploadResponse.ok) {
         console.warn(`Failed to upload file ${fileUrl} (${expectedFilePath})`);
         return null;
@@ -2449,7 +2618,7 @@ var uploadFile = async ({
         }
         const file2 = await fileClient.get({ id });
         if (!file2 || file2.state !== FILE_READY_STATE || !file2.url) {
-          await new Promise((resolve2) => setTimeout(resolve2, 1e3));
+          await new Promise((resolve4) => setTimeout(resolve4, 1e3));
           return checkForFile();
         }
         return file2.url;
@@ -2476,7 +2645,7 @@ import {
   walkNodeTree,
   walkPropertyValues
 } from "@uniformdev/canvas";
-var UNIFORM_FILE_MATCH = /"(https:\/\/([^"]*?)?(img|files)\.(eu\.)?uniform\.(rocks|global)\/([^"]*?))"/g;
+var UNIFORM_FILE_MATCH = /"(https:\/\/([^"]*?)?(img|files)\.(eu([1-9]\d*)?\.)?uniform\.(rocks|global)\/([^"]*?))"/g;
 var walkFileUrlsForCompositionOrEntry = ({
   entity,
   callback
@@ -2525,6 +2694,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 downloadFileForAsset = async ({
   asset,
   directory,
@@ -2638,7 +2810,6 @@ var downloadFilesForCompositionOrEntry = async ({
   directory,
   fileClient
 }) => {
-  const fileDownloadQueue = new PQueue2({ concurrency: 10 });
   await walkFileUrlsForCompositionOrEntry({
     entity,
     callback: ({ fileUrl }) => {
@@ -2654,7 +2825,6 @@ var uploadFilesForCompositionOrEntry = async ({
   directory,
   fileClient
 }) => {
-  const fileUploadQueue2 = new PQueue2({ concurrency: 10 });
   const urlReplacementMap = /* @__PURE__ */ new Map();
   walkFileUrlsForCompositionOrEntry({
     entity: entity.object,
@@ -2687,7 +2857,6 @@ var replaceRemoteUrlsWithLocalReferences = async ({
   let sourceEntityAsString = JSON.stringify(sourceEntity);
   const targetEntityAsString = JSON.stringify(targetEntity);
   const writeDirectory = getFilesDirectory(directory);
-  const fileUrlReplacementQueue = new PQueue2({ concurrency: 10 });
   walkFileUrlsForCompositionOrEntry({
     entity: sourceEntity.object,
     callback: ({ fileUrl }) => {
@@ -2695,7 +2864,7 @@ var replaceRemoteUrlsWithLocalReferences = async ({
         try {
           const localFileName = urlToFileName(fileUrl);
           const fileExistsLocally = await fsj4.existsAsync(
-            join10(writeDirectory, FILES_DIRECTORY_NAME, localFileName)
+            join11(writeDirectory, FILES_DIRECTORY_NAME, localFileName)
           );
           if (fileExistsLocally) {
             return;
@@ -2727,23 +2896,17 @@ var replaceLocalUrlsWithRemoteReferences = async ({
   fileClient
 }) => {
   let entityAsString = JSON.stringify(entity);
-  const fileUrlReplacementQueue = new PQueue2({ concurrency: 10 });
   walkFileUrlsForCompositionOrEntry({
     entity: entity.object,
     callback: ({ fileUrl }) => {
       fileUrlReplacementQueue.add(async () => {
         try {
           const hash = urlToHash(fileUrl);
-          fileUrlReplacementQueue.add(async () => {
-            try {
-              const file = await fileClient.get({ sourceId: hash }).catch(() => null);
-              if (!file) {
-                return;
-              }
-              entityAsString = entityAsString.replaceAll(`"${fileUrl}"`, `"${file.url}"`);
-            } catch {
-            }
-          });
+          const file = await fileClient.get({ sourceId: hash }).catch(() => null);
+          if (!file) {
+            return;
+          }
+          entityAsString = entityAsString.replaceAll(`"${fileUrl}"`, `"${file.url}"`);
         } catch {
         }
       });
@@ -2759,7 +2922,7 @@ var escapeRegExp = (string4) => {
 var findUrlMatchingPartialPathname = (source, pathname) => {
   const escapedPathname = escapeRegExp(pathname);
   const regex = new RegExp(
-    `"(https://([^"]*?)?(img|files).uniform.(rocks|global)${escapedPathname}([^"]*?))"`
+    `"(https://([^"]*?)?(img|files).(eu([1-9]\\d*)?\\.)?uniform.(rocks|global)${escapedPathname}([^"]*?))"`
   );
   const match = source.match(regex);
   if (match && match[1]) {
@@ -2784,8 +2947,8 @@ function prepCompositionForDisk(composition) {
   delete prepped.state;
   return prepped;
 }
-function withStateOptions(yargs42, defaultState = "preview") {
-  return yargs42.option("state", {
+function withStateOptions(yargs44, defaultState = "preview") {
+  return yargs44.option("state", {
     type: "string",
     describe: `State to fetch.`,
     choices: ["preview", "published"],
@@ -2867,12 +3030,12 @@ function writeCanvasPackage(filename, packageContents) {
 var AssetPullModule = {
   command: "pull <directory>",
   describe: "Pulls all assets to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -2984,12 +3147,12 @@ var AssetPullModule = {
 var AssetPushModule = {
   command: "push <directory>",
   describe: "Pushes all assets from files in a directory to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.positional("directory", {
               describe: "Directory to read the assets from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -3113,10 +3276,10 @@ var AssetRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an asset",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
-        withProjectOptions(yargs42.positional("id", { demandOption: true, describe: "Asset ID to delete" }))
+        withProjectOptions(yargs44.positional("id", { demandOption: true, describe: "Asset ID to delete" }))
       )
     )
   ),
@@ -3137,11 +3300,11 @@ var AssetUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an asset",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("filename", { demandOption: true, describe: "Asset file to put" })
+          yargs44.positional("filename", { demandOption: true, describe: "Asset file to put" })
         )
       )
     )
@@ -3167,14 +3330,14 @@ var AssetUpdateModule = {
 var AssetModule = {
   command: "asset <command>",
   describe: "Commands for Assets",
-  builder: (yargs42) => yargs42.command(AssetGetModule).command(AssetListModule).command(AssetRemoveModule).command(AssetUpdateModule).command(AssetPullModule).command(AssetPushModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(AssetGetModule).command(AssetListModule).command(AssetRemoveModule).command(AssetUpdateModule).command(AssetPullModule).command(AssetPushModule).demandCommand(),
   handler: () => {
-    yargs4.help();
+    yargs5.help();
   }
 };
 
 // src/commands/canvas/commands/category.ts
-import yargs5 from "yargs";
+import yargs6 from "yargs";
 
 // src/commands/canvas/commands/category/_util.ts
 import { UncachedCategoryClient } from "@uniformdev/canvas";
@@ -3188,12 +3351,12 @@ function getCategoryClient(options) {
 var CategoryGetModule = {
   command: "get <id>",
   describe: "Fetch a category",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
+            yargs44.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
           )
         )
       )
@@ -3218,8 +3381,8 @@ var CategoryListModule = {
   command: "list",
   describe: "List categories",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(
-    withFormatOptions(withDebugOptions(withApiOptions(withProjectOptions(yargs42.options({})))))
+  builder: (yargs44) => withConfiguration(
+    withFormatOptions(withDebugOptions(withApiOptions(withProjectOptions(yargs44.options({})))))
   ),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
@@ -3263,12 +3426,12 @@ function createCategoriesEngineDataSource({
 var CategoryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all categories to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
           withDebugOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -3343,12 +3506,12 @@ var CategoryPullModule = {
 var CategoryPushModule = {
   command: "push <directory>",
   describe: "Pushes all categories from files in a directory to Uniform Canvas",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.positional("directory", {
               describe: "Directory to read the categories from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -3412,11 +3575,11 @@ var CategoryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a category",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Category UUID to delete" })
+          yargs44.positional("id", { demandOption: true, describe: "Category UUID to delete" })
         )
       )
     )
@@ -3437,11 +3600,11 @@ var CategoryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a category",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("filename", { demandOption: true, describe: "Category file to put" })
+          yargs44.positional("filename", { demandOption: true, describe: "Category file to put" })
         )
       )
     )
@@ -3463,14 +3626,14 @@ var CategoryModule = {
   command: "category <command>",
   aliases: ["cat"],
   describe: "Commands for Canvas categories",
-  builder: (yargs42) => yargs42.command(CategoryPullModule).command(CategoryPushModule).command(CategoryGetModule).command(CategoryRemoveModule).command(CategoryListModule).command(CategoryUpdateModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(CategoryPullModule).command(CategoryPushModule).command(CategoryGetModule).command(CategoryRemoveModule).command(CategoryListModule).command(CategoryUpdateModule).demandCommand(),
   handler: () => {
-    yargs5.help();
+    yargs6.help();
   }
 };
 
 // src/commands/canvas/commands/component.ts
-import yargs6 from "yargs";
+import yargs7 from "yargs";
 
 // src/commands/canvas/commands/component/_util.ts
 import { UncachedCanvasClient } from "@uniformdev/canvas";
@@ -3485,12 +3648,12 @@ function getCanvasClient(options) {
 var ComponentGetModule = {
   command: "get <id>",
   describe: "Fetch a component definition",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.positional("id", {
+            yargs44.positional("id", {
               demandOption: true,
               describe: "Component definition public ID to fetch"
             })
@@ -3524,12 +3687,12 @@ var ComponentListModule = {
   command: "list",
   describe: "List component definitions",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.options({
+            yargs44.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 }
             })
@@ -3598,12 +3761,12 @@ function createComponentDefinitionEngineDataSource({
 var ComponentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all component definitions to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -3679,12 +3842,12 @@ var ComponentPullModule = {
 var ComponentPushModule = {
   command: "push <directory>",
   describe: "Pushes all component definitions from files in a directory to Uniform Canvas",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -3749,11 +3912,11 @@ var ComponentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a component definition",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", {
+          yargs44.positional("id", {
             demandOption: true,
             describe: "Component definition public ID to delete"
           })
@@ -3777,11 +3940,11 @@ var ComponentUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a component definition",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("filename", { demandOption: true, describe: "Component definition file to put" })
+          yargs44.positional("filename", { demandOption: true, describe: "Component definition file to put" })
         )
       )
     )
@@ -3803,28 +3966,177 @@ var ComponentModule = {
   command: "component <command>",
   aliases: ["def"],
   describe: "Commands for Canvas component definitions",
-  builder: (yargs42) => yargs42.command(ComponentPullModule).command(ComponentPushModule).command(ComponentGetModule).command(ComponentRemoveModule).command(ComponentListModule).command(ComponentUpdateModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(ComponentPullModule).command(ComponentPushModule).command(ComponentGetModule).command(ComponentRemoveModule).command(ComponentListModule).command(ComponentUpdateModule).demandCommand(),
   handler: () => {
-    yargs6.help();
+    yargs7.help();
   }
 };
 
 // src/commands/canvas/commands/componentPattern.ts
-import yargs7 from "yargs";
+import yargs8 from "yargs";
+
+// src/commands/canvas/util/entityTypeValidation.ts
+import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE2 } from "@uniformdev/canvas";
+function getCompositionActualType(composition) {
+  return composition.pattern ? composition.patternType === "component" ? "component-pattern" : "composition-pattern" : "composition";
+}
+function getEntryActualType(entry) {
+  return entry.pattern ? "entry-pattern" : "entry";
+}
+async function validateCompositionType(client, id, expectedType) {
+  try {
+    const composition = await client.getCompositionById({
+      compositionId: id,
+      skipDataResolution: true,
+      state: CANVAS_DRAFT_STATE2,
+      withPatternType: true
+    });
+    const actualType = getCompositionActualType(composition);
+    return {
+      actualType,
+      isValid: actualType === expectedType,
+      exists: true
+    };
+  } catch (error) {
+    if (error && typeof error === "object" && "statusCode" in error && error.statusCode === 404) {
+      return {
+        actualType: expectedType,
+        isValid: false,
+        exists: false
+      };
+    }
+    throw error;
+  }
+}
+async function validateEntryType(client, id, expectedType) {
+  const res = await client.getEntries({
+    offset: 0,
+    limit: 1,
+    entryIDs: [id],
+    skipDataResolution: true,
+    state: CANVAS_DRAFT_STATE2,
+    pattern: expectedType === "entry-pattern" ? true : void 0
+  });
+  if (res.entries.length !== 1) {
+    return {
+      actualType: expectedType,
+      isValid: false,
+      exists: false
+    };
+  }
+  const entry = res.entries[0];
+  const actualType = getEntryActualType(entry);
+  return {
+    actualType,
+    isValid: actualType === expectedType,
+    exists: true
+  };
+}
+function getCompositionDisplayNameWithArticle(type) {
+  switch (type) {
+    case "composition":
+      return "a composition";
+    case "composition-pattern":
+      return "a composition pattern";
+    case "component-pattern":
+      return "a component pattern";
+  }
+}
+function getEntryDisplayNameWithArticle(type) {
+  return type === "entry" ? "an entry" : "an entry pattern";
+}
+function getCompositionDisplayName(type) {
+  switch (type) {
+    case "composition":
+      return "Composition";
+    case "composition-pattern":
+      return "Composition Pattern";
+    case "component-pattern":
+      return "Component Pattern";
+  }
+}
+function getEntryDisplayName(type) {
+  return type === "entry" ? "Entry" : "Entry Pattern";
+}
+function getCommandVerb(action) {
+  return action === "delete" ? "remove" : action;
+}
+function formatCompositionTypeError(id, actualType, expectedType, action) {
+  const actualDisplayName = getCompositionDisplayNameWithArticle(actualType);
+  const expectedDisplayName = getCompositionDisplayNameWithArticle(expectedType);
+  return `Error: The provided ID belongs to ${actualDisplayName}, not ${expectedDisplayName}.
+To ${action} ${actualDisplayName}, use: uniform canvas ${actualType} ${getCommandVerb(action)} ${id}`;
+}
+function formatEntryTypeError(id, actualType, expectedType, action) {
+  const actualDisplayName = getEntryDisplayNameWithArticle(actualType);
+  const expectedDisplayName = getEntryDisplayNameWithArticle(expectedType);
+  return `Error: The provided ID belongs to ${actualDisplayName}, not ${expectedDisplayName}.
+To ${action} ${actualDisplayName}, use: uniform canvas ${actualType} ${getCommandVerb(action)} ${id}`;
+}
 
 // src/commands/canvas/commands/composition/get.ts
+function createCompositionGetHandler(expectedType) {
+  return async ({
+    apiHost,
+    edgeApiHost,
+    apiKey,
+    proxy,
+    id,
+    format,
+    filename,
+    state,
+    project: projectId,
+    resolvePatterns,
+    resolveOverrides,
+    componentIDs,
+    resolveData,
+    diagnostics,
+    resolutionDepth,
+    verbose
+  }) => {
+    const parameters = {
+      compositionId: id,
+      state: convertStateOption(state),
+      skipPatternResolution: !resolvePatterns,
+      skipOverridesResolution: !resolveOverrides,
+      withComponentIDs: componentIDs,
+      skipDataResolution: !resolveData,
+      diagnostics: resolveData ? diagnostics : void 0,
+      resolutionDepth: resolveData ? resolutionDepth : void 0,
+      withPatternType: true
+    };
+    if (verbose) {
+      console.log(`\u{1F41B} get ${expectedType}:`, parameters);
+    }
+    const fetch2 = nodeFetchProxy(proxy, verbose);
+    const client = getCanvasClient({ apiKey, edgeApiHost, apiHost, fetch: fetch2, projectId });
+    const composition = await client.getCompositionById(parameters);
+    const actualType = getCompositionActualType(composition);
+    if (actualType !== expectedType) {
+      console.error(formatCompositionTypeError(id, actualType, expectedType, "get"));
+      process.exit(1);
+    }
+    const {
+      // We fetch pattern type for type validation, but historically we did not include it in the payload so excluding for now
+      patternType,
+      ...rest
+    } = composition;
+    const res = prepCompositionForDisk(rest);
+    emitWithFormat(res, format, filename);
+  };
+}
 var CompositionGetModule = {
   command: "get <id>",
   describe: "Fetch a composition",
-  builder: (yargs42) => withFormatOptions(
+  builder: (yargs44) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDebugOptions(
-              yargs42.positional("id", {
+              yargs44.positional("id", {
                 demandOption: true,
-                describe: "Composition/pattern public ID to fetch"
+                describe: "Composition public ID to fetch"
               }).option({
                 resolvePatterns: {
                   type: "boolean",
@@ -3863,48 +4175,14 @@ var CompositionGetModule = {
       )
     )
   ),
-  handler: async ({
-    apiHost,
-    edgeApiHost,
-    apiKey,
-    proxy,
-    id,
-    format,
-    filename,
-    state,
-    project: projectId,
-    resolvePatterns,
-    resolveOverrides,
-    componentIDs,
-    resolveData,
-    diagnostics,
-    resolutionDepth,
-    verbose
-  }) => {
-    const parameters = {
-      compositionId: id,
-      state: convertStateOption(state),
-      skipPatternResolution: !resolvePatterns,
-      skipOverridesResolution: !resolveOverrides,
-      withComponentIDs: componentIDs,
-      skipDataResolution: !resolveData,
-      diagnostics: resolveData ? diagnostics : void 0,
-      resolutionDepth: resolveData ? resolutionDepth : void 0
-    };
-    if (verbose) {
-      console.log(`\u{1F41B} get composition:`, parameters);
-    }
-    const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, edgeApiHost, apiHost, fetch: fetch2, projectId });
-    const res = prepCompositionForDisk(await client.getCompositionById(parameters));
-    emitWithFormat(res, format, filename);
-  }
+  handler: createCompositionGetHandler("composition")
 };
 
 // src/commands/canvas/commands/componentPattern/get.ts
 var ComponentPatternGetModule = {
   ...CompositionGetModule,
-  describe: "Fetch a component pattern"
+  describe: "Fetch a component pattern",
+  handler: createCompositionGetHandler("component-pattern")
 };
 
 // src/commands/canvas/commands/composition/list.ts
@@ -3912,13 +4190,13 @@ var CompositionListModule = {
   command: "list",
   describe: "List compositions",
   aliases: ["ls"],
-  builder: (yargs42) => withFormatOptions(
+  builder: (yargs44) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withDebugOptions(
             withStateOptions(
-              yargs42.options({
+              yargs44.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: "" },
@@ -3999,13 +4277,13 @@ var CompositionListModule = {
 var ComponentPatternListModule = {
   ...CompositionListModule,
   describe: "List component patterns",
-  builder: (yargs42) => withFormatOptions(
+  builder: (yargs44) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withDebugOptions(
           withProjectOptions(
             withStateOptions(
-              yargs42.options({
+              yargs44.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: {
@@ -4128,12 +4406,12 @@ function createComponentInstanceEngineDataSource({
 var CompositionPublishModule = {
   command: "publish [ids]",
   describe: "Publishes composition(s)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDebugOptions(
           withDiffOptions(
-            yargs42.positional("ids", {
+            yargs44.positional("ids", {
               describe: "Publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
               type: "string"
             }).option("all", {
@@ -4226,12 +4504,12 @@ var CompositionPublishModule = {
 var ComponentPatternPublishModule = {
   ...CompositionPublishModule,
   describe: "Publishes component pattern(s)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("ids", {
+            yargs44.positional("ids", {
               describe: "Publishes component pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
               type: "string"
             }).option("all", {
@@ -4271,13 +4549,13 @@ function componentInstancePullModuleFactory(type) {
   return {
     command: "pull <directory>",
     describe: "Pulls all compositions to local files in a directory",
-    builder: (yargs42) => withConfiguration(
+    builder: (yargs44) => withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDebugOptions(
               withDiffOptions(
-                yargs42.positional("directory", {
+                yargs44.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", {
@@ -4392,13 +4670,13 @@ function componentInstancePullModuleFactory(type) {
 var ComponentPatternPullModule = {
   ...componentInstancePullModuleFactory("componentPatterns"),
   describe: "Pulls all component patterns to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDebugOptions(
           withStateOptions(
             withDiffOptions(
-              yargs42.positional("directory", {
+              yargs44.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", {
@@ -4472,13 +4750,13 @@ function componentInstancePushModuleFactory(type) {
   return {
     command: "push <directory>",
     describe: "Pushes all compositions from files in a directory to Uniform Canvas",
-    builder: (yargs42) => withConfiguration(
+    builder: (yargs44) => withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDebugOptions(
               withDiffOptions(
-                yargs42.positional("directory", {
+                yargs44.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", {
@@ -4592,13 +4870,13 @@ function componentInstancePushModuleFactory(type) {
 var ComponentPatternPushModule = {
   ...componentInstancePushModuleFactory("componentPatterns"),
   describe: "Pushes all component patterns from files in a directory to Uniform Canvas",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
             withDebugOptions(
-              yargs42.positional("directory", {
+              yargs44.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", {
@@ -4628,40 +4906,61 @@ var ComponentPatternPushModule = {
 };
 
 // src/commands/canvas/commands/composition/remove.ts
+function createCompositionRemoveHandler(expectedType) {
+  return async ({
+    apiHost,
+    apiKey,
+    proxy,
+    id,
+    project: projectId,
+    verbose,
+    whatIf
+  }) => {
+    if (verbose) {
+      console.log(`\u{1F41B} remove ${expectedType}: (id: ${id})`);
+    }
+    const fetch2 = nodeFetchProxy(proxy, verbose);
+    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const validation = await validateCompositionType(client, id, expectedType);
+    if (!validation.exists) {
+      console.error(`Error: ${getCompositionDisplayName(expectedType)} with ID "${id}" not found.`);
+      process.exit(1);
+    }
+    if (!validation.isValid) {
+      console.error(formatCompositionTypeError(id, validation.actualType, expectedType, "delete"));
+      process.exit(1);
+    }
+    if (!whatIf) {
+      await client.removeComposition({ compositionId: id });
+    } else {
+      whatIfSimpleLog({ id, displayName: getCompositionDisplayName(expectedType), action: "delete" });
+    }
+  };
+}
 var CompositionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a composition",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("id", {
+          yargs44.positional("id", {
             demandOption: true,
-            describe: "Composition/pattern public ID to delete"
+            describe: "Composition public ID to delete"
           })
         )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose, whatIf }) => {
-    if (verbose) {
-      console.log(`\u{1F41B} remove composition: (id: ${id})`);
-    }
-    const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    if (!whatIf) {
-      await client.removeComposition({ compositionId: id });
-    } else {
-      whatIfSimpleLog({ id, displayName: `Composition`, action: "delete" });
-    }
-  }
+  handler: createCompositionRemoveHandler("composition")
 };
 
 // src/commands/canvas/commands/componentPattern/remove.ts
 var ComponentPatternRemoveModule = {
   ...CompositionRemoveModule,
-  describe: "Delete a component pattern"
+  describe: "Delete a component pattern",
+  handler: createCompositionRemoveHandler("component-pattern")
 };
 
 // src/commands/canvas/commands/composition/unpublish.ts
@@ -4673,11 +4972,11 @@ import { diffJson as diffJson2 } from "diff";
 var CompositionUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a composition(s)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("ids", {
+          yargs44.positional("ids", {
             describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
             type: "string"
           }).option("all", {
@@ -4788,11 +5087,11 @@ var CompositionUnpublishModule = {
 var ComponentPatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a component pattern(s)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("ids", {
+          yargs44.positional("ids", {
             describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
             type: "string"
           }).option("all", {
@@ -4822,16 +5121,50 @@ var ComponentPatternUnpublishModule = {
 };
 
 // src/commands/canvas/commands/composition/update.ts
+function createCompositionUpdateHandler(expectedType) {
+  return async ({
+    apiHost,
+    apiKey,
+    proxy,
+    filename,
+    project: projectId,
+    state,
+    verbose,
+    whatIf
+  }) => {
+    if (verbose) {
+      console.log(`\u{1F41B} update ${expectedType}: (filename: ${filename}, state: ${convertStateOption(state)})`);
+    }
+    const fetch2 = nodeFetchProxy(proxy, verbose);
+    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const file = readFileToObject(filename);
+    const id = file.composition._id;
+    const validation = await validateCompositionType(client, id, expectedType);
+    if (validation.exists && !validation.isValid) {
+      console.error(formatCompositionTypeError(id, validation.actualType, expectedType, "update"));
+      process.exit(1);
+    }
+    if (!whatIf) {
+      await client.updateComposition({ ...file, state: convertStateOption(state) });
+    } else {
+      whatIfSimpleLog({
+        id,
+        displayName: `${getCompositionDisplayName(expectedType)}: ${file.composition._name}`,
+        action: "update"
+      });
+    }
+  };
+}
 var CompositionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a composition",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDebugOptions(
           withStateOptions(
-            yargs42.positional("filename", {
+            yargs44.positional("filename", {
               demandOption: true,
               describe: "Composition/pattern file to put"
             })
@@ -4840,73 +5173,59 @@ var CompositionUpdateModule = {
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, filename, project: projectId, state, verbose, whatIf }) => {
-    if (verbose) {
-      console.log(`\u{1F41B} update composition: (filename: ${filename}, state: ${convertStateOption(state)})`);
-    }
-    const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const file = readFileToObject(filename);
-    if (!whatIf) {
-      await client.updateComposition({ ...file, state: convertStateOption(state) });
-    } else {
-      whatIfSimpleLog({
-        id: file.composition._id,
-        displayName: `Composition: ${file.composition._name}`,
-        action: "update"
-      });
-    }
-  }
+  handler: createCompositionUpdateHandler("composition")
 };
 
 // src/commands/canvas/commands/componentPattern/update.ts
 var ComponentPatternUpdateModule = {
   ...CompositionUpdateModule,
-  describe: "Insert or update a component pattern"
+  describe: "Insert or update a component pattern",
+  handler: createCompositionUpdateHandler("component-pattern")
 };
 
 // src/commands/canvas/commands/componentPattern.ts
 var ComponentPatternModule = {
   command: "component-pattern <command>",
   describe: "Commands for Canvas component patterns",
-  builder: (yargs42) => yargs42.command(ComponentPatternPullModule).command(ComponentPatternPushModule).command(ComponentPatternGetModule).command(ComponentPatternRemoveModule).command(ComponentPatternListModule).command(ComponentPatternUpdateModule).command(ComponentPatternPublishModule).command(ComponentPatternUnpublishModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(ComponentPatternPullModule).command(ComponentPatternPushModule).command(ComponentPatternGetModule).command(ComponentPatternRemoveModule).command(ComponentPatternListModule).command(ComponentPatternUpdateModule).command(ComponentPatternPublishModule).command(ComponentPatternUnpublishModule).demandCommand(),
   handler: () => {
-    yargs7.help();
+    yargs8.help();
   }
 };
 
 // src/commands/canvas/commands/composition.ts
-import yargs8 from "yargs";
+import yargs9 from "yargs";
 var CompositionModule = {
   command: "composition <command>",
   describe: "Commands for Canvas compositions",
   aliases: ["comp"],
-  builder: (yargs42) => yargs42.command(CompositionPullModule).command(CompositionPushModule).command(CompositionGetModule).command(CompositionRemoveModule).command(CompositionListModule).command(CompositionUpdateModule).command(CompositionPublishModule).command(CompositionUnpublishModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(CompositionPullModule).command(CompositionPushModule).command(CompositionGetModule).command(CompositionRemoveModule).command(CompositionListModule).command(CompositionUpdateModule).command(CompositionPublishModule).command(CompositionUnpublishModule).demandCommand(),
   handler: () => {
-    yargs8.help();
+    yargs9.help();
   }
 };
 
 // src/commands/canvas/commands/compositionPattern.ts
-import yargs9 from "yargs";
+import yargs10 from "yargs";
 
 // src/commands/canvas/commands/compositionPattern/get.ts
 var CompositionPatternGetModule = {
   ...CompositionGetModule,
-  describe: "Fetch a composition pattern"
+  describe: "Fetch a composition pattern",
+  handler: createCompositionGetHandler("composition-pattern")
 };
 
 // src/commands/canvas/commands/compositionPattern/list.ts
 var CompositionPatternListModule = {
   ...CompositionListModule,
   describe: "List composition patterns",
-  builder: (yargs42) => withFormatOptions(
+  builder: (yargs44) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withDebugOptions(
           withProjectOptions(
             withStateOptions(
-              yargs42.options({
+              yargs44.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: {
@@ -4950,12 +5269,12 @@ var CompositionPatternListModule = {
 var CompositionPatternPublishModule = {
   ...CompositionPublishModule,
   describe: "Publishes composition pattern(s)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("ids", {
+            yargs44.positional("ids", {
               describe: "Publishes composition pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
               type: "string"
             }).option("all", {
@@ -4994,13 +5313,13 @@ var CompositionPatternPublishModule = {
 var CompositionPatternPullModule = {
   ...componentInstancePullModuleFactory("compositionPatterns"),
   describe: "Pulls all composition patterns to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              yargs42.positional("directory", {
+              yargs44.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", {
@@ -5038,13 +5357,13 @@ var CompositionPatternPullModule = {
 var CompositionPatternPushModule = {
   ...componentInstancePushModuleFactory("compositionPatterns"),
   describe: "Pushes all composition patterns from files in a directory to Uniform Canvas",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              yargs42.positional("directory", {
+              yargs44.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", {
@@ -5076,18 +5395,19 @@ var CompositionPatternPushModule = {
 // src/commands/canvas/commands/compositionPattern/remove.ts
 var CompositionPatternRemoveModule = {
   ...CompositionRemoveModule,
-  describe: "Delete a composition pattern"
+  describe: "Delete a composition pattern",
+  handler: createCompositionRemoveHandler("composition-pattern")
 };
 
 // src/commands/canvas/commands/compositionPattern/unpublish.ts
 var CompositionPatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a composition pattern(s)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("ids", {
+          yargs44.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", {
@@ -5116,21 +5436,22 @@ var CompositionPatternUnpublishModule = {
 // src/commands/canvas/commands/compositionPattern/update.ts
 var CompositionPatternUpdateModule = {
   ...CompositionUpdateModule,
-  describe: "Insert or update a composition pattern"
+  describe: "Insert or update a composition pattern",
+  handler: createCompositionUpdateHandler("composition-pattern")
 };
 
 // src/commands/canvas/commands/compositionPattern.ts
 var CompositionPatternModule = {
   command: "composition-pattern <command>",
   describe: "Commands for Canvas composition patterns",
-  builder: (yargs42) => yargs42.command(CompositionPatternPullModule).command(CompositionPatternPushModule).command(CompositionPatternGetModule).command(CompositionPatternRemoveModule).command(CompositionPatternListModule).command(CompositionPatternUpdateModule).command(CompositionPatternPublishModule).command(CompositionPatternUnpublishModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(CompositionPatternPullModule).command(CompositionPatternPushModule).command(CompositionPatternGetModule).command(CompositionPatternRemoveModule).command(CompositionPatternListModule).command(CompositionPatternUpdateModule).command(CompositionPatternPublishModule).command(CompositionPatternUnpublishModule).demandCommand(),
   handler: () => {
-    yargs9.help();
+    yargs10.help();
   }
 };
 
 // src/commands/canvas/commands/contentType.ts
-import yargs10 from "yargs";
+import yargs11 from "yargs";
 
 // src/commands/canvas/commands/contentType/_util.ts
 import { ContentClient } from "@uniformdev/canvas";
@@ -5144,12 +5465,12 @@ function getContentClient(options) {
 var ContentTypeGetModule = {
   command: "get <id>",
   describe: "Get a content type",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.positional("id", {
+            yargs44.positional("id", {
               demandOption: true,
               describe: "Content type public ID to fetch"
             })
@@ -5174,7 +5495,7 @@ var ContentTypeGetModule = {
 var ContentTypeListModule = {
   command: "list",
   describe: "List content types",
-  builder: (yargs42) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs42))))),
+  builder: (yargs44) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs44))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getContentClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -5215,12 +5536,12 @@ function createContentTypeEngineDataSource({
 var ContentTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all content types to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -5300,12 +5621,12 @@ var ContentTypePullModule = {
 var ContentTypePushModule = {
   command: "push <directory>",
   describe: "Pushes all content types from files in a directory to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -5379,11 +5700,11 @@ var ContentTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a content type",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
+          yargs44.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
         )
       )
     )
@@ -5404,11 +5725,11 @@ var ContentTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a content type",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("filename", { demandOption: true, describe: "Content type file to put" })
+          yargs44.positional("filename", { demandOption: true, describe: "Content type file to put" })
         )
       )
     )
@@ -5430,14 +5751,14 @@ var ContentTypeModule = {
   command: "contenttype <command>",
   aliases: ["ct"],
   describe: "Commands for Content Types",
-  builder: (yargs42) => yargs42.command(ContentTypeGetModule).command(ContentTypeListModule).command(ContentTypeRemoveModule).command(ContentTypeUpdateModule).command(ContentTypePullModule).command(ContentTypePushModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(ContentTypeGetModule).command(ContentTypeListModule).command(ContentTypeRemoveModule).command(ContentTypeUpdateModule).command(ContentTypePullModule).command(ContentTypePushModule).demandCommand(),
   handler: () => {
-    yargs10.help();
+    yargs11.help();
   }
 };
 
 // src/commands/canvas/commands/dataSource.ts
-import yargs11 from "yargs";
+import yargs12 from "yargs";
 
 // src/commands/canvas/commands/dataSource/_util.ts
 import { DataSourceClient } from "@uniformdev/canvas";
@@ -5449,11 +5770,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: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Data source public ID to fetch" })
+          yargs44.positional("id", { demandOption: true, describe: "Data source public ID to fetch" })
         )
       )
     )
@@ -5471,11 +5792,11 @@ var DataSourceRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a data source",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Data source public ID to delete" })
+          yargs44.positional("id", { demandOption: true, describe: "Data source public ID to delete" })
         )
       )
     )
@@ -5496,11 +5817,11 @@ var DataSourceUpdateModule = {
   command: "update <dataSource>",
   aliases: ["put"],
   describe: "Insert or update a data source",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("dataSource", { demandOption: true, describe: "Data source JSON to put" }).option("integrationType", {
+          yargs44.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
@@ -5535,14 +5856,14 @@ var DataSourceModule = {
   command: "datasource <command>",
   aliases: ["ds"],
   describe: "Commands for Data Source definitions",
-  builder: (yargs42) => yargs42.command(DataSourceGetModule).command(DataSourceRemoveModule).command(DataSourceUpdateModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(DataSourceGetModule).command(DataSourceRemoveModule).command(DataSourceUpdateModule).demandCommand(),
   handler: () => {
-    yargs11.help();
+    yargs12.help();
   }
 };
 
 // src/commands/canvas/commands/dataType.ts
-import yargs12 from "yargs";
+import yargs13 from "yargs";
 
 // src/commands/canvas/commands/dataType/_util.ts
 import { DataTypeClient } from "@uniformdev/canvas";
@@ -5557,12 +5878,12 @@ var DataTypeGetModule = {
   command: "get <id>",
   describe: "Get a data type",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
+            yargs44.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
           )
         )
       )
@@ -5585,7 +5906,7 @@ var DataTypeListModule = {
   command: "list",
   describe: "List data types",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs42))))),
+  builder: (yargs44) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs44))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getDataTypeClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -5628,12 +5949,12 @@ function createDataTypeEngineDataSource({
 var DataTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all data types to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -5713,12 +6034,12 @@ var DataTypePullModule = {
 var DataTypePushModule = {
   command: "push <directory>",
   describe: "Pushes all data types from files in a directory to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -5787,11 +6108,11 @@ var DataTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a data type",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
+          yargs44.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
         )
       )
     )
@@ -5812,11 +6133,11 @@ var DataTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a data type",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("filename", { demandOption: true, describe: "Data type file to put" })
+          yargs44.positional("filename", { demandOption: true, describe: "Data type file to put" })
         )
       )
     )
@@ -5838,26 +6159,74 @@ var DataTypeModule = {
   command: "datatype <command>",
   aliases: ["dt"],
   describe: "Commands for Data Type definitions",
-  builder: (yargs42) => yargs42.command(DataTypeGetModule).command(DataTypePullModule).command(DataTypePushModule).command(DataTypeRemoveModule).command(DataTypeListModule).command(DataTypeUpdateModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(DataTypeGetModule).command(DataTypePullModule).command(DataTypePushModule).command(DataTypeRemoveModule).command(DataTypeListModule).command(DataTypeUpdateModule).demandCommand(),
   handler: () => {
-    yargs12.help();
+    yargs13.help();
   }
 };
 
 // src/commands/canvas/commands/entry.ts
-import yargs13 from "yargs";
+import yargs14 from "yargs";
 
 // src/commands/canvas/commands/entry/get.ts
+function createEntryGetHandler(expectedType) {
+  return async ({
+    apiHost,
+    edgeApiHost,
+    apiKey,
+    proxy,
+    id,
+    format,
+    filename,
+    project: projectId,
+    state,
+    resolveData,
+    diagnostics,
+    resolutionDepth,
+    withComponentIDs,
+    verbose
+  }) => {
+    if (verbose) {
+      console.log(`\u{1F41B} get ${expectedType}: (id: ${id})`);
+    }
+    const fetch2 = nodeFetchProxy(proxy, verbose);
+    const client = getContentClient({ apiKey, apiHost, edgeApiHost, fetch: fetch2, projectId });
+    const res = await client.getEntries({
+      offset: 0,
+      limit: 1,
+      entryIDs: [id],
+      state: convertStateOption(state),
+      skipOverridesResolution: true,
+      skipPatternResolution: true,
+      skipDataResolution: !resolveData,
+      diagnostics: resolveData ? diagnostics : void 0,
+      resolutionDepth: resolveData ? resolutionDepth : void 0,
+      withComponentIDs,
+      pattern: expectedType === "entry-pattern" ? true : void 0
+    });
+    if (res.entries.length !== 1) {
+      console.error(`Error: ${getEntryDisplayName(expectedType)} with ID "${id}" not found.`);
+      process.exit(1);
+    }
+    const entry = res.entries[0];
+    const actualType = getEntryActualType(entry);
+    if (actualType !== expectedType) {
+      console.error(formatEntryTypeError(id, actualType, expectedType, "get"));
+      process.exit(1);
+    }
+    emitWithFormat(entry, format, filename);
+  };
+}
 var EntryGetModule = {
   command: "get <id>",
   describe: "Get an entry",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
             withStateOptions(
-              yargs42.positional("id", { demandOption: true, describe: "Entry public ID to fetch" }).option({
+              yargs44.positional("id", { demandOption: true, describe: "Entry public ID to fetch" }).option({
                 resolveData: {
                   type: "boolean",
                   default: false,
@@ -5887,41 +6256,7 @@ var EntryGetModule = {
       )
     )
   ),
-  handler: async ({
-    apiHost,
-    edgeApiHost,
-    apiKey,
-    proxy,
-    id,
-    format,
-    filename,
-    project: projectId,
-    state,
-    resolveData,
-    diagnostics,
-    resolutionDepth,
-    withComponentIDs,
-    verbose
-  }) => {
-    const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, edgeApiHost, fetch: fetch2, projectId });
-    const res = await client.getEntries({
-      offset: 0,
-      limit: 1,
-      entryIDs: [id],
-      state: convertStateOption(state),
-      skipOverridesResolution: true,
-      skipPatternResolution: true,
-      skipDataResolution: !resolveData,
-      diagnostics: resolveData ? diagnostics : void 0,
-      resolutionDepth: resolveData ? resolutionDepth : void 0,
-      withComponentIDs
-    });
-    if (res.entries.length !== 1) {
-      throw new Error(`Entry with ID ${id} not found`);
-    }
-    emitWithFormat(res.entries[0], format, filename);
-  }
+  handler: createEntryGetHandler("entry")
 };
 
 // src/commands/canvas/commands/entry/list.ts
@@ -5929,13 +6264,13 @@ var LEGACY_DEFAULT_LIMIT = 1e3;
 var EntryListModule = {
   command: "list",
   describe: "List entries",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
             withStateOptions(
-              yargs42.options({
+              yargs44.options({
                 offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
                 limit: {
                   describe: "Number of rows to fetch",
@@ -6070,12 +6405,12 @@ function createEntryEngineDataSource({
 var EntryPublishModule = {
   command: "publish [ids]",
   describe: "Publishes entry(ies)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withDiffOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.positional("ids", {
+            yargs44.positional("ids", {
               describe: "Publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
               type: "string"
             }).option("all", {
@@ -6150,13 +6485,13 @@ var EntryPublishModule = {
 var EntryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all entries to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              yargs42.positional("directory", {
+              yargs44.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", {
@@ -6256,13 +6591,13 @@ var EntryPullModule = {
 var EntryPushModule = {
   command: "push <directory>",
   describe: "Pushes all entries from files in a directory to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              yargs42.positional("directory", {
+              yargs44.positional("directory", {
                 describe: "Directory to read the entries from. If a filename is used, a package will be read instead.",
                 type: "string"
               }).option("mode", {
@@ -6357,28 +6692,51 @@ var EntryPushModule = {
 };
 
 // src/commands/canvas/commands/entry/remove.ts
+function createEntryRemoveHandler(expectedType) {
+  return async ({
+    apiHost,
+    apiKey,
+    proxy,
+    id,
+    project: projectId,
+    verbose,
+    whatIf
+  }) => {
+    if (verbose) {
+      console.log(`\u{1F41B} remove ${expectedType}: (id: ${id})`);
+    }
+    const fetch2 = nodeFetchProxy(proxy, verbose);
+    const client = getContentClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const validation = await validateEntryType(client, id, expectedType);
+    if (!validation.exists) {
+      console.error(`Error: ${getEntryDisplayName(expectedType)} with ID "${id}" not found.`);
+      process.exit(1);
+    }
+    if (!validation.isValid) {
+      console.error(formatEntryTypeError(id, validation.actualType, expectedType, "delete"));
+      process.exit(1);
+    }
+    if (!whatIf) {
+      await client.deleteEntry({ entryId: id });
+    } else {
+      whatIfSimpleLog({ id, displayName: getEntryDisplayName(expectedType), action: "delete" });
+    }
+  };
+}
 var EntryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an entry",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
+          yargs44.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
         )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose, whatIf }) => {
-    const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    if (!whatIf) {
-      await client.deleteEntry({ entryId: id });
-    } else {
-      whatIfSimpleLog({ id, displayName: `Entry`, action: "delete" });
-    }
-  }
+  handler: createEntryRemoveHandler("entry")
 };
 
 // src/commands/canvas/commands/entry/unpublish.ts
@@ -6387,11 +6745,11 @@ import { diffJson as diffJson3 } from "diff";
 var EntryUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish an entry(ies)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("ids", {
+          yargs44.positional("ids", {
             describe: "Un-publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
             type: "string"
           }).option("all", {
@@ -6472,22 +6830,8 @@ var EntryUnpublishModule = {
 };
 
 // src/commands/canvas/commands/entry/update.ts
-var EntryUpdateModule = {
-  command: "update <filename>",
-  aliases: ["put"],
-  describe: "Insert or update an entry",
-  builder: (yargs42) => withConfiguration(
-    withDebugOptions(
-      withApiOptions(
-        withProjectOptions(
-          withStateOptions(
-            yargs42.positional("filename", { demandOption: true, describe: "Entry file to put" })
-          )
-        )
-      )
-    )
-  ),
-  handler: async ({
+function createEntryUpdateHandler(expectedType) {
+  return async ({
     apiHost,
     edgeApiHost,
     apiKey,
@@ -6498,44 +6842,86 @@ var EntryUpdateModule = {
     verbose,
     whatIf
   }) => {
+    if (verbose) {
+      console.log(`\u{1F41B} update ${expectedType}: (filename: ${filename}, state: ${convertStateOption(state)})`);
+    }
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getContentClient({ apiKey, apiHost, edgeApiHost, fetch: fetch2, projectId });
     const file = readFileToObject(filename);
+    const id = file.entry._id;
+    const validation = await validateEntryType(client, id, expectedType);
+    if (validation.exists && !validation.isValid) {
+      console.error(formatEntryTypeError(id, validation.actualType, expectedType, "update"));
+      process.exit(1);
+    }
     if (!whatIf) {
       await client.upsertEntry({ ...file, state: convertStateOption(state) });
     } else {
-      whatIfSimpleLog({ id: file.entry._id, displayName: `Entry: ${file.entry._name}`, action: "update" });
+      whatIfSimpleLog({
+        id,
+        displayName: `${getEntryDisplayName(expectedType)}: ${file.entry._name}`,
+        action: "update"
+      });
     }
-  }
+  };
+}
+var EntryUpdateModule = {
+  command: "update <filename>",
+  aliases: ["put"],
+  describe: "Insert or update an entry",
+  builder: (yargs44) => withConfiguration(
+    withDebugOptions(
+      withApiOptions(
+        withProjectOptions(
+          withStateOptions(
+            yargs44.positional("filename", { demandOption: true, describe: "Entry file to put" })
+          )
+        )
+      )
+    )
+  ),
+  handler: createEntryUpdateHandler("entry")
 };
 
 // src/commands/canvas/commands/entry.ts
 var EntryModule = {
   command: "entry <command>",
   describe: "Commands for Entries",
-  builder: (yargs42) => yargs42.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).command(EntryPublishModule).command(EntryUnpublishModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).command(EntryPublishModule).command(EntryUnpublishModule).demandCommand(),
   handler: () => {
-    yargs13.help();
+    yargs14.help();
   }
 };
 
 // src/commands/canvas/commands/entryPattern.ts
-import yargs14 from "yargs";
+import yargs15 from "yargs";
 
 // src/commands/canvas/commands/entryPattern/get.ts
 var EntryPatternGetModule = {
   command: "get <id>",
   describe: "Get an entry pattern",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
             withStateOptions(
-              yargs42.positional("id", {
-                demandOption: true,
-                describe: "Entry pattern public ID to fetch"
-              }).option({
+              yargs44.positional("id", { demandOption: true, describe: "Entry pattern public ID to fetch" }).option({
+                resolveData: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Resolve all data resources used by the entry pattern"
+                },
+                diagnostics: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Include diagnostics information when resolving data"
+                },
+                resolutionDepth: {
+                  type: "number",
+                  default: 1,
+                  describe: "Controls how many levels deep content references should be resolved"
+                },
                 withComponentIDs: {
                   type: "boolean",
                   default: false,
@@ -6549,49 +6935,20 @@ var EntryPatternGetModule = {
       )
     )
   ),
-  handler: async ({
-    apiHost,
-    apiKey,
-    proxy,
-    id,
-    format,
-    filename,
-    project: projectId,
-    state,
-    withComponentIDs,
-    verbose
-  }) => {
-    const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const res = await client.getEntries({
-      offset: 0,
-      limit: 1,
-      entryIDs: [id],
-      state: convertStateOption(state),
-      skipOverridesResolution: true,
-      skipPatternResolution: true,
-      skipDataResolution: true,
-      pattern: true,
-      withComponentIDs
-    });
-    if (res.entries.length !== 1) {
-      throw new Error(`Entry pattern with ID ${id} not found`);
-    }
-    emitWithFormat(res.entries[0], format, filename);
-  }
+  handler: createEntryGetHandler("entry-pattern")
 };
 
 // src/commands/canvas/commands/entryPattern/list.ts
 var EntryPatternListModule = {
   command: "list",
   describe: "List entry patterns",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
             withStateOptions(
-              yargs42.option({
+              yargs44.option({
                 withComponentIDs: {
                   type: "boolean",
                   default: false,
@@ -6637,12 +6994,12 @@ var EntryPatternListModule = {
 var EntryPatternPublishModule = {
   command: "publish [ids]",
   describe: "Publishes entry pattern(s)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("ids", {
+            yargs44.positional("ids", {
               describe: "Publishes entry pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
               type: "string"
             }).option("all", {
@@ -6717,13 +7074,13 @@ var EntryPatternPublishModule = {
 var EntryPatternPullModule = {
   command: "pull <directory>",
   describe: "Pulls all entry patterns to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              yargs42.positional("directory", {
+              yargs44.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", {
@@ -6823,13 +7180,13 @@ var EntryPatternPullModule = {
 var EntryPatternPushModule = {
   command: "push <directory>",
   describe: "Pushes all entry patterns from files in a directory to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              yargs42.positional("directory", {
+              yargs44.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", {
@@ -6933,24 +7290,16 @@ var EntryPatternRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an entry pattern",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Entry pattern public ID to delete" })
+          yargs44.positional("id", { demandOption: true, describe: "Entry pattern public ID to delete" })
         )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose, whatIf }) => {
-    const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    if (!whatIf) {
-      await client.deleteEntry({ entryId: id });
-    } else {
-      whatIfSimpleLog({ id, displayName: `Entry Pattern`, action: "delete" });
-    }
-  }
+  handler: createEntryRemoveHandler("entry-pattern")
 };
 
 // src/commands/canvas/commands/entryPattern/unpublish.ts
@@ -6959,11 +7308,11 @@ import { diffJson as diffJson4 } from "diff";
 var EntryPatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish entry pattern(s)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("ids", {
+          yargs44.positional("ids", {
             describe: "Un-publishes entry patterns by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
             type: "string"
           }).option("all", {
@@ -7039,21 +7388,191 @@ var EntryPatternUnpublishModule = {
         diff: () => targetObject ? diffJson4(targetObject.object, sourceObject.object) : []
       });
     }
-    await Promise.all(actions);
+    await Promise.all(actions);
+  }
+};
+
+// src/commands/canvas/commands/entryPattern/update.ts
+var EntryPatternUpdateModule = {
+  command: "update <filename>",
+  aliases: ["put"],
+  describe: "Insert or update an entry pattern",
+  builder: (yargs44) => withConfiguration(
+    withDebugOptions(
+      withApiOptions(
+        withProjectOptions(
+          withStateOptions(
+            yargs44.positional("filename", { demandOption: true, describe: "Entry pattern file to put" })
+          )
+        )
+      )
+    )
+  ),
+  handler: createEntryUpdateHandler("entry-pattern")
+};
+
+// src/commands/canvas/commands/entryPattern.ts
+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(),
+  handler: () => {
+    yargs15.help();
+  }
+};
+
+// src/commands/canvas/commands/label.ts
+import yargs16 from "yargs";
+
+// src/commands/canvas/labelsEngineDataSource.ts
+function normalizeLabelForSync(label) {
+  const { projectId: _projectId, ...labelWithoutProjectId } = label;
+  return labelWithoutProjectId;
+}
+function createLabelsEngineDataSource({
+  client
+}) {
+  async function* getObjects() {
+    const labels = paginateAsync(
+      async (offset, limit2) => (await client.getLabels({ offset, limit: limit2 })).labels,
+      { pageSize: 100 }
+    );
+    for await (const label of labels) {
+      const result = {
+        id: label.label.publicId,
+        displayName: `${label.label.displayName} (pid: ${label.label.publicId})`,
+        providerId: label.label.publicId,
+        object: normalizeLabelForSync(label)
+      };
+      yield result;
+    }
+  }
+  return {
+    name: "Uniform API",
+    objects: getObjects(),
+    deleteObject: async (providerId) => {
+      await client.removeLabel({ labelId: providerId });
+    },
+    writeObject: async ({ object: object4 }) => {
+      await client.upsertLabel({ label: object4.label });
+    }
+  };
+}
+
+// src/commands/canvas/commands/label/_util.ts
+import { LabelClient } from "@uniformdev/canvas";
+var selectLabelIdentifier = (label) => label.label.publicId;
+var selectLabelDisplayName = (label) => `${label.label.displayName} (pid: ${label.label.publicId})`;
+function getLabelClient(options) {
+  return new LabelClient({ ...options, bypassCache: true, limitPolicy: cliLimitPolicy });
+}
+
+// src/commands/canvas/commands/label/pull.ts
+var LabelPullModule = {
+  command: "pull <directory>",
+  describe: "Pulls all labels to local files in a directory",
+  builder: (yargs44) => withConfiguration(
+    withDebugOptions(
+      withApiOptions(
+        withProjectOptions(
+          withDiffOptions(
+            yargs44.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", {
+              alias: ["f"],
+              describe: "Output format",
+              default: "yaml",
+              choices: ["yaml", "json"],
+              type: "string"
+            }).option("mode", {
+              alias: ["m"],
+              describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
+              choices: ["create", "createOrUpdate", "mirror"],
+              default: "mirror",
+              type: "string"
+            })
+          )
+        )
+      )
+    )
+  ),
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    directory,
+    format,
+    mode,
+    whatIf,
+    project: projectId,
+    diff: diffMode,
+    allowEmptySource,
+    verbose
+  }) => {
+    const fetch2 = nodeFetchProxy(proxy, verbose);
+    const client = getLabelClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const source = createLabelsEngineDataSource({ client });
+    let target;
+    const isPackage = isPathAPackageFile(directory);
+    if (isPackage) {
+      const packageContents = readCanvasPackage(directory, false, verbose);
+      const packageLabels = Array.isArray(packageContents.labels) ? packageContents.labels : [];
+      target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
+        objects: packageLabels,
+        selectIdentifier: selectLabelIdentifier,
+        selectDisplayName: selectLabelDisplayName,
+        onSyncComplete: async (_, synced) => {
+          packageContents.labels = synced;
+          writeCanvasPackage(directory, packageContents);
+        }
+      });
+    } else {
+      target = await createFileSyncEngineDataSource({
+        directory,
+        selectIdentifier: selectLabelIdentifier,
+        selectDisplayName: selectLabelDisplayName,
+        format,
+        verbose
+      });
+    }
+    await syncEngine({
+      source,
+      target,
+      mode,
+      whatIf,
+      allowEmptySource: allowEmptySource ?? true,
+      log: createSyncEngineConsoleLogger({ diffMode }),
+      onBeforeWriteObject: async (sourceObject) => {
+        delete sourceObject.object.createdBy;
+        delete sourceObject.object.modifiedBy;
+        return sourceObject;
+      }
+    });
   }
 };
 
-// src/commands/canvas/commands/entryPattern/update.ts
-var EntryPatternUpdateModule = {
-  command: "update <filename>",
-  aliases: ["put"],
-  describe: "Insert or update an entry pattern",
-  builder: (yargs42) => withConfiguration(
+// src/commands/canvas/commands/label/push.ts
+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(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          withStateOptions(
-            yargs42.positional("filename", { demandOption: true, describe: "Entry pattern file to put" })
+          withDiffOptions(
+            yargs44.positional("directory", {
+              describe: "Directory to read the labels from. If a filename is used, a package will be read instead.",
+              type: "string"
+            }).option("mode", {
+              alias: ["m"],
+              describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
+              choices: ["create", "createOrUpdate", "mirror"],
+              default: "mirror",
+              type: "string"
+            })
           )
         )
       )
@@ -7061,42 +7580,88 @@ var EntryPatternUpdateModule = {
   ),
   handler: async ({
     apiHost,
-    edgeApiHost,
     apiKey,
     proxy,
-    filename,
+    directory,
+    mode,
+    whatIf,
     project: projectId,
-    state,
-    verbose,
-    whatIf
+    diff: diffMode,
+    allowEmptySource,
+    verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, edgeApiHost, fetch: fetch2, projectId });
-    const file = readFileToObject(filename);
-    if (!whatIf) {
-      await client.upsertEntry({ ...file, state: convertStateOption(state) });
+    const client = getLabelClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    let source;
+    const isPackage = isPathAPackageFile(directory);
+    if (isPackage) {
+      const packageContents = readCanvasPackage(directory, true, verbose);
+      const packageLabels = Array.isArray(packageContents.labels) ? packageContents.labels : [];
+      source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
+        objects: packageLabels,
+        selectIdentifier: selectLabelIdentifier,
+        selectDisplayName: selectLabelDisplayName
+      });
     } else {
-      whatIfSimpleLog({
-        id: file.entry._id,
-        displayName: `Entry Pattern: ${file.entry._name}`,
-        action: "update"
+      source = await createFileSyncEngineDataSource({
+        directory,
+        selectIdentifier: selectLabelIdentifier,
+        selectDisplayName: selectLabelDisplayName,
+        verbose
       });
     }
+    const target = createLabelsEngineDataSource({ client });
+    const labelsFailedDueToMissingParent = /* @__PURE__ */ new Set();
+    const attemptSync = async () => {
+      const lastFailedLabelsCount = labelsFailedDueToMissingParent.size;
+      labelsFailedDueToMissingParent.clear();
+      await syncEngine({
+        source,
+        target,
+        mode,
+        whatIf,
+        allowEmptySource,
+        log: createSyncEngineConsoleLogger({ diffMode }),
+        onError: (error, object4) => {
+          if (error.message.includes(__INTERNAL_MISSING_PARENT_LABEL_ERROR)) {
+            labelsFailedDueToMissingParent.add(object4.object);
+          } else {
+            throw error;
+          }
+        }
+      });
+      if (labelsFailedDueToMissingParent.size !== 0) {
+        const newFailedLabelsCount = labelsFailedDueToMissingParent.size;
+        if (newFailedLabelsCount !== lastFailedLabelsCount) {
+          source = await createArraySyncEngineDataSource({
+            name: `Labels re-push from ${directory}`,
+            objects: Array.from(labelsFailedDueToMissingParent),
+            selectIdentifier: selectLabelIdentifier,
+            selectDisplayName: selectLabelDisplayName
+          });
+          await attemptSync();
+        } else {
+          throw new Error("Failed to push labels due to missing parent labels");
+        }
+      }
+    };
+    await attemptSync();
   }
 };
 
-// src/commands/canvas/commands/entryPattern.ts
-var EntryPatternModule = {
-  command: "entry-pattern <command>",
-  describe: "Commands for Entry patterns",
-  builder: (yargs42) => yargs42.command(EntryPatternGetModule).command(EntryPatternListModule).command(EntryPatternRemoveModule).command(EntryPatternUpdateModule).command(EntryPatternPullModule).command(EntryPatternPushModule).command(EntryPatternPublishModule).command(EntryPatternUnpublishModule).demandCommand(),
+// src/commands/canvas/commands/label.ts
+var LabelModule = {
+  command: "label <command>",
+  describe: "Commands for label definitions",
+  builder: (yargs44) => yargs44.command(LabelPullModule).command(LabelPushModule),
   handler: () => {
-    yargs14.help();
+    yargs16.help();
   }
 };
 
 // src/commands/canvas/commands/locale.ts
-import yargs15 from "yargs";
+import yargs17 from "yargs";
 
 // src/commands/canvas/localesEngineDataSource.ts
 function createLocaleEngineDataSource({
@@ -7138,12 +7703,12 @@ function getLocaleClient(options) {
 var LocalePullModule = {
   command: "pull <directory>",
   describe: "Pulls all locales to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -7223,12 +7788,12 @@ var LocalePullModule = {
 var LocalePushModule = {
   command: "push <directory>",
   describe: "Pushes all locales from files in a directory to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.positional("directory", {
               describe: "Directory to read the locales from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -7296,14 +7861,14 @@ var LocalePushModule = {
 var LocaleModule = {
   command: "locale <command>",
   describe: "Commands for locale definitions",
-  builder: (yargs42) => yargs42.command(LocalePullModule).command(LocalePushModule),
+  builder: (yargs44) => yargs44.command(LocalePullModule).command(LocalePushModule),
   handler: () => {
-    yargs15.help();
+    yargs17.help();
   }
 };
 
 // src/commands/canvas/commands/previewUrl.ts
-import yargs16 from "yargs";
+import yargs18 from "yargs";
 
 // src/commands/canvas/commands/previewUrl/_util.ts
 import { PreviewClient } from "@uniformdev/canvas";
@@ -7317,12 +7882,12 @@ function getPreviewClient(options) {
 var PreviewUrlGetModule = {
   command: "get <id>",
   describe: "Fetch a preview URL",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.positional("id", { demandOption: true, describe: "Preview URL UUID to fetch" })
+            yargs44.positional("id", { demandOption: true, describe: "Preview URL UUID to fetch" })
           )
         )
       )
@@ -7346,8 +7911,8 @@ var PreviewUrlListModule = {
   command: "list",
   describe: "List preview URLs",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(
-    withFormatOptions(withApiOptions(withDebugOptions(withProjectOptions(yargs42.options({})))))
+  builder: (yargs44) => withConfiguration(
+    withFormatOptions(withApiOptions(withDebugOptions(withProjectOptions(yargs44.options({})))))
   ),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
@@ -7389,12 +7954,12 @@ function createPreviewUrlEngineDataSource({
 var PreviewUrlPullModule = {
   command: "pull <directory>",
   describe: "Pulls all preview urls to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDebugOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -7469,12 +8034,12 @@ var PreviewUrlPullModule = {
 var PreviewUrlPushModule = {
   command: "push <directory>",
   describe: "Pushes all preview urls from files in a directory to Uniform Canvas",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
           withDebugOptions(
-            yargs42.positional("directory", {
+            yargs44.positional("directory", {
               describe: "Directory to read from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -7538,11 +8103,11 @@ var PreviewUrlRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a preview URL",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Preview URL UUID to delete" })
+          yargs44.positional("id", { demandOption: true, describe: "Preview URL UUID to delete" })
         )
       )
     )
@@ -7563,11 +8128,11 @@ var PreviewUrlUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a preview URL",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("filename", { demandOption: true, describe: "Category file to put" })
+          yargs44.positional("filename", { demandOption: true, describe: "Category file to put" })
         )
       )
     )
@@ -7589,25 +8154,25 @@ var PreviewUrlModule = {
   command: "preview-url <command>",
   aliases: ["pu"],
   describe: "Commands for Canvas preview urls",
-  builder: (yargs42) => yargs42.command(PreviewUrlPullModule).command(PreviewUrlPushModule).command(PreviewUrlGetModule).command(PreviewUrlRemoveModule).command(PreviewUrlListModule).command(PreviewUrlUpdateModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(PreviewUrlPullModule).command(PreviewUrlPushModule).command(PreviewUrlGetModule).command(PreviewUrlRemoveModule).command(PreviewUrlListModule).command(PreviewUrlUpdateModule).demandCommand(),
   handler: () => {
-    yargs16.help();
+    yargs18.help();
   }
 };
 
 // src/commands/canvas/commands/previewViewport.ts
-import yargs17 from "yargs";
+import yargs19 from "yargs";
 
 // src/commands/canvas/commands/previewViewport/get.ts
 var PreviewViewportGetModule = {
   command: "get <id>",
   describe: "Fetch a preview viewport",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.positional("id", { demandOption: true, describe: "Preview viewport UUID to fetch" })
+            yargs44.positional("id", { demandOption: true, describe: "Preview viewport UUID to fetch" })
           )
         )
       )
@@ -7631,8 +8196,8 @@ var PreviewViewportListModule = {
   command: "list",
   describe: "List preview viewports",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(
-    withFormatOptions(withDebugOptions(withApiOptions(withProjectOptions(yargs42.options({})))))
+  builder: (yargs44) => withConfiguration(
+    withFormatOptions(withDebugOptions(withApiOptions(withProjectOptions(yargs44.options({})))))
   ),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
@@ -7678,12 +8243,12 @@ function createPreviewViewportEngineDataSource({
 var PreviewViewportPullModule = {
   command: "pull <directory>",
   describe: "Pulls all preview viewports to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDebugOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -7758,12 +8323,12 @@ var PreviewViewportPullModule = {
 var PreviewViewportPushModule = {
   command: "push <directory>",
   describe: "Pushes all preview viewports from files in a directory to Uniform Canvas",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
           withDebugOptions(
-            yargs42.positional("directory", {
+            yargs44.positional("directory", {
               describe: "Directory to read from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -7827,11 +8392,11 @@ var PreviewViewportRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a preview viewport",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Preview viewport UUID to delete" })
+          yargs44.positional("id", { demandOption: true, describe: "Preview viewport UUID to delete" })
         )
       )
     )
@@ -7852,11 +8417,11 @@ var PreviewViewportUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a preview viewport",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("filename", { demandOption: true, describe: "Preview viewport file to put" })
+          yargs44.positional("filename", { demandOption: true, describe: "Preview viewport file to put" })
         )
       )
     )
@@ -7878,14 +8443,14 @@ var PreviewViewportModule = {
   command: "preview-viewport <command>",
   aliases: ["pv"],
   describe: "Commands for Canvas preview viewports",
-  builder: (yargs42) => yargs42.command(PreviewViewportPullModule).command(PreviewViewportPushModule).command(PreviewViewportGetModule).command(PreviewViewportRemoveModule).command(PreviewViewportListModule).command(PreviewViewportUpdateModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(PreviewViewportPullModule).command(PreviewViewportPushModule).command(PreviewViewportGetModule).command(PreviewViewportRemoveModule).command(PreviewViewportListModule).command(PreviewViewportUpdateModule).demandCommand(),
   handler: () => {
-    yargs17.help();
+    yargs19.help();
   }
 };
 
 // src/commands/canvas/commands/prompts.ts
-import yargs18 from "yargs";
+import yargs20 from "yargs";
 
 // src/commands/canvas/commands/prompts/_util.ts
 import { PromptClient } from "@uniformdev/canvas";
@@ -7897,12 +8462,12 @@ var getPromptClient = (options) => new PromptClient({ ...options, bypassCache: t
 var PromptGetModule = {
   command: "get <id>",
   describe: "Get a prompt",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.positional("id", { demandOption: true, describe: "Prompt ID to fetch" })
+            yargs44.positional("id", { demandOption: true, describe: "Prompt ID to fetch" })
           )
         )
       )
@@ -7923,7 +8488,7 @@ var PromptGetModule = {
 var PromptListModule = {
   command: "list",
   describe: "List prompts",
-  builder: (yargs42) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs42))))),
+  builder: (yargs44) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs44))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getPromptClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -7964,13 +8529,13 @@ function createPromptEngineDataSource({
 var PromptPullModule = {
   command: "pull <directory>",
   describe: "Pulls all prompts to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              yargs42.positional("directory", {
+              yargs44.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", {
@@ -8051,12 +8616,12 @@ var PromptPullModule = {
 var PromptPushModule = {
   command: "push <directory>",
   describe: "Pushes all prompts from files in a directory to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.positional("directory", {
               describe: "Directory to read the prompts from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -8125,10 +8690,10 @@ var PromptRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a prompt",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
-        withProjectOptions(yargs42.positional("id", { demandOption: true, describe: "Prompt ID to delete" }))
+        withProjectOptions(yargs44.positional("id", { demandOption: true, describe: "Prompt ID to delete" }))
       )
     )
   ),
@@ -8148,11 +8713,11 @@ var PromptUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a prompt",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("filename", { demandOption: true, describe: "Prompt file to put" })
+          yargs44.positional("filename", { demandOption: true, describe: "Prompt file to put" })
         )
       )
     )
@@ -8174,14 +8739,14 @@ var PromptModule = {
   command: "prompt <command>",
   aliases: ["dt"],
   describe: "Commands for AI Prompt definitions",
-  builder: (yargs42) => yargs42.command(PromptGetModule).command(PromptListModule).command(PromptPullModule).command(PromptPushModule).command(PromptRemoveModule).command(PromptUpdateModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(PromptGetModule).command(PromptListModule).command(PromptPullModule).command(PromptPushModule).command(PromptRemoveModule).command(PromptUpdateModule).demandCommand(),
   handler: () => {
-    yargs18.help();
+    yargs20.help();
   }
 };
 
 // src/commands/canvas/commands/workflow.ts
-import yargs19 from "yargs";
+import yargs21 from "yargs";
 
 // src/commands/canvas/commands/workflow/_util.ts
 import { WorkflowClient } from "@uniformdev/canvas";
@@ -8224,12 +8789,12 @@ function createWorkflowEngineDataSource({
 var WorkflowPullModule = {
   command: "pull <directory>",
   describe: "Pulls all workflows to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -8304,12 +8869,12 @@ var WorkflowPullModule = {
 var WorkflowPushModule = {
   command: "push <directory>",
   describe: "Pushes all workflows from files in a directory to Uniform Canvas",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.positional("directory", {
               describe: "Directory to read from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -8373,9 +8938,9 @@ var WorkflowModule = {
   command: "workflow <command>",
   aliases: ["wf"],
   describe: "Commands for Canvas workflows",
-  builder: (yargs42) => yargs42.command(WorkflowPullModule).command(WorkflowPushModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(WorkflowPullModule).command(WorkflowPushModule).demandCommand(),
   handler: () => {
-    yargs19.help();
+    yargs21.help();
   }
 };
 
@@ -8384,17 +8949,17 @@ var CanvasCommand = {
   command: "canvas <command>",
   aliases: ["cv", "pm", "presentation"],
   describe: "Uniform Canvas commands",
-  builder: (yargs42) => yargs42.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(LocaleModule).command(WorkflowModule).command(PreviewUrlModule).command(PreviewViewportModule).demandCommand(),
+  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(),
   handler: () => {
-    yargs20.showHelp();
+    yargs22.showHelp();
   }
 };
 
 // src/commands/context/index.ts
-import yargs27 from "yargs";
+import yargs29 from "yargs";
 
 // src/commands/context/commands/aggregate.ts
-import yargs21 from "yargs";
+import yargs23 from "yargs";
 
 // src/commands/context/commands/aggregate/_util.ts
 import { AggregateClient } from "@uniformdev/context/api";
@@ -8406,11 +8971,11 @@ var getAggregateClient = (options) => new AggregateClient({ ...options, bypassCa
 var AggregateGetModule = {
   command: "get <id>",
   describe: "Fetch an aggregate",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
+          yargs44.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
         )
       )
     )
@@ -8433,7 +8998,7 @@ var AggregateListModule = {
   command: "list",
   describe: "List aggregates",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs42)))),
+  builder: (yargs44) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs44)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = getAggregateClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -8496,12 +9061,12 @@ function writeContextPackage(filename, packageContents) {
 var AggregatePullModule = {
   command: "pull <directory>",
   describe: "Pulls all aggregates to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -8576,12 +9141,12 @@ var AggregatePullModule = {
 var AggregatePushModule = {
   command: "push <directory>",
   describe: "Pushes all aggregates from files in a directory or package to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
           withDebugOptions(
-            yargs42.positional("directory", {
+            yargs44.positional("directory", {
               describe: "Directory to read the aggregates from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -8646,10 +9211,10 @@ var AggregateRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an aggregate",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
+        yargs44.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
       )
     )
   ),
@@ -8665,10 +9230,10 @@ var AggregateUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an aggregate",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
+        yargs44.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
       )
     )
   ),
@@ -8685,14 +9250,14 @@ var AggregateModule = {
   command: "aggregate <command>",
   aliases: ["agg", "intent", "audience"],
   describe: "Commands for Context aggregates (intents, audiences)",
-  builder: (yargs42) => yargs42.command(AggregatePullModule).command(AggregatePushModule).command(AggregateGetModule).command(AggregateRemoveModule).command(AggregateListModule).command(AggregateUpdateModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(AggregatePullModule).command(AggregatePushModule).command(AggregateGetModule).command(AggregateRemoveModule).command(AggregateListModule).command(AggregateUpdateModule).demandCommand(),
   handler: () => {
-    yargs21.help();
+    yargs23.help();
   }
 };
 
 // src/commands/context/commands/enrichment.ts
-import yargs22 from "yargs";
+import yargs24 from "yargs";
 
 // src/commands/context/commands/enrichment/_util.ts
 import { UncachedEnrichmentClient } from "@uniformdev/context/api";
@@ -8706,11 +9271,11 @@ function getEnrichmentClient(options) {
 var EnrichmentGetModule = {
   command: "get <id>",
   describe: "Fetch an enrichment category and its values",
-  builder: (yargs42) => withFormatOptions(
+  builder: (yargs44) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
+          yargs44.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
         )
       )
     )
@@ -8733,7 +9298,7 @@ var EnrichmentListModule = {
   command: "list",
   describe: "List enrichments",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs42)))),
+  builder: (yargs44) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs44)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = getEnrichmentClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -8828,12 +9393,12 @@ var createEnrichmentValueEngineDataSource = ({
 var EnrichmentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all enrichments to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -8908,11 +9473,11 @@ var EnrichmentPullModule = {
 var EnrichmentPushModule = {
   command: "push <directory>",
   describe: "Pushes all enrichments from files in a directory or package to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs42.positional("directory", {
+          yargs44.positional("directory", {
             describe: "Directory to read the enrichments from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("mode", {
@@ -8975,10 +9540,10 @@ var EnrichmentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an enrichment category and its values",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
+        yargs44.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
       )
     )
   ),
@@ -8994,14 +9559,14 @@ var EnrichmentModule = {
   command: "enrichment <command>",
   aliases: ["enr"],
   describe: "Commands for Context enrichments",
-  builder: (yargs42) => yargs42.command(EnrichmentPullModule).command(EnrichmentPushModule).command(EnrichmentGetModule).command(EnrichmentRemoveModule).command(EnrichmentListModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(EnrichmentPullModule).command(EnrichmentPushModule).command(EnrichmentGetModule).command(EnrichmentRemoveModule).command(EnrichmentListModule).demandCommand(),
   handler: () => {
-    yargs22.help();
+    yargs24.help();
   }
 };
 
 // src/commands/context/commands/manifest.ts
-import yargs23 from "yargs";
+import yargs25 from "yargs";
 
 // src/commands/context/commands/manifest/get.ts
 import { ApiClientError as ApiClientError5, UncachedManifestClient } from "@uniformdev/context/api";
@@ -9012,10 +9577,10 @@ var ManifestGetModule = {
   command: "get [output]",
   aliases: ["dl", "download"],
   describe: "Download the Uniform Context manifest for a project",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.option("preview", {
+        yargs44.option("preview", {
           describe: "If set, fetches the unpublished preview manifest (The API key must have permission)",
           default: false,
           type: "boolean",
@@ -9077,7 +9642,7 @@ import { exit as exit2 } from "process";
 var ManifestPublishModule = {
   command: "publish",
   describe: "Publish the Uniform Context manifest for a project",
-  builder: (yargs42) => withConfiguration(withApiOptions(withProjectOptions(yargs42))),
+  builder: (yargs44) => withConfiguration(withApiOptions(withProjectOptions(yargs44))),
   handler: async ({ apiKey, apiHost, proxy, project }) => {
     const fetch2 = nodeFetchProxy(proxy);
     try {
@@ -9110,25 +9675,25 @@ var ManifestModule = {
   command: "manifest <command>",
   describe: "Commands for context manifests",
   aliases: ["man"],
-  builder: (yargs42) => yargs42.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
   handler: () => {
-    yargs23.help();
+    yargs25.help();
   }
 };
 
 // src/commands/context/commands/quirk.ts
-import yargs24 from "yargs";
+import yargs26 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: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
+          yargs44.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
         )
       )
     )
@@ -9152,11 +9717,11 @@ var QuirkListModule = {
   command: "list",
   describe: "List quirks",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.option("withIntegrations", {
+          yargs44.option("withIntegrations", {
             alias: ["i"],
             describe: "Whether to include meta-quirks created by integrations in the list. Defaults to false.",
             type: "boolean"
@@ -9214,12 +9779,12 @@ function createQuirkEngineDataSource({
 var QuirkPullModule = {
   command: "pull <directory>",
   describe: "Pulls all quirks to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -9295,12 +9860,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: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.positional("directory", {
               describe: "Directory to read the quirks from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -9365,10 +9930,10 @@ var QuirkRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a quirk",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
+        yargs44.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
       )
     )
   ),
@@ -9385,10 +9950,10 @@ var QuirkUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a quirk",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("filename", { demandOption: true, describe: "Quirk file to put" })
+        yargs44.positional("filename", { demandOption: true, describe: "Quirk file to put" })
       )
     )
   ),
@@ -9405,25 +9970,25 @@ var QuirkModule = {
   command: "quirk <command>",
   aliases: ["qk"],
   describe: "Commands for Context quirks",
-  builder: (yargs42) => yargs42.command(QuirkPullModule).command(QuirkPushModule).command(QuirkGetModule).command(QuirkRemoveModule).command(QuirkListModule).command(QuirkUpdateModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(QuirkPullModule).command(QuirkPushModule).command(QuirkGetModule).command(QuirkRemoveModule).command(QuirkListModule).command(QuirkUpdateModule).demandCommand(),
   handler: () => {
-    yargs24.help();
+    yargs26.help();
   }
 };
 
 // src/commands/context/commands/signal.ts
-import yargs25 from "yargs";
+import yargs27 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: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
+          yargs44.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
         )
       )
     )
@@ -9447,7 +10012,7 @@ var SignalListModule = {
   command: "list",
   describe: "List signals",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs42)))),
+  builder: (yargs44) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs44)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new UncachedSignalClient2({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -9497,12 +10062,12 @@ function createSignalEngineDataSource({
 var SignalPullModule = {
   command: "pull <directory>",
   describe: "Pulls all signals to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -9578,12 +10143,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: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.positional("directory", {
               describe: "Directory to read the signals from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -9648,10 +10213,10 @@ var SignalRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a signal",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
+        yargs44.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
       )
     )
   ),
@@ -9668,10 +10233,10 @@ var SignalUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a signal",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("filename", { demandOption: true, describe: "Signal file to put" })
+        yargs44.positional("filename", { demandOption: true, describe: "Signal file to put" })
       )
     )
   ),
@@ -9688,25 +10253,25 @@ var SignalModule = {
   command: "signal <command>",
   aliases: ["sig"],
   describe: "Commands for Context signals",
-  builder: (yargs42) => yargs42.command(SignalPullModule).command(SignalPushModule).command(SignalGetModule).command(SignalRemoveModule).command(SignalListModule).command(SignalUpdateModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(SignalPullModule).command(SignalPushModule).command(SignalGetModule).command(SignalRemoveModule).command(SignalListModule).command(SignalUpdateModule).demandCommand(),
   handler: () => {
-    yargs25.help();
+    yargs27.help();
   }
 };
 
 // src/commands/context/commands/test.ts
-import yargs26 from "yargs";
+import yargs28 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: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
+          yargs44.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
         )
       )
     )
@@ -9730,7 +10295,7 @@ var TestListModule = {
   command: "list",
   describe: "List tests",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs42)))),
+  builder: (yargs44) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs44)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new UncachedTestClient2({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -9780,12 +10345,12 @@ function createTestEngineDataSource({
 var TestPullModule = {
   command: "pull <directory>",
   describe: "Pulls all tests to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -9861,12 +10426,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: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.positional("directory", {
               describe: "Directory to read the tests from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -9931,10 +10496,10 @@ var TestRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a test",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("id", { demandOption: true, describe: "Test public ID to delete" })
+        yargs44.positional("id", { demandOption: true, describe: "Test public ID to delete" })
       )
     )
   ),
@@ -9951,9 +10516,9 @@ var TestUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a test",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs42.positional("filename", { demandOption: true, describe: "Test file to put" }))
+      withProjectOptions(yargs44.positional("filename", { demandOption: true, describe: "Test file to put" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
@@ -9968,9 +10533,9 @@ var TestUpdateModule = {
 var TestModule = {
   command: "test <command>",
   describe: "Commands for Context A/B tests",
-  builder: (yargs42) => yargs42.command(TestPullModule).command(TestPushModule).command(TestGetModule).command(TestRemoveModule).command(TestListModule).command(TestUpdateModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(TestPullModule).command(TestPushModule).command(TestGetModule).command(TestRemoveModule).command(TestListModule).command(TestUpdateModule).demandCommand(),
   handler: () => {
-    yargs26.help();
+    yargs28.help();
   }
 };
 
@@ -9979,56 +10544,23 @@ var ContextCommand = {
   command: "context <command>",
   aliases: ["ctx"],
   describe: "Uniform Context commands",
-  builder: (yargs42) => yargs42.command(ManifestModule).command(SignalModule).command(EnrichmentModule).command(AggregateModule).command(QuirkModule).command(TestModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(ManifestModule).command(SignalModule).command(EnrichmentModule).command(AggregateModule).command(QuirkModule).command(TestModule).demandCommand(),
   handler: () => {
-    yargs27.showHelp();
+    yargs29.showHelp();
   }
 };
 
 // src/commands/integration/index.ts
-import yargs32 from "yargs";
+import yargs34 from "yargs";
 
 // src/commands/integration/commands/definition.ts
-import yargs31 from "yargs";
+import yargs33 from "yargs";
 
 // src/commands/integration/commands/definition/dataResourceEditor/dataResourceEditor.ts
-import yargs28 from "yargs";
+import yargs30 from "yargs";
 
 // src/commands/integration/commands/definition/dataResourceEditor/deploy.ts
-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;
-}
+import { readFileSync as readFileSync3 } from "fs";
 
 // src/commands/integration/commands/definition/edgehancer/EdgehancerClient.ts
 import { createLimitPolicy as createLimitPolicy2 } from "@uniformdev/canvas";
@@ -10063,8 +10595,8 @@ var EdgehancerClient = class extends ApiClient {
 };
 
 // src/commands/integration/commands/definition/dataResourceEditor/util.ts
-function withDataResourceEditorIdOptions(yargs42) {
-  return yargs42.option("connectorType", {
+function withDataResourceEditorIdOptions(yargs44) {
+  return yargs44.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"
@@ -10084,11 +10616,11 @@ function withDataResourceEditorIdOptions(yargs42) {
 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: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withTeamOptions(
         withDataResourceEditorIdOptions(
-          yargs42.positional("filename", {
+          yargs44.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", {
@@ -10119,7 +10651,7 @@ var IntegrationDataResourceEditorDeployModule = {
     const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch2, teamId });
     let code;
     if (skipBundle) {
-      code = readFileSync2(filename, "utf8");
+      code = readFileSync3(filename, "utf8");
     } else {
       code = await bundleWorkerCode(filename);
     }
@@ -10131,7 +10663,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: (yargs42) => withConfiguration(withApiOptions(withTeamOptions(withDataResourceEditorIdOptions(yargs42)))),
+  builder: (yargs44) => withConfiguration(withApiOptions(withTeamOptions(withDataResourceEditorIdOptions(yargs44)))),
   handler: async ({ apiHost, apiKey, proxy, team: teamId, connectorType, archetype, hook }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch2, teamId });
@@ -10143,21 +10675,21 @@ var IntegrationDataResourceEditorRemoveModule = {
 var IntegrationDataResourceEditorModule = {
   command: "dataResourceEditor <command>",
   describe: "Commands for managing custom AI data resource editors at the team level.",
-  builder: (yargs42) => yargs42.command(IntegrationDataResourceEditorDeployModule).command(IntegrationDataResourceEditorRemoveModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(IntegrationDataResourceEditorDeployModule).command(IntegrationDataResourceEditorRemoveModule).demandCommand(),
   handler: () => {
-    yargs28.help();
+    yargs30.help();
   }
 };
 
 // src/commands/integration/commands/definition/edgehancer/edgehancer.ts
-import yargs29 from "yargs";
+import yargs31 from "yargs";
 
 // src/commands/integration/commands/definition/edgehancer/deploy.ts
-import { readFileSync as readFileSync3 } from "fs";
+import { readFileSync as readFileSync4 } from "fs";
 
 // src/commands/integration/commands/definition/edgehancer/util.ts
-function withEdgehancerIdOptions(yargs42) {
-  return yargs42.option("connectorType", {
+function withEdgehancerIdOptions(yargs44) {
+  return yargs44.option("connectorType", {
     describe: "Integration data connector type to edgehance, as defined in the integration manifest file.",
     demandOption: true,
     type: "string"
@@ -10177,11 +10709,11 @@ function withEdgehancerIdOptions(yargs42) {
 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: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withTeamOptions(
         withEdgehancerIdOptions(
-          yargs42.positional("filename", {
+          yargs44.positional("filename", {
             demandOption: true,
             describe: "ESM code file to run for the target edgehancer hook. Refer to the documentation for expected types."
           }).option("compatibilityDate", {
@@ -10212,7 +10744,7 @@ var IntegrationEdgehancerDeployModule = {
     const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch2, teamId });
     let code;
     if (skipBundle) {
-      code = readFileSync3(filename, "utf8");
+      code = readFileSync4(filename, "utf8");
     } else {
       code = await bundleWorkerCode(filename);
     }
@@ -10224,7 +10756,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: (yargs42) => withConfiguration(withApiOptions(withTeamOptions(withEdgehancerIdOptions(yargs42)))),
+  builder: (yargs44) => withConfiguration(withApiOptions(withTeamOptions(withEdgehancerIdOptions(yargs44)))),
   handler: async ({ apiHost, apiKey, proxy, team: teamId, archetype, connectorType, hook }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch2, teamId });
@@ -10236,22 +10768,22 @@ var IntegrationEdgehancerRemoveModule = {
 var IntegrationEdgehancerModule = {
   command: "edgehancer <command>",
   describe: "Commands for managing custom integration edgehancers at the team level.",
-  builder: (yargs42) => yargs42.command(IntegrationEdgehancerDeployModule).command(IntegrationEdgehancerRemoveModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(IntegrationEdgehancerDeployModule).command(IntegrationEdgehancerRemoveModule).demandCommand(),
   handler: () => {
-    yargs29.help();
+    yargs31.help();
   }
 };
 
 // src/commands/integration/commands/definition/propertyEditor/propertyEditor.ts
-import yargs30 from "yargs";
+import yargs32 from "yargs";
 
 // src/commands/integration/commands/definition/propertyEditor/deploy.ts
 import { IntegrationPropertyEditorsClient } from "@uniformdev/canvas";
-import { readFileSync as readFileSync4 } from "fs";
+import { readFileSync as readFileSync5 } from "fs";
 
 // src/commands/integration/commands/definition/propertyEditor/util.ts
-function withPropertyEditorIdOptions(yargs42) {
-  return yargs42.option("propertyType", {
+function withPropertyEditorIdOptions(yargs44) {
+  return yargs44.option("propertyType", {
     describe: "Property type to attach the editor to.",
     demandOption: true,
     type: "string"
@@ -10267,11 +10799,11 @@ function withPropertyEditorIdOptions(yargs42) {
 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: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withTeamOptions(
         withPropertyEditorIdOptions(
-          yargs42.positional("filename", {
+          yargs44.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", {
@@ -10301,7 +10833,7 @@ var IntegrationPropertyEditorDeployModule = {
     const client = new IntegrationPropertyEditorsClient({ apiKey, apiHost, fetch: fetch2, teamId });
     let code;
     if (skipBundle) {
-      code = readFileSync4(filename, "utf8");
+      code = readFileSync5(filename, "utf8");
     } else {
       code = await bundleWorkerCode(filename);
     }
@@ -10314,7 +10846,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: (yargs42) => withConfiguration(withApiOptions(withTeamOptions(withPropertyEditorIdOptions(yargs42)))),
+  builder: (yargs44) => withConfiguration(withApiOptions(withTeamOptions(withPropertyEditorIdOptions(yargs44)))),
   handler: async ({ apiHost, apiKey, proxy, team: teamId, propertyType, hook }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new IntegrationPropertyEditorsClient2({ apiKey, apiHost, fetch: fetch2, teamId });
@@ -10326,9 +10858,9 @@ var IntegrationPropertyEditorRemoveModule = {
 var IntegrationPropertyEditorModule = {
   command: "propertyEditor <command>",
   describe: "Commands for managing custom AI property editors at the team level.",
-  builder: (yargs42) => yargs42.command(IntegrationPropertyEditorDeployModule).command(IntegrationPropertyEditorRemoveModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(IntegrationPropertyEditorDeployModule).command(IntegrationPropertyEditorRemoveModule).demandCommand(),
   handler: () => {
-    yargs30.help();
+    yargs32.help();
   }
 };
 
@@ -10368,10 +10900,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: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withTeamOptions(
-        yargs42.positional("filename", {
+        yargs44.positional("filename", {
           demandOption: true,
           describe: "Integration definition manifest to register"
         })
@@ -10390,10 +10922,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: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withTeamOptions(
-        yargs42.positional("type", {
+        yargs44.positional("type", {
           demandOption: true,
           describe: "Integration type (from its manifest) to remove."
         })
@@ -10411,9 +10943,9 @@ var IntegrationDefinitionRemoveModule = {
 var IntegrationDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for managing custom integration definitions at the team level.",
-  builder: (yargs42) => yargs42.command(IntegrationDefinitionRemoveModule).command(IntegrationDefinitionRegisterModule).command(IntegrationEdgehancerModule).command(IntegrationDataResourceEditorModule).command(IntegrationPropertyEditorModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(IntegrationDefinitionRemoveModule).command(IntegrationDefinitionRegisterModule).command(IntegrationEdgehancerModule).command(IntegrationDataResourceEditorModule).command(IntegrationPropertyEditorModule).demandCommand(),
   handler: () => {
-    yargs31.help();
+    yargs33.help();
   }
 };
 
@@ -10453,10 +10985,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: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("type", {
+        yargs44.positional("type", {
           demandOption: true,
           describe: "Integration type to install (as defined in its manifest)"
         }).option("configuration", {
@@ -10478,10 +11010,10 @@ var IntegrationInstallModule = {
 var IntegrationUninstallModule = {
   command: "uninstall <type>",
   describe: "Uninstalls an integration from a project. Existing usages of the integration may break.",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("type", {
+        yargs44.positional("type", {
           demandOption: true,
           describe: "Integration type to uninstall (as defined in its manifest)"
         })
@@ -10499,9 +11031,9 @@ var IntegrationUninstallModule = {
 var IntegrationCommand = {
   command: "integration <command>",
   describe: "Integration management commands",
-  builder: (yargs42) => yargs42.command(IntegrationDefinitionModule).command(IntegrationInstallModule).command(IntegrationUninstallModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(IntegrationDefinitionModule).command(IntegrationInstallModule).command(IntegrationUninstallModule).demandCommand(),
   handler: () => {
-    yargs32.showHelp();
+    yargs34.showHelp();
   }
 };
 
@@ -10749,7 +11281,7 @@ npm run dev
 
 // src/commands/new/commands/new-mesh-integration.ts
 import { input as input2 } from "@inquirer/prompts";
-import { existsSync as existsSync4, mkdirSync as mkdirSync3, readdirSync, readFileSync as readFileSync5, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync5, mkdirSync as mkdirSync3, readdirSync, readFileSync as readFileSync6, writeFileSync as writeFileSync2 } from "fs";
 import path7 from "path";
 import slugify2 from "slugify";
 async function newMeshIntegrationHandler({
@@ -10798,16 +11330,16 @@ async function newMeshIntegrationHandler({
   });
   let done = await spin("Registering integration to team...");
   const pathToManifest = path7.resolve(targetDir, "mesh-manifest.json");
-  if (!existsSync4(pathToManifest)) {
+  if (!existsSync5(pathToManifest)) {
     throw new Error("Invalid integration starter cloned: missing `mesh-manifest.json`");
   }
-  const manifestContents = readFileSync5(pathToManifest, "utf-8");
+  const manifestContents = readFileSync6(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(readFileSync5(packageJsonPath, "utf-8"));
+  const packageJson = JSON.parse(readFileSync6(packageJsonPath, "utf-8"));
   packageJson.name = typeSlug;
   writeFileSync2(packageJsonPath, JSON.stringify(packageJson, null, 2), "utf-8");
   const fullMeshAppKey = await uniformClient.registerMeshIntegration({ teamId, manifest: manifestJson });
@@ -10852,12 +11384,12 @@ function validateIntegrationName(integrationName, explicitOutputPath) {
     throw new Error("Integration name cannot be shorter than 6 characters.");
   }
   let targetDir = explicitOutputPath ?? process.cwd();
-  if (!existsSync4(targetDir)) {
+  if (!existsSync5(targetDir)) {
     mkdirSync3(targetDir, { recursive: true });
   }
   if (readdirSync(targetDir).length > 0) {
     targetDir = path7.resolve(targetDir, typeSlug);
-    if (existsSync4(targetDir)) {
+    if (existsSync5(targetDir)) {
       throw new Error(`${targetDir} directory already exists, choose a different name.`);
     }
   }
@@ -10966,14 +11498,14 @@ var NewMeshCmd = {
 };
 
 // src/commands/policy-documents/index.ts
-import yargs33 from "yargs";
+import yargs35 from "yargs";
 
 // src/commands/policy-documents/commands/list.ts
 var PolicyDocumentsListModule = {
   command: "list",
   describe: "List policy documents for a project",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs42)))),
+  builder: (yargs44) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs44)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const url = new URL(`/api/v1/policy-documents`, apiHost);
@@ -11058,12 +11590,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: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -11118,18 +11650,19 @@ var PolicyDocumentsPullModule = {
 };
 
 // src/commands/policy-documents/commands/push.ts
-import { readdir as readdir2, stat } from "fs/promises";
-import { extname as extname2, join as join11 } from "path";
+import { existsSync as existsSync6, mkdirSync as mkdirSync4 } from "fs";
+import { readdir as readdir2 } from "fs/promises";
+import { extname as extname3, join as join12 } from "path";
 async function readLocalPolicyDocuments(directory, format, verbose) {
   const files = await readdir2(directory);
   const policyDocuments = {};
   const errors = [];
   for (const filename of files) {
-    const ext = extname2(filename);
+    const ext = extname3(filename);
     if (ext !== `.${format}` && ext !== ".yaml" && ext !== ".yml" && ext !== ".json") {
       continue;
     }
-    const filePath = join11(directory, filename);
+    const filePath = join12(directory, filename);
     try {
       let roleId = filename.replace(ext, "");
       const fileContent = readFileToObject(filePath);
@@ -11196,12 +11729,12 @@ function mergePolicyDocuments(localDocs, remoteDocs, mode) {
 var PolicyDocumentsPushModule = {
   command: "push <directory>",
   describe: "Pushes policy documents from local files to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.positional("directory", {
               describe: "Directory containing policy document files (one file per role ID).",
               type: "string"
             }).option("format", {
@@ -11235,16 +11768,11 @@ var PolicyDocumentsPushModule = {
     allowEmptySource,
     verbose
   }) => {
-    try {
-      const dirStat = await stat(directory);
-      if (!dirStat.isDirectory()) {
-        throw new Error(`Path "${directory}" is not a directory`);
-      }
-    } catch (e) {
-      if (e.code === "ENOENT") {
-        throw new Error(`Directory "${directory}" does not exist`);
+    if (!existsSync6(directory)) {
+      if (verbose) {
+        console.log(`Creating directory ${directory}`);
       }
-      throw e;
+      mkdirSync4(directory, { recursive: true });
     }
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const localDocs = await readLocalPolicyDocuments(directory, format, verbose);
@@ -11302,17 +11830,17 @@ var PolicyDocumentsCommand = {
   command: "policy-documents <command>",
   aliases: ["policy", "policies"],
   describe: "Uniform Policy Documents commands",
-  builder: (yargs42) => yargs42.command(PolicyDocumentsListModule).command(PolicyDocumentsPullModule).command(PolicyDocumentsPushModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(PolicyDocumentsListModule).command(PolicyDocumentsPullModule).command(PolicyDocumentsPushModule).demandCommand(),
   handler: () => {
-    yargs33.showHelp();
+    yargs35.showHelp();
   }
 };
 
 // src/commands/project-map/index.ts
-import yargs36 from "yargs";
+import yargs38 from "yargs";
 
 // src/commands/project-map/commands/projectMapDefinition.ts
-import yargs34 from "yargs";
+import yargs36 from "yargs";
 
 // src/commands/project-map/commands/ProjectMapDefinition/_util.ts
 import { UncachedProjectMapClient } from "@uniformdev/project-map";
@@ -11326,11 +11854,11 @@ function getProjectMapClient(options) {
 var ProjectMapDefinitionGetModule = {
   command: "get <id>",
   describe: "Fetch a project map",
-  builder: (yargs42) => withFormatOptions(
+  builder: (yargs44) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
+          yargs44.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
         )
       )
     )
@@ -11353,7 +11881,7 @@ var ProjectMapDefinitionListModule = {
   command: "list",
   describe: "List of project maps",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs42)))),
+  builder: (yargs44) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs44)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = getProjectMapClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -11407,12 +11935,12 @@ function createProjectMapDefinitionEngineDataSource({
 var ProjectMapDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -11487,12 +12015,12 @@ var ProjectMapDefinitionPullModule = {
 var ProjectMapDefinitionPushModule = {
   command: "push <directory>",
   describe: "Pushes all project maps from files in a directory or package to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.positional("directory", {
               describe: "Directory to read project maps from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -11556,9 +12084,9 @@ var ProjectMapDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs42.positional("id", { demandOption: true, describe: " UUID to delete" }))
+      withProjectOptions(yargs44.positional("id", { demandOption: true, describe: " UUID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -11573,10 +12101,10 @@ var ProjectMapDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a project map",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("filename", { demandOption: true, describe: "Project map file to put" })
+        yargs44.positional("filename", { demandOption: true, describe: "Project map file to put" })
       )
     )
   ),
@@ -11592,24 +12120,24 @@ var ProjectMapDefinitionUpdateModule = {
 var ProjectMapDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for ProjectMap Definitions",
-  builder: (yargs42) => yargs42.command(ProjectMapDefinitionPullModule).command(ProjectMapDefinitionPushModule).command(ProjectMapDefinitionGetModule).command(ProjectMapDefinitionRemoveModule).command(ProjectMapDefinitionListModule).command(ProjectMapDefinitionUpdateModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(ProjectMapDefinitionPullModule).command(ProjectMapDefinitionPushModule).command(ProjectMapDefinitionGetModule).command(ProjectMapDefinitionRemoveModule).command(ProjectMapDefinitionListModule).command(ProjectMapDefinitionUpdateModule).demandCommand(),
   handler: () => {
-    yargs34.help();
+    yargs36.help();
   }
 };
 
 // src/commands/project-map/commands/projectMapNode.ts
-import yargs35 from "yargs";
+import yargs37 from "yargs";
 
 // src/commands/project-map/commands/ProjectMapNode/get.ts
 var ProjectMapNodeGetModule = {
   command: "get <id> <projectMapId>",
   describe: "Fetch a project map node",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to fetch" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to fetch from" })
+          yargs44.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to fetch" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to fetch from" })
         )
       )
     )
@@ -11633,12 +12161,12 @@ var ProjectMapNodeListModule = {
   command: "list <projectMapId>",
   describe: "List project map nodes",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs42.positional("projectMapId", {
+            yargs44.positional("projectMapId", {
               demandOption: true,
               describe: "ProjectMap UUID to fetch from"
             })
@@ -11716,12 +12244,12 @@ function createProjectMapNodeEngineDataSource({
 var ProjectMapNodePullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps nodes to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -11803,12 +12331,12 @@ import {
 var ProjectMapNodePushModule = {
   command: "push <directory>",
   describe: "Pushes all project maps nodes from files in a directory or package to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.positional("directory", {
               describe: "Directory to read project maps from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -11910,10 +12438,10 @@ var ProjectMapNodeRemoveModule = {
   command: "remove <id> <projectMapId>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map node",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to delete" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to delete from" })
+        yargs44.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to delete" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to delete from" })
       )
     )
   ),
@@ -11929,10 +12457,10 @@ var ProjectMapNodeUpdateModule = {
   command: "update <filename> <projectMapId>",
   aliases: ["put"],
   describe: "Insert or update a project map node",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("filename", { demandOption: true, describe: "ProjectMap node file with nodes data" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to put into" })
+        yargs44.positional("filename", { demandOption: true, describe: "ProjectMap node file with nodes data" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to put into" })
       )
     )
   ),
@@ -11948,9 +12476,9 @@ var ProjectMapNodeUpdateModule = {
 var ProjectMapNodeModule = {
   command: "node <command>",
   describe: "Commands for ProjectMap Nodes",
-  builder: (yargs42) => yargs42.command(ProjectMapNodePullModule).command(ProjectMapNodePushModule).command(ProjectMapNodeGetModule).command(ProjectMapNodeRemoveModule).command(ProjectMapNodeListModule).command(ProjectMapNodeUpdateModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(ProjectMapNodePullModule).command(ProjectMapNodePushModule).command(ProjectMapNodeGetModule).command(ProjectMapNodeRemoveModule).command(ProjectMapNodeListModule).command(ProjectMapNodeUpdateModule).demandCommand(),
   handler: () => {
-    yargs35.help();
+    yargs37.help();
   }
 };
 
@@ -11959,17 +12487,17 @@ var ProjectMapCommand = {
   command: "project-map <command>",
   aliases: ["prm"],
   describe: "Uniform ProjectMap commands",
-  builder: (yargs42) => yargs42.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
   handler: () => {
-    yargs36.showHelp();
+    yargs38.showHelp();
   }
 };
 
 // src/commands/redirect/index.ts
-import yargs38 from "yargs";
+import yargs40 from "yargs";
 
 // src/commands/redirect/commands/redirect.ts
-import yargs37 from "yargs";
+import yargs39 from "yargs";
 
 // src/commands/redirect/commands/RedirectDefinition/_util.ts
 import { UncachedRedirectClient } from "@uniformdev/redirect";
@@ -11994,11 +12522,11 @@ function getRedirectClient(options) {
 var RedirectDefinitionGetModule = {
   command: "get <id>",
   describe: "Fetch a redirect",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
+          yargs44.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
         )
       )
     )
@@ -12021,7 +12549,7 @@ var RedirectDefinitionListModule = {
   command: "list",
   describe: "List of redirects",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs42)))),
+  builder: (yargs44) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs44)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = getRedirectClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -12073,12 +12601,12 @@ function createRedirectDefinitionEngineDataSource({
 var RedirectDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all redirects to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -12154,12 +12682,12 @@ var RedirectDefinitionPullModule = {
 var RedirectDefinitionPushModule = {
   command: "push <directory>",
   describe: "Pushes all redirects from files in a directory or package to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.positional("directory", {
               describe: "Directory to read redirects from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -12223,9 +12751,9 @@ var RedirectDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a redirect",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs42.positional("id", { demandOption: true, describe: " UUID to delete" }))
+      withProjectOptions(yargs44.positional("id", { demandOption: true, describe: " UUID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -12240,10 +12768,10 @@ var RedirectDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a redirect",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("filename", { demandOption: true, describe: "Redirect file to put" })
+        yargs44.positional("filename", { demandOption: true, describe: "Redirect file to put" })
       )
     )
   ),
@@ -12259,9 +12787,9 @@ var RedirectDefinitionUpdateModule = {
 var RedirectDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for Redirect Definitions",
-  builder: (yargs42) => yargs42.command(RedirectDefinitionPullModule).command(RedirectDefinitionPushModule).command(RedirectDefinitionGetModule).command(RedirectDefinitionRemoveModule).command(RedirectDefinitionListModule).command(RedirectDefinitionUpdateModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(RedirectDefinitionPullModule).command(RedirectDefinitionPushModule).command(RedirectDefinitionGetModule).command(RedirectDefinitionRemoveModule).command(RedirectDefinitionListModule).command(RedirectDefinitionUpdateModule).demandCommand(),
   handler: () => {
-    yargs37.help();
+    yargs39.help();
   }
 };
 
@@ -12270,20 +12798,20 @@ var RedirectCommand = {
   command: "redirect <command>",
   aliases: ["red"],
   describe: "Uniform Redirect commands",
-  builder: (yargs42) => yargs42.command(RedirectDefinitionModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(RedirectDefinitionModule).demandCommand(),
   handler: () => {
-    yargs38.showHelp();
+    yargs40.showHelp();
   }
 };
 
 // src/commands/sync/index.ts
-import yargs39 from "yargs";
+import yargs41 from "yargs";
 
 // src/webhooksClient.ts
 import { ApiClient as ApiClient4 } from "@uniformdev/context/api";
 import PQueue3 from "p-queue";
 import { Svix } from "svix";
-import * as z3 from "zod/v3";
+import * as z4 from "zod";
 var WEBHOOKS_DASHBOARD_BASE_PATH = "/api/v1/svix-dashboard";
 var WebhooksClient = class extends ApiClient4 {
   constructor(options) {
@@ -12303,14 +12831,14 @@ var WebhooksClient = class extends ApiClient4 {
     if (!key) {
       throw new Error("Failed to get webhooks token");
     }
-    const keySchema = z3.object({
-      appId: z3.string(),
-      oneTimeToken: z3.string(),
-      region: z3.enum(["us", "eu"])
+    const keySchema = z4.object({
+      appId: z4.string(),
+      oneTimeToken: z4.string(),
+      region: z4.enum(["us", "eu"])
     });
     const { appId, oneTimeToken, region } = keySchema.parse(JSON.parse(atob(key)));
-    const tokenSchema = z3.object({
-      token: z3.string()
+    const tokenSchema = z4.object({
+      token: z4.string()
     });
     const tokenResponse = await fetch(`https://api.${region}.svix.com/api/v1/auth/one-time-token`, {
       method: "POST",
@@ -12471,12 +12999,12 @@ function createWebhookEngineDataSource({
 var WebhookPullModule = {
   command: "pull <directory>",
   describe: "Pulls all webhooks to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.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", {
@@ -12662,11 +13190,12 @@ function numPad(num, spaces = 6) {
 var SyncPullModule = {
   command: "pull",
   describe: "Pulls whole project to local files in a directory",
-  builder: (yargs42) => withConfiguration(withApiOptions(withProjectOptions(withDebugOptions(withDiffOptions(yargs42))))),
+  builder: (yargs44) => withConfiguration(withApiOptions(withProjectOptions(withDebugOptions(withDiffOptions(yargs44))))),
   handler: async ({ serialization, ...otherParams }) => {
     const config2 = serialization;
     const enabledEntities = Object.entries({
       locale: LocalePullModule,
+      label: LabelPullModule,
       asset: AssetPullModule,
       category: CategoryPullModule,
       workflow: WorkflowPullModule,
@@ -12761,12 +13290,12 @@ var getFormat = (entityType, config2) => {
 var WebhookPushModule = {
   command: "push <directory>",
   describe: "Pushes all webhooks from files in a directory to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs44) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs44.positional("directory", {
               describe: "Directory to read from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -12830,11 +13359,12 @@ var WebhookPushModule = {
 var SyncPushModule = {
   command: "push",
   describe: "Pushes whole project data from files in a directory or package to Uniform",
-  builder: (yargs42) => withConfiguration(withApiOptions(withProjectOptions(withDiffOptions(withDebugOptions(yargs42))))),
+  builder: (yargs44) => withConfiguration(withApiOptions(withProjectOptions(withDiffOptions(withDebugOptions(yargs44))))),
   handler: async ({ serialization, ...otherParams }) => {
     const config2 = serialization;
     const enabledEntities = Object.entries({
       locale: LocalePushModule,
+      label: LabelPushModule,
       asset: AssetPushModule,
       category: CategoryPushModule,
       workflow: WorkflowPushModule,
@@ -13040,21 +13570,21 @@ var getFormat2 = (entityType, config2) => {
 var SyncCommand = {
   command: "sync <command>",
   describe: "Uniform Sync commands",
-  builder: (yargs42) => yargs42.command(SyncPullModule).command(SyncPushModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(SyncPullModule).command(SyncPushModule).demandCommand(),
   handler: () => {
-    yargs39.showHelp();
+    yargs41.showHelp();
   }
 };
 
 // src/commands/webhook/index.ts
-import yargs40 from "yargs";
+import yargs42 from "yargs";
 var WebhookCommand = {
   command: "webhook <command>",
   aliases: ["wh"],
   describe: "Commands for webhooks",
-  builder: (yargs42) => yargs42.command(WebhookPullModule).command(WebhookPushModule).demandCommand(),
+  builder: (yargs44) => yargs44.command(WebhookPullModule).command(WebhookPushModule).demandCommand(),
   handler: () => {
-    yargs40.help();
+    yargs42.help();
   }
 };
 
@@ -13062,29 +13592,29 @@ var WebhookCommand = {
 import { bold as bold3, gray as gray6, green as green7 } from "colorette";
 
 // src/updateCheck.ts
-import { existsSync as existsSync5, promises as fs8 } from "fs";
+import { existsSync as existsSync7, promises as fs8 } from "fs";
 import { get as getHttp } from "http";
 import { get as getHttps } from "https";
-import { tmpdir } from "os";
-import { join as join12 } from "path";
+import { tmpdir as tmpdir2 } from "os";
+import { join as join13 } 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 = tmpdir();
-  const subDir = join12(rootDir, "update-check");
-  if (!existsSync5(subDir)) {
+  const rootDir = tmpdir2();
+  const subDir = join13(rootDir, "update-check");
+  if (!existsSync7(subDir)) {
     await fs8.mkdir(subDir);
   }
   let name = `${details.name}-${distTag}.json`;
   if (details.scope) {
     name = `${details.scope}-${name}`;
   }
-  return join12(subDir, name);
+  return join13(subDir, name);
 };
 var evaluateCache = async (file, time, interval) => {
-  if (existsSync5(file)) {
+  if (existsSync7(file)) {
     const content = await fs8.readFile(file, "utf8");
     const { lastUpdate, latest } = JSON.parse(content);
     const nextCheck = lastUpdate + interval;
@@ -13107,7 +13637,7 @@ var updateCache = async (file, latest, lastUpdate) => {
   });
   await fs8.writeFile(file, content, "utf8");
 };
-var loadPackage = ({ url, timeout }, authInfo) => new Promise((resolve2, reject) => {
+var loadPackage = ({ url, timeout }, authInfo) => new Promise((resolve4, reject) => {
   const options = {
     host: url.hostname,
     path: url.pathname,
@@ -13138,7 +13668,7 @@ var loadPackage = ({ url, timeout }, authInfo) => new Promise((resolve2, reject)
     response.on("end", () => {
       try {
         const parsedData = JSON.parse(rawData);
-        resolve2(parsedData);
+        resolve4(parsedData);
       } catch (e) {
         reject(e);
       }
@@ -13236,7 +13766,7 @@ var checkForUpdateMiddleware = async ({ verbose }) => {
 
 // src/middleware/checkLocalDepsVersionsMiddleware.ts
 import { magenta, red as red8 } from "colorette";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 var uniformStrictVersions = [
   "@uniformdev/canvas",
   "@uniformdev/canvas-next",
@@ -13258,7 +13788,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(join13(process.cwd(), "package.json"));
+    const localPackages = await tryReadJSON(join14(process.cwd(), "package.json"));
     if (!localPackages) return;
     let firstVersion;
     const allDependencies = {
@@ -13289,11 +13819,11 @@ First found was: v${firstVersion}`;
 
 // src/index.ts
 dotenv.config();
-var yarggery = yargs41(hideBin(process.argv));
+var yarggery = yargs43(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(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();
+}).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).recommendCommands().demandCommand(1, "").strict().help().middleware([checkForUpdateMiddleware, checkLocalDepsVersions]).parse();