@uniformdev/cli 20.47.2-alpha.4 → 20.48.1-alpha.11

package/dist/index.mjs

@@ -20,7 +20,7 @@ import {
 
 // src/index.ts
 import * as dotenv from "dotenv";
-import yargs41 from "yargs";
+import yargs42 from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // src/commands/ai/index.ts
@@ -150,10 +150,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 +324,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 +447,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
   }));
@@ -722,7 +722,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 +1033,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 +1042,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!) {
+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}` };
+    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}`);
@@ -1124,7 +1107,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "20.47.1",
+  version: "20.56.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -1180,7 +1163,7 @@ var package_default = {
     open: "10.2.0",
     ora: "8.0.1",
     "p-queue": "7.3.4",
-    "posthog-node": "5.10.3",
+    "posthog-node": "5.28.5",
     "registry-auth-token": "^5.0.0",
     "registry-url": "^6.0.0",
     slugify: "1.6.6",
@@ -1343,16 +1326,12 @@ function getMcpDirectory(agentType, customDir) {
 // src/commands/ai/lib/mcp.ts
 import { yellow as yellow2 } from "colorette";
 import { existsSync as existsSync3, readFileSync } from "fs";
-function createUniformMcpServerConfig(apiKey, projectId, aiApiHost, apiHost) {
+function createUniformMcpServerConfig(apiKey, projectId, aiApiHost, _apiHost) {
   return {
-    type: "stdio",
-    command: "npx",
-    args: ["-y", "@uniformdev/uniform-mcp"],
-    env: {
-      UNIFORM_API_KEY: apiKey,
-      UNIFORM_PROJECT_ID: projectId,
-      UNIFORM_AI_API_HOST: aiApiHost,
-      UNIFORM_API_HOST: apiHost
+    type: "streamable-http",
+    url: `${aiApiHost}/projects/${projectId}/mcp`,
+    headers: {
+      "x-api-key": apiKey
     }
   };
 }
@@ -1407,8 +1386,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: (yargs43) => withConfiguration(
+    yargs43.option("agent", {
       alias: "a",
       describe: "Specify agent type (cursor, claude, copilot, other)",
       type: "string",
@@ -1560,7 +1539,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") {
@@ -1608,7 +1587,7 @@ Selected agent: ${agentType}`));
 var McpCommand = {
   command: "mcp <command>",
   describe: "Uniform MCP server management commands",
-  builder: (yargs42) => yargs42.command(InstallMcpCommand).demandCommand(),
+  builder: (yargs43) => yargs43.command(InstallMcpCommand).demandCommand(),
   handler: () => {
     yargs.showHelp();
   }
@@ -2083,8 +2062,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: (yargs43) => withConfiguration(
+    yargs43.option("agent", {
       alias: "a",
       describe: "Specify agent type (cursor, claude, copilot, other)",
       type: "string",
@@ -2122,7 +2101,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: (yargs43) => withConfiguration(yargs43),
   handler: async function() {
     const { stopAllSpinners, spin } = makeSpinner();
     try {
@@ -2151,7 +2130,7 @@ var ListRulesCommand = {
 var RulesCommand = {
   command: "rules <command>",
   describe: "Uniform AI rules management commands",
-  builder: (yargs42) => yargs42.command(InstallRulesCommand).command(ListRulesCommand).demandCommand(),
+  builder: (yargs43) => yargs43.command(InstallRulesCommand).command(ListRulesCommand).demandCommand(),
   handler: () => {
     yargs2.showHelp();
   }
@@ -2161,14 +2140,14 @@ var RulesCommand = {
 var AiCommand = {
   command: "ai <command>",
   describe: "Uniform AI development assistant commands",
-  builder: (yargs42) => yargs42.command(RulesCommand).command(McpCommand).demandCommand(),
+  builder: (yargs43) => yargs43.command(RulesCommand).command(McpCommand).demandCommand(),
   handler: () => {
     yargs3.showHelp();
   }
 };
 
 // src/commands/canvas/index.ts
-import yargs20 from "yargs";
+import yargs21 from "yargs";
 
 // src/commands/canvas/commands/asset.ts
 import yargs4 from "yargs";
@@ -2200,12 +2179,12 @@ function getFileClient(options) {
 var AssetGetModule = {
   command: "get <id>",
   describe: "Get an asset",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.positional("id", { demandOption: true, describe: "Asset ID to fetch" })
+            yargs43.positional("id", { demandOption: true, describe: "Asset ID to fetch" })
           )
         )
       )
@@ -2226,7 +2205,7 @@ var AssetGetModule = {
 var AssetListModule = {
   command: "list",
   describe: "List assets",
-  builder: (yargs42) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs42))))),
+  builder: (yargs43) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs43))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getAssetClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -2480,7 +2459,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
@@ -2616,6 +2595,15 @@ var compareCompositionsOrEntriesWithoutAssetUrls = (source, target) => {
     removeUrlsFromAssetParameters(structuredClone(target.object))
   );
 };
+var PUBLISH_TIMESTAMP_TOLERANCE_MS = 2e3;
+var compareCompositionsOrEntriesWithoutAssetUrlsForPublishing = (source, target) => {
+  const sourceModified = new Date(source.object.modified).getTime();
+  const targetModified = new Date(target.object.modified).getTime();
+  if (sourceModified - targetModified > PUBLISH_TIMESTAMP_TOLERANCE_MS) {
+    return false;
+  }
+  return compareCompositionsOrEntriesWithoutAssetUrls(source, target);
+};
 var removeUrlFromAsset = (asset) => {
   if (asset.asset.fields?.url?.value) {
     asset.asset.fields.url.value = "";
@@ -2754,7 +2742,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]) {
@@ -2779,8 +2767,8 @@ function prepCompositionForDisk(composition) {
   delete prepped.state;
   return prepped;
 }
-function withStateOptions(yargs42, defaultState = "preview") {
-  return yargs42.option("state", {
+function withStateOptions(yargs43, defaultState = "preview") {
+  return yargs43.option("state", {
     type: "string",
     describe: `State to fetch.`,
     choices: ["preview", "published"],
@@ -2862,12 +2850,12 @@ function writeCanvasPackage(filename, packageContents) {
 var AssetPullModule = {
   command: "pull <directory>",
   describe: "Pulls all assets to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the assets to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -2979,12 +2967,12 @@ var AssetPullModule = {
 var AssetPushModule = {
   command: "push <directory>",
   describe: "Pushes all assets from files in a directory to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the assets from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -3108,10 +3096,10 @@ var AssetRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an asset",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
-        withProjectOptions(yargs42.positional("id", { demandOption: true, describe: "Asset ID to delete" }))
+        withProjectOptions(yargs43.positional("id", { demandOption: true, describe: "Asset ID to delete" }))
       )
     )
   ),
@@ -3132,11 +3120,11 @@ var AssetUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an asset",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("filename", { demandOption: true, describe: "Asset file to put" })
+          yargs43.positional("filename", { demandOption: true, describe: "Asset file to put" })
         )
       )
     )
@@ -3162,7 +3150,7 @@ 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: (yargs43) => yargs43.command(AssetGetModule).command(AssetListModule).command(AssetRemoveModule).command(AssetUpdateModule).command(AssetPullModule).command(AssetPushModule).demandCommand(),
   handler: () => {
     yargs4.help();
   }
@@ -3183,12 +3171,12 @@ function getCategoryClient(options) {
 var CategoryGetModule = {
   command: "get <id>",
   describe: "Fetch a category",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
+            yargs43.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
           )
         )
       )
@@ -3213,8 +3201,8 @@ var CategoryListModule = {
   command: "list",
   describe: "List categories",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(
-    withFormatOptions(withDebugOptions(withApiOptions(withProjectOptions(yargs42.options({})))))
+  builder: (yargs43) => withConfiguration(
+    withFormatOptions(withDebugOptions(withApiOptions(withProjectOptions(yargs43.options({})))))
   ),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
@@ -3258,12 +3246,12 @@ function createCategoriesEngineDataSource({
 var CategoryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all categories to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
           withDebugOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the categories to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -3338,12 +3326,12 @@ var CategoryPullModule = {
 var CategoryPushModule = {
   command: "push <directory>",
   describe: "Pushes all categories from files in a directory to Uniform Canvas",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the categories from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -3407,11 +3395,11 @@ var CategoryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a category",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Category UUID to delete" })
+          yargs43.positional("id", { demandOption: true, describe: "Category UUID to delete" })
         )
       )
     )
@@ -3432,11 +3420,11 @@ var CategoryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a category",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("filename", { demandOption: true, describe: "Category file to put" })
+          yargs43.positional("filename", { demandOption: true, describe: "Category file to put" })
         )
       )
     )
@@ -3458,7 +3446,7 @@ 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: (yargs43) => yargs43.command(CategoryPullModule).command(CategoryPushModule).command(CategoryGetModule).command(CategoryRemoveModule).command(CategoryListModule).command(CategoryUpdateModule).demandCommand(),
   handler: () => {
     yargs5.help();
   }
@@ -3480,12 +3468,12 @@ function getCanvasClient(options) {
 var ComponentGetModule = {
   command: "get <id>",
   describe: "Fetch a component definition",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.positional("id", {
+            yargs43.positional("id", {
               demandOption: true,
               describe: "Component definition public ID to fetch"
             })
@@ -3519,12 +3507,12 @@ var ComponentListModule = {
   command: "list",
   describe: "List component definitions",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.options({
+            yargs43.options({
               offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
               limit: { describe: "Number of rows to fetch", type: "number", default: 20 }
             })
@@ -3593,12 +3581,12 @@ function createComponentDefinitionEngineDataSource({
 var ComponentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all component definitions to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -3674,12 +3662,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: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the component definitions from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -3744,11 +3732,11 @@ var ComponentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a component definition",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", {
+          yargs43.positional("id", {
             demandOption: true,
             describe: "Component definition public ID to delete"
           })
@@ -3772,11 +3760,11 @@ var ComponentUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a component definition",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("filename", { demandOption: true, describe: "Component definition file to put" })
+          yargs43.positional("filename", { demandOption: true, describe: "Component definition file to put" })
         )
       )
     )
@@ -3798,7 +3786,7 @@ 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: (yargs43) => yargs43.command(ComponentPullModule).command(ComponentPushModule).command(ComponentGetModule).command(ComponentRemoveModule).command(ComponentListModule).command(ComponentUpdateModule).demandCommand(),
   handler: () => {
     yargs6.help();
   }
@@ -3811,13 +3799,13 @@ import yargs7 from "yargs";
 var CompositionGetModule = {
   command: "get <id>",
   describe: "Fetch a composition",
-  builder: (yargs42) => withFormatOptions(
+  builder: (yargs43) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDebugOptions(
-              yargs42.positional("id", {
+              yargs43.positional("id", {
                 demandOption: true,
                 describe: "Composition/pattern public ID to fetch"
               }).option({
@@ -3907,13 +3895,13 @@ var CompositionListModule = {
   command: "list",
   describe: "List compositions",
   aliases: ["ls"],
-  builder: (yargs42) => withFormatOptions(
+  builder: (yargs43) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withDebugOptions(
             withStateOptions(
-              yargs42.options({
+              yargs43.options({
                 offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
                 limit: { describe: "Number of rows to fetch", type: "number", default: 20 },
                 search: { describe: "Search query", type: "string", default: "" },
@@ -3994,13 +3982,13 @@ var CompositionListModule = {
 var ComponentPatternListModule = {
   ...CompositionListModule,
   describe: "List component patterns",
-  builder: (yargs42) => withFormatOptions(
+  builder: (yargs43) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withDebugOptions(
           withProjectOptions(
             withStateOptions(
-              yargs42.options({
+              yargs43.options({
                 offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
                 limit: { describe: "Number of rows to fetch", type: "number", default: 20 },
                 resolvePatterns: {
@@ -4123,12 +4111,12 @@ function createComponentInstanceEngineDataSource({
 var CompositionPublishModule = {
   command: "publish [ids]",
   describe: "Publishes composition(s)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDebugOptions(
           withDiffOptions(
-            yargs42.positional("ids", {
+            yargs43.positional("ids", {
               describe: "Publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
               type: "string"
             }).option("all", {
@@ -4205,7 +4193,7 @@ var CompositionPublishModule = {
           fileClient
         });
       },
-      compareContents: compareCompositionsOrEntriesWithoutAssetUrls,
+      compareContents: compareCompositionsOrEntriesWithoutAssetUrlsForPublishing,
       onBeforeWriteObject: async (sourceObject) => {
         return uploadFilesForCompositionOrEntry({
           entity: sourceObject,
@@ -4221,12 +4209,12 @@ var CompositionPublishModule = {
 var ComponentPatternPublishModule = {
   ...CompositionPublishModule,
   describe: "Publishes component pattern(s)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("ids", {
+            yargs43.positional("ids", {
               describe: "Publishes component pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
               type: "string"
             }).option("all", {
@@ -4266,13 +4254,13 @@ function componentInstancePullModuleFactory(type) {
   return {
     command: "pull <directory>",
     describe: "Pulls all compositions to local files in a directory",
-    builder: (yargs42) => withConfiguration(
+    builder: (yargs43) => withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDebugOptions(
               withDiffOptions(
-                yargs42.positional("directory", {
+                yargs43.positional("directory", {
                   describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
                   type: "string"
                 }).option("format", {
@@ -4387,13 +4375,13 @@ function componentInstancePullModuleFactory(type) {
 var ComponentPatternPullModule = {
   ...componentInstancePullModuleFactory("componentPatterns"),
   describe: "Pulls all component patterns to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDebugOptions(
           withStateOptions(
             withDiffOptions(
-              yargs42.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
                 type: "string"
               }).option("format", {
@@ -4467,13 +4455,13 @@ function componentInstancePushModuleFactory(type) {
   return {
     command: "push <directory>",
     describe: "Pushes all compositions from files in a directory to Uniform Canvas",
-    builder: (yargs42) => withConfiguration(
+    builder: (yargs43) => withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDebugOptions(
               withDiffOptions(
-                yargs42.positional("directory", {
+                yargs43.positional("directory", {
                   describe: "Directory to read the compositions/patterns from. If a filename is used, a package will be read instead.",
                   type: "string"
                 }).option("mode", {
@@ -4587,13 +4575,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: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
             withDebugOptions(
-              yargs42.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to read the compositions/component patterns from. If a filename is used, a package will be read instead.",
                 type: "string"
               }).option("mode", {
@@ -4627,11 +4615,11 @@ var CompositionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a composition",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("id", {
+          yargs43.positional("id", {
             demandOption: true,
             describe: "Composition/pattern public ID to delete"
           })
@@ -4660,29 +4648,32 @@ var ComponentPatternRemoveModule = {
 };
 
 // src/commands/canvas/commands/composition/unpublish.ts
-import { CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE2 } from "@uniformdev/canvas";
+import {
+  ApiClientError,
+  CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE2
+} from "@uniformdev/canvas";
 import { diffJson as diffJson2 } from "diff";
 var CompositionUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a composition(s)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("ids", {
+          yargs43.positional("ids", {
             describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
             type: "string"
           }).option("all", {
             alias: ["a"],
-            describe: "Un-publishes all compositions. Use compositionId to publish one instead.",
+            describe: "Un-publishes all compositions. Use composition ID(s) to unpublish specific one(s) instead.",
             default: false,
             type: "boolean"
           }).option("onlyCompositions", {
-            describe: "Only publishing compositions and not patterns",
+            describe: "Only un-publishing compositions and not patterns",
             default: false,
             type: "boolean"
           }).option("onlyPatterns", {
-            describe: "Only pulling patterns and not compositions",
+            describe: "Only un-publishing patterns and not compositions",
             default: false,
             type: "boolean",
             hidden: true
@@ -4705,7 +4696,7 @@ var CompositionUnpublishModule = {
     verbose
   }) => {
     if (!all && !ids || all && ids) {
-      console.error(`Specify --all or composition ID(s) to publish.`);
+      console.error(`Specify --all or composition ID(s) to unpublish.`);
       process.exit(1);
     }
     const compositionIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
@@ -4730,7 +4721,6 @@ var CompositionUnpublishModule = {
       patternType,
       verbose
     });
-    const actions = [];
     const log2 = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
     for await (const obj of target.objects) {
       if (Array.isArray(obj.id)) {
@@ -4739,16 +4729,30 @@ var CompositionUnpublishModule = {
         targetItems.set(obj.id, obj);
       }
     }
+    const toUnpublish = [];
     for await (const sourceObject of source.objects) {
+      toUnpublish.push(sourceObject);
+    }
+    const actions = [];
+    for (const sourceObject of toUnpublish) {
       const id = Array.isArray(sourceObject.id) ? sourceObject.id[0] : sourceObject.id;
       const targetObject = targetItems.get(id);
       if (!targetObject) {
-        console.log(`Composition ${id} was not found`);
-        return;
+        console.log(`Composition ${id} did not have a draft (removing published)`);
       }
-      console.log(`\u{1F41B} unpublishing composition: (id: ${id})`);
       if (!whatIf) {
-        actions.push(client.removeComposition({ compositionId: id, state: CANVAS_PUBLISHED_STATE2 }));
+        actions.push(
+          client.removeComposition({ ...parseCompositionSerializedId(id), state: CANVAS_PUBLISHED_STATE2 }).catch((err) => {
+            const isNotFound = err instanceof ApiClientError && err.statusCode === 404;
+            if (isNotFound) {
+              console.warn(
+                `Composition ${id} was not found when unpublishing (may already be unpublished or orphaned); skipping.`
+              );
+              return;
+            }
+            throw err;
+          })
+        );
       }
       log2({
         action: "update",
@@ -4756,9 +4760,10 @@ var CompositionUnpublishModule = {
         providerId: sourceObject.providerId,
         displayName: sourceObject.displayName ?? sourceObject.providerId,
         whatIf,
-        diff: () => diffJson2(targetObject.object, sourceObject.object)
+        diff: () => targetObject ? diffJson2(targetObject.object, sourceObject.object) : []
       });
     }
+    await Promise.all(actions);
   }
 };
 
@@ -4766,16 +4771,16 @@ var CompositionUnpublishModule = {
 var ComponentPatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a component pattern(s)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("ids", {
+          yargs43.positional("ids", {
             describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
             type: "string"
           }).option("all", {
             alias: ["a"],
-            describe: "Un-publishes all compositions. Use compositionId to publish one instead.",
+            describe: "Un-publishes all component patterns. Use composition ID(s) to unpublish specific one(s) instead.",
             default: false,
             type: "boolean"
           }).option("onlyCompositions", {
@@ -4804,12 +4809,12 @@ var CompositionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a composition",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDebugOptions(
           withStateOptions(
-            yargs42.positional("filename", {
+            yargs43.positional("filename", {
               demandOption: true,
               describe: "Composition/pattern file to put"
             })
@@ -4847,7 +4852,7 @@ var ComponentPatternUpdateModule = {
 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: (yargs43) => yargs43.command(ComponentPatternPullModule).command(ComponentPatternPushModule).command(ComponentPatternGetModule).command(ComponentPatternRemoveModule).command(ComponentPatternListModule).command(ComponentPatternUpdateModule).command(ComponentPatternPublishModule).command(ComponentPatternUnpublishModule).demandCommand(),
   handler: () => {
     yargs7.help();
   }
@@ -4859,7 +4864,7 @@ 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: (yargs43) => yargs43.command(CompositionPullModule).command(CompositionPushModule).command(CompositionGetModule).command(CompositionRemoveModule).command(CompositionListModule).command(CompositionUpdateModule).command(CompositionPublishModule).command(CompositionUnpublishModule).demandCommand(),
   handler: () => {
     yargs8.help();
   }
@@ -4878,13 +4883,13 @@ var CompositionPatternGetModule = {
 var CompositionPatternListModule = {
   ...CompositionListModule,
   describe: "List composition patterns",
-  builder: (yargs42) => withFormatOptions(
+  builder: (yargs43) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withDebugOptions(
           withProjectOptions(
             withStateOptions(
-              yargs42.options({
+              yargs43.options({
                 offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
                 limit: { describe: "Number of rows to fetch", type: "number", default: 20 },
                 resolvePatterns: {
@@ -4928,12 +4933,12 @@ var CompositionPatternListModule = {
 var CompositionPatternPublishModule = {
   ...CompositionPublishModule,
   describe: "Publishes composition pattern(s)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("ids", {
+            yargs43.positional("ids", {
               describe: "Publishes composition pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
               type: "string"
             }).option("all", {
@@ -4972,13 +4977,13 @@ var CompositionPatternPublishModule = {
 var CompositionPatternPullModule = {
   ...componentInstancePullModuleFactory("compositionPatterns"),
   describe: "Pulls all composition patterns to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              yargs42.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to save the composition patterns to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
                 type: "string"
               }).option("format", {
@@ -5016,13 +5021,13 @@ var CompositionPatternPullModule = {
 var CompositionPatternPushModule = {
   ...componentInstancePushModuleFactory("compositionPatterns"),
   describe: "Pushes all composition patterns from files in a directory to Uniform Canvas",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              yargs42.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to read the compositions patterns from. If a filename is used, a package will be read instead.",
                 type: "string"
               }).option("mode", {
@@ -5061,16 +5066,16 @@ var CompositionPatternRemoveModule = {
 var CompositionPatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a composition pattern(s)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("ids", {
+          yargs43.positional("ids", {
             describe: "Un-publishes composition pattern(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
             type: "string"
           }).option("all", {
             alias: ["a"],
-            describe: "Un-publishes all compositions. Use compositionId to publish one instead.",
+            describe: "Un-publishes all composition patterns. Use composition ID(s) to unpublish specific one(s) instead.",
             default: false,
             type: "boolean"
           }).option("onlyCompositions", {
@@ -5101,7 +5106,7 @@ var CompositionPatternUpdateModule = {
 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: (yargs43) => yargs43.command(CompositionPatternPullModule).command(CompositionPatternPushModule).command(CompositionPatternGetModule).command(CompositionPatternRemoveModule).command(CompositionPatternListModule).command(CompositionPatternUpdateModule).command(CompositionPatternPublishModule).command(CompositionPatternUnpublishModule).demandCommand(),
   handler: () => {
     yargs9.help();
   }
@@ -5122,12 +5127,12 @@ function getContentClient(options) {
 var ContentTypeGetModule = {
   command: "get <id>",
   describe: "Get a content type",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.positional("id", {
+            yargs43.positional("id", {
               demandOption: true,
               describe: "Content type public ID to fetch"
             })
@@ -5152,7 +5157,7 @@ var ContentTypeGetModule = {
 var ContentTypeListModule = {
   command: "list",
   describe: "List content types",
-  builder: (yargs42) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs42))))),
+  builder: (yargs43) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs43))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getContentClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -5193,12 +5198,12 @@ function createContentTypeEngineDataSource({
 var ContentTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all content types to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the content types to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -5278,12 +5283,12 @@ var ContentTypePullModule = {
 var ContentTypePushModule = {
   command: "push <directory>",
   describe: "Pushes all content types from files in a directory to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the content types from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("what-if", {
@@ -5357,11 +5362,11 @@ var ContentTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a content type",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
+          yargs43.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
         )
       )
     )
@@ -5382,11 +5387,11 @@ var ContentTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a content type",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("filename", { demandOption: true, describe: "Content type file to put" })
+          yargs43.positional("filename", { demandOption: true, describe: "Content type file to put" })
         )
       )
     )
@@ -5408,7 +5413,7 @@ 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: (yargs43) => yargs43.command(ContentTypeGetModule).command(ContentTypeListModule).command(ContentTypeRemoveModule).command(ContentTypeUpdateModule).command(ContentTypePullModule).command(ContentTypePushModule).demandCommand(),
   handler: () => {
     yargs10.help();
   }
@@ -5427,11 +5432,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: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Data source public ID to fetch" })
+          yargs43.positional("id", { demandOption: true, describe: "Data source public ID to fetch" })
         )
       )
     )
@@ -5449,11 +5454,11 @@ var DataSourceRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a data source",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Data source public ID to delete" })
+          yargs43.positional("id", { demandOption: true, describe: "Data source public ID to delete" })
         )
       )
     )
@@ -5474,11 +5479,11 @@ var DataSourceUpdateModule = {
   command: "update <dataSource>",
   aliases: ["put"],
   describe: "Insert or update a data source",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("dataSource", { demandOption: true, describe: "Data source JSON to put" }).option("integrationType", {
+          yargs43.positional("dataSource", { demandOption: true, describe: "Data source JSON to put" }).option("integrationType", {
             describe: "Integration type that exposes the connector type for this data source (as defined in integration manifest).",
             type: "string",
             demandOption: true
@@ -5513,7 +5518,7 @@ var DataSourceModule = {
   command: "datasource <command>",
   aliases: ["ds"],
   describe: "Commands for Data Source definitions",
-  builder: (yargs42) => yargs42.command(DataSourceGetModule).command(DataSourceRemoveModule).command(DataSourceUpdateModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(DataSourceGetModule).command(DataSourceRemoveModule).command(DataSourceUpdateModule).demandCommand(),
   handler: () => {
     yargs11.help();
   }
@@ -5535,12 +5540,12 @@ var DataTypeGetModule = {
   command: "get <id>",
   describe: "Get a data type",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
+            yargs43.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
           )
         )
       )
@@ -5563,7 +5568,7 @@ var DataTypeListModule = {
   command: "list",
   describe: "List data types",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs42))))),
+  builder: (yargs43) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs43))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getDataTypeClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -5606,12 +5611,12 @@ function createDataTypeEngineDataSource({
 var DataTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all data types to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the data types to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -5691,12 +5696,12 @@ var DataTypePullModule = {
 var DataTypePushModule = {
   command: "push <directory>",
   describe: "Pushes all data types from files in a directory to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the data types from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -5765,11 +5770,11 @@ var DataTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a data type",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
+          yargs43.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
         )
       )
     )
@@ -5790,11 +5795,11 @@ var DataTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a data type",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("filename", { demandOption: true, describe: "Data type file to put" })
+          yargs43.positional("filename", { demandOption: true, describe: "Data type file to put" })
         )
       )
     )
@@ -5816,7 +5821,7 @@ 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: (yargs43) => yargs43.command(DataTypeGetModule).command(DataTypePullModule).command(DataTypePushModule).command(DataTypeRemoveModule).command(DataTypeListModule).command(DataTypeUpdateModule).demandCommand(),
   handler: () => {
     yargs12.help();
   }
@@ -5829,13 +5834,13 @@ import yargs13 from "yargs";
 var EntryGetModule = {
   command: "get <id>",
   describe: "Get an entry",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
             withStateOptions(
-              yargs42.positional("id", { demandOption: true, describe: "Entry public ID to fetch" }).option({
+              yargs43.positional("id", { demandOption: true, describe: "Entry public ID to fetch" }).option({
                 resolveData: {
                   type: "boolean",
                   default: false,
@@ -5907,13 +5912,13 @@ var LEGACY_DEFAULT_LIMIT = 1e3;
 var EntryListModule = {
   command: "list",
   describe: "List entries",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
             withStateOptions(
-              yargs42.options({
+              yargs43.options({
                 offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
                 limit: {
                   describe: "Number of rows to fetch",
@@ -5968,7 +5973,7 @@ var EntryListModule = {
 };
 
 // src/commands/canvas/entryEngineDataSource.ts
-import { ApiClientError, convertEntryToPutEntry } from "@uniformdev/canvas";
+import { ApiClientError as ApiClientError2, convertEntryToPutEntry } from "@uniformdev/canvas";
 
 // src/commands/canvas/commands/entry/_util.ts
 var selectEntryIdentifier = (e) => {
@@ -6014,7 +6019,7 @@ function createEntryEngineDataSource({
             editions: "all"
           })).entries;
         } catch (error) {
-          if (error instanceof ApiClientError && error.errorMessage === "Entry not found or not published") {
+          if (error instanceof ApiClientError2 && error.errorMessage === "Entry not found or not published") {
             return [];
           }
           throw error;
@@ -6048,12 +6053,12 @@ function createEntryEngineDataSource({
 var EntryPublishModule = {
   command: "publish [ids]",
   describe: "Publishes entry(ies)",
-  builder: (yargs42) => withConfiguration(
-    withDiffOptions(
-      withApiOptions(
-        withProjectOptions(
-          withDiffOptions(
-            yargs42.positional("ids", {
+  builder: (yargs43) => withConfiguration(
+    withDebugOptions(
+      withDiffOptions(
+        withApiOptions(
+          withProjectOptions(
+            yargs43.positional("ids", {
               describe: "Publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
               type: "string"
             }).option("all", {
@@ -6112,7 +6117,7 @@ var EntryPublishModule = {
           fileClient
         });
       },
-      compareContents: compareCompositionsOrEntriesWithoutAssetUrls,
+      compareContents: compareCompositionsOrEntriesWithoutAssetUrlsForPublishing,
       onBeforeWriteObject: async (sourceObject) => {
         return uploadFilesForCompositionOrEntry({
           entity: sourceObject,
@@ -6128,13 +6133,13 @@ var EntryPublishModule = {
 var EntryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all entries to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              yargs42.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to save the entries to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
                 type: "string"
               }).option("format", {
@@ -6234,13 +6239,13 @@ var EntryPullModule = {
 var EntryPushModule = {
   command: "push <directory>",
   describe: "Pushes all entries from files in a directory to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              yargs42.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to read the entries from. If a filename is used, a package will be read instead.",
                 type: "string"
               }).option("mode", {
@@ -6339,11 +6344,11 @@ var EntryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an entry",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
+          yargs43.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
         )
       )
     )
@@ -6360,16 +6365,16 @@ var EntryRemoveModule = {
 };
 
 // src/commands/canvas/commands/entry/unpublish.ts
-import { CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE3 } from "@uniformdev/canvas";
+import { ApiClientError as ApiClientError3, CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE3 } from "@uniformdev/canvas";
 import { diffJson as diffJson3 } from "diff";
 var EntryUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish an entry(ies)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("ids", {
+          yargs43.positional("ids", {
             describe: "Un-publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
             type: "string"
           }).option("all", {
@@ -6384,7 +6389,7 @@ var EntryUnpublishModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, ids, all, project: projectId, whatIf, verbose }) => {
     if (!all && !ids || all && ids) {
-      console.error(`Specify --all or entry ID(s) to publish.`);
+      console.error(`Specify --all or entry ID(s) to unpublish.`);
       process.exit(1);
     }
     const entryIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
@@ -6403,7 +6408,6 @@ var EntryUnpublishModule = {
       entryIDs: entryIDsArray,
       onlyEntries: true
     });
-    const actions = [];
     const log2 = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
     for await (const obj of target.objects) {
       if (Array.isArray(obj.id)) {
@@ -6412,15 +6416,30 @@ var EntryUnpublishModule = {
         targetItems.set(obj.id, obj);
       }
     }
+    const toUnpublish = [];
     for await (const sourceObject of source.objects) {
+      toUnpublish.push(sourceObject);
+    }
+    const actions = [];
+    for (const sourceObject of toUnpublish) {
       const id = Array.isArray(sourceObject.id) ? sourceObject.id[0] : sourceObject.id;
       const targetObject = targetItems.get(id);
       if (!targetObject) {
-        console.log(`Entry ${id} was not found`);
-        return;
+        console.log(`Entry ${id} did not have a draft (removing published)`);
       }
       if (!whatIf) {
-        actions.push(client.deleteEntry({ entryId: id, state: CANVAS_PUBLISHED_STATE3 }));
+        actions.push(
+          client.deleteEntry({ ...parseEntrySerializedId(id), state: CANVAS_PUBLISHED_STATE3 }).catch((err) => {
+            const isNotFound = err instanceof ApiClientError3 && err.statusCode === 404;
+            if (isNotFound) {
+              console.warn(
+                `Entry ${id} was not found when unpublishing (may already be unpublished or orphaned); skipping.`
+              );
+              return;
+            }
+            throw err;
+          })
+        );
       }
       log2({
         action: "update",
@@ -6428,9 +6447,10 @@ var EntryUnpublishModule = {
         providerId: sourceObject.providerId,
         displayName: sourceObject.displayName ?? sourceObject.providerId,
         whatIf,
-        diff: () => diffJson3(targetObject.object, sourceObject.object)
+        diff: () => targetObject ? diffJson3(targetObject.object, sourceObject.object) : []
       });
     }
+    await Promise.all(actions);
   }
 };
 
@@ -6439,12 +6459,12 @@ var EntryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an entry",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs42.positional("filename", { demandOption: true, describe: "Entry file to put" })
+            yargs43.positional("filename", { demandOption: true, describe: "Entry file to put" })
           )
         )
       )
@@ -6476,7 +6496,7 @@ var EntryUpdateModule = {
 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: (yargs43) => yargs43.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).command(EntryPublishModule).command(EntryUnpublishModule).demandCommand(),
   handler: () => {
     yargs13.help();
   }
@@ -6489,13 +6509,13 @@ import yargs14 from "yargs";
 var EntryPatternGetModule = {
   command: "get <id>",
   describe: "Get an entry pattern",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
             withStateOptions(
-              yargs42.positional("id", {
+              yargs43.positional("id", {
                 demandOption: true,
                 describe: "Entry pattern public ID to fetch"
               }).option({
@@ -6548,13 +6568,13 @@ var EntryPatternGetModule = {
 var EntryPatternListModule = {
   command: "list",
   describe: "List entry patterns",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
             withStateOptions(
-              yargs42.option({
+              yargs43.option({
                 withComponentIDs: {
                   type: "boolean",
                   default: false,
@@ -6600,12 +6620,12 @@ var EntryPatternListModule = {
 var EntryPatternPublishModule = {
   command: "publish [ids]",
   describe: "Publishes entry pattern(s)",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("ids", {
+            yargs43.positional("ids", {
               describe: "Publishes entry pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
               type: "string"
             }).option("all", {
@@ -6664,7 +6684,7 @@ var EntryPatternPublishModule = {
           fileClient
         });
       },
-      compareContents: compareCompositionsOrEntriesWithoutAssetUrls,
+      compareContents: compareCompositionsOrEntriesWithoutAssetUrlsForPublishing,
       onBeforeWriteObject: async (sourceObject) => {
         return uploadFilesForCompositionOrEntry({
           entity: sourceObject,
@@ -6680,13 +6700,13 @@ var EntryPatternPublishModule = {
 var EntryPatternPullModule = {
   command: "pull <directory>",
   describe: "Pulls all entry patterns to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              yargs42.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to save the entries to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
                 type: "string"
               }).option("format", {
@@ -6786,13 +6806,13 @@ var EntryPatternPullModule = {
 var EntryPatternPushModule = {
   command: "push <directory>",
   describe: "Pushes all entry patterns from files in a directory to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              yargs42.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to read the entry patterns from. If a filename is used, a package will be read instead.",
                 type: "string"
               }).option("what-if", {
@@ -6896,11 +6916,11 @@ var EntryPatternRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an entry pattern",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Entry pattern public ID to delete" })
+          yargs43.positional("id", { demandOption: true, describe: "Entry pattern public ID to delete" })
         )
       )
     )
@@ -6917,16 +6937,16 @@ var EntryPatternRemoveModule = {
 };
 
 // src/commands/canvas/commands/entryPattern/unpublish.ts
-import { CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE4 } from "@uniformdev/canvas";
+import { ApiClientError as ApiClientError4, CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE4 } from "@uniformdev/canvas";
 import { diffJson as diffJson4 } from "diff";
 var EntryPatternUnpublishModule = {
   command: "unpublish [ids]",
-  describe: "Unpublish an entry patterns",
-  builder: (yargs42) => withConfiguration(
+  describe: "Unpublish entry pattern(s)",
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("ids", {
+          yargs43.positional("ids", {
             describe: "Un-publishes entry patterns by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
             type: "string"
           }).option("all", {
@@ -6941,7 +6961,7 @@ var EntryPatternUnpublishModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, ids, all, project: projectId, whatIf, verbose }) => {
     if (!all && !ids || all && ids) {
-      console.error(`Specify --all or entry pattern ID(s) to publish.`);
+      console.error(`Specify --all or entry pattern ID(s) to unpublish.`);
       process.exit(1);
     }
     const entryIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
@@ -6960,7 +6980,6 @@ var EntryPatternUnpublishModule = {
       entryIDs: entryIDsArray,
       onlyPatterns: true
     });
-    const actions = [];
     const log2 = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
     for await (const obj of target.objects) {
       if (Array.isArray(obj.id)) {
@@ -6969,15 +6988,30 @@ var EntryPatternUnpublishModule = {
         targetItems.set(obj.id, obj);
       }
     }
+    const toUnpublish = [];
     for await (const sourceObject of source.objects) {
+      toUnpublish.push(sourceObject);
+    }
+    const actions = [];
+    for (const sourceObject of toUnpublish) {
       const id = Array.isArray(sourceObject.id) ? sourceObject.id[0] : sourceObject.id;
       const targetObject = targetItems.get(id);
       if (!targetObject) {
-        console.log(`Entry pattern ${id} was not found`);
-        return;
+        console.log(`Entry pattern ${id} did not have a draft (removing published)`);
       }
       if (!whatIf) {
-        actions.push(client.deleteEntry({ entryId: id, state: CANVAS_PUBLISHED_STATE4 }));
+        actions.push(
+          client.deleteEntry({ ...parseEntrySerializedId(id), state: CANVAS_PUBLISHED_STATE4 }).catch((err) => {
+            const isNotFound = err instanceof ApiClientError4 && err.statusCode === 404;
+            if (isNotFound) {
+              console.warn(
+                `Entry pattern ${id} was not found when unpublishing (may already be unpublished or orphaned); skipping.`
+              );
+              return;
+            }
+            throw err;
+          })
+        );
       }
       log2({
         action: "update",
@@ -6985,9 +7019,10 @@ var EntryPatternUnpublishModule = {
         providerId: sourceObject.providerId,
         displayName: sourceObject.displayName ?? sourceObject.providerId,
         whatIf,
-        diff: () => diffJson4(targetObject.object, sourceObject.object)
+        diff: () => targetObject ? diffJson4(targetObject.object, sourceObject.object) : []
       });
     }
+    await Promise.all(actions);
   }
 };
 
@@ -6996,12 +7031,12 @@ var EntryPatternUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an entry pattern",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs42.positional("filename", { demandOption: true, describe: "Entry pattern file to put" })
+            yargs43.positional("filename", { demandOption: true, describe: "Entry pattern file to put" })
           )
         )
       )
@@ -7037,15 +7072,254 @@ var EntryPatternUpdateModule = {
 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(),
+  builder: (yargs43) => yargs43.command(EntryPatternGetModule).command(EntryPatternListModule).command(EntryPatternRemoveModule).command(EntryPatternUpdateModule).command(EntryPatternPullModule).command(EntryPatternPushModule).command(EntryPatternPublishModule).command(EntryPatternUnpublishModule).demandCommand(),
   handler: () => {
     yargs14.help();
   }
 };
 
-// src/commands/canvas/commands/locale.ts
+// src/commands/canvas/commands/label.ts
 import yargs15 from "yargs";
 
+// 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/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/pull.ts
+var LabelPullModule = {
+  command: "pull <directory>",
+  describe: "Pulls all labels to local files in a directory",
+  builder: (yargs43) => withConfiguration(
+    withDebugOptions(
+      withApiOptions(
+        withProjectOptions(
+          withDiffOptions(
+            yargs43.positional("directory", {
+              describe: "Directory to save the labels to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
+              type: "string"
+            }).option("format", {
+              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/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: (yargs43) => withConfiguration(
+    withDebugOptions(
+      withApiOptions(
+        withProjectOptions(
+          withDiffOptions(
+            yargs43.positional("directory", {
+              describe: "Directory to read the labels from. If a filename is used, a package will be read instead.",
+              type: "string"
+            }).option("mode", {
+              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"
+            })
+          )
+        )
+      )
+    )
+  ),
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    directory,
+    mode,
+    whatIf,
+    project: projectId,
+    diff: diffMode,
+    allowEmptySource,
+    verbose
+  }) => {
+    const fetch2 = nodeFetchProxy(proxy, verbose);
+    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 {
+      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/label.ts
+var LabelModule = {
+  command: "label <command>",
+  describe: "Commands for label definitions",
+  builder: (yargs43) => yargs43.command(LabelPullModule).command(LabelPushModule),
+  handler: () => {
+    yargs15.help();
+  }
+};
+
+// src/commands/canvas/commands/locale.ts
+import yargs16 from "yargs";
+
 // src/commands/canvas/localesEngineDataSource.ts
 function createLocaleEngineDataSource({
   client
@@ -7086,12 +7360,12 @@ function getLocaleClient(options) {
 var LocalePullModule = {
   command: "pull <directory>",
   describe: "Pulls all locales to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the locales to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -7171,12 +7445,12 @@ var LocalePullModule = {
 var LocalePushModule = {
   command: "push <directory>",
   describe: "Pushes all locales from files in a directory to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the locales from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -7244,14 +7518,14 @@ var LocalePushModule = {
 var LocaleModule = {
   command: "locale <command>",
   describe: "Commands for locale definitions",
-  builder: (yargs42) => yargs42.command(LocalePullModule).command(LocalePushModule),
+  builder: (yargs43) => yargs43.command(LocalePullModule).command(LocalePushModule),
   handler: () => {
-    yargs15.help();
+    yargs16.help();
   }
 };
 
 // src/commands/canvas/commands/previewUrl.ts
-import yargs16 from "yargs";
+import yargs17 from "yargs";
 
 // src/commands/canvas/commands/previewUrl/_util.ts
 import { PreviewClient } from "@uniformdev/canvas";
@@ -7265,12 +7539,12 @@ function getPreviewClient(options) {
 var PreviewUrlGetModule = {
   command: "get <id>",
   describe: "Fetch a preview URL",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.positional("id", { demandOption: true, describe: "Preview URL UUID to fetch" })
+            yargs43.positional("id", { demandOption: true, describe: "Preview URL UUID to fetch" })
           )
         )
       )
@@ -7294,8 +7568,8 @@ var PreviewUrlListModule = {
   command: "list",
   describe: "List preview URLs",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(
-    withFormatOptions(withApiOptions(withDebugOptions(withProjectOptions(yargs42.options({})))))
+  builder: (yargs43) => withConfiguration(
+    withFormatOptions(withApiOptions(withDebugOptions(withProjectOptions(yargs43.options({})))))
   ),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
@@ -7337,12 +7611,12 @@ function createPreviewUrlEngineDataSource({
 var PreviewUrlPullModule = {
   command: "pull <directory>",
   describe: "Pulls all preview urls to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDebugOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -7417,12 +7691,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: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
           withDebugOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -7486,11 +7760,11 @@ var PreviewUrlRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a preview URL",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Preview URL UUID to delete" })
+          yargs43.positional("id", { demandOption: true, describe: "Preview URL UUID to delete" })
         )
       )
     )
@@ -7511,11 +7785,11 @@ var PreviewUrlUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a preview URL",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("filename", { demandOption: true, describe: "Category file to put" })
+          yargs43.positional("filename", { demandOption: true, describe: "Category file to put" })
         )
       )
     )
@@ -7537,25 +7811,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: (yargs43) => yargs43.command(PreviewUrlPullModule).command(PreviewUrlPushModule).command(PreviewUrlGetModule).command(PreviewUrlRemoveModule).command(PreviewUrlListModule).command(PreviewUrlUpdateModule).demandCommand(),
   handler: () => {
-    yargs16.help();
+    yargs17.help();
   }
 };
 
 // src/commands/canvas/commands/previewViewport.ts
-import yargs17 from "yargs";
+import yargs18 from "yargs";
 
 // src/commands/canvas/commands/previewViewport/get.ts
 var PreviewViewportGetModule = {
   command: "get <id>",
   describe: "Fetch a preview viewport",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.positional("id", { demandOption: true, describe: "Preview viewport UUID to fetch" })
+            yargs43.positional("id", { demandOption: true, describe: "Preview viewport UUID to fetch" })
           )
         )
       )
@@ -7579,8 +7853,8 @@ var PreviewViewportListModule = {
   command: "list",
   describe: "List preview viewports",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(
-    withFormatOptions(withDebugOptions(withApiOptions(withProjectOptions(yargs42.options({})))))
+  builder: (yargs43) => withConfiguration(
+    withFormatOptions(withDebugOptions(withApiOptions(withProjectOptions(yargs43.options({})))))
   ),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
@@ -7626,12 +7900,12 @@ function createPreviewViewportEngineDataSource({
 var PreviewViewportPullModule = {
   command: "pull <directory>",
   describe: "Pulls all preview viewports to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDebugOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -7706,12 +7980,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: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
           withDebugOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -7775,11 +8049,11 @@ var PreviewViewportRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a preview viewport",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Preview viewport UUID to delete" })
+          yargs43.positional("id", { demandOption: true, describe: "Preview viewport UUID to delete" })
         )
       )
     )
@@ -7800,11 +8074,11 @@ var PreviewViewportUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a preview viewport",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("filename", { demandOption: true, describe: "Preview viewport file to put" })
+          yargs43.positional("filename", { demandOption: true, describe: "Preview viewport file to put" })
         )
       )
     )
@@ -7826,14 +8100,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: (yargs43) => yargs43.command(PreviewViewportPullModule).command(PreviewViewportPushModule).command(PreviewViewportGetModule).command(PreviewViewportRemoveModule).command(PreviewViewportListModule).command(PreviewViewportUpdateModule).demandCommand(),
   handler: () => {
-    yargs17.help();
+    yargs18.help();
   }
 };
 
 // src/commands/canvas/commands/prompts.ts
-import yargs18 from "yargs";
+import yargs19 from "yargs";
 
 // src/commands/canvas/commands/prompts/_util.ts
 import { PromptClient } from "@uniformdev/canvas";
@@ -7845,12 +8119,12 @@ var getPromptClient = (options) => new PromptClient({ ...options, bypassCache: t
 var PromptGetModule = {
   command: "get <id>",
   describe: "Get a prompt",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
-            yargs42.positional("id", { demandOption: true, describe: "Prompt ID to fetch" })
+            yargs43.positional("id", { demandOption: true, describe: "Prompt ID to fetch" })
           )
         )
       )
@@ -7871,7 +8145,7 @@ var PromptGetModule = {
 var PromptListModule = {
   command: "list",
   describe: "List prompts",
-  builder: (yargs42) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs42))))),
+  builder: (yargs43) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs43))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getPromptClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -7912,13 +8186,13 @@ function createPromptEngineDataSource({
 var PromptPullModule = {
   command: "pull <directory>",
   describe: "Pulls all prompts to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             withDiffOptions(
-              yargs42.positional("directory", {
+              yargs43.positional("directory", {
                 describe: "Directory to save the prompts to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
                 type: "string"
               }).option("format", {
@@ -7999,12 +8273,12 @@ var PromptPullModule = {
 var PromptPushModule = {
   command: "push <directory>",
   describe: "Pushes all prompts from files in a directory to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the prompts from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -8073,10 +8347,10 @@ var PromptRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a prompt",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
-        withProjectOptions(yargs42.positional("id", { demandOption: true, describe: "Prompt ID to delete" }))
+        withProjectOptions(yargs43.positional("id", { demandOption: true, describe: "Prompt ID to delete" }))
       )
     )
   ),
@@ -8096,11 +8370,11 @@ var PromptUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a prompt",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("filename", { demandOption: true, describe: "Prompt file to put" })
+          yargs43.positional("filename", { demandOption: true, describe: "Prompt file to put" })
         )
       )
     )
@@ -8122,14 +8396,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: (yargs43) => yargs43.command(PromptGetModule).command(PromptListModule).command(PromptPullModule).command(PromptPushModule).command(PromptRemoveModule).command(PromptUpdateModule).demandCommand(),
   handler: () => {
-    yargs18.help();
+    yargs19.help();
   }
 };
 
 // src/commands/canvas/commands/workflow.ts
-import yargs19 from "yargs";
+import yargs20 from "yargs";
 
 // src/commands/canvas/commands/workflow/_util.ts
 import { WorkflowClient } from "@uniformdev/canvas";
@@ -8172,12 +8446,12 @@ function createWorkflowEngineDataSource({
 var WorkflowPullModule = {
   command: "pull <directory>",
   describe: "Pulls all workflows to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -8252,12 +8526,12 @@ var WorkflowPullModule = {
 var WorkflowPushModule = {
   command: "push <directory>",
   describe: "Pushes all workflows from files in a directory to Uniform Canvas",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -8321,9 +8595,9 @@ var WorkflowModule = {
   command: "workflow <command>",
   aliases: ["wf"],
   describe: "Commands for Canvas workflows",
-  builder: (yargs42) => yargs42.command(WorkflowPullModule).command(WorkflowPushModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(WorkflowPullModule).command(WorkflowPushModule).demandCommand(),
   handler: () => {
-    yargs19.help();
+    yargs20.help();
   }
 };
 
@@ -8332,17 +8606,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: (yargs43) => yargs43.command(CompositionModule).command(ComponentModule).command(DataTypeModule).command(DataSourceModule).command(CategoryModule).command(ComponentPatternModule).command(CompositionPatternModule).command(ContentTypeModule).command(EntryModule).command(EntryPatternModule).command(PromptModule).command(AssetModule).command(LabelModule).command(LocaleModule).command(WorkflowModule).command(PreviewUrlModule).command(PreviewViewportModule).demandCommand(),
   handler: () => {
-    yargs20.showHelp();
+    yargs21.showHelp();
   }
 };
 
 // src/commands/context/index.ts
-import yargs27 from "yargs";
+import yargs28 from "yargs";
 
 // src/commands/context/commands/aggregate.ts
-import yargs21 from "yargs";
+import yargs22 from "yargs";
 
 // src/commands/context/commands/aggregate/_util.ts
 import { AggregateClient } from "@uniformdev/context/api";
@@ -8354,11 +8628,11 @@ var getAggregateClient = (options) => new AggregateClient({ ...options, bypassCa
 var AggregateGetModule = {
   command: "get <id>",
   describe: "Fetch an aggregate",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
+          yargs43.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
         )
       )
     )
@@ -8381,7 +8655,7 @@ var AggregateListModule = {
   command: "list",
   describe: "List aggregates",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs42)))),
+  builder: (yargs43) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = getAggregateClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -8444,12 +8718,12 @@ function writeContextPackage(filename, packageContents) {
 var AggregatePullModule = {
   command: "pull <directory>",
   describe: "Pulls all aggregates to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the aggregates to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -8524,12 +8798,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: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
           withDebugOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the aggregates from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -8594,10 +8868,10 @@ var AggregateRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an aggregate",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
+        yargs43.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
       )
     )
   ),
@@ -8613,10 +8887,10 @@ var AggregateUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an aggregate",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
+        yargs43.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
       )
     )
   ),
@@ -8633,14 +8907,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: (yargs43) => yargs43.command(AggregatePullModule).command(AggregatePushModule).command(AggregateGetModule).command(AggregateRemoveModule).command(AggregateListModule).command(AggregateUpdateModule).demandCommand(),
   handler: () => {
-    yargs21.help();
+    yargs22.help();
   }
 };
 
 // src/commands/context/commands/enrichment.ts
-import yargs22 from "yargs";
+import yargs23 from "yargs";
 
 // src/commands/context/commands/enrichment/_util.ts
 import { UncachedEnrichmentClient } from "@uniformdev/context/api";
@@ -8654,11 +8928,11 @@ function getEnrichmentClient(options) {
 var EnrichmentGetModule = {
   command: "get <id>",
   describe: "Fetch an enrichment category and its values",
-  builder: (yargs42) => withFormatOptions(
+  builder: (yargs43) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
+          yargs43.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
         )
       )
     )
@@ -8681,7 +8955,7 @@ var EnrichmentListModule = {
   command: "list",
   describe: "List enrichments",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs42)))),
+  builder: (yargs43) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = getEnrichmentClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -8776,12 +9050,12 @@ var createEnrichmentValueEngineDataSource = ({
 var EnrichmentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all enrichments to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the enrichments to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -8856,11 +9130,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: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs42.positional("directory", {
+          yargs43.positional("directory", {
             describe: "Directory to read the enrichments from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("mode", {
@@ -8923,10 +9197,10 @@ var EnrichmentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an enrichment category and its values",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
+        yargs43.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
       )
     )
   ),
@@ -8942,17 +9216,17 @@ 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: (yargs43) => yargs43.command(EnrichmentPullModule).command(EnrichmentPushModule).command(EnrichmentGetModule).command(EnrichmentRemoveModule).command(EnrichmentListModule).demandCommand(),
   handler: () => {
-    yargs22.help();
+    yargs23.help();
   }
 };
 
 // src/commands/context/commands/manifest.ts
-import yargs23 from "yargs";
+import yargs24 from "yargs";
 
 // src/commands/context/commands/manifest/get.ts
-import { ApiClientError as ApiClientError2, UncachedManifestClient } from "@uniformdev/context/api";
+import { ApiClientError as ApiClientError5, UncachedManifestClient } from "@uniformdev/context/api";
 import { gray as gray4, green as green6, red as red6 } from "colorette";
 import { writeFile } from "fs";
 import { exit } from "process";
@@ -8960,10 +9234,10 @@ var ManifestGetModule = {
   command: "get [output]",
   aliases: ["dl", "download"],
   describe: "Download the Uniform Context manifest for a project",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.option("preview", {
+        yargs43.option("preview", {
           describe: "If set, fetches the unpublished preview manifest (The API key must have permission)",
           default: false,
           type: "boolean",
@@ -9003,7 +9277,7 @@ var ManifestGetModule = {
       }
     } catch (e) {
       let message;
-      if (e instanceof ApiClientError2) {
+      if (e instanceof ApiClientError5) {
         if (e.statusCode === 403) {
           message = `The API key ${apiKey} did not have permissions to fetch the manifest. Ensure ${preview ? "Uniform Context > Read Drafts" : "Uniform Context > Manifest > Read"} permissions are granted.`;
         }
@@ -9019,13 +9293,13 @@ var ManifestGetModule = {
 };
 
 // src/commands/context/commands/manifest/publish.ts
-import { ApiClientError as ApiClientError3, UncachedManifestClient as UncachedManifestClient2 } from "@uniformdev/context/api";
+import { ApiClientError as ApiClientError6, UncachedManifestClient as UncachedManifestClient2 } from "@uniformdev/context/api";
 import { gray as gray5, red as red7 } from "colorette";
 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: (yargs43) => withConfiguration(withApiOptions(withProjectOptions(yargs43))),
   handler: async ({ apiKey, apiHost, proxy, project }) => {
     const fetch2 = nodeFetchProxy(proxy);
     try {
@@ -9038,7 +9312,7 @@ var ManifestPublishModule = {
       await client.publish();
     } catch (e) {
       let message;
-      if (e instanceof ApiClientError3) {
+      if (e instanceof ApiClientError6) {
         if (e.statusCode === 403) {
           message = `The API key ${apiKey} did not have permissions to publish the manifest. Ensure Uniform Context > Manifest > Publish permissions are granted.`;
         }
@@ -9058,25 +9332,25 @@ var ManifestModule = {
   command: "manifest <command>",
   describe: "Commands for context manifests",
   aliases: ["man"],
-  builder: (yargs42) => yargs42.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
   handler: () => {
-    yargs23.help();
+    yargs24.help();
   }
 };
 
 // src/commands/context/commands/quirk.ts
-import yargs24 from "yargs";
+import yargs25 from "yargs";
 
 // src/commands/context/commands/quirk/get.ts
 import { UncachedQuirkClient } from "@uniformdev/context/api";
 var QuirkGetModule = {
   command: "get <id>",
   describe: "Fetch a quirk",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
+          yargs43.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
         )
       )
     )
@@ -9100,11 +9374,11 @@ var QuirkListModule = {
   command: "list",
   describe: "List quirks",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.option("withIntegrations", {
+          yargs43.option("withIntegrations", {
             alias: ["i"],
             describe: "Whether to include meta-quirks created by integrations in the list. Defaults to false.",
             type: "boolean"
@@ -9162,12 +9436,12 @@ function createQuirkEngineDataSource({
 var QuirkPullModule = {
   command: "pull <directory>",
   describe: "Pulls all quirks to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the quirks to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -9243,12 +9517,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: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the quirks from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -9313,10 +9587,10 @@ var QuirkRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a quirk",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
+        yargs43.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
       )
     )
   ),
@@ -9333,10 +9607,10 @@ var QuirkUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a quirk",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("filename", { demandOption: true, describe: "Quirk file to put" })
+        yargs43.positional("filename", { demandOption: true, describe: "Quirk file to put" })
       )
     )
   ),
@@ -9353,25 +9627,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: (yargs43) => yargs43.command(QuirkPullModule).command(QuirkPushModule).command(QuirkGetModule).command(QuirkRemoveModule).command(QuirkListModule).command(QuirkUpdateModule).demandCommand(),
   handler: () => {
-    yargs24.help();
+    yargs25.help();
   }
 };
 
 // src/commands/context/commands/signal.ts
-import yargs25 from "yargs";
+import yargs26 from "yargs";
 
 // src/commands/context/commands/signal/get.ts
 import { UncachedSignalClient } from "@uniformdev/context/api";
 var SignalGetModule = {
   command: "get <id>",
   describe: "Fetch a signal",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
+          yargs43.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
         )
       )
     )
@@ -9395,7 +9669,7 @@ var SignalListModule = {
   command: "list",
   describe: "List signals",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs42)))),
+  builder: (yargs43) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new UncachedSignalClient2({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -9445,12 +9719,12 @@ function createSignalEngineDataSource({
 var SignalPullModule = {
   command: "pull <directory>",
   describe: "Pulls all signals to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the signals to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -9526,12 +9800,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: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the signals from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -9596,10 +9870,10 @@ var SignalRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a signal",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
+        yargs43.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
       )
     )
   ),
@@ -9616,10 +9890,10 @@ var SignalUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a signal",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("filename", { demandOption: true, describe: "Signal file to put" })
+        yargs43.positional("filename", { demandOption: true, describe: "Signal file to put" })
       )
     )
   ),
@@ -9636,25 +9910,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: (yargs43) => yargs43.command(SignalPullModule).command(SignalPushModule).command(SignalGetModule).command(SignalRemoveModule).command(SignalListModule).command(SignalUpdateModule).demandCommand(),
   handler: () => {
-    yargs25.help();
+    yargs26.help();
   }
 };
 
 // src/commands/context/commands/test.ts
-import yargs26 from "yargs";
+import yargs27 from "yargs";
 
 // src/commands/context/commands/test/get.ts
 import { UncachedTestClient } from "@uniformdev/context/api";
 var TestGetModule = {
   command: "get <id>",
   describe: "Fetch a test",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
+          yargs43.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
         )
       )
     )
@@ -9678,7 +9952,7 @@ var TestListModule = {
   command: "list",
   describe: "List tests",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs42)))),
+  builder: (yargs43) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new UncachedTestClient2({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -9728,12 +10002,12 @@ function createTestEngineDataSource({
 var TestPullModule = {
   command: "pull <directory>",
   describe: "Pulls all tests to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save the tests to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -9809,12 +10083,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: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read the tests from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -9879,10 +10153,10 @@ var TestRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a test",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("id", { demandOption: true, describe: "Test public ID to delete" })
+        yargs43.positional("id", { demandOption: true, describe: "Test public ID to delete" })
       )
     )
   ),
@@ -9899,9 +10173,9 @@ var TestUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a test",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs42.positional("filename", { demandOption: true, describe: "Test file to put" }))
+      withProjectOptions(yargs43.positional("filename", { demandOption: true, describe: "Test file to put" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
@@ -9916,9 +10190,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: (yargs43) => yargs43.command(TestPullModule).command(TestPushModule).command(TestGetModule).command(TestRemoveModule).command(TestListModule).command(TestUpdateModule).demandCommand(),
   handler: () => {
-    yargs26.help();
+    yargs27.help();
   }
 };
 
@@ -9927,20 +10201,20 @@ 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: (yargs43) => yargs43.command(ManifestModule).command(SignalModule).command(EnrichmentModule).command(AggregateModule).command(QuirkModule).command(TestModule).demandCommand(),
   handler: () => {
-    yargs27.showHelp();
+    yargs28.showHelp();
   }
 };
 
 // src/commands/integration/index.ts
-import yargs32 from "yargs";
+import yargs33 from "yargs";
 
 // src/commands/integration/commands/definition.ts
-import yargs31 from "yargs";
+import yargs32 from "yargs";
 
 // src/commands/integration/commands/definition/dataResourceEditor/dataResourceEditor.ts
-import yargs28 from "yargs";
+import yargs29 from "yargs";
 
 // src/commands/integration/commands/definition/dataResourceEditor/deploy.ts
 import { readFileSync as readFileSync2 } from "fs";
@@ -10011,8 +10285,8 @@ var EdgehancerClient = class extends ApiClient {
 };
 
 // src/commands/integration/commands/definition/dataResourceEditor/util.ts
-function withDataResourceEditorIdOptions(yargs42) {
-  return yargs42.option("connectorType", {
+function withDataResourceEditorIdOptions(yargs43) {
+  return yargs43.option("connectorType", {
     describe: "Integration data connector type to attach the data resource editor to, as defined in the integration manifest file.",
     demandOption: true,
     type: "string"
@@ -10032,11 +10306,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: (yargs43) => withConfiguration(
     withApiOptions(
       withTeamOptions(
         withDataResourceEditorIdOptions(
-          yargs42.positional("filename", {
+          yargs43.positional("filename", {
             demandOption: true,
             describe: "ESM code file to run for the target data resource editor hook. Refer to the documentation for expected types."
           }).option("compatibilityDate", {
@@ -10079,7 +10353,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: (yargs43) => withConfiguration(withApiOptions(withTeamOptions(withDataResourceEditorIdOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, team: teamId, connectorType, archetype, hook }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch2, teamId });
@@ -10091,21 +10365,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: (yargs43) => yargs43.command(IntegrationDataResourceEditorDeployModule).command(IntegrationDataResourceEditorRemoveModule).demandCommand(),
   handler: () => {
-    yargs28.help();
+    yargs29.help();
   }
 };
 
 // src/commands/integration/commands/definition/edgehancer/edgehancer.ts
-import yargs29 from "yargs";
+import yargs30 from "yargs";
 
 // src/commands/integration/commands/definition/edgehancer/deploy.ts
 import { readFileSync as readFileSync3 } from "fs";
 
 // src/commands/integration/commands/definition/edgehancer/util.ts
-function withEdgehancerIdOptions(yargs42) {
-  return yargs42.option("connectorType", {
+function withEdgehancerIdOptions(yargs43) {
+  return yargs43.option("connectorType", {
     describe: "Integration data connector type to edgehance, as defined in the integration manifest file.",
     demandOption: true,
     type: "string"
@@ -10125,11 +10399,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: (yargs43) => withConfiguration(
     withApiOptions(
       withTeamOptions(
         withEdgehancerIdOptions(
-          yargs42.positional("filename", {
+          yargs43.positional("filename", {
             demandOption: true,
             describe: "ESM code file to run for the target edgehancer hook. Refer to the documentation for expected types."
           }).option("compatibilityDate", {
@@ -10172,7 +10446,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: (yargs43) => withConfiguration(withApiOptions(withTeamOptions(withEdgehancerIdOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, team: teamId, archetype, connectorType, hook }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch2, teamId });
@@ -10184,22 +10458,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: (yargs43) => yargs43.command(IntegrationEdgehancerDeployModule).command(IntegrationEdgehancerRemoveModule).demandCommand(),
   handler: () => {
-    yargs29.help();
+    yargs30.help();
   }
 };
 
 // src/commands/integration/commands/definition/propertyEditor/propertyEditor.ts
-import yargs30 from "yargs";
+import yargs31 from "yargs";
 
 // src/commands/integration/commands/definition/propertyEditor/deploy.ts
 import { IntegrationPropertyEditorsClient } from "@uniformdev/canvas";
 import { readFileSync as readFileSync4 } from "fs";
 
 // src/commands/integration/commands/definition/propertyEditor/util.ts
-function withPropertyEditorIdOptions(yargs42) {
-  return yargs42.option("propertyType", {
+function withPropertyEditorIdOptions(yargs43) {
+  return yargs43.option("propertyType", {
     describe: "Property type to attach the editor to.",
     demandOption: true,
     type: "string"
@@ -10215,11 +10489,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: (yargs43) => withConfiguration(
     withApiOptions(
       withTeamOptions(
         withPropertyEditorIdOptions(
-          yargs42.positional("filename", {
+          yargs43.positional("filename", {
             demandOption: true,
             describe: "ESM code file to run for the target property editor hook. Refer to the documentation for expected types."
           }).option("compatibilityDate", {
@@ -10262,7 +10536,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: (yargs43) => withConfiguration(withApiOptions(withTeamOptions(withPropertyEditorIdOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, team: teamId, propertyType, hook }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new IntegrationPropertyEditorsClient2({ apiKey, apiHost, fetch: fetch2, teamId });
@@ -10274,9 +10548,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: (yargs43) => yargs43.command(IntegrationPropertyEditorDeployModule).command(IntegrationPropertyEditorRemoveModule).demandCommand(),
   handler: () => {
-    yargs30.help();
+    yargs31.help();
   }
 };
 
@@ -10316,10 +10590,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: (yargs43) => withConfiguration(
     withApiOptions(
       withTeamOptions(
-        yargs42.positional("filename", {
+        yargs43.positional("filename", {
           demandOption: true,
           describe: "Integration definition manifest to register"
         })
@@ -10338,10 +10612,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: (yargs43) => withConfiguration(
     withApiOptions(
       withTeamOptions(
-        yargs42.positional("type", {
+        yargs43.positional("type", {
           demandOption: true,
           describe: "Integration type (from its manifest) to remove."
         })
@@ -10359,9 +10633,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: (yargs43) => yargs43.command(IntegrationDefinitionRemoveModule).command(IntegrationDefinitionRegisterModule).command(IntegrationEdgehancerModule).command(IntegrationDataResourceEditorModule).command(IntegrationPropertyEditorModule).demandCommand(),
   handler: () => {
-    yargs31.help();
+    yargs32.help();
   }
 };
 
@@ -10401,10 +10675,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: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("type", {
+        yargs43.positional("type", {
           demandOption: true,
           describe: "Integration type to install (as defined in its manifest)"
         }).option("configuration", {
@@ -10426,10 +10700,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: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("type", {
+        yargs43.positional("type", {
           demandOption: true,
           describe: "Integration type to uninstall (as defined in its manifest)"
         })
@@ -10447,9 +10721,9 @@ var IntegrationUninstallModule = {
 var IntegrationCommand = {
   command: "integration <command>",
   describe: "Integration management commands",
-  builder: (yargs42) => yargs42.command(IntegrationDefinitionModule).command(IntegrationInstallModule).command(IntegrationUninstallModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(IntegrationDefinitionModule).command(IntegrationInstallModule).command(IntegrationUninstallModule).demandCommand(),
   handler: () => {
-    yargs32.showHelp();
+    yargs33.showHelp();
   }
 };
 
@@ -10914,14 +11188,14 @@ var NewMeshCmd = {
 };
 
 // src/commands/policy-documents/index.ts
-import yargs33 from "yargs";
+import yargs34 from "yargs";
 
 // src/commands/policy-documents/commands/list.ts
 var PolicyDocumentsListModule = {
   command: "list",
   describe: "List policy documents for a project",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs42)))),
+  builder: (yargs43) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const url = new URL(`/api/v1/policy-documents`, apiHost);
@@ -11006,12 +11280,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: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save to. Each policy document will be saved as a separate file named by role ID.",
               type: "string"
             }).option("format", {
@@ -11066,7 +11340,8 @@ var PolicyDocumentsPullModule = {
 };
 
 // src/commands/policy-documents/commands/push.ts
-import { readdir as readdir2, stat } from "fs/promises";
+import { existsSync as existsSync5, mkdirSync as mkdirSync4 } from "fs";
+import { readdir as readdir2 } from "fs/promises";
 import { extname as extname2, join as join11 } from "path";
 async function readLocalPolicyDocuments(directory, format, verbose) {
   const files = await readdir2(directory);
@@ -11144,12 +11419,12 @@ function mergePolicyDocuments(localDocs, remoteDocs, mode) {
 var PolicyDocumentsPushModule = {
   command: "push <directory>",
   describe: "Pushes policy documents from local files to Uniform",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory containing policy document files (one file per role ID).",
               type: "string"
             }).option("format", {
@@ -11183,16 +11458,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 (!existsSync5(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);
@@ -11250,17 +11520,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: (yargs43) => yargs43.command(PolicyDocumentsListModule).command(PolicyDocumentsPullModule).command(PolicyDocumentsPushModule).demandCommand(),
   handler: () => {
-    yargs33.showHelp();
+    yargs34.showHelp();
   }
 };
 
 // src/commands/project-map/index.ts
-import yargs36 from "yargs";
+import yargs37 from "yargs";
 
 // src/commands/project-map/commands/projectMapDefinition.ts
-import yargs34 from "yargs";
+import yargs35 from "yargs";
 
 // src/commands/project-map/commands/ProjectMapDefinition/_util.ts
 import { UncachedProjectMapClient } from "@uniformdev/project-map";
@@ -11274,11 +11544,11 @@ function getProjectMapClient(options) {
 var ProjectMapDefinitionGetModule = {
   command: "get <id>",
   describe: "Fetch a project map",
-  builder: (yargs42) => withFormatOptions(
+  builder: (yargs43) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
+          yargs43.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
         )
       )
     )
@@ -11301,7 +11571,7 @@ var ProjectMapDefinitionListModule = {
   command: "list",
   describe: "List of project maps",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs42)))),
+  builder: (yargs43) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = getProjectMapClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -11355,12 +11625,12 @@ function createProjectMapDefinitionEngineDataSource({
 var ProjectMapDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save project maps to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -11435,12 +11705,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: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read project maps from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -11504,9 +11774,9 @@ var ProjectMapDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs42.positional("id", { demandOption: true, describe: " UUID to delete" }))
+      withProjectOptions(yargs43.positional("id", { demandOption: true, describe: " UUID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -11521,10 +11791,10 @@ var ProjectMapDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a project map",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("filename", { demandOption: true, describe: "Project map file to put" })
+        yargs43.positional("filename", { demandOption: true, describe: "Project map file to put" })
       )
     )
   ),
@@ -11540,24 +11810,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: (yargs43) => yargs43.command(ProjectMapDefinitionPullModule).command(ProjectMapDefinitionPushModule).command(ProjectMapDefinitionGetModule).command(ProjectMapDefinitionRemoveModule).command(ProjectMapDefinitionListModule).command(ProjectMapDefinitionUpdateModule).demandCommand(),
   handler: () => {
-    yargs34.help();
+    yargs35.help();
   }
 };
 
 // src/commands/project-map/commands/projectMapNode.ts
-import yargs35 from "yargs";
+import yargs36 from "yargs";
 
 // src/commands/project-map/commands/ProjectMapNode/get.ts
 var ProjectMapNodeGetModule = {
   command: "get <id> <projectMapId>",
   describe: "Fetch a project map node",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => 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" })
+          yargs43.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to fetch" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to fetch from" })
         )
       )
     )
@@ -11581,12 +11851,12 @@ var ProjectMapNodeListModule = {
   command: "list <projectMapId>",
   describe: "List project map nodes",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs42.positional("projectMapId", {
+            yargs43.positional("projectMapId", {
               demandOption: true,
               describe: "ProjectMap UUID to fetch from"
             })
@@ -11664,12 +11934,12 @@ function createProjectMapNodeEngineDataSource({
 var ProjectMapNodePullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps nodes to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save project maps to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -11751,12 +12021,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: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read project maps from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -11858,10 +12128,10 @@ var ProjectMapNodeRemoveModule = {
   command: "remove <id> <projectMapId>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map node",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to delete" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to delete from" })
+        yargs43.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to delete" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to delete from" })
       )
     )
   ),
@@ -11877,10 +12147,10 @@ var ProjectMapNodeUpdateModule = {
   command: "update <filename> <projectMapId>",
   aliases: ["put"],
   describe: "Insert or update a project map node",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => 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" })
+        yargs43.positional("filename", { demandOption: true, describe: "ProjectMap node file with nodes data" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to put into" })
       )
     )
   ),
@@ -11896,9 +12166,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: (yargs43) => yargs43.command(ProjectMapNodePullModule).command(ProjectMapNodePushModule).command(ProjectMapNodeGetModule).command(ProjectMapNodeRemoveModule).command(ProjectMapNodeListModule).command(ProjectMapNodeUpdateModule).demandCommand(),
   handler: () => {
-    yargs35.help();
+    yargs36.help();
   }
 };
 
@@ -11907,17 +12177,17 @@ var ProjectMapCommand = {
   command: "project-map <command>",
   aliases: ["prm"],
   describe: "Uniform ProjectMap commands",
-  builder: (yargs42) => yargs42.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
   handler: () => {
-    yargs36.showHelp();
+    yargs37.showHelp();
   }
 };
 
 // src/commands/redirect/index.ts
-import yargs38 from "yargs";
+import yargs39 from "yargs";
 
 // src/commands/redirect/commands/redirect.ts
-import yargs37 from "yargs";
+import yargs38 from "yargs";
 
 // src/commands/redirect/commands/RedirectDefinition/_util.ts
 import { UncachedRedirectClient } from "@uniformdev/redirect";
@@ -11942,11 +12212,11 @@ function getRedirectClient(options) {
 var RedirectDefinitionGetModule = {
   command: "get <id>",
   describe: "Fetch a redirect",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs42.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
+          yargs43.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
         )
       )
     )
@@ -11969,7 +12239,7 @@ var RedirectDefinitionListModule = {
   command: "list",
   describe: "List of redirects",
   aliases: ["ls"],
-  builder: (yargs42) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs42)))),
+  builder: (yargs43) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs43)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = getRedirectClient({ apiKey, apiHost, fetch: fetch2, projectId });
@@ -12021,12 +12291,12 @@ function createRedirectDefinitionEngineDataSource({
 var RedirectDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all redirects to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save redirects to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -12102,12 +12372,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: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read redirects from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -12171,9 +12441,9 @@ var RedirectDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a redirect",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs42.positional("id", { demandOption: true, describe: " UUID to delete" }))
+      withProjectOptions(yargs43.positional("id", { demandOption: true, describe: " UUID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -12188,10 +12458,10 @@ var RedirectDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a redirect",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs42.positional("filename", { demandOption: true, describe: "Redirect file to put" })
+        yargs43.positional("filename", { demandOption: true, describe: "Redirect file to put" })
       )
     )
   ),
@@ -12207,9 +12477,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: (yargs43) => yargs43.command(RedirectDefinitionPullModule).command(RedirectDefinitionPushModule).command(RedirectDefinitionGetModule).command(RedirectDefinitionRemoveModule).command(RedirectDefinitionListModule).command(RedirectDefinitionUpdateModule).demandCommand(),
   handler: () => {
-    yargs37.help();
+    yargs38.help();
   }
 };
 
@@ -12218,14 +12488,14 @@ var RedirectCommand = {
   command: "redirect <command>",
   aliases: ["red"],
   describe: "Uniform Redirect commands",
-  builder: (yargs42) => yargs42.command(RedirectDefinitionModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(RedirectDefinitionModule).demandCommand(),
   handler: () => {
-    yargs38.showHelp();
+    yargs39.showHelp();
   }
 };
 
 // src/commands/sync/index.ts
-import yargs39 from "yargs";
+import yargs40 from "yargs";
 
 // src/webhooksClient.ts
 import { ApiClient as ApiClient4 } from "@uniformdev/context/api";
@@ -12419,12 +12689,12 @@ function createWebhookEngineDataSource({
 var WebhookPullModule = {
   command: "pull <directory>",
   describe: "Pulls all webhooks to local files in a directory",
-  builder: (yargs42) => withConfiguration(
+  builder: (yargs43) => withConfiguration(
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to save to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -12610,11 +12880,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: (yargs43) => withConfiguration(withApiOptions(withProjectOptions(withDebugOptions(withDiffOptions(yargs43))))),
   handler: async ({ serialization, ...otherParams }) => {
     const config2 = serialization;
     const enabledEntities = Object.entries({
       locale: LocalePullModule,
+      label: LabelPullModule,
       asset: AssetPullModule,
       category: CategoryPullModule,
       workflow: WorkflowPullModule,
@@ -12637,6 +12908,7 @@ var SyncPullModule = {
       contentType: ContentTypePullModule,
       previewUrl: PreviewUrlPullModule,
       previewViewport: PreviewViewportPullModule,
+      policyDocument: PolicyDocumentsPullModule,
       webhook: WebhookPullModule
     }).filter(([entityType]) => {
       return Boolean(config2.entitiesConfig?.[entityType]) && config2.entitiesConfig?.[entityType]?.disabled !== true && config2.entitiesConfig?.[entityType]?.pull?.disabled !== true;
@@ -12708,12 +12980,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: (yargs43) => withConfiguration(
     withDebugOptions(
       withApiOptions(
         withProjectOptions(
           withDiffOptions(
-            yargs42.positional("directory", {
+            yargs43.positional("directory", {
               describe: "Directory to read from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("mode", {
@@ -12777,11 +13049,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: (yargs43) => withConfiguration(withApiOptions(withProjectOptions(withDiffOptions(withDebugOptions(yargs43))))),
   handler: async ({ serialization, ...otherParams }) => {
     const config2 = serialization;
     const enabledEntities = Object.entries({
       locale: LocalePushModule,
+      label: LabelPushModule,
       asset: AssetPushModule,
       category: CategoryPushModule,
       workflow: WorkflowPushModule,
@@ -12804,6 +13077,7 @@ var SyncPushModule = {
       entryPattern: EntryPatternPushModule,
       previewUrl: PreviewUrlPushModule,
       previewViewport: PreviewViewportPushModule,
+      policyDocument: PolicyDocumentsPushModule,
       webhook: WebhookPushModule
     }).filter(([entityType]) => {
       return Boolean(config2.entitiesConfig?.[entityType]) && config2.entitiesConfig?.[entityType]?.disabled !== true && config2.entitiesConfig?.[entityType]?.push?.disabled !== true;
@@ -12986,21 +13260,21 @@ var getFormat2 = (entityType, config2) => {
 var SyncCommand = {
   command: "sync <command>",
   describe: "Uniform Sync commands",
-  builder: (yargs42) => yargs42.command(SyncPullModule).command(SyncPushModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(SyncPullModule).command(SyncPushModule).demandCommand(),
   handler: () => {
-    yargs39.showHelp();
+    yargs40.showHelp();
   }
 };
 
 // src/commands/webhook/index.ts
-import yargs40 from "yargs";
+import yargs41 from "yargs";
 var WebhookCommand = {
   command: "webhook <command>",
   aliases: ["wh"],
   describe: "Commands for webhooks",
-  builder: (yargs42) => yargs42.command(WebhookPullModule).command(WebhookPushModule).demandCommand(),
+  builder: (yargs43) => yargs43.command(WebhookPullModule).command(WebhookPushModule).demandCommand(),
   handler: () => {
-    yargs40.help();
+    yargs41.help();
   }
 };
 
@@ -13008,7 +13282,7 @@ 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 existsSync6, promises as fs8 } from "fs";
 import { get as getHttp } from "http";
 import { get as getHttps } from "https";
 import { tmpdir } from "os";
@@ -13020,7 +13294,7 @@ var encode = (value) => encodeURIComponent(value).replace(/^%40/, "@");
 var getFile = async (details, distTag) => {
   const rootDir = tmpdir();
   const subDir = join12(rootDir, "update-check");
-  if (!existsSync5(subDir)) {
+  if (!existsSync6(subDir)) {
     await fs8.mkdir(subDir);
   }
   let name = `${details.name}-${distTag}.json`;
@@ -13030,7 +13304,7 @@ var getFile = async (details, distTag) => {
   return join12(subDir, name);
 };
 var evaluateCache = async (file, time, interval) => {
-  if (existsSync5(file)) {
+  if (existsSync6(file)) {
     const content = await fs8.readFile(file, "utf8");
     const { lastUpdate, latest } = JSON.parse(content);
     const nextCheck = lastUpdate + interval;
@@ -13235,7 +13509,7 @@ First found was: v${firstVersion}`;
 
 // src/index.ts
 dotenv.config();
-var yarggery = yargs41(hideBin(process.argv));
+var yarggery = yargs42(hideBin(process.argv));
 var useDefaultConfig = !process.argv.includes("--config");
 var defaultConfig2 = useDefaultConfig ? loadConfig(null) : {};
 yarggery.option("verbose", {