@uniformdev/cli 19.195.1-alpha.2 → 19.195.1-alpha.4

package/dist/index.mjs

@@ -11,19 +11,21 @@ import {
   readFileToObject,
   withApiOptions,
   withConfiguration,
+  withDebugOptions,
   withDiffOptions,
   withFormatOptions,
   withProjectOptions,
-  withTeamOptions
-} from "./chunk-VMUNHMVI.mjs";
+  withTeamOptions,
+  withVerboseOption
+} from "./chunk-MIERGFOU.mjs";
 
 // src/index.ts
 import * as dotenv from "dotenv";
-import yargs35 from "yargs";
+import yargs37 from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // src/commands/canvas/index.ts
-import yargs16 from "yargs";
+import yargs18 from "yargs";
 
 // src/commands/canvas/commands/asset.ts
 import yargs from "yargs";
@@ -35,20 +37,20 @@ import { UncachedAssetClient } from "@uniformdev/assets";
 async function createArraySyncEngineDataSource({
   name,
   objects,
-  selectIdentifier: selectIdentifier14,
-  selectDisplayName: selectDisplayName14 = selectIdentifier14,
+  selectIdentifier: selectIdentifier16,
+  selectDisplayName: selectDisplayName16 = selectIdentifier16,
   onSyncComplete,
   onBeforeDeleteObject
 }) {
   const objectIndex = objects.reduce(
     (result, current) => {
-      const rawIdentifiers = selectIdentifier14(current);
+      const rawIdentifiers = selectIdentifier16(current);
       const identifiers = Array.isArray(rawIdentifiers) ? rawIdentifiers : [rawIdentifiers];
       const existingResult = identifiers.find((id) => result[id]);
       if (existingResult) {
         throw new Error(`Identifier(s) ${identifiers} was not unique.`);
       }
-      const displayName = selectDisplayName14(current);
+      const displayName = selectDisplayName16(current);
       result[identifiers[0]] = {
         id: identifiers,
         object: current,
@@ -78,7 +80,7 @@ async function createArraySyncEngineDataSource({
       delete objectIndex[providerId];
     },
     writeObject: async (objectToWrite) => {
-      const id = selectIdentifier14(objectToWrite.object);
+      const id = selectIdentifier16(objectToWrite.object);
       if (Array.isArray(id)) {
         objectIndex[id[0]] = objectToWrite;
       } else {
@@ -139,8 +141,8 @@ var loadConfig = (configPath) => {
 async function createFileSyncEngineDataSource({
   directory,
   format = "yaml",
-  selectIdentifier: selectIdentifier14,
-  selectDisplayName: selectDisplayName14 = selectIdentifier14,
+  selectIdentifier: selectIdentifier16,
+  selectDisplayName: selectDisplayName16 = selectIdentifier16,
   selectFilename: selectFilename3,
   selectSchemaUrl: selectSchemaUrl2,
   onBeforeDeleteObject
@@ -162,9 +164,9 @@ async function createFileSyncEngineDataSource({
       const fullFilename = join(directory, filename);
       try {
         const contents = await readFileToObject(fullFilename);
-        const displayName = selectDisplayName14(contents);
+        const displayName = selectDisplayName16(contents);
         const object = {
-          id: selectIdentifier14(contents),
+          id: selectIdentifier16(contents),
           displayName: Array.isArray(displayName) ? displayName[0] : displayName,
           providerId: fullFilename,
           object: omit(contents, ["$schema"])
@@ -244,24 +246,25 @@ async function syncEngine({
   const processDelete = async (object) => {
     if (deleteTracker.has(object)) return;
     deleteTracker.add(object);
-    if (!whatIf) {
-      try {
+    try {
+      if (!whatIf) {
         await target.deleteObject(object.providerId, object);
-        log({
-          action: "delete",
-          id: object.id[0],
-          providerId: object.providerId,
-          displayName: object.displayName ?? object.providerId,
-          whatIf,
-          diff: diffLines(JSON.stringify(object.object, null, 2), "")
-        });
-      } catch (e) {
-        if (onError) {
-          onError(e, object);
-        } else {
-          throw new SyncEngineError(e, object);
-        }
       }
+    } catch (e) {
+      if (onError) {
+        onError(e, object);
+      } else {
+        throw new SyncEngineError(e, object);
+      }
+    } finally {
+      log({
+        action: "delete",
+        id: object.id[0],
+        providerId: object.providerId,
+        displayName: object.displayName ?? object.providerId,
+        whatIf,
+        diff: diffLines(JSON.stringify(object.object, null, 2), "")
+      });
     }
   };
   for await (const obj of target.objects) {
@@ -283,25 +286,26 @@ async function syncEngine({
       if (!compareContents(sourceObject, targetObject)) {
         if (mode === "createOrUpdate" || mode === "mirror") {
           const process2 = async (sourceObject2, targetObject2) => {
-            if (!whatIf) {
-              try {
+            try {
+              if (!whatIf) {
                 const finalSourceObject = onBeforeWriteObject ? await onBeforeWriteObject(sourceObject2, targetObject2) : sourceObject2;
                 await target.writeObject(finalSourceObject, targetObject2);
-                log({
-                  action: "update",
-                  id: ids[0],
-                  providerId: sourceObject2.providerId,
-                  displayName: sourceObject2.displayName ?? sourceObject2.providerId,
-                  whatIf,
-                  diff: diffJson(targetObject2.object, sourceObject2.object)
-                });
-              } catch (e) {
-                if (onError) {
-                  onError(e, sourceObject2);
-                } else {
-                  throw new SyncEngineError(e, sourceObject2);
-                }
               }
+            } catch (e) {
+              if (onError) {
+                onError(e, sourceObject2);
+              } else {
+                throw new SyncEngineError(e, sourceObject2);
+              }
+            } finally {
+              log({
+                action: "update",
+                id: ids[0],
+                providerId: sourceObject2.providerId,
+                displayName: sourceObject2.displayName ?? sourceObject2.providerId,
+                whatIf,
+                diff: diffJson(targetObject2.object, sourceObject2.object)
+              });
             }
           };
           actions.push(process2(sourceObject, targetObject));
@@ -310,25 +314,26 @@ async function syncEngine({
       ids.forEach((i) => targetItems.delete(i));
     } else {
       const process2 = async (sourceObject2, id) => {
-        if (!whatIf) {
-          try {
+        try {
+          if (!whatIf) {
             const finalSourceObject = onBeforeWriteObject ? await onBeforeWriteObject(sourceObject2) : sourceObject2;
             await target.writeObject(finalSourceObject);
-            log({
-              action: "create",
-              id,
-              providerId: id,
-              displayName: sourceObject2.displayName ?? sourceObject2.providerId,
-              whatIf,
-              diff: diffLines("", JSON.stringify(sourceObject2.object, null, 2))
-            });
-          } catch (e) {
-            if (onError) {
-              onError(e, sourceObject2);
-            } else {
-              throw new SyncEngineError(e, sourceObject2);
-            }
           }
+        } catch (e) {
+          if (onError) {
+            onError(e, sourceObject2);
+          } else {
+            throw new SyncEngineError(e, sourceObject2);
+          }
+        } finally {
+          log({
+            action: "create",
+            id,
+            providerId: id,
+            displayName: sourceObject2.displayName ?? sourceObject2.providerId,
+            whatIf,
+            diff: diffLines("", JSON.stringify(sourceObject2.object, null, 2))
+          });
         }
       };
       if (invalidTargetObjects.length > 0) {
@@ -419,12 +424,12 @@ function createPublishStatusSyncEngineConsoleLogger(options) {
 var AssetGetModule = {
   command: "get <id>",
   describe: "Get an asset",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs36.positional("id", { demandOption: true, describe: "Asset ID to fetch" })
+          yargs38.positional("id", { demandOption: true, describe: "Asset ID to fetch" })
         )
       )
     )
@@ -445,7 +450,7 @@ import { UncachedAssetClient as UncachedAssetClient2 } from "@uniformdev/assets"
 var AssetListModule = {
   command: "list",
   describe: "List assets",
-  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
+  builder: (yargs38) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs38)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedAssetClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -797,8 +802,8 @@ function prepCompositionForDisk(composition) {
   delete prepped.state;
   return prepped;
 }
-function withStateOptions(yargs36, defaultState = "preview") {
-  return yargs36.option("state", {
+function withStateOptions(yargs38, defaultState = "preview") {
+  return yargs38.option("state", {
     type: "string",
     describe: `State to fetch.`,
     choices: ["preview", "published"],
@@ -865,11 +870,11 @@ function writeCanvasPackage(filename, packageContents) {
 var AssetPullModule = {
   command: "pull <directory>",
   describe: "Pulls all assets to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.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", {
@@ -987,11 +992,11 @@ import { UncachedFileClient as UncachedFileClient2 } from "@uniformdev/files";
 var AssetPushModule = {
   command: "push <directory>",
   describe: "Pushes all assets from files in a directory to Uniform",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.positional("directory", {
             describe: "Directory to read the assets from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -1092,9 +1097,9 @@ var AssetRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an asset",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs36.positional("id", { demandOption: true, describe: "Asset ID to delete" }))
+      withProjectOptions(yargs38.positional("id", { demandOption: true, describe: "Asset ID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -1110,10 +1115,10 @@ var AssetUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an asset",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("filename", { demandOption: true, describe: "Asset file to put" })
+        yargs38.positional("filename", { demandOption: true, describe: "Asset file to put" })
       )
     )
   ),
@@ -1129,7 +1134,7 @@ var AssetUpdateModule = {
 var AssetModule = {
   command: "asset <command>",
   describe: "Commands for Assets",
-  builder: (yargs36) => yargs36.command(AssetGetModule).command(AssetListModule).command(AssetRemoveModule).command(AssetUpdateModule).command(AssetPullModule).command(AssetPushModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(AssetGetModule).command(AssetListModule).command(AssetRemoveModule).command(AssetUpdateModule).command(AssetPullModule).command(AssetPushModule).demandCommand(),
   handler: () => {
     yargs.help();
   }
@@ -1143,11 +1148,11 @@ import { UncachedCategoryClient } from "@uniformdev/canvas";
 var CategoryGetModule = {
   command: "get <id>",
   describe: "Fetch a category",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs36.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
+          yargs38.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
         )
       )
     )
@@ -1172,7 +1177,7 @@ var CategoryListModule = {
   command: "list",
   describe: "List categories",
   aliases: ["ls"],
-  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36.options({}))))),
+  builder: (yargs38) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs38.options({}))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCategoryClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -1222,11 +1227,11 @@ function createCategoriesEngineDataSource({
 var CategoryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all categories to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.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", {
@@ -1304,11 +1309,11 @@ import { UncachedCategoryClient as UncachedCategoryClient4 } from "@uniformdev/c
 var CategoryPushModule = {
   command: "push <directory>",
   describe: "Pushes all categories from files in a directory to Uniform Canvas",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.positional("directory", {
             describe: "Directory to read the categories from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -1375,10 +1380,10 @@ var CategoryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a category",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("id", { demandOption: true, describe: "Category UUID to delete" })
+        yargs38.positional("id", { demandOption: true, describe: "Category UUID to delete" })
       )
     )
   ),
@@ -1395,10 +1400,10 @@ var CategoryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a category",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("filename", { demandOption: true, describe: "Category file to put" })
+        yargs38.positional("filename", { demandOption: true, describe: "Category file to put" })
       )
     )
   ),
@@ -1415,7 +1420,7 @@ var CategoryModule = {
   command: "category <command>",
   aliases: ["cat"],
   describe: "Commands for Canvas categories",
-  builder: (yargs36) => yargs36.command(CategoryPullModule).command(CategoryPushModule).command(CategoryGetModule).command(CategoryRemoveModule).command(CategoryListModule).command(CategoryUpdateModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(CategoryPullModule).command(CategoryPushModule).command(CategoryGetModule).command(CategoryRemoveModule).command(CategoryListModule).command(CategoryUpdateModule).demandCommand(),
   handler: () => {
     yargs2.help();
   }
@@ -1436,11 +1441,11 @@ var selectSchemaUrl = () => "/schemas/json-schema/component-definition/v1.json";
 var ComponentGetModule = {
   command: "get <id>",
   describe: "Fetch a component definition",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs36.positional("id", {
+          yargs38.positional("id", {
             demandOption: true,
             describe: "Component definition public ID to fetch"
           })
@@ -1474,11 +1479,11 @@ var ComponentListModule = {
   command: "list",
   describe: "List component definitions",
   aliases: ["ls"],
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs36.options({
+          yargs38.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 }
           })
@@ -1534,11 +1539,11 @@ function createComponentDefinitionEngineDataSource({
 var ComponentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all component definitions to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.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", {
@@ -1617,11 +1622,11 @@ import { UncachedCanvasClient as UncachedCanvasClient4 } from "@uniformdev/canva
 var ComponentPushModule = {
   command: "push <directory>",
   describe: "Pushes all component definitions from files in a directory to Uniform Canvas",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.positional("directory", {
             describe: "Directory to read the component definitions from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -1689,10 +1694,10 @@ var ComponentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a component definition",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("id", { demandOption: true, describe: "Component definition public ID to delete" })
+        yargs38.positional("id", { demandOption: true, describe: "Component definition public ID to delete" })
       )
     )
   ),
@@ -1709,10 +1714,10 @@ var ComponentUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a component definition",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("filename", { demandOption: true, describe: "Component definition file to put" })
+        yargs38.positional("filename", { demandOption: true, describe: "Component definition file to put" })
       )
     )
   ),
@@ -1729,7 +1734,7 @@ var ComponentModule = {
   command: "component <command>",
   aliases: ["def"],
   describe: "Commands for Canvas component definitions",
-  builder: (yargs36) => yargs36.command(ComponentPullModule).command(ComponentPushModule).command(ComponentGetModule).command(ComponentRemoveModule).command(ComponentListModule).command(ComponentUpdateModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(ComponentPullModule).command(ComponentPushModule).command(ComponentGetModule).command(ComponentRemoveModule).command(ComponentListModule).command(ComponentUpdateModule).demandCommand(),
   handler: () => {
     yargs3.help();
   }
@@ -1743,43 +1748,48 @@ import { UncachedCanvasClient as UncachedCanvasClient7 } from "@uniformdev/canva
 var CompositionGetModule = {
   command: "get <id>",
   describe: "Fetch a composition",
-  builder: (yargs36) => withFormatOptions(
+  builder: (yargs38) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs36.positional("id", { demandOption: true, describe: "Composition/pattern public ID to fetch" }).option({
-              resolvePatterns: {
-                type: "boolean",
-                default: false,
-                describe: "Resolve pattern references in the composition"
-              },
-              resolveOverrides: {
-                type: "boolean",
-                default: false,
-                describe: "Resolves pattern overrides in the composition and removes override definition data"
-              },
-              componentIDs: {
-                type: "boolean",
-                default: false,
-                describe: "Include individual component UIDs"
-              },
-              resolveData: {
-                type: "boolean",
-                default: false,
-                describe: "Resolve all data resources used by the composition/pattern"
-              },
-              diagnostics: {
-                type: "boolean",
-                default: false,
-                describe: "Include diagnostics information when resolving data"
-              },
-              resolutionDepth: {
-                type: "number",
-                default: 1,
-                describe: "Controls how many levels deep content references should be resolved"
-              }
-            })
+            withVerboseOption(
+              yargs38.positional("id", {
+                demandOption: true,
+                describe: "Composition/pattern public ID to fetch"
+              }).option({
+                resolvePatterns: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Resolve pattern references in the composition"
+                },
+                resolveOverrides: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Resolves pattern overrides in the composition and removes override definition data"
+                },
+                componentIDs: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Include individual component UIDs"
+                },
+                resolveData: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Resolve all data resources used by the composition/pattern"
+                },
+                diagnostics: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Include diagnostics information when resolving data"
+                },
+                resolutionDepth: {
+                  type: "number",
+                  default: 1,
+                  describe: "Controls how many levels deep content references should be resolved"
+                }
+              })
+            )
           )
         )
       )
@@ -1800,22 +1810,25 @@ var CompositionGetModule = {
     componentIDs,
     resolveData,
     diagnostics,
-    resolutionDepth
+    resolutionDepth,
+    verbose
   }) => {
-    const fetch3 = nodeFetchProxy(proxy);
+    const parameters = {
+      compositionId: id,
+      state: convertStateOption(state),
+      skipPatternResolution: !resolvePatterns,
+      skipOverridesResolution: !resolveOverrides,
+      withComponentIDs: componentIDs,
+      skipDataResolution: !resolveData,
+      diagnostics: resolveData ? diagnostics : void 0,
+      resolutionDepth: resolveData ? resolutionDepth : void 0
+    };
+    if (verbose) {
+      console.log(`\u{1F41B} get composition:`, parameters);
+    }
+    const fetch3 = nodeFetchProxy(proxy, verbose);
     const client = new UncachedCanvasClient7({ apiKey, edgeApiHost, apiHost, fetch: fetch3, projectId });
-    const res = prepCompositionForDisk(
-      await client.getCompositionById({
-        compositionId: id,
-        state: convertStateOption(state),
-        skipPatternResolution: !resolvePatterns,
-        skipOverridesResolution: !resolveOverrides,
-        withComponentIDs: componentIDs,
-        skipDataResolution: !resolveData,
-        diagnostics: resolveData ? diagnostics : void 0,
-        resolutionDepth: resolveData ? resolutionDepth : void 0
-      })
-    );
+    const res = prepCompositionForDisk(await client.getCompositionById(parameters));
     emitWithFormat(res, format, filename);
   }
 };
@@ -1832,42 +1845,44 @@ var CompositionListModule = {
   command: "list",
   describe: "List compositions",
   aliases: ["ls"],
-  builder: (yargs36) => withFormatOptions(
+  builder: (yargs38) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          withStateOptions(
-            yargs36.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: "" },
-              resolvePatterns: {
-                type: "boolean",
-                default: false,
-                describe: "Resolve pattern references in the composition"
-              },
-              resolveOverrides: {
-                type: "boolean",
-                default: false,
-                describe: "Resolves pattern overrides in the composition and removes override definition data"
-              },
-              onlyCompositions: {
-                describe: "Only pulling compositions and not patterns",
-                default: false,
-                type: "boolean"
-              },
-              onlyPatterns: {
-                describe: "Only pulling patterns and not compositions",
-                default: false,
-                type: "boolean",
-                hidden: true
-              },
-              componentIDs: {
-                type: "boolean",
-                default: false,
-                describe: "Include individual component UIDs"
-              }
-            })
+          withDebugOptions(
+            withStateOptions(
+              yargs38.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: "" },
+                resolvePatterns: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Resolve pattern references in the composition"
+                },
+                resolveOverrides: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Resolves pattern overrides in the composition and removes override definition data"
+                },
+                onlyCompositions: {
+                  describe: "Only pulling compositions and not patterns",
+                  default: false,
+                  type: "boolean"
+                },
+                onlyPatterns: {
+                  describe: "Only pulling patterns and not compositions",
+                  default: false,
+                  type: "boolean",
+                  hidden: true
+                },
+                componentIDs: {
+                  type: "boolean",
+                  default: false,
+                  describe: "Include individual component UIDs"
+                }
+              })
+            )
           )
         )
       )
@@ -1889,11 +1904,10 @@ var CompositionListModule = {
     state,
     resolvePatterns,
     resolveOverrides,
-    componentIDs
+    componentIDs,
+    verbose
   }) => {
-    const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedCanvasClient8({ apiKey, apiHost, fetch: fetch3, projectId });
-    const res = await client.getCompositionList({
+    const parameters = {
       limit,
       offset,
       search: search && search.length > 0 ? search : void 0,
@@ -1903,7 +1917,13 @@ var CompositionListModule = {
       skipPatternResolution: !resolvePatterns,
       withComponentIDs: componentIDs,
       skipOverridesResolution: !resolveOverrides
-    });
+    };
+    if (verbose) {
+      console.log(`\u{1F41B} list compositions:`, parameters);
+    }
+    const fetch3 = nodeFetchProxy(proxy, verbose);
+    const client = new UncachedCanvasClient8({ apiKey, apiHost, fetch: fetch3, projectId });
+    const res = await client.getCompositionList();
     emitWithFormat(res.compositions, format, filename);
   }
 };
@@ -1912,12 +1932,12 @@ var CompositionListModule = {
 var ComponentPatternListModule = {
   ...CompositionListModule,
   describe: "List component patterns",
-  builder: (yargs36) => withFormatOptions(
+  builder: (yargs38) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs36.options({
+            yargs38.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: {
@@ -1984,23 +2004,30 @@ function createComponentInstanceEngineDataSource({
   onlyCompositions,
   onlyPatterns,
   patternType,
+  verbose,
   ...clientOptions
 }) {
   const stateId = convertStateOption(state);
   async function* getObjects() {
     const componentInstances = paginateAsync(
-      async (offset, limit) => (await client.getCompositionList({
-        ...clientOptions,
-        limit,
-        offset,
-        pattern: onlyCompositions ? false : onlyPatterns ? true : void 0,
-        state: stateId,
-        skipPatternResolution: true,
-        skipOverridesResolution: true,
-        withComponentIDs: true,
-        patternType,
-        editions: "all"
-      })).compositions,
+      async (offset, limit) => {
+        const parameters = {
+          ...clientOptions,
+          limit,
+          offset,
+          pattern: onlyCompositions ? false : onlyPatterns ? true : void 0,
+          state: stateId,
+          skipPatternResolution: true,
+          skipOverridesResolution: true,
+          withComponentIDs: true,
+          patternType,
+          editions: "all"
+        };
+        if (verbose) {
+          console.log(`\u{1F41B} pull compositions: `, parameters);
+        }
+        return (await client.getCompositionList(parameters)).compositions;
+      },
       { pageSize: 100 }
     );
     for await (const compositionListItem of componentInstances) {
@@ -2017,9 +2044,15 @@ function createComponentInstanceEngineDataSource({
     name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
+      if (verbose) {
+        console.log(`\u{1F41B} delete composition: (id: ${parseCompositionSerializedId(providerId)})`);
+      }
       await client.removeComposition(parseCompositionSerializedId(providerId));
     },
     writeObject: async (object) => {
+      if (verbose) {
+        console.log(`\u{1F41B} push composition: (id: ${object.object.composition._id})`);
+      }
       await client.updateComposition({ ...object.object, state: stateId });
     }
   };
@@ -2029,33 +2062,30 @@ function createComponentInstanceEngineDataSource({
 var CompositionPublishModule = {
   command: "publish [ids]",
   describe: "Publishes composition(s)",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        withDiffOptions(
-          yargs36.positional("ids", {
-            describe: "Publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
-            type: "string"
-          }).option("all", {
-            alias: ["a"],
-            describe: "Publishes all compositions. Use compositionId to publish one instead.",
-            default: false,
-            type: "boolean"
-          }).option("what-if", {
-            alias: ["w"],
-            describe: "What-if mode reports what would be done but does not perform any publishing",
-            default: false,
-            type: "boolean"
-          }).option("onlyCompositions", {
-            describe: "Only publishing compositions and not patterns",
-            default: false,
-            type: "boolean"
-          }).option("onlyPatterns", {
-            describe: "Only pulling patterns and not compositions",
-            default: false,
-            type: "boolean",
-            hidden: true
-          })
+        withDebugOptions(
+          withDiffOptions(
+            yargs38.positional("ids", {
+              describe: "Publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
+              type: "string"
+            }).option("all", {
+              alias: ["a"],
+              describe: "Publishes all compositions. Use compositionId to publish one instead.",
+              default: false,
+              type: "boolean"
+            }).option("onlyCompositions", {
+              describe: "Only publishing compositions and not patterns",
+              default: false,
+              type: "boolean"
+            }).option("onlyPatterns", {
+              describe: "Only pulling patterns and not compositions",
+              default: false,
+              type: "boolean",
+              hidden: true
+            })
+          )
         )
       )
     )
@@ -2070,14 +2100,15 @@ var CompositionPublishModule = {
     project: projectId,
     onlyCompositions,
     onlyPatterns,
-    patternType
+    patternType,
+    verbose
   }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or composition ID(s) to publish.`);
       process.exit(1);
     }
     const compositionIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
-    const fetch3 = nodeFetchProxy(proxy);
+    const fetch3 = nodeFetchProxy(proxy, verbose);
     const client = new UncachedCanvasClient9({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createComponentInstanceEngineDataSource({
       client,
@@ -2085,7 +2116,8 @@ var CompositionPublishModule = {
       compositionIDs: compositionIDsArray,
       onlyCompositions,
       onlyPatterns,
-      patternType
+      patternType,
+      verbose
     });
     const target = createComponentInstanceEngineDataSource({
       client,
@@ -2093,7 +2125,8 @@ var CompositionPublishModule = {
       compositionIDs: compositionIDsArray,
       onlyCompositions,
       onlyPatterns,
-      patternType
+      patternType,
+      verbose
     });
     await syncEngine({
       source,
@@ -2101,6 +2134,7 @@ var CompositionPublishModule = {
       // Publishing is one-direction operation, so no need to support automatic un-publishing
       mode: "createOrUpdate",
       whatIf,
+      verbose,
       log: createPublishStatusSyncEngineConsoleLogger({ status: "publish" })
     });
   }
@@ -2110,11 +2144,11 @@ var CompositionPublishModule = {
 var ComponentPatternPublishModule = {
   ...CompositionPublishModule,
   describe: "Publishes component pattern(s)",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("ids", {
+          yargs38.positional("ids", {
             describe: "Publishes component pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
@@ -2158,41 +2192,38 @@ import { UncachedFileClient as UncachedFileClient3 } from "@uniformdev/files";
 var CompositionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all compositions to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
-          withDiffOptions(
-            yargs36.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", {
-              alias: ["f"],
-              describe: "Output format",
-              default: "yaml",
-              choices: ["yaml", "json"],
-              type: "string"
-            }).option("onlyCompositions", {
-              describe: "Only pulling compositions and not patterns",
-              default: false,
-              type: "boolean"
-            }).option("onlyPatterns", {
-              describe: "Only pulling patterns and not compositions",
-              default: false,
-              type: "boolean",
-              hidden: true
-            }).option("what-if", {
-              alias: ["w"],
-              describe: "What-if mode reports what would be done but changes no files",
-              default: false,
-              type: "boolean"
-            }).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"
-            })
+          withDebugOptions(
+            withDiffOptions(
+              yargs38.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", {
+                alias: ["f"],
+                describe: "Output format",
+                default: "yaml",
+                choices: ["yaml", "json"],
+                type: "string"
+              }).option("onlyCompositions", {
+                describe: "Only pulling compositions and not patterns",
+                default: false,
+                type: "boolean"
+              }).option("onlyPatterns", {
+                describe: "Only pulling patterns and not compositions",
+                default: false,
+                type: "boolean",
+                hidden: true
+              }).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"
+              })
+            )
           )
         )
       )
@@ -2212,9 +2243,10 @@ var CompositionPullModule = {
     state,
     project: projectId,
     diff: diffMode,
-    allowEmptySource
+    allowEmptySource,
+    verbose
   }) => {
-    const fetch3 = nodeFetchProxy(proxy);
+    const fetch3 = nodeFetchProxy(proxy, verbose);
     const client = new UncachedCanvasClient10({ apiKey, apiHost, fetch: fetch3, projectId });
     const fileClient = new UncachedFileClient3({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createComponentInstanceEngineDataSource({
@@ -2222,7 +2254,8 @@ var CompositionPullModule = {
       state,
       onlyCompositions,
       onlyPatterns,
-      patternType
+      patternType,
+      verbose
     });
     const isPackage = isPathAPackageFile(directory);
     let target;
@@ -2273,12 +2306,12 @@ var CompositionPullModule = {
 var ComponentPatternPullModule = {
   ...CompositionPullModule,
   describe: "Pulls all component patterns to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs36.positional("directory", {
+            yargs38.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", {
@@ -2322,35 +2355,32 @@ import { UncachedFileClient as UncachedFileClient4 } from "@uniformdev/files";
 var CompositionPushModule = {
   command: "push <directory>",
   describe: "Pushes all compositions from files in a directory to Uniform Canvas",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
-          withDiffOptions(
-            yargs36.positional("directory", {
-              describe: "Directory to read the compositions/patterns from. If a filename is used, a package will be read instead.",
-              type: "string"
-            }).option("what-if", {
-              alias: ["w"],
-              describe: "What-if mode reports what would be done but changes nothing",
-              default: false,
-              type: "boolean"
-            }).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"
-            }).option("onlyCompositions", {
-              describe: "Only pulling compositions and not patterns",
-              default: false,
-              type: "boolean"
-            }).option("onlyPatterns", {
-              describe: "Only pulling patterns and not compositions",
-              default: false,
-              type: "boolean",
-              hidden: true
-            })
+          withDebugOptions(
+            withDiffOptions(
+              yargs38.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", {
+                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"
+              }).option("onlyCompositions", {
+                describe: "Only pulling compositions and not patterns",
+                default: false,
+                type: "boolean"
+              }).option("onlyPatterns", {
+                describe: "Only pulling patterns and not compositions",
+                default: false,
+                type: "boolean",
+                hidden: true
+              })
+            )
           )
         )
       )
@@ -2369,9 +2399,10 @@ var CompositionPushModule = {
     onlyPatterns,
     patternType,
     diff: diffMode,
-    allowEmptySource
+    allowEmptySource,
+    verbose
   }) => {
-    const fetch3 = nodeFetchProxy(proxy);
+    const fetch3 = nodeFetchProxy(proxy, verbose);
     const client = new UncachedCanvasClient11({ apiKey, apiHost, fetch: fetch3, projectId });
     let source;
     const isPackage = isPathAPackageFile(directory);
@@ -2395,7 +2426,8 @@ var CompositionPushModule = {
       state,
       onlyCompositions,
       onlyPatterns,
-      patternType
+      patternType,
+      verbose
     });
     const fileClient = new UncachedFileClient4({ apiKey, apiHost, fetch: fetch3, projectId });
     await syncEngine({
@@ -2403,6 +2435,7 @@ var CompositionPushModule = {
       target,
       mode,
       whatIf,
+      verbose,
       allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode }),
       onBeforeCompareObjects: async (sourceObject) => {
@@ -2424,12 +2457,12 @@ var CompositionPushModule = {
 var ComponentPatternPushModule = {
   ...CompositionPushModule,
   describe: "Pushes all component patterns from files in a directory to Uniform Canvas",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs36.positional("directory", {
+            yargs38.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("what-if", {
@@ -2467,15 +2500,23 @@ var CompositionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a composition",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
-      withProjectOptions(
-        yargs36.positional("id", { demandOption: true, describe: "Composition/pattern public ID to delete" })
+      withDebugOptions(
+        withProjectOptions(
+          yargs38.positional("id", {
+            demandOption: true,
+            describe: "Composition/pattern public ID to delete"
+          })
+        )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
-    const fetch3 = nodeFetchProxy(proxy);
+  handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose }) => {
+    if (verbose) {
+      console.log(`\u{1F41B} remove composition: (id: ${id})`);
+    }
+    const fetch3 = nodeFetchProxy(proxy, verbose);
     const client = new UncachedCanvasClient12({ apiKey, apiHost, fetch: fetch3, projectId });
     await client.removeComposition({ compositionId: id });
   }
@@ -2496,37 +2537,34 @@ import { diffJson as diffJson2 } from "diff";
 var CompositionUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a composition(s)",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
-      withProjectOptions(
-        yargs36.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.",
-          default: false,
-          type: "boolean"
-        }).option("what-if", {
-          alias: ["w"],
-          describe: "What-if mode reports what would be done but does not perform any publishing",
-          default: false,
-          type: "boolean"
-        }).option("onlyCompositions", {
-          describe: "Only publishing compositions and not patterns",
-          default: false,
-          type: "boolean"
-        }).option("onlyPatterns", {
-          describe: "Only pulling patterns and not compositions",
-          default: false,
-          type: "boolean",
-          hidden: true
-        })
-      )
-    )
-  ),
-  handler: async ({
-    apiHost,
+      withDebugOptions(
+        withProjectOptions(
+          yargs38.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.",
+            default: false,
+            type: "boolean"
+          }).option("onlyCompositions", {
+            describe: "Only publishing compositions and not patterns",
+            default: false,
+            type: "boolean"
+          }).option("onlyPatterns", {
+            describe: "Only pulling patterns and not compositions",
+            default: false,
+            type: "boolean",
+            hidden: true
+          })
+        )
+      )
+    )
+  ),
+  handler: async ({
+    apiHost,
     apiKey,
     proxy,
     ids,
@@ -2535,7 +2573,8 @@ var CompositionUnpublishModule = {
     onlyPatterns,
     patternType,
     project: projectId,
-    whatIf
+    whatIf,
+    verbose
   }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or composition ID(s) to publish.`);
@@ -2543,7 +2582,7 @@ var CompositionUnpublishModule = {
     }
     const compositionIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
     const targetItems = /* @__PURE__ */ new Map();
-    const fetch3 = nodeFetchProxy(proxy);
+    const fetch3 = nodeFetchProxy(proxy, verbose);
     const client = new UncachedCanvasClient13({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createComponentInstanceEngineDataSource({
       client,
@@ -2551,7 +2590,8 @@ var CompositionUnpublishModule = {
       compositionIDs: compositionIDsArray,
       onlyCompositions,
       onlyPatterns,
-      patternType
+      patternType,
+      verbose
     });
     const target = createComponentInstanceEngineDataSource({
       client,
@@ -2559,7 +2599,8 @@ var CompositionUnpublishModule = {
       compositionIDs: compositionIDsArray,
       onlyCompositions,
       onlyPatterns,
-      patternType
+      patternType,
+      verbose
     });
     const actions = [];
     const log = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
@@ -2577,6 +2618,7 @@ var CompositionUnpublishModule = {
         console.log(`Composition ${id} was not found`);
         return;
       }
+      console.log(`\u{1F41B} unpublishing composition: (id: ${id})`);
       actions.push(client.removeComposition({ compositionId: id, state: CANVAS_PUBLISHED_STATE2 }));
       log({
         action: "update",
@@ -2594,10 +2636,10 @@ var CompositionUnpublishModule = {
 var ComponentPatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a component pattern(s)",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("ids", {
+        yargs38.positional("ids", {
           describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
           type: "string"
         }).option("all", {
@@ -2636,17 +2678,25 @@ var CompositionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a composition",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        withStateOptions(
-          yargs36.positional("filename", { demandOption: true, describe: "Composition/pattern file to put" })
+        withVerboseOption(
+          withStateOptions(
+            yargs38.positional("filename", {
+              demandOption: true,
+              describe: "Composition/pattern file to put"
+            })
+          )
         )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, filename, project: projectId, state }) => {
-    const fetch3 = nodeFetchProxy(proxy);
+  handler: async ({ apiHost, apiKey, proxy, filename, project: projectId, state, verbose }) => {
+    if (verbose) {
+      console.log(`\u{1F41B} update composition: (filename: ${filename}, state: ${convertStateOption(state)})`);
+    }
+    const fetch3 = nodeFetchProxy(proxy, verbose);
     const client = new UncachedCanvasClient14({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
     await client.updateComposition({ ...file, state: convertStateOption(state) });
@@ -2663,7 +2713,7 @@ var ComponentPatternUpdateModule = {
 var ComponentPatternModule = {
   command: "component-pattern <command>",
   describe: "Commands for Canvas component patterns",
-  builder: (yargs36) => yargs36.command(ComponentPatternPullModule).command(ComponentPatternPushModule).command(ComponentPatternGetModule).command(ComponentPatternRemoveModule).command(ComponentPatternListModule).command(ComponentPatternUpdateModule).command(ComponentPatternPublishModule).command(ComponentPatternUnpublishModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(ComponentPatternPullModule).command(ComponentPatternPushModule).command(ComponentPatternGetModule).command(ComponentPatternRemoveModule).command(ComponentPatternListModule).command(ComponentPatternUpdateModule).command(ComponentPatternPublishModule).command(ComponentPatternUnpublishModule).demandCommand(),
   handler: () => {
     yargs4.help();
   }
@@ -2675,7 +2725,7 @@ var CompositionModule = {
   command: "composition <command>",
   describe: "Commands for Canvas compositions",
   aliases: ["comp"],
-  builder: (yargs36) => yargs36.command(CompositionPullModule).command(CompositionPushModule).command(CompositionGetModule).command(CompositionRemoveModule).command(CompositionListModule).command(CompositionUpdateModule).command(CompositionPublishModule).command(CompositionUnpublishModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(CompositionPullModule).command(CompositionPushModule).command(CompositionGetModule).command(CompositionRemoveModule).command(CompositionListModule).command(CompositionUpdateModule).command(CompositionPublishModule).command(CompositionUnpublishModule).demandCommand(),
   handler: () => {
     yargs5.help();
   }
@@ -2694,12 +2744,12 @@ var CompositionPatternGetModule = {
 var CompositionPatternListModule = {
   ...CompositionListModule,
   describe: "List composition patterns",
-  builder: (yargs36) => withFormatOptions(
+  builder: (yargs38) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs36.options({
+            yargs38.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: {
@@ -2742,11 +2792,11 @@ var CompositionPatternListModule = {
 var CompositionPatternPublishModule = {
   ...CompositionPublishModule,
   describe: "Publishes composition pattern(s)",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("ids", {
+          yargs38.positional("ids", {
             describe: "Publishes composition pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
@@ -2789,12 +2839,12 @@ var CompositionPatternPublishModule = {
 var CompositionPatternPullModule = {
   ...CompositionPullModule,
   describe: "Pulls all composition patterns to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs36.positional("directory", {
+            yargs38.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", {
@@ -2836,12 +2886,12 @@ var CompositionPatternPullModule = {
 var CompositionPatternPushModule = {
   ...CompositionPushModule,
   describe: "Pushes all composition patterns from files in a directory to Uniform Canvas",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs36.positional("directory", {
+            yargs38.positional("directory", {
               describe: "Directory to read the compositions patterns from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("what-if", {
@@ -2883,10 +2933,10 @@ var CompositionPatternRemoveModule = {
 var CompositionPatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a composition pattern(s)",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("ids", {
+        yargs38.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", {
@@ -2926,7 +2976,7 @@ var CompositionPatternUpdateModule = {
 var CompositionPatternModule = {
   command: "composition-pattern <command>",
   describe: "Commands for Canvas composition patterns",
-  builder: (yargs36) => yargs36.command(CompositionPatternPullModule).command(CompositionPatternPushModule).command(CompositionPatternGetModule).command(CompositionPatternRemoveModule).command(CompositionPatternListModule).command(CompositionPatternUpdateModule).command(CompositionPatternPublishModule).command(CompositionPatternUnpublishModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(CompositionPatternPullModule).command(CompositionPatternPushModule).command(CompositionPatternGetModule).command(CompositionPatternRemoveModule).command(CompositionPatternListModule).command(CompositionPatternUpdateModule).command(CompositionPatternPublishModule).command(CompositionPatternUnpublishModule).demandCommand(),
   handler: () => {
     yargs6.help();
   }
@@ -2940,12 +2990,12 @@ import { ContentClient } from "@uniformdev/canvas";
 var ContentTypeGetModule = {
   command: "get <id>",
   describe: "Get a content type",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs36.positional("id", { demandOption: true, describe: "Content type public ID to fetch" })
+          yargs38.positional("id", { demandOption: true, describe: "Content type public ID to fetch" })
         )
       )
     )
@@ -2967,7 +3017,7 @@ import { ContentClient as ContentClient2 } from "@uniformdev/canvas";
 var ContentTypeListModule = {
   command: "list",
   describe: "List content types",
-  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
+  builder: (yargs38) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs38)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new ContentClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -3015,11 +3065,11 @@ function createContentTypeEngineDataSource({
 var ContentTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all content types to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.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", {
@@ -3103,11 +3153,11 @@ import { ContentClient as ContentClient4 } from "@uniformdev/canvas";
 var ContentTypePushModule = {
   command: "push <directory>",
   describe: "Pushes all content types from files in a directory to Uniform",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.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", {
@@ -3180,10 +3230,10 @@ var ContentTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a content type",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
+        yargs38.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
       )
     )
   ),
@@ -3200,10 +3250,10 @@ var ContentTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a content type",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("filename", { demandOption: true, describe: "Content type file to put" })
+        yargs38.positional("filename", { demandOption: true, describe: "Content type file to put" })
       )
     )
   ),
@@ -3220,7 +3270,7 @@ var ContentTypeModule = {
   command: "contenttype <command>",
   aliases: ["ct"],
   describe: "Commands for Content Types",
-  builder: (yargs36) => yargs36.command(ContentTypeGetModule).command(ContentTypeListModule).command(ContentTypeRemoveModule).command(ContentTypeUpdateModule).command(ContentTypePullModule).command(ContentTypePushModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(ContentTypeGetModule).command(ContentTypeListModule).command(ContentTypeRemoveModule).command(ContentTypeUpdateModule).command(ContentTypePullModule).command(ContentTypePushModule).demandCommand(),
   handler: () => {
     yargs7.help();
   }
@@ -3234,11 +3284,11 @@ import { DataSourceClient } from "@uniformdev/canvas";
 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: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        yargs36.positional("id", { demandOption: true, describe: "Data source public ID to fetch" })
+        yargs38.positional("id", { demandOption: true, describe: "Data source public ID to fetch" })
       )
     )
   ),
@@ -3256,10 +3306,10 @@ var DataSourceRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a data source",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("id", { demandOption: true, describe: "Data source public ID to delete" })
+        yargs38.positional("id", { demandOption: true, describe: "Data source public ID to delete" })
       )
     )
   ),
@@ -3276,10 +3326,10 @@ var DataSourceUpdateModule = {
   command: "update <dataSource>",
   aliases: ["put"],
   describe: "Insert or update a data source",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("dataSource", { demandOption: true, describe: "Data source JSON to put" }).option("integrationType", {
+        yargs38.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
@@ -3299,7 +3349,7 @@ var DataSourceModule = {
   command: "datasource <command>",
   aliases: ["ds"],
   describe: "Commands for Data Source definitions",
-  builder: (yargs36) => yargs36.command(DataSourceGetModule).command(DataSourceRemoveModule).command(DataSourceUpdateModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(DataSourceGetModule).command(DataSourceRemoveModule).command(DataSourceUpdateModule).demandCommand(),
   handler: () => {
     yargs8.help();
   }
@@ -3314,12 +3364,12 @@ var DataTypeGetModule = {
   command: "get <id>",
   describe: "Get a data type",
   aliases: ["ls"],
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs36.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
+          yargs38.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
         )
       )
     )
@@ -3342,7 +3392,7 @@ var DataTypeListModule = {
   command: "list",
   describe: "List data types",
   aliases: ["ls"],
-  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
+  builder: (yargs38) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs38)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new DataTypeClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -3392,11 +3442,11 @@ function createDataTypeEngineDataSource({
 var DataTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all data types to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.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", {
@@ -3480,11 +3530,11 @@ import { DataTypeClient as DataTypeClient4 } from "@uniformdev/canvas";
 var DataTypePushModule = {
   command: "push <directory>",
   describe: "Pushes all data types from files in a directory to Uniform",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.positional("directory", {
             describe: "Directory to read the data types from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -3557,10 +3607,10 @@ var DataTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a data type",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
+        yargs38.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
       )
     )
   ),
@@ -3577,10 +3627,10 @@ var DataTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a data type",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("filename", { demandOption: true, describe: "Data type file to put" })
+        yargs38.positional("filename", { demandOption: true, describe: "Data type file to put" })
       )
     )
   ),
@@ -3597,7 +3647,7 @@ var DataTypeModule = {
   command: "datatype <command>",
   aliases: ["dt"],
   describe: "Commands for Data Type definitions",
-  builder: (yargs36) => yargs36.command(DataTypeGetModule).command(DataTypePullModule).command(DataTypePushModule).command(DataTypeRemoveModule).command(DataTypeListModule).command(DataTypeUpdateModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(DataTypeGetModule).command(DataTypePullModule).command(DataTypePushModule).command(DataTypeRemoveModule).command(DataTypeListModule).command(DataTypeUpdateModule).demandCommand(),
   handler: () => {
     yargs9.help();
   }
@@ -3611,12 +3661,12 @@ import { ContentClient as ContentClient7 } from "@uniformdev/canvas";
 var EntryGetModule = {
   command: "get <id>",
   describe: "Get an entry",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs36.positional("id", { demandOption: true, describe: "Entry public ID to fetch" }).option({
+            yargs38.positional("id", { demandOption: true, describe: "Entry public ID to fetch" }).option({
               resolveData: {
                 type: "boolean",
                 default: false,
@@ -3680,12 +3730,12 @@ var LEGACY_DEFAULT_LIMIT = 1e3;
 var EntryListModule = {
   command: "list",
   describe: "List entries",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs36.options({
+            yargs38.options({
               offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
               limit: { describe: "Number of rows to fetch", type: "number", default: LEGACY_DEFAULT_LIMIT },
               search: { describe: "Search query", type: "string", default: "" }
@@ -3730,7 +3780,7 @@ var EntryListModule = {
 import { ContentClient as ContentClient10 } from "@uniformdev/canvas";
 
 // src/commands/canvas/entryEngineDataSource.ts
-import { convertEntryToPutEntry } from "@uniformdev/canvas";
+import { ApiClientError, convertEntryToPutEntry } from "@uniformdev/canvas";
 
 // src/commands/canvas/commands/entry/_util.ts
 var selectEntryIdentifier = (e) => {
@@ -3761,18 +3811,27 @@ function createEntryEngineDataSource({
   const stateId = convertStateOption(state);
   async function* getObjects() {
     const entries = paginateAsync(
-      async (offset, limit) => (await client.getEntries({
-        offset,
-        limit,
-        entryIDs,
-        pattern: onlyEntries ? false : onlyPatterns ? true : void 0,
-        skipDataResolution: true,
-        skipOverridesResolution: true,
-        skipPatternResolution: true,
-        state: stateId,
-        withComponentIDs: true,
-        editions: "all"
-      })).entries,
+      async (offset, limit) => {
+        try {
+          return (await client.getEntries({
+            offset,
+            limit,
+            entryIDs,
+            pattern: onlyEntries ? false : onlyPatterns ? true : void 0,
+            skipDataResolution: true,
+            skipOverridesResolution: true,
+            skipPatternResolution: true,
+            state: stateId,
+            withComponentIDs: true,
+            editions: "all"
+          })).entries;
+        } catch (error) {
+          if (error instanceof ApiClientError && error.errorMessage === "Entry not found or not published") {
+            return [];
+          }
+          throw error;
+        }
+      },
       { pageSize: 100 }
     );
     for await (const e of entries) {
@@ -3801,11 +3860,11 @@ function createEntryEngineDataSource({
 var EntryPublishModule = {
   command: "publish [ids]",
   describe: "Publishes entry(ies)",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("ids", {
+          yargs38.positional("ids", {
             describe: "Publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
@@ -3860,12 +3919,12 @@ import { UncachedFileClient as UncachedFileClient5 } from "@uniformdev/files";
 var EntryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all entries to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs36.positional("directory", {
+            yargs38.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", {
@@ -3965,12 +4024,12 @@ import { UncachedFileClient as UncachedFileClient6 } from "@uniformdev/files";
 var EntryPushModule = {
   command: "push <directory>",
   describe: "Pushes all entries from files in a directory to Uniform",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs36.positional("directory", {
+            yargs38.positional("directory", {
               describe: "Directory to read the entries from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("what-if", {
@@ -4057,10 +4116,10 @@ var EntryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an entry",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
+        yargs38.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
       )
     )
   ),
@@ -4077,10 +4136,10 @@ import { diffJson as diffJson3 } from "diff";
 var EntryUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish an entry(ies)",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("ids", {
+        yargs38.positional("ids", {
           describe: "Un-publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
           type: "string"
         }).option("all", {
@@ -4153,11 +4212,11 @@ var EntryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an entry",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
-          yargs36.positional("filename", { demandOption: true, describe: "Entry file to put" })
+          yargs38.positional("filename", { demandOption: true, describe: "Entry file to put" })
         )
       )
     )
@@ -4174,7 +4233,7 @@ var EntryUpdateModule = {
 var EntryModule = {
   command: "entry <command>",
   describe: "Commands for Entries",
-  builder: (yargs36) => yargs36.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).command(EntryPublishModule).command(EntryUnpublishModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).command(EntryPublishModule).command(EntryUnpublishModule).demandCommand(),
   handler: () => {
     yargs10.help();
   }
@@ -4188,12 +4247,12 @@ import { ContentClient as ContentClient16 } from "@uniformdev/canvas";
 var EntryPatternGetModule = {
   command: "get <id>",
   describe: "Get an entry pattern",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs36.positional("id", {
+            yargs38.positional("id", {
               demandOption: true,
               describe: "Entry pattern public ID to fetch"
             }),
@@ -4228,8 +4287,8 @@ import { ContentClient as ContentClient17 } from "@uniformdev/canvas";
 var EntryPatternListModule = {
   command: "list",
   describe: "List entry patterns",
-  builder: (yargs36) => withConfiguration(
-    withFormatOptions(withApiOptions(withProjectOptions(withStateOptions(yargs36, "published"))))
+  builder: (yargs38) => withConfiguration(
+    withFormatOptions(withApiOptions(withProjectOptions(withStateOptions(yargs38, "published"))))
   ),
   handler: async ({ apiHost, edgeApiHost, apiKey, proxy, format, filename, project: projectId, state }) => {
     const fetch3 = nodeFetchProxy(proxy);
@@ -4252,11 +4311,11 @@ import { ContentClient as ContentClient18 } from "@uniformdev/canvas";
 var EntryPatternPublishModule = {
   command: "publish [ids]",
   describe: "Publishes entry pattern(s)",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("ids", {
+          yargs38.positional("ids", {
             describe: "Publishes entry pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
@@ -4311,12 +4370,12 @@ import { UncachedFileClient as UncachedFileClient7 } from "@uniformdev/files";
 var EntryPatternPullModule = {
   command: "pull <directory>",
   describe: "Pulls all entry patterns to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs36.positional("directory", {
+            yargs38.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", {
@@ -4416,12 +4475,12 @@ import { UncachedFileClient as UncachedFileClient8 } from "@uniformdev/files";
 var EntryPatternPushModule = {
   command: "push <directory>",
   describe: "Pushes all entry patterns from files in a directory to Uniform",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs36.positional("directory", {
+            yargs38.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", {
@@ -4508,10 +4567,10 @@ var EntryPatternRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an entry pattern",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("id", { demandOption: true, describe: "Entry pattern public ID to delete" })
+        yargs38.positional("id", { demandOption: true, describe: "Entry pattern public ID to delete" })
       )
     )
   ),
@@ -4528,10 +4587,10 @@ import { diffJson as diffJson4 } from "diff";
 var EntryPatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish an entry patterns",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("ids", {
+        yargs38.positional("ids", {
           describe: "Un-publishes entry patterns by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
           type: "string"
         }).option("all", {
@@ -4604,11 +4663,11 @@ var EntryPatternUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an entry pattern",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
-          yargs36.positional("filename", { demandOption: true, describe: "Entry pattern file to put" })
+          yargs38.positional("filename", { demandOption: true, describe: "Entry pattern file to put" })
         )
       )
     )
@@ -4625,7 +4684,7 @@ var EntryPatternUpdateModule = {
 var EntryPatternModule = {
   command: "entry-pattern <command>",
   describe: "Commands for Entry patterns",
-  builder: (yargs36) => yargs36.command(EntryPatternGetModule).command(EntryPatternListModule).command(EntryPatternRemoveModule).command(EntryPatternUpdateModule).command(EntryPatternPullModule).command(EntryPatternPushModule).command(EntryPatternPublishModule).command(EntryPatternUnpublishModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(EntryPatternGetModule).command(EntryPatternListModule).command(EntryPatternRemoveModule).command(EntryPatternUpdateModule).command(EntryPatternPullModule).command(EntryPatternPushModule).command(EntryPatternPublishModule).command(EntryPatternUnpublishModule).demandCommand(),
   handler: () => {
     yargs11.help();
   }
@@ -4671,11 +4730,11 @@ function createLocaleEngineDataSource({
 var LocalePullModule = {
   command: "pull <directory>",
   describe: "Pulls all locales to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.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", {
@@ -4759,11 +4818,11 @@ import { LocaleClient as LocaleClient2 } from "@uniformdev/canvas";
 var LocalePushModule = {
   command: "push <directory>",
   describe: "Pushes all locales from files in a directory to Uniform",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.positional("directory", {
             describe: "Directory to read the locales from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -4834,7 +4893,7 @@ var LocalePushModule = {
 var LocaleModule = {
   command: "locale <command>",
   describe: "Commands for locale definitions",
-  builder: (yargs36) => yargs36.command(LocalePullModule).command(LocalePushModule),
+  builder: (yargs38) => yargs38.command(LocalePullModule).command(LocalePushModule),
   handler: () => {
     yargs12.help();
   }
@@ -4853,12 +4912,12 @@ var PatternGetModule = {
 var PatternListModule = {
   ...CompositionListModule,
   describe: "List patterns",
-  builder: (yargs36) => withFormatOptions(
+  builder: (yargs38) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs36.options({
+            yargs38.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: {
@@ -4896,11 +4955,11 @@ var PatternListModule = {
 var PatternPublishModule = {
   ...CompositionPublishModule,
   describe: "Publishes pattern(s)",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("ids", {
+          yargs38.positional("ids", {
             describe: "Publishes pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
@@ -4938,12 +4997,12 @@ var PatternPublishModule = {
 var PatternPullModule = {
   ...CompositionPullModule,
   describe: "Pulls all patterns to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs36.positional("directory", {
+            yargs38.positional("directory", {
               describe: "Directory to save the 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", {
@@ -4981,12 +5040,12 @@ var PatternPullModule = {
 var PatternPushModule = {
   ...CompositionPushModule,
   describe: "Pushes all patterns from files in a directory to Uniform Canvas",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs36.positional("directory", {
+            yargs38.positional("directory", {
               describe: "Directory to read the patterns from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("what-if", {
@@ -5028,10 +5087,10 @@ var PatternRemoveModule = {
 var PatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a pattern(s)",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("ids", {
+        yargs38.positional("ids", {
           describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
           type: "string"
         }).option("all", {
@@ -5066,31 +5125,597 @@ var PatternUpdateModule = {
   describe: "Insert or update a pattern"
 };
 
-// src/commands/canvas/commands/pattern.ts
-var PatternModule = {
-  command: "pattern <command>",
-  describe: "Commands for Canvas patterns",
-  deprecated: 'will be removed in a future major release. Use "component-pattern" and "composition-pattern" instead.',
-  builder: (yargs36) => yargs36.command(PatternPullModule).command(PatternPushModule).command(PatternGetModule).command(PatternRemoveModule).command(PatternListModule).command(PatternUpdateModule).command(PatternPublishModule).command(PatternUnpublishModule).demandCommand(),
+// src/commands/canvas/commands/pattern.ts
+var PatternModule = {
+  command: "pattern <command>",
+  describe: "Commands for Canvas patterns",
+  deprecated: 'will be removed in a future major release. Use "component-pattern" and "composition-pattern" instead.',
+  builder: (yargs38) => yargs38.command(PatternPullModule).command(PatternPushModule).command(PatternGetModule).command(PatternRemoveModule).command(PatternListModule).command(PatternUpdateModule).command(PatternPublishModule).command(PatternUnpublishModule).demandCommand(),
+  handler: () => {
+    yargs13.help();
+  }
+};
+
+// src/commands/canvas/commands/previewUrl.ts
+import yargs14 from "yargs";
+
+// src/commands/canvas/commands/previewUrl/get.ts
+import { PreviewClient } from "@uniformdev/canvas";
+var PreviewUrlGetModule = {
+  command: "get <id>",
+  describe: "Fetch a preview URL",
+  builder: (yargs38) => withConfiguration(
+    withFormatOptions(
+      withApiOptions(
+        withProjectOptions(
+          yargs38.positional("id", { demandOption: true, describe: "Preview URL UUID to fetch" })
+        )
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, id, format, project: projectId, filename }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new PreviewClient({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const previewUrl = await client.getPreviewUrl({ id });
+    if (!previewUrl) {
+      console.error("Preview URL did not exist");
+      process.exit(1);
+    } else {
+      emitWithFormat(previewUrl, format, filename);
+    }
+  }
+};
+
+// src/commands/canvas/commands/previewUrl/list.ts
+import { PreviewClient as PreviewClient2 } from "@uniformdev/canvas";
+var PreviewUrlListModule = {
+  command: "list",
+  describe: "List preview URLs",
+  aliases: ["ls"],
+  builder: (yargs38) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs38.options({}))))),
+  handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new PreviewClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const res = await client.getPreviewUrls();
+    emitWithFormat(res.previewUrls, format, filename);
+  }
+};
+
+// src/commands/canvas/commands/previewUrl/pull.ts
+import { PreviewClient as PreviewClient3 } from "@uniformdev/canvas";
+
+// src/commands/canvas/commands/previewUrl/_util.ts
+var selectIdentifier5 = (previewUrl) => previewUrl.id;
+var selectDisplayName5 = (previewUrl) => `${previewUrl.name} (pid: ${previewUrl.id})`;
+
+// src/commands/canvas/previewUrlEngineDataSource.ts
+function createPreviewUrlEngineDataSource({
+  client
+}) {
+  async function* getObjects() {
+    const previewUrls = (await client.getPreviewUrls()).previewUrls;
+    for await (const previewUrl of previewUrls) {
+      const result = {
+        id: selectIdentifier5(previewUrl),
+        displayName: selectDisplayName5(previewUrl),
+        providerId: previewUrl.id,
+        object: previewUrl
+      };
+      yield result;
+    }
+  }
+  return {
+    name: "Uniform API",
+    objects: getObjects(),
+    deleteObject: async (providerId) => {
+      await client.deletePreviewUrl({ id: providerId });
+    },
+    writeObject: async (object) => {
+      await client.upsertPreviewUrl(object.object);
+    }
+  };
+}
+
+// src/commands/canvas/commands/previewUrl/pull.ts
+var PreviewUrlPullModule = {
+  command: "pull <directory>",
+  describe: "Pulls all preview urls to local files in a directory",
+  builder: (yargs38) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withDiffOptions(
+          yargs38.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", {
+            alias: ["f"],
+            describe: "Output format",
+            default: "yaml",
+            choices: ["yaml", "json"],
+            type: "string"
+          }).option("what-if", {
+            alias: ["w"],
+            describe: "What-if mode reports what would be done but changes no files",
+            default: false,
+            type: "boolean"
+          }).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
+  }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new PreviewClient3({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const source = createPreviewUrlEngineDataSource({ client });
+    let target;
+    const isPackage = isPathAPackageFile(directory);
+    if (isPackage) {
+      const packageContents = readCanvasPackage(directory, false);
+      target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
+        objects: packageContents.previewUrls ?? [],
+        selectIdentifier: selectIdentifier5,
+        selectDisplayName: selectDisplayName5,
+        onSyncComplete: async (_, synced) => {
+          packageContents.previewUrls = synced;
+          writeCanvasPackage(directory, packageContents);
+        }
+      });
+    } else {
+      target = await createFileSyncEngineDataSource({
+        directory,
+        selectIdentifier: selectIdentifier5,
+        selectDisplayName: selectDisplayName5,
+        format
+      });
+    }
+    await syncEngine({
+      source,
+      target,
+      mode,
+      whatIf,
+      allowEmptySource: allowEmptySource ?? true,
+      log: createSyncEngineConsoleLogger({ diffMode })
+    });
+  }
+};
+
+// src/commands/canvas/commands/previewUrl/push.ts
+import { PreviewClient as PreviewClient4 } from "@uniformdev/canvas";
+var PreviewUrlPushModule = {
+  command: "push <directory>",
+  describe: "Pushes all preview urls from files in a directory to Uniform Canvas",
+  builder: (yargs38) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withDiffOptions(
+          yargs38.positional("directory", {
+            describe: "Directory to read from. If a filename is used, a package will be read instead.",
+            type: "string"
+          }).option("what-if", {
+            alias: ["w"],
+            describe: "What-if mode reports what would be done but changes nothing",
+            default: false,
+            type: "boolean"
+          }).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
+  }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new PreviewClient4({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    let source;
+    const isPackage = isPathAPackageFile(directory);
+    if (isPackage) {
+      const packageContents = readCanvasPackage(directory, true);
+      source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
+        objects: packageContents.previewUrls ?? [],
+        selectIdentifier: selectIdentifier5,
+        selectDisplayName: selectDisplayName5
+      });
+    } else {
+      source = await createFileSyncEngineDataSource({
+        directory,
+        selectIdentifier: selectIdentifier5,
+        selectDisplayName: selectDisplayName5
+      });
+    }
+    const target = createPreviewUrlEngineDataSource({ client });
+    await syncEngine({
+      source,
+      target,
+      mode,
+      whatIf,
+      allowEmptySource,
+      log: createSyncEngineConsoleLogger({ diffMode })
+    });
+  }
+};
+
+// src/commands/canvas/commands/previewUrl/remove.ts
+import { PreviewClient as PreviewClient5 } from "@uniformdev/canvas";
+var PreviewUrlRemoveModule = {
+  command: "remove <id>",
+  aliases: ["delete", "rm"],
+  describe: "Delete a preview URL",
+  builder: (yargs38) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs38.positional("id", { demandOption: true, describe: "Preview URL UUID to delete" })
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new PreviewClient5({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    await client.deletePreviewUrl({ id });
+  }
+};
+
+// src/commands/canvas/commands/previewUrl/update.ts
+import { PreviewClient as PreviewClient6 } from "@uniformdev/canvas";
+var PreviewUrlUpdateModule = {
+  command: "update <filename>",
+  aliases: ["put"],
+  describe: "Insert or update a preview URL",
+  builder: (yargs38) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs38.positional("filename", { demandOption: true, describe: "Category file to put" })
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new PreviewClient6({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const file = readFileToObject(filename);
+    await client.upsertPreviewUrl(file);
+  }
+};
+
+// src/commands/canvas/commands/previewUrl.ts
+var PreviewUrlModule = {
+  command: "preview-url <command>",
+  aliases: ["pu"],
+  describe: "Commands for Canvas preview urls",
+  builder: (yargs38) => yargs38.command(PreviewUrlPullModule).command(PreviewUrlPushModule).command(PreviewUrlGetModule).command(PreviewUrlRemoveModule).command(PreviewUrlListModule).command(PreviewUrlUpdateModule).demandCommand(),
+  handler: () => {
+    yargs14.help();
+  }
+};
+
+// src/commands/canvas/commands/previewViewport.ts
+import yargs15 from "yargs";
+
+// src/commands/canvas/commands/previewViewport/get.ts
+import { PreviewClient as PreviewClient7 } from "@uniformdev/canvas";
+var PreviewViewportGetModule = {
+  command: "get <id>",
+  describe: "Fetch a preview viewport",
+  builder: (yargs38) => withConfiguration(
+    withFormatOptions(
+      withApiOptions(
+        withProjectOptions(
+          yargs38.positional("id", { demandOption: true, describe: "Preview viewport UUID to fetch" })
+        )
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, id, format, project: projectId, filename }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new PreviewClient7({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const previewViewport = await client.getPreviewViewport({ id });
+    if (!previewViewport) {
+      console.error("Preview viewport did not exist");
+      process.exit(1);
+    } else {
+      emitWithFormat(previewViewport, format, filename);
+    }
+  }
+};
+
+// src/commands/canvas/commands/previewViewport/list.ts
+import { PreviewClient as PreviewClient8 } from "@uniformdev/canvas";
+var PreviewViewportListModule = {
+  command: "list",
+  describe: "List preview viewports",
+  aliases: ["ls"],
+  builder: (yargs38) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs38.options({}))))),
+  handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new PreviewClient8({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const res = await client.getPreviewViewports();
+    emitWithFormat(res.previewViewports, format, filename);
+  }
+};
+
+// src/commands/canvas/commands/previewViewport/pull.ts
+import { PreviewClient as PreviewClient9 } from "@uniformdev/canvas";
+
+// src/commands/canvas/commands/previewViewport/_util.ts
+var selectIdentifier6 = (previewViewport) => previewViewport.id;
+var selectDisplayName6 = (previewViewport) => `${previewViewport.name} (pid: ${previewViewport.id})`;
+
+// src/commands/canvas/previewViewportEngineDataSource.ts
+function createPreviewViewportEngineDataSource({
+  client
+}) {
+  async function* getObjects() {
+    const previewViewports = (await client.getPreviewViewports()).previewViewports;
+    for await (const previewViewport of previewViewports) {
+      const result = {
+        id: selectIdentifier6(previewViewport),
+        displayName: selectDisplayName6(previewViewport),
+        providerId: previewViewport.id,
+        object: previewViewport
+      };
+      yield result;
+    }
+  }
+  return {
+    name: "Uniform API",
+    objects: getObjects(),
+    deleteObject: async (providerId) => {
+      await client.deletePreviewViewport({ id: providerId });
+    },
+    writeObject: async (object) => {
+      await client.upsertPreviewViewport(object.object);
+    }
+  };
+}
+
+// src/commands/canvas/commands/previewViewport/pull.ts
+var PreviewViewportPullModule = {
+  command: "pull <directory>",
+  describe: "Pulls all preview viewports to local files in a directory",
+  builder: (yargs38) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withDiffOptions(
+          yargs38.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", {
+            alias: ["f"],
+            describe: "Output format",
+            default: "yaml",
+            choices: ["yaml", "json"],
+            type: "string"
+          }).option("what-if", {
+            alias: ["w"],
+            describe: "What-if mode reports what would be done but changes no files",
+            default: false,
+            type: "boolean"
+          }).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
+  }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new PreviewClient9({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const source = createPreviewViewportEngineDataSource({ client });
+    let target;
+    const isPackage = isPathAPackageFile(directory);
+    if (isPackage) {
+      const packageContents = readCanvasPackage(directory, false);
+      target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
+        objects: packageContents.previewViewports ?? [],
+        selectIdentifier: selectIdentifier6,
+        selectDisplayName: selectDisplayName6,
+        onSyncComplete: async (_, synced) => {
+          packageContents.previewViewports = synced;
+          writeCanvasPackage(directory, packageContents);
+        }
+      });
+    } else {
+      target = await createFileSyncEngineDataSource({
+        directory,
+        selectIdentifier: selectIdentifier6,
+        selectDisplayName: selectDisplayName6,
+        format
+      });
+    }
+    await syncEngine({
+      source,
+      target,
+      mode,
+      whatIf,
+      allowEmptySource: allowEmptySource ?? true,
+      log: createSyncEngineConsoleLogger({ diffMode })
+    });
+  }
+};
+
+// src/commands/canvas/commands/previewViewport/push.ts
+import { PreviewClient as PreviewClient10 } from "@uniformdev/canvas";
+var PreviewViewportPushModule = {
+  command: "push <directory>",
+  describe: "Pushes all preview viewports from files in a directory to Uniform Canvas",
+  builder: (yargs38) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withDiffOptions(
+          yargs38.positional("directory", {
+            describe: "Directory to read from. If a filename is used, a package will be read instead.",
+            type: "string"
+          }).option("what-if", {
+            alias: ["w"],
+            describe: "What-if mode reports what would be done but changes nothing",
+            default: false,
+            type: "boolean"
+          }).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
+  }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new PreviewClient10({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    let source;
+    const isPackage = isPathAPackageFile(directory);
+    if (isPackage) {
+      const packageContents = readCanvasPackage(directory, true);
+      source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
+        objects: packageContents.previewViewports ?? [],
+        selectIdentifier: selectIdentifier6,
+        selectDisplayName: selectDisplayName6
+      });
+    } else {
+      source = await createFileSyncEngineDataSource({
+        directory,
+        selectIdentifier: selectIdentifier6,
+        selectDisplayName: selectDisplayName6
+      });
+    }
+    const target = createPreviewViewportEngineDataSource({ client });
+    await syncEngine({
+      source,
+      target,
+      mode,
+      whatIf,
+      allowEmptySource,
+      log: createSyncEngineConsoleLogger({ diffMode })
+    });
+  }
+};
+
+// src/commands/canvas/commands/previewViewport/remove.ts
+import { PreviewClient as PreviewClient11 } from "@uniformdev/canvas";
+var PreviewViewportRemoveModule = {
+  command: "remove <id>",
+  aliases: ["delete", "rm"],
+  describe: "Delete a preview viewport",
+  builder: (yargs38) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs38.positional("id", { demandOption: true, describe: "Preview viewport UUID to delete" })
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new PreviewClient11({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    await client.deletePreviewViewport({ id });
+  }
+};
+
+// src/commands/canvas/commands/previewViewport/update.ts
+import { PreviewClient as PreviewClient12 } from "@uniformdev/canvas";
+var PreviewViewportUpdateModule = {
+  command: "update <filename>",
+  aliases: ["put"],
+  describe: "Insert or update a preview viewport",
+  builder: (yargs38) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs38.positional("filename", { demandOption: true, describe: "Preview viewport file to put" })
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new PreviewClient12({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const file = readFileToObject(filename);
+    await client.upsertPreviewViewport(file);
+  }
+};
+
+// src/commands/canvas/commands/previewViewport.ts
+var PreviewViewportModule = {
+  command: "preview-viewport <command>",
+  aliases: ["pv"],
+  describe: "Commands for Canvas preview viewports",
+  builder: (yargs38) => yargs38.command(PreviewViewportPullModule).command(PreviewViewportPushModule).command(PreviewViewportGetModule).command(PreviewViewportRemoveModule).command(PreviewViewportListModule).command(PreviewViewportUpdateModule).demandCommand(),
   handler: () => {
-    yargs13.help();
+    yargs15.help();
   }
 };
 
 // src/commands/canvas/commands/prompts.ts
-import yargs14 from "yargs";
+import yargs16 from "yargs";
 
 // src/commands/canvas/commands/prompts/get.ts
 import { PromptClient } from "@uniformdev/canvas";
 var PromptGetModule = {
   command: "get <id>",
   describe: "Get a prompt",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs36.positional("id", { demandOption: true, describe: "Prompt ID to fetch" })
+          yargs38.positional("id", { demandOption: true, describe: "Prompt ID to fetch" })
         )
       )
     )
@@ -5111,7 +5736,7 @@ import { PromptClient as PromptClient2 } from "@uniformdev/canvas";
 var PromptListModule = {
   command: "list",
   describe: "List prompts",
-  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
+  builder: (yargs38) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs38)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new PromptClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -5159,12 +5784,12 @@ function createPromptEngineDataSource({
 var PromptPullModule = {
   command: "pull <directory>",
   describe: "Pulls all prompts to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs36.positional("directory", {
+            yargs38.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", {
@@ -5249,12 +5874,12 @@ import { PromptClient as PromptClient4 } from "@uniformdev/canvas";
 var PromptPushModule = {
   command: "push <directory>",
   describe: "Pushes all prompts from files in a directory to Uniform",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs36.positional("directory", {
+            yargs38.positional("directory", {
               describe: "Directory to read the prompts from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("what-if", {
@@ -5328,9 +5953,9 @@ var PromptRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a prompt",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs36.positional("id", { demandOption: true, describe: "Prompt ID to delete" }))
+      withProjectOptions(yargs38.positional("id", { demandOption: true, describe: "Prompt ID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -5346,10 +5971,10 @@ var PromptUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a prompt",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("filename", { demandOption: true, describe: "Prompt file to put" })
+        yargs38.positional("filename", { demandOption: true, describe: "Prompt file to put" })
       )
     )
   ),
@@ -5366,21 +5991,21 @@ var PromptModule = {
   command: "prompt <command>",
   aliases: ["dt"],
   describe: "Commands for AI Prompt definitions",
-  builder: (yargs36) => yargs36.command(PromptGetModule).command(PromptListModule).command(PromptPullModule).command(PromptPushModule).command(PromptRemoveModule).command(PromptUpdateModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(PromptGetModule).command(PromptListModule).command(PromptPullModule).command(PromptPushModule).command(PromptRemoveModule).command(PromptUpdateModule).demandCommand(),
   handler: () => {
-    yargs14.help();
+    yargs16.help();
   }
 };
 
 // src/commands/canvas/commands/workflow.ts
-import yargs15 from "yargs";
+import yargs17 from "yargs";
 
 // src/commands/canvas/commands/workflow/pull.ts
 import { WorkflowClient } from "@uniformdev/canvas";
 
 // src/commands/canvas/commands/workflow/_util.ts
-var selectIdentifier5 = (workflow) => workflow.id;
-var selectDisplayName5 = (workflow) => `${workflow.name} (pid: ${workflow.id})`;
+var selectIdentifier7 = (workflow) => workflow.id;
+var selectDisplayName7 = (workflow) => `${workflow.name} (pid: ${workflow.id})`;
 
 // src/commands/canvas/workflowEngineDataSource.ts
 function createWorkflowEngineDataSource({
@@ -5393,8 +6018,8 @@ function createWorkflowEngineDataSource({
     for await (const workflow of workflows) {
       const { modified, modifiedBy, created, createdBy, ...workflowWithoutStatistics } = workflow;
       const result = {
-        id: selectIdentifier5(workflow),
-        displayName: selectDisplayName5(workflow),
+        id: selectIdentifier7(workflow),
+        displayName: selectDisplayName7(workflow),
         providerId: workflow.id,
         object: workflowWithoutStatistics
       };
@@ -5417,11 +6042,11 @@ function createWorkflowEngineDataSource({
 var WorkflowPullModule = {
   command: "pull <directory>",
   describe: "Pulls all workflows to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.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", {
@@ -5468,8 +6093,8 @@ var WorkflowPullModule = {
       target = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
         objects: packageContents.workflows ?? [],
-        selectIdentifier: selectIdentifier5,
-        selectDisplayName: selectDisplayName5,
+        selectIdentifier: selectIdentifier7,
+        selectDisplayName: selectDisplayName7,
         onSyncComplete: async (_, synced) => {
           packageContents.workflows = synced;
           writeCanvasPackage(directory, packageContents);
@@ -5478,8 +6103,8 @@ var WorkflowPullModule = {
     } else {
       target = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier5,
-        selectDisplayName: selectDisplayName5,
+        selectIdentifier: selectIdentifier7,
+        selectDisplayName: selectDisplayName7,
         format
       });
     }
@@ -5499,11 +6124,11 @@ import { WorkflowClient as WorkflowClient2 } from "@uniformdev/canvas";
 var WorkflowPushModule = {
   command: "push <directory>",
   describe: "Pushes all workflows from files in a directory to Uniform Canvas",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.positional("directory", {
             describe: "Directory to read from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -5542,14 +6167,14 @@ var WorkflowPushModule = {
       source = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
         objects: packageContents.workflows ?? [],
-        selectIdentifier: selectIdentifier5,
-        selectDisplayName: selectDisplayName5
+        selectIdentifier: selectIdentifier7,
+        selectDisplayName: selectDisplayName7
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier5,
-        selectDisplayName: selectDisplayName5
+        selectIdentifier: selectIdentifier7,
+        selectDisplayName: selectDisplayName7
       });
     }
     const target = createWorkflowEngineDataSource({ client });
@@ -5569,9 +6194,9 @@ var WorkflowModule = {
   command: "workflow <command>",
   aliases: ["wf"],
   describe: "Commands for Canvas workflows",
-  builder: (yargs36) => yargs36.command(WorkflowPullModule).command(WorkflowPushModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(WorkflowPullModule).command(WorkflowPushModule).demandCommand(),
   handler: () => {
-    yargs15.help();
+    yargs17.help();
   }
 };
 
@@ -5580,28 +6205,28 @@ var CanvasCommand = {
   command: "canvas <command>",
   aliases: ["cv", "pm", "presentation"],
   describe: "Uniform Canvas commands",
-  builder: (yargs36) => yargs36.command(CompositionModule).command(ComponentModule).command(DataTypeModule).command(DataSourceModule).command(CategoryModule).command(PatternModule).command(ComponentPatternModule).command(CompositionPatternModule).command(ContentTypeModule).command(EntryModule).command(EntryPatternModule).command(PromptModule).command(AssetModule).command(LocaleModule).command(WorkflowModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(CompositionModule).command(ComponentModule).command(DataTypeModule).command(DataSourceModule).command(CategoryModule).command(PatternModule).command(ComponentPatternModule).command(CompositionPatternModule).command(ContentTypeModule).command(EntryModule).command(EntryPatternModule).command(PromptModule).command(AssetModule).command(LocaleModule).command(WorkflowModule).command(PreviewUrlModule).command(PreviewViewportModule).demandCommand(),
   handler: () => {
-    yargs16.showHelp();
+    yargs18.showHelp();
   }
 };
 
 // src/commands/context/index.ts
-import yargs23 from "yargs";
+import yargs25 from "yargs";
 
 // src/commands/context/commands/aggregate.ts
-import yargs17 from "yargs";
+import yargs19 from "yargs";
 
 // src/commands/context/commands/aggregate/get.ts
 import { UncachedAggregateClient } from "@uniformdev/context/api";
 var AggregateGetModule = {
   command: "get <id>",
   describe: "Fetch an aggregate",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs36.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
+          yargs38.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
         )
       )
     )
@@ -5625,7 +6250,7 @@ var AggregateListModule = {
   command: "list",
   describe: "List aggregates",
   aliases: ["ls"],
-  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
+  builder: (yargs38) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs38)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedAggregateClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -5638,8 +6263,8 @@ var AggregateListModule = {
 import { UncachedAggregateClient as UncachedAggregateClient3 } from "@uniformdev/context/api";
 
 // src/commands/context/commands/aggregate/_util.ts
-var selectIdentifier6 = (source) => source.id;
-var selectDisplayName6 = (source) => `${source.name} (pid: ${source.id})`;
+var selectIdentifier8 = (source) => source.id;
+var selectDisplayName8 = (source) => `${source.name} (pid: ${source.id})`;
 
 // src/commands/context/aggregateEngineDataSource.ts
 function createAggregateEngineDataSource({
@@ -5650,8 +6275,8 @@ function createAggregateEngineDataSource({
     const aggregates = (await client.get({ type })).aggregates;
     for await (const def of aggregates) {
       const result = {
-        id: selectIdentifier6(def),
-        displayName: selectDisplayName6(def),
+        id: selectIdentifier8(def),
+        displayName: selectDisplayName8(def),
         providerId: def.id,
         object: def
       };
@@ -5692,11 +6317,11 @@ function writeContextPackage(filename, packageContents) {
 var AggregatePullModule = {
   command: "pull <directory>",
   describe: "Pulls all aggregates to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.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", {
@@ -5743,8 +6368,8 @@ var AggregatePullModule = {
       target = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
         objects: packageContents.aggregates ?? [],
-        selectIdentifier: selectIdentifier6,
-        selectDisplayName: selectDisplayName6,
+        selectIdentifier: selectIdentifier8,
+        selectDisplayName: selectDisplayName8,
         onSyncComplete: async (_, synced) => {
           packageContents.aggregates = synced;
           writeContextPackage(directory, packageContents);
@@ -5753,8 +6378,8 @@ var AggregatePullModule = {
     } else {
       target = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier6,
-        selectDisplayName: selectDisplayName6,
+        selectIdentifier: selectIdentifier8,
+        selectDisplayName: selectDisplayName8,
         format
       });
     }
@@ -5774,11 +6399,11 @@ import { UncachedAggregateClient as UncachedAggregateClient4 } from "@uniformdev
 var AggregatePushModule = {
   command: "push <directory>",
   describe: "Pushes all aggregates from files in a directory or package to Uniform",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.positional("directory", {
             describe: "Directory to read the aggregates from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -5817,14 +6442,14 @@ var AggregatePushModule = {
       source = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
         objects: packageContents.aggregates ?? [],
-        selectIdentifier: selectIdentifier6,
-        selectDisplayName: selectDisplayName6
+        selectIdentifier: selectIdentifier8,
+        selectDisplayName: selectDisplayName8
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier6,
-        selectDisplayName: selectDisplayName6
+        selectIdentifier: selectIdentifier8,
+        selectDisplayName: selectDisplayName8
       });
     }
     const target = createAggregateEngineDataSource({ client });
@@ -5846,10 +6471,10 @@ var AggregateRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an aggregate",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
+        yargs38.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
       )
     )
   ),
@@ -5866,10 +6491,10 @@ var AggregateUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an aggregate",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
+        yargs38.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
       )
     )
   ),
@@ -5886,25 +6511,25 @@ var AggregateModule = {
   command: "aggregate <command>",
   aliases: ["agg", "intent", "audience"],
   describe: "Commands for Context aggregates (intents, audiences)",
-  builder: (yargs36) => yargs36.command(AggregatePullModule).command(AggregatePushModule).command(AggregateGetModule).command(AggregateRemoveModule).command(AggregateListModule).command(AggregateUpdateModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(AggregatePullModule).command(AggregatePushModule).command(AggregateGetModule).command(AggregateRemoveModule).command(AggregateListModule).command(AggregateUpdateModule).demandCommand(),
   handler: () => {
-    yargs17.help();
+    yargs19.help();
   }
 };
 
 // src/commands/context/commands/enrichment.ts
-import yargs18 from "yargs";
+import yargs20 from "yargs";
 
 // src/commands/context/commands/enrichment/get.ts
 import { UncachedEnrichmentClient } from "@uniformdev/context/api";
 var EnrichmentGetModule = {
   command: "get <id>",
   describe: "Fetch an enrichment category and its values",
-  builder: (yargs36) => withFormatOptions(
+  builder: (yargs38) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs36.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
+          yargs38.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
         )
       )
     )
@@ -5928,7 +6553,7 @@ var EnrichmentListModule = {
   command: "list",
   describe: "List enrichments",
   aliases: ["ls"],
-  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
+  builder: (yargs38) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs38)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedEnrichmentClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -5941,8 +6566,8 @@ var EnrichmentListModule = {
 import { UncachedEnrichmentClient as UncachedEnrichmentClient3 } from "@uniformdev/context/api";
 
 // src/commands/context/commands/enrichment/_util.ts
-var selectIdentifier7 = (source) => source.id;
-var selectDisplayName7 = (source) => `${source.name} (pid: ${source.id})`;
+var selectIdentifier9 = (source) => source.id;
+var selectDisplayName9 = (source) => `${source.name} (pid: ${source.id})`;
 
 // src/commands/context/enrichmentEngineDataSource.ts
 function createEnrichmentEngineDataSource({
@@ -5952,8 +6577,8 @@ function createEnrichmentEngineDataSource({
     const enrichments = (await client.get()).enrichments;
     for await (const def of enrichments) {
       const result = {
-        id: selectIdentifier7(def),
-        displayName: selectDisplayName7(def),
+        id: selectIdentifier9(def),
+        displayName: selectDisplayName9(def),
         providerId: def.id,
         object: def
       };
@@ -6030,11 +6655,11 @@ var createEnrichmentValueEngineDataSource = ({
 var EnrichmentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all enrichments to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.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", {
@@ -6081,8 +6706,8 @@ var EnrichmentPullModule = {
       target = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
         objects: packageContents.enrichments ?? [],
-        selectIdentifier: selectIdentifier7,
-        selectDisplayName: selectDisplayName7,
+        selectIdentifier: selectIdentifier9,
+        selectDisplayName: selectDisplayName9,
         onSyncComplete: async (_, synced) => {
           packageContents.enrichments = synced;
           writeContextPackage(directory, packageContents);
@@ -6091,8 +6716,8 @@ var EnrichmentPullModule = {
     } else {
       target = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier7,
-        selectDisplayName: selectDisplayName7,
+        selectIdentifier: selectIdentifier9,
+        selectDisplayName: selectDisplayName9,
         format
       });
     }
@@ -6112,11 +6737,11 @@ import { UncachedEnrichmentClient as UncachedEnrichmentClient4 } from "@uniformd
 var EnrichmentPushModule = {
   command: "push <directory>",
   describe: "Pushes all enrichments from files in a directory or package to Uniform",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.positional("directory", {
             describe: "Directory to read the enrichments from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -6155,14 +6780,14 @@ var EnrichmentPushModule = {
       source = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
         objects: packageContents.enrichments ?? [],
-        selectIdentifier: selectIdentifier7,
-        selectDisplayName: selectDisplayName7
+        selectIdentifier: selectIdentifier9,
+        selectDisplayName: selectDisplayName9
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier7,
-        selectDisplayName: selectDisplayName7
+        selectIdentifier: selectIdentifier9,
+        selectDisplayName: selectDisplayName9
       });
     }
     const target = createEnrichmentEngineDataSource({ client });
@@ -6183,10 +6808,10 @@ var EnrichmentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an enrichment category and its values",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
+        yargs38.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
       )
     )
   ),
@@ -6202,17 +6827,17 @@ var EnrichmentModule = {
   command: "enrichment <command>",
   aliases: ["enr"],
   describe: "Commands for Context enrichments",
-  builder: (yargs36) => yargs36.command(EnrichmentPullModule).command(EnrichmentPushModule).command(EnrichmentGetModule).command(EnrichmentRemoveModule).command(EnrichmentListModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(EnrichmentPullModule).command(EnrichmentPushModule).command(EnrichmentGetModule).command(EnrichmentRemoveModule).command(EnrichmentListModule).demandCommand(),
   handler: () => {
-    yargs18.help();
+    yargs20.help();
   }
 };
 
 // src/commands/context/commands/manifest.ts
-import yargs19 from "yargs";
+import yargs21 from "yargs";
 
 // src/commands/context/commands/manifest/get.ts
-import { ApiClientError, UncachedManifestClient } from "@uniformdev/context/api";
+import { ApiClientError as ApiClientError2, UncachedManifestClient } from "@uniformdev/context/api";
 import { gray as gray2, green as green2, red as red3 } from "colorette";
 import { writeFile } from "fs";
 import { exit } from "process";
@@ -6220,10 +6845,10 @@ var ManifestGetModule = {
   command: "get [output]",
   aliases: ["dl", "download"],
   describe: "Download the Uniform Context manifest for a project",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.option("preview", {
+        yargs38.option("preview", {
           describe: "If set, fetches the unpublished preview manifest (The API key must have permission)",
           default: false,
           type: "boolean",
@@ -6263,7 +6888,7 @@ var ManifestGetModule = {
       }
     } catch (e) {
       let message;
-      if (e instanceof ApiClientError) {
+      if (e instanceof ApiClientError2) {
         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.`;
         }
@@ -6279,13 +6904,13 @@ var ManifestGetModule = {
 };
 
 // src/commands/context/commands/manifest/publish.ts
-import { ApiClientError as ApiClientError2, UncachedManifestClient as UncachedManifestClient2 } from "@uniformdev/context/api";
+import { ApiClientError as ApiClientError3, UncachedManifestClient as UncachedManifestClient2 } from "@uniformdev/context/api";
 import { gray as gray3, red as red4 } from "colorette";
 import { exit as exit2 } from "process";
 var ManifestPublishModule = {
   command: "publish",
   describe: "Publish the Uniform Context manifest for a project",
-  builder: (yargs36) => withConfiguration(withApiOptions(withProjectOptions(yargs36))),
+  builder: (yargs38) => withConfiguration(withApiOptions(withProjectOptions(yargs38))),
   handler: async ({ apiKey, apiHost, proxy, project }) => {
     const fetch3 = nodeFetchProxy(proxy);
     try {
@@ -6298,7 +6923,7 @@ var ManifestPublishModule = {
       await client.publish();
     } catch (e) {
       let message;
-      if (e instanceof ApiClientError2) {
+      if (e instanceof ApiClientError3) {
         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.`;
         }
@@ -6318,25 +6943,25 @@ var ManifestModule = {
   command: "manifest <command>",
   describe: "Commands for context manifests",
   aliases: ["man"],
-  builder: (yargs36) => yargs36.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
   handler: () => {
-    yargs19.help();
+    yargs21.help();
   }
 };
 
 // src/commands/context/commands/quirk.ts
-import yargs20 from "yargs";
+import yargs22 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: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs36.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
+          yargs38.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
         )
       )
     )
@@ -6360,11 +6985,11 @@ var QuirkListModule = {
   command: "list",
   describe: "List quirks",
   aliases: ["ls"],
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs36.option("withIntegrations", {
+          yargs38.option("withIntegrations", {
             alias: ["i"],
             describe: "Whether to include meta-quirks created by integrations in the list. Defaults to false.",
             type: "boolean"
@@ -6385,8 +7010,8 @@ var QuirkListModule = {
 import { UncachedQuirkClient as UncachedQuirkClient3 } from "@uniformdev/context/api";
 
 // src/commands/context/commands/quirk/_util.ts
-var selectIdentifier8 = (source) => source.id;
-var selectDisplayName8 = (source) => `${source.name} (pid: ${source.id})`;
+var selectIdentifier10 = (source) => source.id;
+var selectDisplayName10 = (source) => `${source.name} (pid: ${source.id})`;
 
 // src/commands/context/quirkEngineDataSource.ts
 function createQuirkEngineDataSource({
@@ -6396,8 +7021,8 @@ function createQuirkEngineDataSource({
     const quirks = (await client.get({ withIntegrations: false })).quirks;
     for await (const def of quirks) {
       const result = {
-        id: selectIdentifier8(def),
-        displayName: selectDisplayName8(def),
+        id: selectIdentifier10(def),
+        displayName: selectDisplayName10(def),
         providerId: def.id,
         object: def
       };
@@ -6422,11 +7047,11 @@ function createQuirkEngineDataSource({
 var QuirkPullModule = {
   command: "pull <directory>",
   describe: "Pulls all quirks to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.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", {
@@ -6473,8 +7098,8 @@ var QuirkPullModule = {
       target = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
         objects: packageContents.quirks ?? [],
-        selectIdentifier: selectIdentifier8,
-        selectDisplayName: selectDisplayName8,
+        selectIdentifier: selectIdentifier10,
+        selectDisplayName: selectDisplayName10,
         onSyncComplete: async (_, synced) => {
           packageContents.quirks = synced;
           writeContextPackage(directory, packageContents);
@@ -6483,8 +7108,8 @@ var QuirkPullModule = {
     } else {
       target = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier8,
-        selectDisplayName: selectDisplayName8,
+        selectIdentifier: selectIdentifier10,
+        selectDisplayName: selectDisplayName10,
         format
       });
     }
@@ -6504,11 +7129,11 @@ 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: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.positional("directory", {
             describe: "Directory to read the quirks from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -6547,14 +7172,14 @@ var QuirkPushModule = {
       source = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
         objects: packageContents.quirks ?? [],
-        selectIdentifier: selectIdentifier8,
-        selectDisplayName: selectDisplayName8
+        selectIdentifier: selectIdentifier10,
+        selectDisplayName: selectDisplayName10
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier8,
-        selectDisplayName: selectDisplayName8
+        selectIdentifier: selectIdentifier10,
+        selectDisplayName: selectDisplayName10
       });
     }
     const target = createQuirkEngineDataSource({ client });
@@ -6575,10 +7200,10 @@ var QuirkRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a quirk",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
+        yargs38.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
       )
     )
   ),
@@ -6595,10 +7220,10 @@ var QuirkUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a quirk",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("filename", { demandOption: true, describe: "Quirk file to put" })
+        yargs38.positional("filename", { demandOption: true, describe: "Quirk file to put" })
       )
     )
   ),
@@ -6615,25 +7240,25 @@ var QuirkModule = {
   command: "quirk <command>",
   aliases: ["qk"],
   describe: "Commands for Context quirks",
-  builder: (yargs36) => yargs36.command(QuirkPullModule).command(QuirkPushModule).command(QuirkGetModule).command(QuirkRemoveModule).command(QuirkListModule).command(QuirkUpdateModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(QuirkPullModule).command(QuirkPushModule).command(QuirkGetModule).command(QuirkRemoveModule).command(QuirkListModule).command(QuirkUpdateModule).demandCommand(),
   handler: () => {
-    yargs20.help();
+    yargs22.help();
   }
 };
 
 // src/commands/context/commands/signal.ts
-import yargs21 from "yargs";
+import yargs23 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: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs36.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
+          yargs38.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
         )
       )
     )
@@ -6657,7 +7282,7 @@ var SignalListModule = {
   command: "list",
   describe: "List signals",
   aliases: ["ls"],
-  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
+  builder: (yargs38) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs38)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedSignalClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -6670,8 +7295,8 @@ var SignalListModule = {
 import { UncachedSignalClient as UncachedSignalClient3 } from "@uniformdev/context/api";
 
 // src/commands/context/commands/signal/_util.ts
-var selectIdentifier9 = (source) => source.id;
-var selectDisplayName9 = (source) => `${source.name} (pid: ${source.id})`;
+var selectIdentifier11 = (source) => source.id;
+var selectDisplayName11 = (source) => `${source.name} (pid: ${source.id})`;
 
 // src/commands/context/signalEngineDataSource.ts
 function createSignalEngineDataSource({
@@ -6681,8 +7306,8 @@ function createSignalEngineDataSource({
     const signals = (await client.get()).signals;
     for await (const def of signals) {
       const result = {
-        id: selectIdentifier9(def),
-        displayName: selectDisplayName9(def),
+        id: selectIdentifier11(def),
+        displayName: selectDisplayName11(def),
         providerId: def.id,
         object: def
       };
@@ -6707,11 +7332,11 @@ function createSignalEngineDataSource({
 var SignalPullModule = {
   command: "pull <directory>",
   describe: "Pulls all signals to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.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", {
@@ -6758,8 +7383,8 @@ var SignalPullModule = {
       target = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
         objects: packageContents.signals ?? [],
-        selectIdentifier: selectIdentifier9,
-        selectDisplayName: selectDisplayName9,
+        selectIdentifier: selectIdentifier11,
+        selectDisplayName: selectDisplayName11,
         onSyncComplete: async (_, synced) => {
           packageContents.signals = synced;
           writeContextPackage(directory, packageContents);
@@ -6768,8 +7393,8 @@ var SignalPullModule = {
     } else {
       target = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier9,
-        selectDisplayName: selectDisplayName9,
+        selectIdentifier: selectIdentifier11,
+        selectDisplayName: selectDisplayName11,
         format
       });
     }
@@ -6789,11 +7414,11 @@ 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: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.positional("directory", {
             describe: "Directory to read the signals from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -6832,14 +7457,14 @@ var SignalPushModule = {
       source = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
         objects: packageContents.signals ?? [],
-        selectIdentifier: selectIdentifier9,
-        selectDisplayName: selectDisplayName9
+        selectIdentifier: selectIdentifier11,
+        selectDisplayName: selectDisplayName11
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier9,
-        selectDisplayName: selectDisplayName9
+        selectIdentifier: selectIdentifier11,
+        selectDisplayName: selectDisplayName11
       });
     }
     const target = createSignalEngineDataSource({ client });
@@ -6860,10 +7485,10 @@ var SignalRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a signal",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
+        yargs38.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
       )
     )
   ),
@@ -6880,10 +7505,10 @@ var SignalUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a signal",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("filename", { demandOption: true, describe: "Signal file to put" })
+        yargs38.positional("filename", { demandOption: true, describe: "Signal file to put" })
       )
     )
   ),
@@ -6900,25 +7525,25 @@ var SignalModule = {
   command: "signal <command>",
   aliases: ["sig"],
   describe: "Commands for Context signals",
-  builder: (yargs36) => yargs36.command(SignalPullModule).command(SignalPushModule).command(SignalGetModule).command(SignalRemoveModule).command(SignalListModule).command(SignalUpdateModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(SignalPullModule).command(SignalPushModule).command(SignalGetModule).command(SignalRemoveModule).command(SignalListModule).command(SignalUpdateModule).demandCommand(),
   handler: () => {
-    yargs21.help();
+    yargs23.help();
   }
 };
 
 // src/commands/context/commands/test.ts
-import yargs22 from "yargs";
+import yargs24 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: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs36.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
+          yargs38.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
         )
       )
     )
@@ -6942,7 +7567,7 @@ var TestListModule = {
   command: "list",
   describe: "List tests",
   aliases: ["ls"],
-  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
+  builder: (yargs38) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs38)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedTestClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -6955,8 +7580,8 @@ var TestListModule = {
 import { UncachedTestClient as UncachedTestClient3 } from "@uniformdev/context/api";
 
 // src/commands/context/commands/test/_util.ts
-var selectIdentifier10 = (source) => source.id;
-var selectDisplayName10 = (source) => `${source.name} (pid: ${source.id})`;
+var selectIdentifier12 = (source) => source.id;
+var selectDisplayName12 = (source) => `${source.name} (pid: ${source.id})`;
 
 // src/commands/context/testEngineDataSource.ts
 function createTestEngineDataSource({
@@ -6966,8 +7591,8 @@ function createTestEngineDataSource({
     const tests = (await client.get()).tests;
     for await (const def of tests) {
       const result = {
-        id: selectIdentifier10(def),
-        displayName: selectDisplayName10(def),
+        id: selectIdentifier12(def),
+        displayName: selectDisplayName12(def),
         providerId: def.id,
         object: def
       };
@@ -6992,11 +7617,11 @@ function createTestEngineDataSource({
 var TestPullModule = {
   command: "pull <directory>",
   describe: "Pulls all tests to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.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", {
@@ -7043,8 +7668,8 @@ var TestPullModule = {
       target = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
         objects: packageContents.tests ?? [],
-        selectIdentifier: selectIdentifier10,
-        selectDisplayName: selectDisplayName10,
+        selectIdentifier: selectIdentifier12,
+        selectDisplayName: selectDisplayName12,
         onSyncComplete: async (_, synced) => {
           packageContents.tests = synced;
           writeContextPackage(directory, packageContents);
@@ -7053,8 +7678,8 @@ var TestPullModule = {
     } else {
       target = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier10,
-        selectDisplayName: selectDisplayName10,
+        selectIdentifier: selectIdentifier12,
+        selectDisplayName: selectDisplayName12,
         format
       });
     }
@@ -7074,11 +7699,11 @@ 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: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.positional("directory", {
             describe: "Directory to read the tests from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -7117,14 +7742,14 @@ var TestPushModule = {
       source = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
         objects: packageContents.tests ?? [],
-        selectIdentifier: selectIdentifier10,
-        selectDisplayName: selectDisplayName10
+        selectIdentifier: selectIdentifier12,
+        selectDisplayName: selectDisplayName12
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier10,
-        selectDisplayName: selectDisplayName10
+        selectIdentifier: selectIdentifier12,
+        selectDisplayName: selectDisplayName12
       });
     }
     const target = createTestEngineDataSource({ client });
@@ -7145,10 +7770,10 @@ var TestRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a test",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("id", { demandOption: true, describe: "Test public ID to delete" })
+        yargs38.positional("id", { demandOption: true, describe: "Test public ID to delete" })
       )
     )
   ),
@@ -7165,9 +7790,9 @@ var TestUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a test",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs36.positional("filename", { demandOption: true, describe: "Test file to put" }))
+      withProjectOptions(yargs38.positional("filename", { demandOption: true, describe: "Test file to put" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
@@ -7182,9 +7807,9 @@ var TestUpdateModule = {
 var TestModule = {
   command: "test <command>",
   describe: "Commands for Context A/B tests",
-  builder: (yargs36) => yargs36.command(TestPullModule).command(TestPushModule).command(TestGetModule).command(TestRemoveModule).command(TestListModule).command(TestUpdateModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(TestPullModule).command(TestPushModule).command(TestGetModule).command(TestRemoveModule).command(TestListModule).command(TestUpdateModule).demandCommand(),
   handler: () => {
-    yargs22.help();
+    yargs24.help();
   }
 };
 
@@ -7193,20 +7818,20 @@ var ContextCommand = {
   command: "context <command>",
   aliases: ["ctx"],
   describe: "Uniform Context commands",
-  builder: (yargs36) => yargs36.command(ManifestModule).command(SignalModule).command(EnrichmentModule).command(AggregateModule).command(QuirkModule).command(TestModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(ManifestModule).command(SignalModule).command(EnrichmentModule).command(AggregateModule).command(QuirkModule).command(TestModule).demandCommand(),
   handler: () => {
-    yargs23.showHelp();
+    yargs25.showHelp();
   }
 };
 
 // src/commands/integration/index.ts
-import yargs26 from "yargs";
+import yargs28 from "yargs";
 
 // src/commands/integration/commands/definition.ts
-import yargs25 from "yargs";
+import yargs27 from "yargs";
 
 // src/commands/integration/commands/definition/edgehancer/edgehancer.ts
-import yargs24 from "yargs";
+import yargs26 from "yargs";
 
 // src/commands/integration/commands/definition/edgehancer/deploy.ts
 import { readFileSync } from "fs";
@@ -7244,8 +7869,8 @@ var EdgehancerClient = class extends ApiClient {
 };
 
 // src/commands/integration/commands/definition/edgehancer/util.ts
-function withEdgehancerIdOptions(yargs36) {
-  return yargs36.option("connectorType", {
+function withEdgehancerIdOptions(yargs38) {
+  return yargs38.option("connectorType", {
     describe: "Integration data connector type to edgehance, as defined in the integration manifest file.",
     demandOption: true,
     type: "string"
@@ -7265,11 +7890,11 @@ function withEdgehancerIdOptions(yargs36) {
 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: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withTeamOptions(
         withEdgehancerIdOptions(
-          yargs36.positional("filename", {
+          yargs38.positional("filename", {
             demandOption: true,
             describe: "ESM code file to run for the target edgehancer hook. Refer to the documentation for expected types."
           })
@@ -7289,7 +7914,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: (yargs36) => withConfiguration(withApiOptions(withTeamOptions(withEdgehancerIdOptions(yargs36)))),
+  builder: (yargs38) => withConfiguration(withApiOptions(withTeamOptions(withEdgehancerIdOptions(yargs38)))),
   handler: async ({ apiHost, apiKey, proxy, team: teamId, archetype, connectorType, hook }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch3, teamId });
@@ -7301,9 +7926,9 @@ var IntegrationEdgehancerRemoveModule = {
 var IntegrationEdgehancerModule = {
   command: "edgehancer <command>",
   describe: "Commands for managing custom integration edgehancers at the team level.",
-  builder: (yargs36) => yargs36.command(IntegrationEdgehancerDeployModule).command(IntegrationEdgehancerRemoveModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(IntegrationEdgehancerDeployModule).command(IntegrationEdgehancerRemoveModule).demandCommand(),
   handler: () => {
-    yargs24.help();
+    yargs26.help();
   }
 };
 
@@ -7343,10 +7968,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: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withTeamOptions(
-        yargs36.positional("filename", {
+        yargs38.positional("filename", {
           demandOption: true,
           describe: "Integration definition manifest to register"
         })
@@ -7365,10 +7990,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: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withTeamOptions(
-        yargs36.positional("type", {
+        yargs38.positional("type", {
           demandOption: true,
           describe: "Integration type (from its manifest) to remove."
         })
@@ -7386,9 +8011,9 @@ var IntegrationDefinitionRemoveModule = {
 var IntegrationDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for managing custom integration definitions at the team level.",
-  builder: (yargs36) => yargs36.command(IntegrationDefinitionRemoveModule).command(IntegrationDefinitionRegisterModule).command(IntegrationEdgehancerModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(IntegrationDefinitionRemoveModule).command(IntegrationDefinitionRegisterModule).command(IntegrationEdgehancerModule).demandCommand(),
   handler: () => {
-    yargs25.help();
+    yargs27.help();
   }
 };
 
@@ -7428,10 +8053,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: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("type", {
+        yargs38.positional("type", {
           demandOption: true,
           describe: "Integration type to install (as defined in its manifest)"
         }).option("configuration", {
@@ -7453,10 +8078,10 @@ var IntegrationInstallModule = {
 var IntegrationUninstallModule = {
   command: "uninstall <type>",
   describe: "Uninstalls an integration from a project. Existing usages of the integration may break.",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("type", {
+        yargs38.positional("type", {
           demandOption: true,
           describe: "Integration type to uninstall (as defined in its manifest)"
         })
@@ -7474,9 +8099,9 @@ var IntegrationUninstallModule = {
 var IntegrationCommand = {
   command: "integration <command>",
   describe: "Integration management commands",
-  builder: (yargs36) => yargs36.command(IntegrationDefinitionModule).command(IntegrationInstallModule).command(IntegrationUninstallModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(IntegrationDefinitionModule).command(IntegrationInstallModule).command(IntegrationUninstallModule).demandCommand(),
   handler: () => {
-    yargs26.showHelp();
+    yargs28.showHelp();
   }
 };
 
@@ -7504,7 +8129,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.195.0",
+  version: "19.200.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -8520,10 +9145,10 @@ var NewMeshCmd = {
 };
 
 // src/commands/optimize/index.ts
-import yargs28 from "yargs";
+import yargs30 from "yargs";
 
 // src/commands/optimize/manifest.ts
-import yargs27 from "yargs";
+import yargs29 from "yargs";
 
 // src/commands/optimize/manifest/download.ts
 import { gray as gray4, green as green3, red as red5, yellow as yellow2 } from "colorette";
@@ -8538,7 +9163,7 @@ var UniformBaseUrl = "https://uniform.app";
 var module = {
   command: "download [output]",
   describe: "Download intent manifest",
-  builder: (yargs36) => yargs36.option("apiKey", {
+  builder: (yargs38) => yargs38.option("apiKey", {
     alias: "k",
     demandOption: true,
     string: true,
@@ -8639,10 +9264,10 @@ var module2 = {
   command: "manifest <command>",
   describe: "Intent manifest commands",
   builder: () => {
-    return yargs27.command(download_default);
+    return yargs29.command(download_default);
   },
   handler: () => {
-    yargs27.showHelp();
+    yargs29.showHelp();
   }
 };
 var manifest_default = module2;
@@ -8653,29 +9278,29 @@ var OptimizeCommand = {
   aliases: ["opt"],
   describe: "Uniform Optimize commands",
   builder: () => {
-    return yargs28.command(manifest_default);
+    return yargs30.command(manifest_default);
   },
   handler: () => {
-    yargs28.showHelp();
+    yargs30.showHelp();
   }
 };
 
 // src/commands/project-map/index.ts
-import yargs31 from "yargs";
+import yargs33 from "yargs";
 
 // src/commands/project-map/commands/projectMapDefinition.ts
-import yargs29 from "yargs";
+import yargs31 from "yargs";
 
 // src/commands/project-map/commands/ProjectMapDefinition/get.ts
 import { UncachedProjectMapClient } from "@uniformdev/project-map";
 var ProjectMapDefinitionGetModule = {
   command: "get <id>",
   describe: "Fetch a project map",
-  builder: (yargs36) => withFormatOptions(
+  builder: (yargs38) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs36.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
+          yargs38.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
         )
       )
     )
@@ -8699,7 +9324,7 @@ var ProjectMapDefinitionListModule = {
   command: "list",
   describe: "List of project maps",
   aliases: ["ls"],
-  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
+  builder: (yargs38) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs38)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedProjectMapClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -8720,8 +9345,8 @@ function writeContextPackage2(filename, packageContents) {
 }
 
 // src/commands/project-map/commands/ProjectMapDefinition/_util.ts
-var selectIdentifier11 = (source) => source.id;
-var selectDisplayName11 = (source) => `${source.name} (pid: ${source.id})`;
+var selectIdentifier13 = (source) => source.id;
+var selectDisplayName13 = (source) => `${source.name} (pid: ${source.id})`;
 
 // src/commands/project-map/ProjectMapDefinitionEngineDataSource.ts
 function createProjectMapDefinitionEngineDataSource({
@@ -8731,9 +9356,9 @@ function createProjectMapDefinitionEngineDataSource({
     const projectMaps = (await client.getProjectMapDefinitions()).projectMaps;
     for await (const def of projectMaps) {
       const result = {
-        id: selectIdentifier11(def),
-        displayName: selectDisplayName11(def),
-        providerId: selectIdentifier11(def),
+        id: selectIdentifier13(def),
+        displayName: selectDisplayName13(def),
+        providerId: selectIdentifier13(def),
         object: def
       };
       yield result;
@@ -8757,11 +9382,11 @@ function createProjectMapDefinitionEngineDataSource({
 var ProjectMapDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.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", {
@@ -8808,8 +9433,8 @@ var ProjectMapDefinitionPullModule = {
       target = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
         objects: packageContents.projectMaps ?? [],
-        selectIdentifier: selectIdentifier11,
-        selectDisplayName: selectDisplayName11,
+        selectIdentifier: selectIdentifier13,
+        selectDisplayName: selectDisplayName13,
         onSyncComplete: async (_, synced) => {
           packageContents.projectMaps = synced;
           writeContextPackage2(directory, packageContents);
@@ -8818,8 +9443,8 @@ var ProjectMapDefinitionPullModule = {
     } else {
       target = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier11,
-        selectDisplayName: selectDisplayName11,
+        selectIdentifier: selectIdentifier13,
+        selectDisplayName: selectDisplayName13,
         format
       });
     }
@@ -8839,11 +9464,11 @@ import { UncachedProjectMapClient as UncachedProjectMapClient4 } from "@uniformd
 var ProjectMapDefinitionPushModule = {
   command: "push <directory>",
   describe: "Pushes all project maps from files in a directory or package to Uniform",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.positional("directory", {
             describe: "Directory to read project maps from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -8882,14 +9507,14 @@ var ProjectMapDefinitionPushModule = {
       source = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
         objects: packageContents.projectMaps ?? [],
-        selectIdentifier: selectIdentifier11,
-        selectDisplayName: selectDisplayName11
+        selectIdentifier: selectIdentifier13,
+        selectDisplayName: selectDisplayName13
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier11,
-        selectDisplayName: selectDisplayName11
+        selectIdentifier: selectIdentifier13,
+        selectDisplayName: selectDisplayName13
       });
     }
     const target = createProjectMapDefinitionEngineDataSource({ client });
@@ -8910,9 +9535,9 @@ var ProjectMapDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs36.positional("id", { demandOption: true, describe: " UUID to delete" }))
+      withProjectOptions(yargs38.positional("id", { demandOption: true, describe: " UUID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -8928,10 +9553,10 @@ var ProjectMapDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a project map",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("filename", { demandOption: true, describe: "Project map file to put" })
+        yargs38.positional("filename", { demandOption: true, describe: "Project map file to put" })
       )
     )
   ),
@@ -8947,25 +9572,25 @@ var ProjectMapDefinitionUpdateModule = {
 var ProjectMapDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for ProjectMap Definitions",
-  builder: (yargs36) => yargs36.command(ProjectMapDefinitionPullModule).command(ProjectMapDefinitionPushModule).command(ProjectMapDefinitionGetModule).command(ProjectMapDefinitionRemoveModule).command(ProjectMapDefinitionListModule).command(ProjectMapDefinitionUpdateModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(ProjectMapDefinitionPullModule).command(ProjectMapDefinitionPushModule).command(ProjectMapDefinitionGetModule).command(ProjectMapDefinitionRemoveModule).command(ProjectMapDefinitionListModule).command(ProjectMapDefinitionUpdateModule).demandCommand(),
   handler: () => {
-    yargs29.help();
+    yargs31.help();
   }
 };
 
 // src/commands/project-map/commands/projectMapNode.ts
-import yargs30 from "yargs";
+import yargs32 from "yargs";
 
 // src/commands/project-map/commands/ProjectMapNode/get.ts
 import { UncachedProjectMapClient as UncachedProjectMapClient7 } from "@uniformdev/project-map";
 var ProjectMapNodeGetModule = {
   command: "get <id> <projectMapId>",
   describe: "Fetch a project map node",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs36.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to fetch" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to fetch from" })
+          yargs38.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to fetch" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to fetch from" })
         )
       )
     )
@@ -8990,12 +9615,12 @@ var ProjectMapNodeListModule = {
   command: "list <projectMapId>",
   describe: "List project map nodes",
   aliases: ["ls"],
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs36.positional("projectMapId", {
+            yargs38.positional("projectMapId", {
               demandOption: true,
               describe: "ProjectMap UUID to fetch from"
             })
@@ -9016,12 +9641,12 @@ var ProjectMapNodeListModule = {
 import { UncachedProjectMapClient as UncachedProjectMapClient9 } from "@uniformdev/project-map";
 
 // src/commands/project-map/commands/ProjectMapNode/_util.ts
-var selectIdentifier12 = (source, projectId) => [
+var selectIdentifier14 = (source, projectId) => [
   projectId + source.projectMapId + source.id,
   projectId + source.projectMapId + source.path
 ];
 var selectFilename = (source) => cleanFileName(`${source.pathSegment}_${source.id}`);
-var selectDisplayName12 = (source) => `${source.name} (pid: ${source.id})`;
+var selectDisplayName14 = (source) => `${source.name} (pid: ${source.id})`;
 
 // src/commands/project-map/ProjectMapNodeEngineDataSource.ts
 function createProjectMapNodeEngineDataSource({
@@ -9035,9 +9660,9 @@ function createProjectMapNodeEngineDataSource({
       for await (const node of nodes ?? []) {
         if (node) {
           const result = {
-            id: selectIdentifier12({ ...node, projectMapId: projectMap.id }, projectId),
-            displayName: selectDisplayName12(node),
-            providerId: selectIdentifier12({ ...node, projectMapId: projectMap.id }, projectId)[0],
+            id: selectIdentifier14({ ...node, projectMapId: projectMap.id }, projectId),
+            displayName: selectDisplayName14(node),
+            providerId: selectIdentifier14({ ...node, projectMapId: projectMap.id }, projectId)[0],
             object: { ...node, projectMapId: projectMap.id }
           };
           yield result;
@@ -9068,11 +9693,11 @@ function createProjectMapNodeEngineDataSource({
 var ProjectMapNodePullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps nodes to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.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", {
@@ -9115,7 +9740,7 @@ var ProjectMapNodePullModule = {
     let target;
     const isPackage = isPathAPackageFile(directory);
     const expandedSelectIdentifier = (object) => {
-      return selectIdentifier12(object, projectId);
+      return selectIdentifier14(object, projectId);
     };
     if (isPackage) {
       const packageContents = readContextPackage2(directory, false);
@@ -9123,7 +9748,7 @@ var ProjectMapNodePullModule = {
         name: `Package file ${directory}`,
         objects: packageContents.projectMapNodes ?? [],
         selectIdentifier: expandedSelectIdentifier,
-        selectDisplayName: selectDisplayName12,
+        selectDisplayName: selectDisplayName14,
         onSyncComplete: async (_, synced) => {
           packageContents.projectMapNodes = synced;
           writeContextPackage2(directory, packageContents);
@@ -9133,7 +9758,7 @@ var ProjectMapNodePullModule = {
       target = await createFileSyncEngineDataSource({
         directory,
         selectIdentifier: expandedSelectIdentifier,
-        selectDisplayName: selectDisplayName12,
+        selectDisplayName: selectDisplayName14,
         format,
         selectFilename
       });
@@ -9157,11 +9782,11 @@ import {
 var ProjectMapNodePushModule = {
   command: "push <directory>",
   describe: "Pushes all project maps nodes from files in a directory or package to Uniform",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.positional("directory", {
             describe: "Directory to read project maps from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -9201,7 +9826,7 @@ var ProjectMapNodePushModule = {
     let source;
     const isPackage = isPathAPackageFile(directory);
     const expandedSelectIdentifier = (object) => {
-      return selectIdentifier12(object, projectId);
+      return selectIdentifier14(object, projectId);
     };
     if (isPackage) {
       const packageContents = readContextPackage2(directory, true);
@@ -9211,13 +9836,13 @@ var ProjectMapNodePushModule = {
           return a.path.length - b.path.length;
         }) ?? [],
         selectIdentifier: expandedSelectIdentifier,
-        selectDisplayName: selectDisplayName12
+        selectDisplayName: selectDisplayName14
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
         selectIdentifier: expandedSelectIdentifier,
-        selectDisplayName: selectDisplayName12,
+        selectDisplayName: selectDisplayName14,
         selectFilename
       });
     }
@@ -9248,7 +9873,7 @@ var ProjectMapNodePushModule = {
             name: `Nodes re-push from ${directory}`,
             objects: Array.from(nodesFailedDueToMissingParent),
             selectIdentifier: expandedSelectIdentifier,
-            selectDisplayName: selectDisplayName12
+            selectDisplayName: selectDisplayName14
           });
           await attemptSync();
         } else {
@@ -9266,10 +9891,10 @@ var ProjectMapNodeRemoveModule = {
   command: "remove <id> <projectMapId>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map node",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to delete" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to delete from" })
+        yargs38.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to delete" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to delete from" })
       )
     )
   ),
@@ -9286,10 +9911,10 @@ var ProjectMapNodeUpdateModule = {
   command: "update <filename> <projectMapId>",
   aliases: ["put"],
   describe: "Insert or update a project map node",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("filename", { demandOption: true, describe: "ProjectMap node file with nodes data" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to put into" })
+        yargs38.positional("filename", { demandOption: true, describe: "ProjectMap node file with nodes data" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to put into" })
       )
     )
   ),
@@ -9305,9 +9930,9 @@ var ProjectMapNodeUpdateModule = {
 var ProjectMapNodeModule = {
   command: "node <command>",
   describe: "Commands for ProjectMap Nodes",
-  builder: (yargs36) => yargs36.command(ProjectMapNodePullModule).command(ProjectMapNodePushModule).command(ProjectMapNodeGetModule).command(ProjectMapNodeRemoveModule).command(ProjectMapNodeListModule).command(ProjectMapNodeUpdateModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(ProjectMapNodePullModule).command(ProjectMapNodePushModule).command(ProjectMapNodeGetModule).command(ProjectMapNodeRemoveModule).command(ProjectMapNodeListModule).command(ProjectMapNodeUpdateModule).demandCommand(),
   handler: () => {
-    yargs30.help();
+    yargs32.help();
   }
 };
 
@@ -9316,28 +9941,28 @@ var ProjectMapCommand = {
   command: "project-map <command>",
   aliases: ["prm"],
   describe: "Uniform ProjectMap commands",
-  builder: (yargs36) => yargs36.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
   handler: () => {
-    yargs31.showHelp();
+    yargs33.showHelp();
   }
 };
 
 // src/commands/redirect/index.ts
-import yargs33 from "yargs";
+import yargs35 from "yargs";
 
 // src/commands/redirect/commands/redirect.ts
-import yargs32 from "yargs";
+import yargs34 from "yargs";
 
 // src/commands/redirect/commands/RedirectDefinition/get.ts
 import { UncachedRedirectClient } from "@uniformdev/redirect";
 var RedirectDefinitionGetModule = {
   command: "get <id>",
   describe: "Fetch a redirect",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs36.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
+          yargs38.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
         )
       )
     )
@@ -9361,7 +9986,7 @@ var RedirectDefinitionListModule = {
   command: "list",
   describe: "List of redirects",
   aliases: ["ls"],
-  builder: (yargs36) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs36)))),
+  builder: (yargs38) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs38)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedRedirectClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -9382,12 +10007,12 @@ function writeContextPackage3(filename, packageContents) {
 }
 
 // src/commands/redirect/commands/RedirectDefinition/_util.ts
-var selectIdentifier13 = (source) => source.id;
+var selectIdentifier15 = (source) => source.id;
 var selectFilename2 = (source) => {
   const index = source.sourceUrl.lastIndexOf("/");
   return cleanFileName(source.sourceUrl.substring(index + 1)) + `_${source.id}`;
 };
-var selectDisplayName13 = (source) => {
+var selectDisplayName15 = (source) => {
   let pathName = source.sourceUrl;
   if (pathName.length > 30) {
     const slashIndex = source.sourceUrl.indexOf("/", source.sourceUrl.length - 30);
@@ -9404,9 +10029,9 @@ function createRedirectDefinitionEngineDataSource({
     const redirects = client.getAllRedirects();
     for await (const redirect of redirects) {
       const result = {
-        id: selectIdentifier13(redirect.redirect),
-        displayName: selectDisplayName13(redirect.redirect),
-        providerId: selectIdentifier13(redirect.redirect),
+        id: selectIdentifier15(redirect.redirect),
+        displayName: selectDisplayName15(redirect.redirect),
+        providerId: selectIdentifier15(redirect.redirect),
         object: redirect.redirect
       };
       yield result;
@@ -9428,11 +10053,11 @@ function createRedirectDefinitionEngineDataSource({
 var RedirectDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all redirects to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.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", {
@@ -9479,8 +10104,8 @@ var RedirectDefinitionPullModule = {
       target = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
         objects: packageContents.redirects ?? [],
-        selectIdentifier: selectIdentifier13,
-        selectDisplayName: selectDisplayName13,
+        selectIdentifier: selectIdentifier15,
+        selectDisplayName: selectDisplayName15,
         onSyncComplete: async (_, synced) => {
           packageContents.redirects = synced;
           writeContextPackage3(directory, packageContents);
@@ -9490,8 +10115,8 @@ var RedirectDefinitionPullModule = {
       target = await createFileSyncEngineDataSource({
         directory,
         selectFilename: selectFilename2,
-        selectIdentifier: selectIdentifier13,
-        selectDisplayName: selectDisplayName13,
+        selectIdentifier: selectIdentifier15,
+        selectDisplayName: selectDisplayName15,
         format
       });
     }
@@ -9511,11 +10136,11 @@ import { UncachedRedirectClient as UncachedRedirectClient4 } from "@uniformdev/r
 var RedirectDefinitionPushModule = {
   command: "push <directory>",
   describe: "Pushes all redirects from files in a directory or package to Uniform",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs36.positional("directory", {
+          yargs38.positional("directory", {
             describe: "Directory to read redirects from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -9554,14 +10179,14 @@ var RedirectDefinitionPushModule = {
       source = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
         objects: packageContents.redirects ?? [],
-        selectIdentifier: selectIdentifier13,
-        selectDisplayName: selectDisplayName13
+        selectIdentifier: selectIdentifier15,
+        selectDisplayName: selectDisplayName15
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier13,
-        selectDisplayName: selectDisplayName13
+        selectIdentifier: selectIdentifier15,
+        selectDisplayName: selectDisplayName15
       });
     }
     const target = createRedirectDefinitionEngineDataSource({ client });
@@ -9582,9 +10207,9 @@ var RedirectDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a redirect",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs36.positional("id", { demandOption: true, describe: " UUID to delete" }))
+      withProjectOptions(yargs38.positional("id", { demandOption: true, describe: " UUID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -9600,10 +10225,10 @@ var RedirectDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a redirect",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs36.positional("filename", { demandOption: true, describe: "Redirect file to put" })
+        yargs38.positional("filename", { demandOption: true, describe: "Redirect file to put" })
       )
     )
   ),
@@ -9619,9 +10244,9 @@ var RedirectDefinitionUpdateModule = {
 var RedirectDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for Redirect Definitions",
-  builder: (yargs36) => yargs36.command(RedirectDefinitionPullModule).command(RedirectDefinitionPushModule).command(RedirectDefinitionGetModule).command(RedirectDefinitionRemoveModule).command(RedirectDefinitionListModule).command(RedirectDefinitionUpdateModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(RedirectDefinitionPullModule).command(RedirectDefinitionPushModule).command(RedirectDefinitionGetModule).command(RedirectDefinitionRemoveModule).command(RedirectDefinitionListModule).command(RedirectDefinitionUpdateModule).demandCommand(),
   handler: () => {
-    yargs32.help();
+    yargs34.help();
   }
 };
 
@@ -9630,14 +10255,14 @@ var RedirectCommand = {
   command: "redirect <command>",
   aliases: ["red"],
   describe: "Uniform Redirect commands",
-  builder: (yargs36) => yargs36.command(RedirectDefinitionModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(RedirectDefinitionModule).demandCommand(),
   handler: () => {
-    yargs33.showHelp();
+    yargs35.showHelp();
   }
 };
 
 // src/commands/sync/index.ts
-import yargs34 from "yargs";
+import yargs36 from "yargs";
 
 // src/commands/sync/commands/util.ts
 import ora2 from "ora";
@@ -9697,16 +10322,18 @@ function patchConsole(fn, ora3, replay = []) {
 var SyncPullModule = {
   command: "pull",
   describe: "Pulls whole project to local files in a directory",
-  builder: (yargs36) => withConfiguration(
+  builder: (yargs38) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        withDiffOptions(
-          yargs36.option("what-if", {
-            alias: ["w"],
-            describe: "What-if mode reports what would be done but changes no files",
-            default: false,
-            type: "boolean"
-          })
+        withDebugOptions(
+          withDiffOptions(
+            yargs38.option("what-if", {
+              alias: ["w"],
+              describe: "What-if mode reports what would be done but changes no files",
+              default: false,
+              type: "boolean"
+            })
+          )
         )
       )
     )
@@ -9735,7 +10362,9 @@ var SyncPullModule = {
       redirect: RedirectDefinitionPullModule,
       entry: EntryPullModule,
       entryPattern: EntryPatternPullModule,
-      contentType: ContentTypePullModule
+      contentType: ContentTypePullModule,
+      previewUrl: PreviewUrlPullModule,
+      previewViewport: PreviewViewportPullModule
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     }).filter(([entityType]) => {
       return Boolean(config2.entitiesConfig?.[entityType]) && config2.entitiesConfig?.[entityType]?.disabled !== true && config2.entitiesConfig?.[entityType]?.pull?.disabled !== true;
@@ -9807,20 +10436,7 @@ var getFormat = (entityType, config2) => {
 var SyncPushModule = {
   command: "push",
   describe: "Pushes whole project data from files in a directory or package to Uniform",
-  builder: (yargs36) => withConfiguration(
-    withApiOptions(
-      withProjectOptions(
-        withDiffOptions(
-          yargs36.option("what-if", {
-            alias: ["w"],
-            describe: "What-if mode reports what would be done but changes nothing",
-            default: false,
-            type: "boolean"
-          })
-        )
-      )
-    )
-  ),
+  builder: (yargs38) => withConfiguration(withApiOptions(withProjectOptions(withDiffOptions(withDebugOptions(yargs38))))),
   handler: async ({ serialization, ...otherParams }) => {
     const config2 = serialization;
     const enabledEntities = Object.entries({
@@ -9845,7 +10461,9 @@ var SyncPushModule = {
       redirect: RedirectDefinitionPushModule,
       contentType: ContentTypePushModule,
       entry: EntryPushModule,
-      entryPattern: EntryPatternPushModule
+      entryPattern: EntryPatternPushModule,
+      previewUrl: PreviewUrlPushModule,
+      previewViewport: PreviewViewportPushModule
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     }).filter(([entityType]) => {
       return Boolean(config2.entitiesConfig?.[entityType]) && config2.entitiesConfig?.[entityType]?.disabled !== true && config2.entitiesConfig?.[entityType]?.push?.disabled !== true;
@@ -9928,9 +10546,9 @@ var getFormat2 = (entityType, config2) => {
 var SyncCommand = {
   command: "sync <command>",
   describe: "Uniform Sync commands",
-  builder: (yargs36) => yargs36.command(SyncPullModule).command(SyncPushModule).demandCommand(),
+  builder: (yargs38) => yargs38.command(SyncPullModule).command(SyncPushModule).demandCommand(),
   handler: () => {
-    yargs34.showHelp();
+    yargs36.showHelp();
   }
 };
 
@@ -10065,7 +10683,7 @@ var getMostRecent = async ({ full, scope }, distTag, timeout) => {
 var defaultConfig = {
   interval: 36e5,
   distTag: "latest",
-  timeout: 2e3
+  timeout: 5e3
 };
 var getDetails = (name) => {
   const spec = {
@@ -10096,6 +10714,13 @@ async function updateCheck_default(pkg, config2 = {}) {
   ({ shouldCheck, latest } = await evaluateCache(file, time, interval));
   if (shouldCheck) {
     latest = await getMostRecent(details, distTag, timeout);
+    if (config2.verbose) {
+      console.log("CLI package latest version check", {
+        latest,
+        current: pkg.version,
+        tempFileWithLastUpdateCheck: file
+      });
+    }
     await updateCache(file, latest, time);
   }
   const comparision = compareVersions(pkg.version, latest);
@@ -10109,19 +10734,19 @@ async function updateCheck_default(pkg, config2 = {}) {
 }
 
 // src/middleware/checkForUpdateMiddleware.ts
-async function checkForUpdateMiddleware() {
+var checkForUpdateMiddleware = async ({ verbose }) => {
   try {
     if (process.env.NO_UPDATE_CHECK || process.env.CI) {
       return;
     }
-    const update = await updateCheck_default(package_default);
+    const update = await updateCheck_default(package_default, { verbose });
     if (update) {
       logCallout(`${bold("Update Available:")} ${gray5(package_default.version)} \u226B ${green4(update.latest)}`);
     }
   } catch (e) {
     console.error(`There was an error checking for updates`, e);
   }
-}
+};
 
 // src/middleware/checkLocalDepsVersionsMiddleware.ts
 import { magenta, red as red6 } from "colorette";
@@ -10195,7 +10820,7 @@ First found was: v${firstVersion}`;
 
 // src/index.ts
 dotenv.config();
-var yarggery = yargs35(hideBin(process.argv));
+var yarggery = yargs37(hideBin(process.argv));
 var inlineConfigurationFilePath = "config" in yarggery.argv && yarggery.argv.config;
 var configuration = loadConfig(inlineConfigurationFilePath || null);
 yarggery.option("verbose", {