@uniformdev/cli 19.147.1-alpha.3 → 19.147.1-alpha.5

package/dist/index.mjs

@@ -7,7 +7,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// ../../node_modules/.pnpm/tsup@8.0.2_@microsoft+api-extractor@7.39.0_postcss@8.4.38_typescript@5.3.3/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.0.2_@microsoft+api-extractor@7.43.2_postcss@8.4.38_typescript@5.3.3/node_modules/tsup/assets/esm_shims.js
 import { fileURLToPath } from "url";
 import path from "path";
 var getFilename = () => fileURLToPath(import.meta.url);
@@ -16,11 +16,11 @@ var __dirname = /* @__PURE__ */ getDirname();
 
 // src/index.ts
 import * as dotenv from "dotenv";
-import yargs32 from "yargs";
+import yargs33 from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // src/commands/canvas/index.ts
-import yargs13 from "yargs";
+import yargs14 from "yargs";
 
 // src/commands/canvas/commands/asset.ts
 import yargs from "yargs";
@@ -30,21 +30,22 @@ import { UncachedAssetClient } from "@uniformdev/assets";
 
 // src/sync/arraySyncEngineDataSource.ts
 async function createArraySyncEngineDataSource({
+  name,
   objects,
-  selectIdentifier: selectIdentifier13,
-  selectDisplayName: selectDisplayName13 = selectIdentifier13,
+  selectIdentifier: selectIdentifier14,
+  selectDisplayName: selectDisplayName14 = selectIdentifier14,
   onSyncComplete,
   onBeforeDeleteObject
 }) {
   const objectIndex = objects.reduce(
     (result, current) => {
-      const rawIdentifiers = selectIdentifier13(current);
+      const rawIdentifiers = selectIdentifier14(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 = selectDisplayName13(current);
+      const displayName = selectDisplayName14(current);
       result[identifiers[0]] = {
         id: identifiers,
         object: current,
@@ -66,6 +67,7 @@ async function createArraySyncEngineDataSource({
     return Object.entries(objectIndex).filter((entry) => typeof entry[1] === "object").sort((a, b) => a[0].localeCompare(b[0])).map((entry) => entry[1].object);
   }
   return {
+    name,
     objects: getObjects(),
     deleteObject: async (providerId, object) => {
       if (onBeforeDeleteObject) {
@@ -74,7 +76,7 @@ async function createArraySyncEngineDataSource({
       delete objectIndex[providerId];
     },
     writeObject: async (objectToWrite) => {
-      const id = selectIdentifier13(objectToWrite.object);
+      const id = selectIdentifier14(objectToWrite.object);
       if (Array.isArray(id)) {
         objectIndex[id[0]] = objectToWrite;
       } else {
@@ -136,14 +138,14 @@ import { mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dump, load } from "js-yaml";
 import { dirname, extname, isAbsolute, resolve, sep } from "path";
 import { fetch as undiciFetch, ProxyAgent } from "undici";
-function withConfiguration(yargs33) {
-  return yargs33.option("serialization", {
+function withConfiguration(yargs34) {
+  return yargs34.option("serialization", {
     skipValidation: true,
     hidden: true
   });
 }
-function withApiOptions(yargs33) {
-  return yargs33.option("apiKey", {
+function withApiOptions(yargs34) {
+  return yargs34.option("apiKey", {
     describe: "Uniform API key. Defaults to UNIFORM_CLI_API_KEY or UNIFORM_API_KEY env. Supports dotenv.",
     default: process.env.UNIFORM_CLI_API_KEY ?? // deprecated
     process.env.CANVAS_CLI_API_KEY ?? // deprecated
@@ -182,8 +184,8 @@ function nodeFetchProxy(proxy) {
   };
   return wrappedFetch;
 }
-function withProjectOptions(yargs33) {
-  return yargs33.option("project", {
+function withProjectOptions(yargs34) {
+  return yargs34.option("project", {
     describe: "Uniform project ID. Defaults to UNIFORM_CLI_PROJECT_ID or UNIFORM_PROJECT_ID env. Supports dotenv.",
     default: process.env.UNIFORM_CLI_PROJECT_ID ?? // deprecated
     process.env.CANVAS_CLI_PROJECT_ID ?? // deprecated
@@ -193,8 +195,8 @@ function withProjectOptions(yargs33) {
     alias: ["p"]
   });
 }
-function withTeamOptions(yargs33) {
-  return yargs33.option("team", {
+function withTeamOptions(yargs34) {
+  return yargs34.option("team", {
     describe: "Uniform team ID. Defaults to UNIFORM_CLI_TEAM_ID or UNIFORM_TEAM_ID env. Supports dotenv.",
     default: process.env.UNIFORM_CLI_TEAM_ID ?? process.env.UNIFORM_TEAM_ID,
     demandOption: true,
@@ -202,8 +204,8 @@ function withTeamOptions(yargs33) {
     alias: ["p"]
   });
 }
-function withFormatOptions(yargs33) {
-  return yargs33.option("format", {
+function withFormatOptions(yargs34) {
+  return yargs34.option("format", {
     alias: ["f"],
     describe: "Output format",
     default: "yaml",
@@ -215,8 +217,8 @@ function withFormatOptions(yargs33) {
     type: "string"
   });
 }
-function withDiffOptions(yargs33) {
-  return yargs33.option("diff", {
+function withDiffOptions(yargs34) {
+  return yargs34.option("diff", {
     describe: "Whether to show diffs in stdout. off = no diffs; update = on for updates; on = updates, creates, deletes. Can be set by UNIFORM_CLI_DIFF_MODE environment variable.",
     default: process.env.UNIFORM_CLI_DIFF_MODE ?? "off",
     type: "string",
@@ -373,8 +375,8 @@ var getDirectoryOrFilename = ({
 async function createFileSyncEngineDataSource({
   directory,
   format = "yaml",
-  selectIdentifier: selectIdentifier13,
-  selectDisplayName: selectDisplayName13 = selectIdentifier13,
+  selectIdentifier: selectIdentifier14,
+  selectDisplayName: selectDisplayName14 = selectIdentifier14,
   selectFilename: selectFilename3,
   selectSchemaUrl: selectSchemaUrl2,
   onBeforeDeleteObject
@@ -396,9 +398,9 @@ async function createFileSyncEngineDataSource({
       const fullFilename = join(directory, filename);
       try {
         const contents = await readFileToObject(fullFilename);
-        const displayName = selectDisplayName13(contents);
+        const displayName = selectDisplayName14(contents);
         const object = {
-          id: selectIdentifier13(contents),
+          id: selectIdentifier14(contents),
           displayName: Array.isArray(displayName) ? displayName[0] : displayName,
           providerId: fullFilename,
           object: omit(contents, ["$schema"])
@@ -412,6 +414,7 @@ ${e == null ? void 0 : e.message}`));
     }
   }
   return {
+    name: `files in ${directory}`,
     objects: getObjects(),
     deleteObject: async (providerId, object) => {
       if (onBeforeDeleteObject) {
@@ -574,7 +577,7 @@ async function syncEngine({
   if (mode === "mirror") {
     if (!sourceHasItems && !allowEmptySource && targetItems.size > 0) {
       throw new Error(
-        "Source is empty and mode is mirror. This would cause deletion of everything in the target, and most likely indicates an error in source definition."
+        `Sync source (${source.name}) is empty and mode is mirror. This would cause deletion of everything in the target (${target.name}), and most likely indicates an error in source definition.`
       );
     }
     const deletes = [];
@@ -642,12 +645,12 @@ function createPublishStatusSyncEngineConsoleLogger(options) {
 var AssetGetModule = {
   command: "get <id>",
   describe: "Get an asset",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs33.positional("id", { demandOption: true, describe: "Asset ID to fetch" })
+          yargs34.positional("id", { demandOption: true, describe: "Asset ID to fetch" })
         )
       )
     )
@@ -668,7 +671,7 @@ import { UncachedAssetClient as UncachedAssetClient2 } from "@uniformdev/assets"
 var AssetListModule = {
   command: "list",
   describe: "List assets",
-  builder: (yargs33) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs33)))),
+  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedAssetClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -1024,8 +1027,8 @@ function prepCompositionForDisk(composition) {
   delete prepped.state;
   return prepped;
 }
-function withStateOptions(yargs33, defaultState = "preview") {
-  return yargs33.option("state", {
+function withStateOptions(yargs34, defaultState = "preview") {
+  return yargs34.option("state", {
     type: "string",
     describe: `State to fetch.`,
     choices: ["preview", "published"],
@@ -1069,6 +1072,7 @@ function createAssetEngineDataSource({
     }
   }
   return {
+    name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
       await client.delete({ assetId: providerId });
@@ -1091,11 +1095,11 @@ function writeCanvasPackage(filename, packageContents) {
 var AssetPullModule = {
   command: "pull <directory>",
   describe: "Pulls all assets to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -1156,6 +1160,7 @@ var AssetPullModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.assets ?? [],
         selectIdentifier: selectAssetIdentifier,
         selectDisplayName: selectAssetDisplayName,
@@ -1214,11 +1219,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -1260,6 +1265,7 @@ var AssetPushModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.assets ?? [],
         selectIdentifier: selectAssetIdentifier,
         selectDisplayName: selectAssetDisplayName
@@ -1318,9 +1324,9 @@ var AssetRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an asset",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs33.positional("id", { demandOption: true, describe: "Asset ID to delete" }))
+      withProjectOptions(yargs34.positional("id", { demandOption: true, describe: "Asset ID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -1336,10 +1342,10 @@ var AssetUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an asset",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("filename", { demandOption: true, describe: "Asset file to put" })
+        yargs34.positional("filename", { demandOption: true, describe: "Asset file to put" })
       )
     )
   ),
@@ -1355,7 +1361,7 @@ var AssetUpdateModule = {
 var AssetModule = {
   command: "asset <command>",
   describe: "Commands for Assets",
-  builder: (yargs33) => yargs33.command(AssetGetModule).command(AssetListModule).command(AssetRemoveModule).command(AssetUpdateModule).command(AssetPullModule).command(AssetPushModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(AssetGetModule).command(AssetListModule).command(AssetRemoveModule).command(AssetUpdateModule).command(AssetPullModule).command(AssetPushModule).demandCommand(),
   handler: () => {
     yargs.help();
   }
@@ -1369,11 +1375,11 @@ import { UncachedCategoryClient } from "@uniformdev/canvas";
 var CategoryGetModule = {
   command: "get <id>",
   describe: "Fetch a category",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs33.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
+          yargs34.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
         )
       )
     )
@@ -1398,7 +1404,7 @@ var CategoryListModule = {
   command: "list",
   describe: "List categories",
   aliases: ["ls"],
-  builder: (yargs33) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs33.options({}))))),
+  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34.options({}))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCategoryClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -1433,6 +1439,7 @@ function createCategoriesEngineDataSource({
     }
   }
   return {
+    name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
       await client.removeCategory({ categoryId: providerId });
@@ -1447,11 +1454,11 @@ function createCategoriesEngineDataSource({
 var CategoryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all categories to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -1496,6 +1503,7 @@ var CategoryPullModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.categories ?? [],
         selectIdentifier,
         selectDisplayName,
@@ -1528,11 +1536,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -1569,6 +1577,7 @@ var CategoryPushModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.categories ?? [],
         selectIdentifier,
         selectDisplayName
@@ -1598,10 +1607,10 @@ var CategoryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a category",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("id", { demandOption: true, describe: "Category UUID to delete" })
+        yargs34.positional("id", { demandOption: true, describe: "Category UUID to delete" })
       )
     )
   ),
@@ -1618,10 +1627,10 @@ var CategoryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a category",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("filename", { demandOption: true, describe: "Category file to put" })
+        yargs34.positional("filename", { demandOption: true, describe: "Category file to put" })
       )
     )
   ),
@@ -1638,7 +1647,7 @@ var CategoryModule = {
   command: "category <command>",
   aliases: ["cat"],
   describe: "Commands for Canvas categories",
-  builder: (yargs33) => yargs33.command(CategoryPullModule).command(CategoryPushModule).command(CategoryGetModule).command(CategoryRemoveModule).command(CategoryListModule).command(CategoryUpdateModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(CategoryPullModule).command(CategoryPushModule).command(CategoryGetModule).command(CategoryRemoveModule).command(CategoryListModule).command(CategoryUpdateModule).demandCommand(),
   handler: () => {
     yargs2.help();
   }
@@ -1659,11 +1668,11 @@ var selectSchemaUrl = () => "/schemas/json-schema/component-definition/v1.json";
 var ComponentGetModule = {
   command: "get <id>",
   describe: "Fetch a component definition",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs33.positional("id", {
+          yargs34.positional("id", {
             demandOption: true,
             describe: "Component definition public ID to fetch"
           })
@@ -1697,11 +1706,11 @@ var ComponentListModule = {
   command: "list",
   describe: "List component definitions",
   aliases: ["ls"],
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs33.options({
+          yargs34.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 }
           })
@@ -1740,6 +1749,7 @@ function createComponentDefinitionEngineDataSource({
     }
   }
   return {
+    name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
       await client.removeComponentDefinition({ componentId: providerId });
@@ -1756,11 +1766,11 @@ function createComponentDefinitionEngineDataSource({
 var ComponentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all component definitions to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -1805,6 +1815,7 @@ var ComponentPullModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.components ?? [],
         selectIdentifier: selectIdentifier2,
         selectDisplayName: selectDisplayName2,
@@ -1838,11 +1849,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -1879,6 +1890,7 @@ var ComponentPushModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.components ?? [],
         selectIdentifier: selectIdentifier2,
         selectDisplayName: selectDisplayName2
@@ -1909,10 +1921,10 @@ var ComponentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a component definition",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("id", { demandOption: true, describe: "Component definition public ID to delete" })
+        yargs34.positional("id", { demandOption: true, describe: "Component definition public ID to delete" })
       )
     )
   ),
@@ -1929,10 +1941,10 @@ var ComponentUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a component definition",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("filename", { demandOption: true, describe: "Component definition file to put" })
+        yargs34.positional("filename", { demandOption: true, describe: "Component definition file to put" })
       )
     )
   ),
@@ -1949,7 +1961,7 @@ var ComponentModule = {
   command: "component <command>",
   aliases: ["def"],
   describe: "Commands for Canvas component definitions",
-  builder: (yargs33) => yargs33.command(ComponentPullModule).command(ComponentPushModule).command(ComponentGetModule).command(ComponentRemoveModule).command(ComponentListModule).command(ComponentUpdateModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(ComponentPullModule).command(ComponentPushModule).command(ComponentGetModule).command(ComponentRemoveModule).command(ComponentListModule).command(ComponentUpdateModule).demandCommand(),
   handler: () => {
     yargs3.help();
   }
@@ -1963,12 +1975,12 @@ import { UncachedCanvasClient as UncachedCanvasClient7 } from "@uniformdev/canva
 var CompositionGetModule = {
   command: "get <id>",
   describe: "Fetch a composition",
-  builder: (yargs33) => withFormatOptions(
+  builder: (yargs34) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs33.positional("id", { demandOption: true, describe: "Composition/pattern public ID to fetch" }).option({
+            yargs34.positional("id", { demandOption: true, describe: "Composition/pattern public ID to fetch" }).option({
               resolvePatterns: {
                 type: "boolean",
                 default: false,
@@ -2045,14 +2057,15 @@ var CompositionListModule = {
   command: "list",
   describe: "List compositions",
   aliases: ["ls"],
-  builder: (yargs33) => withFormatOptions(
+  builder: (yargs34) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs33.options({
+            yargs34.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,
@@ -2091,6 +2104,7 @@ var CompositionListModule = {
     proxy,
     limit,
     offset,
+    search,
     format,
     filename,
     onlyCompositions,
@@ -2106,6 +2120,7 @@ var CompositionListModule = {
     const res = await client.getCompositionList({
       limit,
       offset,
+      search: search.length > 0 ? search : void 0,
       pattern: onlyCompositions ? false : onlyPatterns ? true : void 0,
       state: convertStateOption(state),
       skipPatternResolution: !resolvePatterns,
@@ -2120,12 +2135,12 @@ var CompositionListModule = {
 var ComponentPatternListModule = {
   ...CompositionListModule,
   describe: "List component patterns",
-  builder: (yargs33) => withFormatOptions(
+  builder: (yargs34) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs33.options({
+            yargs34.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: {
@@ -2200,6 +2215,7 @@ function createComponentInstanceEngineDataSource({
     }
   }
   return {
+    name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
       await client.removeComposition({ compositionId: providerId });
@@ -2214,11 +2230,11 @@ function createComponentInstanceEngineDataSource({
 var CompositionPublishModule = {
   command: "publish [ids]",
   describe: "Publishes composition(s)",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("ids", {
+          yargs34.positional("ids", {
             describe: "Publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
@@ -2292,11 +2308,11 @@ var CompositionPublishModule = {
 var ComponentPatternPublishModule = {
   ...CompositionPublishModule,
   describe: "Publishes component pattern(s)",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("ids", {
+          yargs34.positional("ids", {
             describe: "Publishes component pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
@@ -2336,12 +2352,12 @@ import { UncachedFileClient as UncachedFileClient3 } from "@uniformdev/files";
 var CompositionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all compositions to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs33.positional("directory", {
+            yargs34.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", {
@@ -2400,6 +2416,7 @@ var CompositionPullModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: (packageContents == null ? void 0 : packageContents.compositions) ?? [],
         selectIdentifier: selectIdentifier3,
         selectDisplayName: selectDisplayName3,
@@ -2443,12 +2460,12 @@ var CompositionPullModule = {
 var ComponentPatternPullModule = {
   ...CompositionPullModule,
   describe: "Pulls all component patterns to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs33.positional("directory", {
+            yargs34.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", {
@@ -2488,12 +2505,12 @@ 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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs33.positional("directory", {
+            yargs34.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", {
@@ -2543,6 +2560,7 @@ var CompositionPushModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.compositions ?? [],
         selectIdentifier: selectIdentifier3,
         selectDisplayName: selectDisplayName3
@@ -2582,12 +2600,12 @@ var CompositionPushModule = {
 var ComponentPatternPushModule = {
   ...CompositionPushModule,
   describe: "Pushes all component patterns from files in a directory to Uniform Canvas",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs33.positional("directory", {
+            yargs34.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", {
@@ -2621,10 +2639,10 @@ var CompositionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a composition",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("id", { demandOption: true, describe: "Composition/pattern public ID to delete" })
+        yargs34.positional("id", { demandOption: true, describe: "Composition/pattern public ID to delete" })
       )
     )
   ),
@@ -2647,10 +2665,10 @@ import { diffJson as diffJson2 } from "diff";
 var CompositionUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a composition(s)",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("ids", {
+        yargs34.positional("ids", {
           describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
           type: "string"
         }).option("all", {
@@ -2742,10 +2760,10 @@ var CompositionUnpublishModule = {
 var ComponentPatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a component pattern(s)",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("ids", {
+        yargs34.positional("ids", {
           describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
           type: "string"
         }).option("all", {
@@ -2780,11 +2798,11 @@ var CompositionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a composition",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
-          yargs33.positional("filename", { demandOption: true, describe: "Composition/pattern file to put" })
+          yargs34.positional("filename", { demandOption: true, describe: "Composition/pattern file to put" })
         )
       )
     )
@@ -2808,7 +2826,7 @@ var ComponentPatternModule = {
   command: "component-pattern <command>",
   aliases: ["pattern"],
   describe: "Commands for Canvas component patterns",
-  builder: (yargs33) => yargs33.command(ComponentPatternPullModule).command(ComponentPatternPushModule).command(ComponentPatternGetModule).command(ComponentPatternRemoveModule).command(ComponentPatternListModule).command(ComponentPatternUpdateModule).command(ComponentPatternPublishModule).command(ComponentPatternUnpublishModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(ComponentPatternPullModule).command(ComponentPatternPushModule).command(ComponentPatternGetModule).command(ComponentPatternRemoveModule).command(ComponentPatternListModule).command(ComponentPatternUpdateModule).command(ComponentPatternPublishModule).command(ComponentPatternUnpublishModule).demandCommand(),
   handler: () => {
     yargs4.help();
   }
@@ -2820,7 +2838,7 @@ var CompositionModule = {
   command: "composition <command>",
   describe: "Commands for Canvas compositions",
   aliases: ["comp"],
-  builder: (yargs33) => yargs33.command(CompositionPullModule).command(CompositionPushModule).command(CompositionGetModule).command(CompositionRemoveModule).command(CompositionListModule).command(CompositionUpdateModule).command(CompositionPublishModule).command(CompositionUnpublishModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(CompositionPullModule).command(CompositionPushModule).command(CompositionGetModule).command(CompositionRemoveModule).command(CompositionListModule).command(CompositionUpdateModule).command(CompositionPublishModule).command(CompositionUnpublishModule).demandCommand(),
   handler: () => {
     yargs5.help();
   }
@@ -2834,12 +2852,12 @@ import { ContentClient } from "@uniformdev/canvas";
 var ContentTypeGetModule = {
   command: "get <id>",
   describe: "Get a content type",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs33.positional("id", { demandOption: true, describe: "Content type public ID to fetch" })
+          yargs34.positional("id", { demandOption: true, describe: "Content type public ID to fetch" })
         )
       )
     )
@@ -2861,7 +2879,7 @@ import { ContentClient as ContentClient2 } from "@uniformdev/canvas";
 var ContentTypeListModule = {
   command: "list",
   describe: "List content types",
-  builder: (yargs33) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs33)))),
+  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new ContentClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -2894,6 +2912,7 @@ function createContentTypeEngineDataSource({
     }
   }
   return {
+    name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
       await client.deleteContentType({ contentTypeId: providerId });
@@ -2908,11 +2927,11 @@ function createContentTypeEngineDataSource({
 var ContentTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all content types to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -2963,6 +2982,7 @@ var ContentTypePullModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.contentTypes ?? [],
         selectIdentifier: selectContentTypeIdentifier,
         selectDisplayName: selectContentTypeDisplayName,
@@ -2995,11 +3015,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -3042,6 +3062,7 @@ var ContentTypePushModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.contentTypes ?? [],
         selectIdentifier: selectContentTypeIdentifier,
         selectDisplayName: selectContentTypeDisplayName
@@ -3071,10 +3092,10 @@ var ContentTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a content type",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
+        yargs34.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
       )
     )
   ),
@@ -3091,10 +3112,10 @@ var ContentTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a content type",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("filename", { demandOption: true, describe: "Content type file to put" })
+        yargs34.positional("filename", { demandOption: true, describe: "Content type file to put" })
       )
     )
   ),
@@ -3111,7 +3132,7 @@ var ContentTypeModule = {
   command: "contenttype <command>",
   aliases: ["ct"],
   describe: "Commands for Content Types",
-  builder: (yargs33) => yargs33.command(ContentTypeGetModule).command(ContentTypeListModule).command(ContentTypeRemoveModule).command(ContentTypeUpdateModule).command(ContentTypePullModule).command(ContentTypePushModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(ContentTypeGetModule).command(ContentTypeListModule).command(ContentTypeRemoveModule).command(ContentTypeUpdateModule).command(ContentTypePullModule).command(ContentTypePushModule).demandCommand(),
   handler: () => {
     yargs6.help();
   }
@@ -3125,11 +3146,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        yargs33.positional("id", { demandOption: true, describe: "Data source public ID to fetch" })
+        yargs34.positional("id", { demandOption: true, describe: "Data source public ID to fetch" })
       )
     )
   ),
@@ -3147,10 +3168,10 @@ var DataSourceRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a data source",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("id", { demandOption: true, describe: "Data source public ID to delete" })
+        yargs34.positional("id", { demandOption: true, describe: "Data source public ID to delete" })
       )
     )
   ),
@@ -3167,10 +3188,10 @@ var DataSourceUpdateModule = {
   command: "update <dataSource>",
   aliases: ["put"],
   describe: "Insert or update a data source",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("dataSource", { demandOption: true, describe: "Data source JSON to put" }).option("integrationType", {
+        yargs34.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
@@ -3190,7 +3211,7 @@ var DataSourceModule = {
   command: "datasource <command>",
   aliases: ["ds"],
   describe: "Commands for Data Source definitions",
-  builder: (yargs33) => yargs33.command(DataSourceGetModule).command(DataSourceRemoveModule).command(DataSourceUpdateModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(DataSourceGetModule).command(DataSourceRemoveModule).command(DataSourceUpdateModule).demandCommand(),
   handler: () => {
     yargs7.help();
   }
@@ -3205,12 +3226,12 @@ var DataTypeGetModule = {
   command: "get <id>",
   describe: "Get a data type",
   aliases: ["ls"],
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs33.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
+          yargs34.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
         )
       )
     )
@@ -3233,7 +3254,7 @@ var DataTypeListModule = {
   command: "list",
   describe: "List data types",
   aliases: ["ls"],
-  builder: (yargs33) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs33)))),
+  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new DataTypeClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -3266,6 +3287,7 @@ function createDataTypeEngineDataSource({
     }
   }
   return {
+    name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
       await client.remove({ typeId: providerId });
@@ -3282,11 +3304,11 @@ function createDataTypeEngineDataSource({
 var DataTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all data types to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -3337,6 +3359,7 @@ var DataTypePullModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.dataTypes ?? [],
         selectIdentifier: selectIdentifier4,
         selectDisplayName: selectDisplayName4,
@@ -3369,11 +3392,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -3416,6 +3439,7 @@ var DataTypePushModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.dataTypes ?? [],
         selectIdentifier: selectIdentifier4,
         selectDisplayName: selectDisplayName4
@@ -3445,10 +3469,10 @@ var DataTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a data type",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
+        yargs34.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
       )
     )
   ),
@@ -3465,10 +3489,10 @@ var DataTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a data type",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("filename", { demandOption: true, describe: "Data type file to put" })
+        yargs34.positional("filename", { demandOption: true, describe: "Data type file to put" })
       )
     )
   ),
@@ -3485,7 +3509,7 @@ var DataTypeModule = {
   command: "datatype <command>",
   aliases: ["dt"],
   describe: "Commands for Data Type definitions",
-  builder: (yargs33) => yargs33.command(DataTypeGetModule).command(DataTypePullModule).command(DataTypePushModule).command(DataTypeRemoveModule).command(DataTypeListModule).command(DataTypeUpdateModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(DataTypeGetModule).command(DataTypePullModule).command(DataTypePushModule).command(DataTypeRemoveModule).command(DataTypeListModule).command(DataTypeUpdateModule).demandCommand(),
   handler: () => {
     yargs8.help();
   }
@@ -3499,13 +3523,13 @@ import { ContentClient as ContentClient7 } from "@uniformdev/canvas";
 var EntryGetModule = {
   command: "get <id>",
   describe: "Get an entry",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            yargs33.positional("id", { demandOption: true, describe: "Entry public ID to fetch" }),
+            yargs34.positional("id", { demandOption: true, describe: "Entry public ID to fetch" }),
             // for backwards compatibility, we default to the "published" state, unlike compositions
             "published"
           )
@@ -3544,15 +3568,20 @@ var EntryGetModule = {
 
 // src/commands/canvas/commands/entry/list.ts
 import { ContentClient as ContentClient8 } from "@uniformdev/canvas";
+var LEGACY_DEFAULT_LIMIT = 1e3;
 var EntryListModule = {
   command: "list",
   describe: "List entries",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs33,
+            yargs34.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: "" }
+            }),
             // for backwards compatibility, we default to the "published" state, unlike compositions
             "published"
           )
@@ -3560,12 +3589,26 @@ var EntryListModule = {
       )
     )
   ),
-  handler: async ({ apiHost, edgeApiHost, apiKey, proxy, format, filename, project: projectId, state }) => {
+  handler: async ({
+    apiHost,
+    edgeApiHost,
+    apiKey,
+    proxy,
+    format,
+    filename,
+    project: projectId,
+    state,
+    limit,
+    offset,
+    search
+  }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new ContentClient8({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId, bypassCache: true });
     const res = await client.getEntries({
-      offset: 0,
-      limit: 1e3,
+      offset,
+      limit: search.length > 0 && limit === LEGACY_DEFAULT_LIMIT ? 100 : limit,
+      // Search API requires a lower default limit (100)
+      search: search.length > 0 ? search : void 0,
       state: convertStateOption(state),
       skipOverridesResolution: true,
       skipPatternResolution: true,
@@ -3620,6 +3663,7 @@ function createEntryEngineDataSource({
     }
   }
   return {
+    name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
       await client.deleteEntry({ entryId: providerId });
@@ -3634,11 +3678,11 @@ function createEntryEngineDataSource({
 var EntryPublishModule = {
   command: "publish [ids]",
   describe: "Publishes entry(ies)",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("ids", {
+          yargs34.positional("ids", {
             describe: "Publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
@@ -3693,12 +3737,12 @@ import { UncachedFileClient as UncachedFileClient5 } from "@uniformdev/files";
 var EntryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all entries to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs33.positional("directory", {
+            yargs34.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", {
@@ -3752,6 +3796,7 @@ var EntryPullModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.entries ?? [],
         selectIdentifier: selectEntryIdentifier,
         selectDisplayName: selectEntryDisplayName,
@@ -3797,12 +3842,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs33.positional("directory", {
+            yargs34.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", {
@@ -3847,6 +3892,7 @@ var EntryPushModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.entries ?? [],
         selectIdentifier: selectEntryIdentifier,
         selectDisplayName: selectEntryDisplayName
@@ -3888,10 +3934,10 @@ var EntryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an entry",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
+        yargs34.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
       )
     )
   ),
@@ -3908,10 +3954,10 @@ import { diffJson as diffJson3 } from "diff";
 var EntryUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish an entry(ies)",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("ids", {
+        yargs34.positional("ids", {
           describe: "Un-publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
           type: "string"
         }).option("all", {
@@ -3984,11 +4030,11 @@ var EntryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an entry",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
-          yargs33.positional("filename", { demandOption: true, describe: "Entry file to put" })
+          yargs34.positional("filename", { demandOption: true, describe: "Entry file to put" })
         )
       )
     )
@@ -4005,7 +4051,7 @@ var EntryUpdateModule = {
 var EntryModule = {
   command: "entry <command>",
   describe: "Commands for Entries",
-  builder: (yargs33) => yargs33.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).command(EntryPublishModule).command(EntryUnpublishModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).command(EntryPublishModule).command(EntryUnpublishModule).demandCommand(),
   handler: () => {
     yargs9.help();
   }
@@ -4019,13 +4065,13 @@ import { ContentClient as ContentClient16 } from "@uniformdev/canvas";
 var EntryPatternGetModule = {
   command: "get <id>",
   describe: "Get an entry pattern",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            yargs33.positional("id", {
+            yargs34.positional("id", {
               demandOption: true,
               describe: "Entry pattern public ID to fetch"
             }),
@@ -4060,8 +4106,8 @@ import { ContentClient as ContentClient17 } from "@uniformdev/canvas";
 var EntryPatternListModule = {
   command: "list",
   describe: "List entry patterns",
-  builder: (yargs33) => withConfiguration(
-    withFormatOptions(withApiOptions(withProjectOptions(withStateOptions(yargs33, "published"))))
+  builder: (yargs34) => withConfiguration(
+    withFormatOptions(withApiOptions(withProjectOptions(withStateOptions(yargs34, "published"))))
   ),
   handler: async ({ apiHost, edgeApiHost, apiKey, proxy, format, filename, project: projectId, state }) => {
     const fetch3 = nodeFetchProxy(proxy);
@@ -4084,11 +4130,11 @@ import { ContentClient as ContentClient18 } from "@uniformdev/canvas";
 var EntryPatternPublishModule = {
   command: "publish [ids]",
   describe: "Publishes entry pattern(s)",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("ids", {
+          yargs34.positional("ids", {
             describe: "Publishes entry pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
@@ -4143,12 +4189,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs33.positional("directory", {
+            yargs34.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", {
@@ -4202,6 +4248,7 @@ var EntryPatternPullModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.entries ?? [],
         selectIdentifier: selectEntryIdentifier,
         selectDisplayName: selectEntryDisplayName,
@@ -4247,12 +4294,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs33.positional("directory", {
+            yargs34.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", {
@@ -4297,6 +4344,7 @@ var EntryPatternPushModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.entries ?? [],
         selectIdentifier: selectEntryIdentifier,
         selectDisplayName: selectEntryDisplayName
@@ -4338,10 +4386,10 @@ var EntryPatternRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an entry pattern",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("id", { demandOption: true, describe: "Entry pattern public ID to delete" })
+        yargs34.positional("id", { demandOption: true, describe: "Entry pattern public ID to delete" })
       )
     )
   ),
@@ -4358,10 +4406,10 @@ import { diffJson as diffJson4 } from "diff";
 var EntryPatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish an entry patterns",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("ids", {
+        yargs34.positional("ids", {
           describe: "Un-publishes entry patterns by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
           type: "string"
         }).option("all", {
@@ -4434,11 +4482,11 @@ var EntryPatternUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an entry pattern",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
-          yargs33.positional("filename", { demandOption: true, describe: "Entry pattern file to put" })
+          yargs34.positional("filename", { demandOption: true, describe: "Entry pattern file to put" })
         )
       )
     )
@@ -4455,7 +4503,7 @@ var EntryPatternUpdateModule = {
 var EntryPatternModule = {
   command: "entry-pattern <command>",
   describe: "Commands for Entry patterns",
-  builder: (yargs33) => yargs33.command(EntryPatternGetModule).command(EntryPatternListModule).command(EntryPatternRemoveModule).command(EntryPatternUpdateModule).command(EntryPatternPullModule).command(EntryPatternPushModule).command(EntryPatternPublishModule).command(EntryPatternUnpublishModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(EntryPatternGetModule).command(EntryPatternListModule).command(EntryPatternRemoveModule).command(EntryPatternUpdateModule).command(EntryPatternPullModule).command(EntryPatternPushModule).command(EntryPatternPublishModule).command(EntryPatternUnpublishModule).demandCommand(),
   handler: () => {
     yargs10.help();
   }
@@ -4484,6 +4532,7 @@ function createLocaleEngineDataSource({
     }
   }
   return {
+    name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
       await client.remove({ locale: providerId });
@@ -4500,11 +4549,11 @@ function createLocaleEngineDataSource({
 var LocalePullModule = {
   command: "pull <directory>",
   describe: "Pulls all locales to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -4555,6 +4604,7 @@ var LocalePullModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.locales ?? [],
         selectIdentifier: (i) => i.locale,
         selectDisplayName: (i) => i.displayName,
@@ -4587,11 +4637,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -4634,6 +4684,7 @@ var LocalePushModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.locales ?? [],
         selectIdentifier: (locale) => locale.locale,
         selectDisplayName: (locale) => locale.displayName
@@ -4661,7 +4712,7 @@ var LocalePushModule = {
 var LocaleModule = {
   command: "locale <command>",
   describe: "Commands for locale definitions",
-  builder: (yargs33) => yargs33.command(LocalePullModule).command(LocalePushModule),
+  builder: (yargs34) => yargs34.command(LocalePullModule).command(LocalePushModule),
   handler: () => {
     yargs11.help();
   }
@@ -4675,12 +4726,12 @@ import { PromptClient } from "@uniformdev/canvas";
 var PromptGetModule = {
   command: "get <id>",
   describe: "Get a prompt",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs33.positional("id", { demandOption: true, describe: "Prompt ID to fetch" })
+          yargs34.positional("id", { demandOption: true, describe: "Prompt ID to fetch" })
         )
       )
     )
@@ -4701,7 +4752,7 @@ import { PromptClient as PromptClient2 } from "@uniformdev/canvas";
 var PromptListModule = {
   command: "list",
   describe: "List prompts",
-  builder: (yargs33) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs33)))),
+  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new PromptClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -4734,6 +4785,7 @@ function createPromptEngineDataSource({
     }
   }
   return {
+    name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
       await client.remove({ promptId: providerId });
@@ -4748,12 +4800,12 @@ function createPromptEngineDataSource({
 var PromptPullModule = {
   command: "pull <directory>",
   describe: "Pulls all prompts to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs33.positional("directory", {
+            yargs34.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", {
@@ -4805,6 +4857,7 @@ var PromptPullModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.prompts ?? [],
         selectIdentifier: selectPromptIdentifier,
         selectDisplayName: selectPromptDisplayName,
@@ -4837,12 +4890,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs33.positional("directory", {
+            yargs34.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", {
@@ -4886,6 +4939,7 @@ var PromptPushModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.prompts ?? [],
         selectIdentifier: selectPromptIdentifier,
         selectDisplayName: selectPromptDisplayName
@@ -4915,9 +4969,9 @@ var PromptRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a prompt",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs33.positional("id", { demandOption: true, describe: "Prompt ID to delete" }))
+      withProjectOptions(yargs34.positional("id", { demandOption: true, describe: "Prompt ID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -4933,10 +4987,10 @@ var PromptUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a prompt",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("filename", { demandOption: true, describe: "Prompt file to put" })
+        yargs34.positional("filename", { demandOption: true, describe: "Prompt file to put" })
       )
     )
   ),
@@ -4953,39 +5007,242 @@ var PromptModule = {
   command: "prompt <command>",
   aliases: ["dt"],
   describe: "Commands for AI Prompt definitions",
-  builder: (yargs33) => yargs33.command(PromptGetModule).command(PromptListModule).command(PromptPullModule).command(PromptPushModule).command(PromptRemoveModule).command(PromptUpdateModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(PromptGetModule).command(PromptListModule).command(PromptPullModule).command(PromptPushModule).command(PromptRemoveModule).command(PromptUpdateModule).demandCommand(),
   handler: () => {
     yargs12.help();
   }
 };
 
+// src/commands/canvas/commands/workflow.ts
+import yargs13 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})`;
+
+// src/commands/canvas/workflowEngineDataSource.ts
+function createWorkflowEngineDataSource({
+  client
+}) {
+  async function* getObjects() {
+    const workflows = paginateAsync(async () => (await client.get()).results, {
+      pageSize: 100
+    });
+    for await (const workflow of workflows) {
+      const { modified, modifiedBy, created, createdBy, ...workflowWithoutStatistics } = workflow;
+      const result = {
+        id: selectIdentifier5(workflow),
+        displayName: selectDisplayName5(workflow),
+        providerId: workflow.id,
+        object: workflowWithoutStatistics
+      };
+      yield result;
+    }
+  }
+  return {
+    name: "Uniform API",
+    objects: getObjects(),
+    deleteObject: async (providerId) => {
+      await client.remove({ workflowId: providerId });
+    },
+    writeObject: async (object) => {
+      await client.upsert({ workflow: object.object });
+    }
+  };
+}
+
+// src/commands/canvas/commands/workflow/pull.ts
+var WorkflowPullModule = {
+  command: "pull <directory>",
+  describe: "Pulls all workflows to local files in a directory",
+  builder: (yargs34) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withDiffOptions(
+          yargs34.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 WorkflowClient({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const source = createWorkflowEngineDataSource({ client });
+    let target;
+    const isPackage = isPathAPackageFile(directory);
+    if (isPackage) {
+      const packageContents = readCanvasPackage(directory, false);
+      target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
+        objects: packageContents.workflows ?? [],
+        selectIdentifier: selectIdentifier5,
+        selectDisplayName: selectDisplayName5,
+        onSyncComplete: async (_, synced) => {
+          packageContents.workflows = 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/workflow/push.ts
+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: (yargs34) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withDiffOptions(
+          yargs34.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 WorkflowClient2({ 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.workflows ?? [],
+        selectIdentifier: selectIdentifier5,
+        selectDisplayName: selectDisplayName5
+      });
+    } else {
+      source = await createFileSyncEngineDataSource({
+        directory,
+        selectIdentifier: selectIdentifier5,
+        selectDisplayName: selectDisplayName5
+      });
+    }
+    const target = createWorkflowEngineDataSource({ client });
+    await syncEngine({
+      source,
+      target,
+      mode,
+      whatIf,
+      allowEmptySource,
+      log: createSyncEngineConsoleLogger({ diffMode })
+    });
+  }
+};
+
+// src/commands/canvas/commands/workflow.ts
+var WorkflowModule = {
+  command: "workflow <command>",
+  aliases: ["wf"],
+  describe: "Commands for Canvas workflows",
+  builder: (yargs34) => yargs34.command(WorkflowPullModule).command(WorkflowPushModule).demandCommand(),
+  handler: () => {
+    yargs13.help();
+  }
+};
+
 // src/commands/canvas/index.ts
 var CanvasCommand = {
   command: "canvas <command>",
   aliases: ["cv", "pm", "presentation"],
   describe: "Uniform Canvas commands",
-  builder: (yargs33) => yargs33.command(CompositionModule).command(ComponentModule).command(DataTypeModule).command(DataSourceModule).command(CategoryModule).command(ComponentPatternModule).command(ContentTypeModule).command(EntryModule).command(EntryPatternModule).command(PromptModule).command(AssetModule).command(LocaleModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(CompositionModule).command(ComponentModule).command(DataTypeModule).command(DataSourceModule).command(CategoryModule).command(ComponentPatternModule).command(ContentTypeModule).command(EntryModule).command(EntryPatternModule).command(PromptModule).command(AssetModule).command(LocaleModule).command(WorkflowModule).demandCommand(),
   handler: () => {
-    yargs13.showHelp();
+    yargs14.showHelp();
   }
 };
 
 // src/commands/context/index.ts
-import yargs20 from "yargs";
+import yargs21 from "yargs";
 
 // src/commands/context/commands/aggregate.ts
-import yargs14 from "yargs";
+import yargs15 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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs33.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
+          yargs34.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
         )
       )
     )
@@ -5009,7 +5266,7 @@ var AggregateListModule = {
   command: "list",
   describe: "List aggregates",
   aliases: ["ls"],
-  builder: (yargs33) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs33)))),
+  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedAggregateClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -5022,8 +5279,8 @@ var AggregateListModule = {
 import { UncachedAggregateClient as UncachedAggregateClient3 } from "@uniformdev/context/api";
 
 // src/commands/context/commands/aggregate/_util.ts
-var selectIdentifier5 = (source) => source.id;
-var selectDisplayName5 = (source) => `${source.name} (pid: ${source.id})`;
+var selectIdentifier6 = (source) => source.id;
+var selectDisplayName6 = (source) => `${source.name} (pid: ${source.id})`;
 
 // src/commands/context/aggregateEngineDataSource.ts
 function createAggregateEngineDataSource({
@@ -5034,8 +5291,8 @@ function createAggregateEngineDataSource({
     const aggregates = (await client.get({ type })).aggregates;
     for await (const def of aggregates) {
       const result = {
-        id: selectIdentifier5(def),
-        displayName: selectDisplayName5(def),
+        id: selectIdentifier6(def),
+        displayName: selectDisplayName6(def),
         providerId: def.id,
         object: def
       };
@@ -5044,6 +5301,7 @@ function createAggregateEngineDataSource({
   }
   const writtenObjects = [];
   return {
+    name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
       await client.remove({ aggregateId: providerId });
@@ -5075,11 +5333,11 @@ function writeContextPackage(filename, packageContents) {
 var AggregatePullModule = {
   command: "pull <directory>",
   describe: "Pulls all aggregates to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -5124,9 +5382,10 @@ var AggregatePullModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.aggregates ?? [],
-        selectIdentifier: selectIdentifier5,
-        selectDisplayName: selectDisplayName5,
+        selectIdentifier: selectIdentifier6,
+        selectDisplayName: selectDisplayName6,
         onSyncComplete: async (_, synced) => {
           packageContents.aggregates = synced;
           writeContextPackage(directory, packageContents);
@@ -5135,8 +5394,8 @@ var AggregatePullModule = {
     } else {
       target = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier5,
-        selectDisplayName: selectDisplayName5,
+        selectIdentifier: selectIdentifier6,
+        selectDisplayName: selectDisplayName6,
         format
       });
     }
@@ -5156,11 +5415,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -5197,15 +5456,16 @@ var AggregatePushModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.aggregates ?? [],
-        selectIdentifier: selectIdentifier5,
-        selectDisplayName: selectDisplayName5
+        selectIdentifier: selectIdentifier6,
+        selectDisplayName: selectDisplayName6
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier5,
-        selectDisplayName: selectDisplayName5
+        selectIdentifier: selectIdentifier6,
+        selectDisplayName: selectDisplayName6
       });
     }
     const target = createAggregateEngineDataSource({ client });
@@ -5227,10 +5487,10 @@ var AggregateRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an aggregate",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
+        yargs34.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
       )
     )
   ),
@@ -5247,10 +5507,10 @@ var AggregateUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an aggregate",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
+        yargs34.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
       )
     )
   ),
@@ -5267,25 +5527,25 @@ var AggregateModule = {
   command: "aggregate <command>",
   aliases: ["agg", "intent", "audience"],
   describe: "Commands for Context aggregates (intents, audiences)",
-  builder: (yargs33) => yargs33.command(AggregatePullModule).command(AggregatePushModule).command(AggregateGetModule).command(AggregateRemoveModule).command(AggregateListModule).command(AggregateUpdateModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(AggregatePullModule).command(AggregatePushModule).command(AggregateGetModule).command(AggregateRemoveModule).command(AggregateListModule).command(AggregateUpdateModule).demandCommand(),
   handler: () => {
-    yargs14.help();
+    yargs15.help();
   }
 };
 
 // src/commands/context/commands/enrichment.ts
-import yargs15 from "yargs";
+import yargs16 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: (yargs33) => withFormatOptions(
+  builder: (yargs34) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs33.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
+          yargs34.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
         )
       )
     )
@@ -5310,7 +5570,7 @@ var EnrichmentListModule = {
   command: "list",
   describe: "List enrichments",
   aliases: ["ls"],
-  builder: (yargs33) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs33)))),
+  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedEnrichmentClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -5323,8 +5583,8 @@ var EnrichmentListModule = {
 import { UncachedEnrichmentClient as UncachedEnrichmentClient3 } from "@uniformdev/context/api";
 
 // src/commands/context/commands/enrichment/_util.ts
-var selectIdentifier6 = (source) => source.id;
-var selectDisplayName6 = (source) => `${source.name} (pid: ${source.id})`;
+var selectIdentifier7 = (source) => source.id;
+var selectDisplayName7 = (source) => `${source.name} (pid: ${source.id})`;
 
 // src/commands/context/enrichmentEngineDataSource.ts
 function createEnrichmentEngineDataSource({
@@ -5334,8 +5594,8 @@ function createEnrichmentEngineDataSource({
     const enrichments = (await client.get()).enrichments;
     for await (const def of enrichments) {
       const result = {
-        id: selectIdentifier6(def),
-        displayName: selectDisplayName6(def),
+        id: selectIdentifier7(def),
+        displayName: selectDisplayName7(def),
         providerId: def.id,
         object: def
       };
@@ -5343,6 +5603,7 @@ function createEnrichmentEngineDataSource({
     }
   }
   return {
+    name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
       await client.removeCategory({ enrichmentId: providerId });
@@ -5391,6 +5652,7 @@ var createEnrichmentValueEngineDataSource = ({
     }
   };
   return {
+    name: "Uniform API",
     objects: iterator(),
     deleteObject: async (providerId) => {
       if (!client) {
@@ -5411,11 +5673,11 @@ var createEnrichmentValueEngineDataSource = ({
 var EnrichmentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all enrichments to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -5460,9 +5722,10 @@ var EnrichmentPullModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.enrichments ?? [],
-        selectIdentifier: selectIdentifier6,
-        selectDisplayName: selectDisplayName6,
+        selectIdentifier: selectIdentifier7,
+        selectDisplayName: selectDisplayName7,
         onSyncComplete: async (_, synced) => {
           packageContents.enrichments = synced;
           writeContextPackage(directory, packageContents);
@@ -5471,8 +5734,8 @@ var EnrichmentPullModule = {
     } else {
       target = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier6,
-        selectDisplayName: selectDisplayName6,
+        selectIdentifier: selectIdentifier7,
+        selectDisplayName: selectDisplayName7,
         format
       });
     }
@@ -5492,11 +5755,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -5533,15 +5796,16 @@ var EnrichmentPushModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.enrichments ?? [],
-        selectIdentifier: selectIdentifier6,
-        selectDisplayName: selectDisplayName6
+        selectIdentifier: selectIdentifier7,
+        selectDisplayName: selectDisplayName7
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier6,
-        selectDisplayName: selectDisplayName6
+        selectIdentifier: selectIdentifier7,
+        selectDisplayName: selectDisplayName7
       });
     }
     const target = createEnrichmentEngineDataSource({ client });
@@ -5562,10 +5826,10 @@ var EnrichmentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an enrichment category and its values",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
+        yargs34.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
       )
     )
   ),
@@ -5581,14 +5845,14 @@ var EnrichmentModule = {
   command: "enrichment <command>",
   aliases: ["enr"],
   describe: "Commands for Context enrichments",
-  builder: (yargs33) => yargs33.command(EnrichmentPullModule).command(EnrichmentPushModule).command(EnrichmentGetModule).command(EnrichmentRemoveModule).command(EnrichmentListModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(EnrichmentPullModule).command(EnrichmentPushModule).command(EnrichmentGetModule).command(EnrichmentRemoveModule).command(EnrichmentListModule).demandCommand(),
   handler: () => {
-    yargs15.help();
+    yargs16.help();
   }
 };
 
 // src/commands/context/commands/manifest.ts
-import yargs16 from "yargs";
+import yargs17 from "yargs";
 
 // src/commands/context/commands/manifest/get.ts
 import { ApiClientError, UncachedManifestClient } from "@uniformdev/context/api";
@@ -5599,10 +5863,10 @@ var ManifestGetModule = {
   command: "get [output]",
   aliases: ["dl", "download"],
   describe: "Download the Uniform Context manifest for a project",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.option("preview", {
+        yargs34.option("preview", {
           describe: "If set, fetches the unpublished preview manifest (The API key must have permission)",
           default: false,
           type: "boolean",
@@ -5664,7 +5928,7 @@ import { exit as exit2 } from "process";
 var ManifestPublishModule = {
   command: "publish",
   describe: "Publish the Uniform Context manifest for a project",
-  builder: (yargs33) => withConfiguration(withApiOptions(withProjectOptions(yargs33))),
+  builder: (yargs34) => withConfiguration(withApiOptions(withProjectOptions(yargs34))),
   handler: async ({ apiKey, apiHost, proxy, project }) => {
     const fetch3 = nodeFetchProxy(proxy);
     try {
@@ -5697,25 +5961,25 @@ var ManifestModule = {
   command: "manifest <command>",
   describe: "Commands for context manifests",
   aliases: ["man"],
-  builder: (yargs33) => yargs33.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
   handler: () => {
-    yargs16.help();
+    yargs17.help();
   }
 };
 
 // src/commands/context/commands/quirk.ts
-import yargs17 from "yargs";
+import yargs18 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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs33.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
+          yargs34.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
         )
       )
     )
@@ -5739,11 +6003,11 @@ var QuirkListModule = {
   command: "list",
   describe: "List quirks",
   aliases: ["ls"],
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs33.option("withIntegrations", {
+          yargs34.option("withIntegrations", {
             alias: ["i"],
             describe: "Whether to include meta-quirks created by integrations in the list. Defaults to false.",
             type: "boolean"
@@ -5764,8 +6028,8 @@ var QuirkListModule = {
 import { UncachedQuirkClient as UncachedQuirkClient3 } from "@uniformdev/context/api";
 
 // src/commands/context/commands/quirk/_util.ts
-var selectIdentifier7 = (source) => source.id;
-var selectDisplayName7 = (source) => `${source.name} (pid: ${source.id})`;
+var selectIdentifier8 = (source) => source.id;
+var selectDisplayName8 = (source) => `${source.name} (pid: ${source.id})`;
 
 // src/commands/context/quirkEngineDataSource.ts
 function createQuirkEngineDataSource({
@@ -5775,8 +6039,8 @@ function createQuirkEngineDataSource({
     const quirks = (await client.get({ withIntegrations: false })).quirks;
     for await (const def of quirks) {
       const result = {
-        id: selectIdentifier7(def),
-        displayName: selectDisplayName7(def),
+        id: selectIdentifier8(def),
+        displayName: selectDisplayName8(def),
         providerId: def.id,
         object: def
       };
@@ -5784,6 +6048,7 @@ function createQuirkEngineDataSource({
     }
   }
   return {
+    name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
       await client.remove({ quirkId: providerId });
@@ -5800,11 +6065,11 @@ function createQuirkEngineDataSource({
 var QuirkPullModule = {
   command: "pull <directory>",
   describe: "Pulls all quirks to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -5849,9 +6114,10 @@ var QuirkPullModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.quirks ?? [],
-        selectIdentifier: selectIdentifier7,
-        selectDisplayName: selectDisplayName7,
+        selectIdentifier: selectIdentifier8,
+        selectDisplayName: selectDisplayName8,
         onSyncComplete: async (_, synced) => {
           packageContents.quirks = synced;
           writeContextPackage(directory, packageContents);
@@ -5860,8 +6126,8 @@ var QuirkPullModule = {
     } else {
       target = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier7,
-        selectDisplayName: selectDisplayName7,
+        selectIdentifier: selectIdentifier8,
+        selectDisplayName: selectDisplayName8,
         format
       });
     }
@@ -5881,11 +6147,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -5922,15 +6188,16 @@ var QuirkPushModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.quirks ?? [],
-        selectIdentifier: selectIdentifier7,
-        selectDisplayName: selectDisplayName7
+        selectIdentifier: selectIdentifier8,
+        selectDisplayName: selectDisplayName8
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier7,
-        selectDisplayName: selectDisplayName7
+        selectIdentifier: selectIdentifier8,
+        selectDisplayName: selectDisplayName8
       });
     }
     const target = createQuirkEngineDataSource({ client });
@@ -5951,10 +6218,10 @@ var QuirkRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a quirk",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
+        yargs34.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
       )
     )
   ),
@@ -5971,10 +6238,10 @@ var QuirkUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a quirk",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("filename", { demandOption: true, describe: "Quirk file to put" })
+        yargs34.positional("filename", { demandOption: true, describe: "Quirk file to put" })
       )
     )
   ),
@@ -5991,25 +6258,25 @@ var QuirkModule = {
   command: "quirk <command>",
   aliases: ["qk"],
   describe: "Commands for Context quirks",
-  builder: (yargs33) => yargs33.command(QuirkPullModule).command(QuirkPushModule).command(QuirkGetModule).command(QuirkRemoveModule).command(QuirkListModule).command(QuirkUpdateModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(QuirkPullModule).command(QuirkPushModule).command(QuirkGetModule).command(QuirkRemoveModule).command(QuirkListModule).command(QuirkUpdateModule).demandCommand(),
   handler: () => {
-    yargs17.help();
+    yargs18.help();
   }
 };
 
 // src/commands/context/commands/signal.ts
-import yargs18 from "yargs";
+import yargs19 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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs33.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
+          yargs34.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
         )
       )
     )
@@ -6033,7 +6300,7 @@ var SignalListModule = {
   command: "list",
   describe: "List signals",
   aliases: ["ls"],
-  builder: (yargs33) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs33)))),
+  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedSignalClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -6046,8 +6313,8 @@ var SignalListModule = {
 import { UncachedSignalClient as UncachedSignalClient3 } from "@uniformdev/context/api";
 
 // src/commands/context/commands/signal/_util.ts
-var selectIdentifier8 = (source) => source.id;
-var selectDisplayName8 = (source) => `${source.name} (pid: ${source.id})`;
+var selectIdentifier9 = (source) => source.id;
+var selectDisplayName9 = (source) => `${source.name} (pid: ${source.id})`;
 
 // src/commands/context/signalEngineDataSource.ts
 function createSignalEngineDataSource({
@@ -6057,8 +6324,8 @@ function createSignalEngineDataSource({
     const signals = (await client.get()).signals;
     for await (const def of signals) {
       const result = {
-        id: selectIdentifier8(def),
-        displayName: selectDisplayName8(def),
+        id: selectIdentifier9(def),
+        displayName: selectDisplayName9(def),
         providerId: def.id,
         object: def
       };
@@ -6066,6 +6333,7 @@ function createSignalEngineDataSource({
     }
   }
   return {
+    name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
       await client.remove({ signalId: providerId });
@@ -6082,11 +6350,11 @@ function createSignalEngineDataSource({
 var SignalPullModule = {
   command: "pull <directory>",
   describe: "Pulls all signals to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -6131,9 +6399,10 @@ var SignalPullModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.signals ?? [],
-        selectIdentifier: selectIdentifier8,
-        selectDisplayName: selectDisplayName8,
+        selectIdentifier: selectIdentifier9,
+        selectDisplayName: selectDisplayName9,
         onSyncComplete: async (_, synced) => {
           packageContents.signals = synced;
           writeContextPackage(directory, packageContents);
@@ -6142,8 +6411,8 @@ var SignalPullModule = {
     } else {
       target = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier8,
-        selectDisplayName: selectDisplayName8,
+        selectIdentifier: selectIdentifier9,
+        selectDisplayName: selectDisplayName9,
         format
       });
     }
@@ -6163,11 +6432,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -6204,15 +6473,16 @@ var SignalPushModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.signals ?? [],
-        selectIdentifier: selectIdentifier8,
-        selectDisplayName: selectDisplayName8
+        selectIdentifier: selectIdentifier9,
+        selectDisplayName: selectDisplayName9
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier8,
-        selectDisplayName: selectDisplayName8
+        selectIdentifier: selectIdentifier9,
+        selectDisplayName: selectDisplayName9
       });
     }
     const target = createSignalEngineDataSource({ client });
@@ -6233,10 +6503,10 @@ var SignalRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a signal",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
+        yargs34.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
       )
     )
   ),
@@ -6253,10 +6523,10 @@ var SignalUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a signal",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("filename", { demandOption: true, describe: "Signal file to put" })
+        yargs34.positional("filename", { demandOption: true, describe: "Signal file to put" })
       )
     )
   ),
@@ -6273,25 +6543,25 @@ var SignalModule = {
   command: "signal <command>",
   aliases: ["sig"],
   describe: "Commands for Context signals",
-  builder: (yargs33) => yargs33.command(SignalPullModule).command(SignalPushModule).command(SignalGetModule).command(SignalRemoveModule).command(SignalListModule).command(SignalUpdateModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(SignalPullModule).command(SignalPushModule).command(SignalGetModule).command(SignalRemoveModule).command(SignalListModule).command(SignalUpdateModule).demandCommand(),
   handler: () => {
-    yargs18.help();
+    yargs19.help();
   }
 };
 
 // src/commands/context/commands/test.ts
-import yargs19 from "yargs";
+import yargs20 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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs33.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
+          yargs34.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
         )
       )
     )
@@ -6315,7 +6585,7 @@ var TestListModule = {
   command: "list",
   describe: "List tests",
   aliases: ["ls"],
-  builder: (yargs33) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs33)))),
+  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedTestClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -6328,8 +6598,8 @@ var TestListModule = {
 import { UncachedTestClient as UncachedTestClient3 } from "@uniformdev/context/api";
 
 // src/commands/context/commands/test/_util.ts
-var selectIdentifier9 = (source) => source.id;
-var selectDisplayName9 = (source) => `${source.name} (pid: ${source.id})`;
+var selectIdentifier10 = (source) => source.id;
+var selectDisplayName10 = (source) => `${source.name} (pid: ${source.id})`;
 
 // src/commands/context/testEngineDataSource.ts
 function createTestEngineDataSource({
@@ -6339,8 +6609,8 @@ function createTestEngineDataSource({
     const tests = (await client.get()).tests;
     for await (const def of tests) {
       const result = {
-        id: selectIdentifier9(def),
-        displayName: selectDisplayName9(def),
+        id: selectIdentifier10(def),
+        displayName: selectDisplayName10(def),
         providerId: def.id,
         object: def
       };
@@ -6348,6 +6618,7 @@ function createTestEngineDataSource({
     }
   }
   return {
+    name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
       await client.remove({ testId: providerId });
@@ -6364,11 +6635,11 @@ function createTestEngineDataSource({
 var TestPullModule = {
   command: "pull <directory>",
   describe: "Pulls all tests to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -6413,9 +6684,10 @@ var TestPullModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.tests ?? [],
-        selectIdentifier: selectIdentifier9,
-        selectDisplayName: selectDisplayName9,
+        selectIdentifier: selectIdentifier10,
+        selectDisplayName: selectDisplayName10,
         onSyncComplete: async (_, synced) => {
           packageContents.tests = synced;
           writeContextPackage(directory, packageContents);
@@ -6424,8 +6696,8 @@ var TestPullModule = {
     } else {
       target = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier9,
-        selectDisplayName: selectDisplayName9,
+        selectIdentifier: selectIdentifier10,
+        selectDisplayName: selectDisplayName10,
         format
       });
     }
@@ -6445,11 +6717,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -6486,15 +6758,16 @@ var TestPushModule = {
     if (isPackage) {
       const packageContents = readContextPackage(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.tests ?? [],
-        selectIdentifier: selectIdentifier9,
-        selectDisplayName: selectDisplayName9
+        selectIdentifier: selectIdentifier10,
+        selectDisplayName: selectDisplayName10
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier9,
-        selectDisplayName: selectDisplayName9
+        selectIdentifier: selectIdentifier10,
+        selectDisplayName: selectDisplayName10
       });
     }
     const target = createTestEngineDataSource({ client });
@@ -6515,10 +6788,10 @@ var TestRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a test",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("id", { demandOption: true, describe: "Test public ID to delete" })
+        yargs34.positional("id", { demandOption: true, describe: "Test public ID to delete" })
       )
     )
   ),
@@ -6535,9 +6808,9 @@ var TestUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a test",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs33.positional("filename", { demandOption: true, describe: "Test file to put" }))
+      withProjectOptions(yargs34.positional("filename", { demandOption: true, describe: "Test file to put" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
@@ -6552,9 +6825,9 @@ var TestUpdateModule = {
 var TestModule = {
   command: "test <command>",
   describe: "Commands for Context A/B tests",
-  builder: (yargs33) => yargs33.command(TestPullModule).command(TestPushModule).command(TestGetModule).command(TestRemoveModule).command(TestListModule).command(TestUpdateModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(TestPullModule).command(TestPushModule).command(TestGetModule).command(TestRemoveModule).command(TestListModule).command(TestUpdateModule).demandCommand(),
   handler: () => {
-    yargs19.help();
+    yargs20.help();
   }
 };
 
@@ -6563,20 +6836,20 @@ var ContextCommand = {
   command: "context <command>",
   aliases: ["ctx"],
   describe: "Uniform Context commands",
-  builder: (yargs33) => yargs33.command(ManifestModule).command(SignalModule).command(EnrichmentModule).command(AggregateModule).command(QuirkModule).command(TestModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(ManifestModule).command(SignalModule).command(EnrichmentModule).command(AggregateModule).command(QuirkModule).command(TestModule).demandCommand(),
   handler: () => {
-    yargs20.showHelp();
+    yargs21.showHelp();
   }
 };
 
 // src/commands/integration/index.ts
-import yargs23 from "yargs";
+import yargs24 from "yargs";
 
 // src/commands/integration/commands/definition.ts
-import yargs22 from "yargs";
+import yargs23 from "yargs";
 
 // src/commands/integration/commands/definition/edgehancer/edgehancer.ts
-import yargs21 from "yargs";
+import yargs22 from "yargs";
 
 // src/commands/integration/commands/definition/edgehancer/deploy.ts
 import { readFileSync as readFileSync2 } from "fs";
@@ -6614,8 +6887,8 @@ var EdgehancerClient = class extends ApiClient {
 };
 
 // src/commands/integration/commands/definition/edgehancer/util.ts
-function withEdgehancerIdOptions(yargs33) {
-  return yargs33.option("connectorType", {
+function withEdgehancerIdOptions(yargs34) {
+  return yargs34.option("connectorType", {
     describe: "Integration data connector type to edgehance, as defined in the integration manifest file.",
     demandOption: true,
     type: "string"
@@ -6635,11 +6908,11 @@ function withEdgehancerIdOptions(yargs33) {
 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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withTeamOptions(
         withEdgehancerIdOptions(
-          yargs33.positional("filename", {
+          yargs34.positional("filename", {
             demandOption: true,
             describe: "ESM code file to run for the target edgehancer hook. Refer to the documentation for expected types."
           })
@@ -6659,7 +6932,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: (yargs33) => withConfiguration(withApiOptions(withTeamOptions(withEdgehancerIdOptions(yargs33)))),
+  builder: (yargs34) => withConfiguration(withApiOptions(withTeamOptions(withEdgehancerIdOptions(yargs34)))),
   handler: async ({ apiHost, apiKey, proxy, team: teamId, archetype, connectorType, hook }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch3, teamId });
@@ -6671,9 +6944,9 @@ var IntegrationEdgehancerRemoveModule = {
 var IntegrationEdgehancerModule = {
   command: "edgehancer <command>",
   describe: "Commands for managing custom integration edgehancers at the team level.",
-  builder: (yargs33) => yargs33.command(IntegrationEdgehancerDeployModule).command(IntegrationEdgehancerRemoveModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(IntegrationEdgehancerDeployModule).command(IntegrationEdgehancerRemoveModule).demandCommand(),
   handler: () => {
-    yargs21.help();
+    yargs22.help();
   }
 };
 
@@ -6713,10 +6986,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withTeamOptions(
-        yargs33.positional("filename", {
+        yargs34.positional("filename", {
           demandOption: true,
           describe: "Integration definition manifest to register"
         })
@@ -6735,10 +7008,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withTeamOptions(
-        yargs33.positional("type", {
+        yargs34.positional("type", {
           demandOption: true,
           describe: "Integration type (from its manifest) to remove."
         })
@@ -6756,9 +7029,9 @@ var IntegrationDefinitionRemoveModule = {
 var IntegrationDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for managing custom integration definitions at the team level.",
-  builder: (yargs33) => yargs33.command(IntegrationDefinitionRemoveModule).command(IntegrationDefinitionRegisterModule).command(IntegrationEdgehancerModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(IntegrationDefinitionRemoveModule).command(IntegrationDefinitionRegisterModule).command(IntegrationEdgehancerModule).demandCommand(),
   handler: () => {
-    yargs22.help();
+    yargs23.help();
   }
 };
 
@@ -6798,10 +7071,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("type", {
+        yargs34.positional("type", {
           demandOption: true,
           describe: "Integration type to install (as defined in its manifest)"
         }).option("configuration", {
@@ -6823,10 +7096,10 @@ var IntegrationInstallModule = {
 var IntegrationUninstallModule = {
   command: "uninstall <type>",
   describe: "Uninstalls an integration from a project. Existing usages of the integration may break.",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("type", {
+        yargs34.positional("type", {
           demandOption: true,
           describe: "Integration type to uninstall (as defined in its manifest)"
         })
@@ -6844,9 +7117,9 @@ var IntegrationUninstallModule = {
 var IntegrationCommand = {
   command: "integration <command>",
   describe: "Integration management commands",
-  builder: (yargs33) => yargs33.command(IntegrationDefinitionModule).command(IntegrationInstallModule).command(IntegrationUninstallModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(IntegrationDefinitionModule).command(IntegrationInstallModule).command(IntegrationUninstallModule).demandCommand(),
   handler: () => {
-    yargs23.showHelp();
+    yargs24.showHelp();
   }
 };
 
@@ -6855,7 +7128,7 @@ import ora from "ora";
 var makeSpinner = () => {
   const spinners = [];
   const stopAllSpinners = () => spinners.forEach((spinner) => spinner.stop());
-  const spin2 = async (text) => {
+  const spin = async (text) => {
     const spinner = ora(text).start();
     spinners.push(spinner);
     const minWait = new Promise((resolve2) => setTimeout(resolve2, 500));
@@ -6864,7 +7137,7 @@ var makeSpinner = () => {
       spinner.stop();
     };
   };
-  return { stopAllSpinners, spin: spin2 };
+  return { stopAllSpinners, spin };
 };
 
 // src/telemetry/telemetry.ts
@@ -6874,7 +7147,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.147.0",
+  version: "19.151.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -7263,12 +7536,12 @@ import * as http from "isomorphic-git/http/node/index.js";
 import os from "os";
 import path2 from "path";
 async function cloneStarter({
-  spin: spin2,
+  spin,
   githubPath,
   targetDir,
   dotEnvFile
 }) {
-  const done = await spin2("Fetching starter code...");
+  const done = await spin("Fetching starter code...");
   const cloneDir = path2.join(os.tmpdir(), `uniform-new-${crypto2.randomBytes(20).toString("hex")}`);
   const [user, repo, ...pathSegments] = githubPath.split("/");
   try {
@@ -7318,7 +7591,7 @@ async function getOrCreateProject({
   user,
   explicitName,
   client,
-  spin: spin2,
+  spin,
   checkTargetDir,
   explicitTargetDir,
   previewUrl,
@@ -7348,7 +7621,7 @@ async function getOrCreateProject({
       checkTargetDir,
       explicitTargetDir
     });
-    const projectId = await createProject({ client, projectName, spin: spin2, teamId, previewUrl });
+    const projectId = await createProject({ client, projectName, spin, teamId, previewUrl });
     telemetry.send("project created", { projectId, targetDir });
     return {
       projectId,
@@ -7389,11 +7662,11 @@ async function getNewProjectName({
 async function createProject({
   projectName,
   teamId,
-  spin: spin2,
+  spin,
   client,
   previewUrl
 }) {
-  const done = await spin2("Creating your new project...");
+  const done = await spin("Creating your new project...");
   const projectId = await client.createProject(teamId, projectName, previewUrl);
   await done();
   return projectId;
@@ -7522,11 +7795,11 @@ var getUserInfo = async (baseUrl, authToken, subject) => {
 async function fetchUserAndEnsureFirstTeamExists({
   baseUrl,
   auth: { authToken, decoded },
-  spin: spin2,
+  spin,
   telemetry
 }) {
   const uniformClient = createClient(baseUrl, authToken);
-  const done = await spin2("Fetching user information...");
+  const done = await spin("Fetching user information...");
   let user = await getUserInfo(baseUrl, authToken, decoded.sub);
   if (user.teams.length < 1) {
     await uniformClient.createTeam(`${user.name}'s team`);
@@ -7539,7 +7812,7 @@ async function fetchUserAndEnsureFirstTeamExists({
 
 // src/commands/new/commands/new.ts
 async function newHandler({
-  spin: spin2,
+  spin,
   projectName,
   apiHost,
   outputPath,
@@ -7551,7 +7824,7 @@ async function newHandler({
   const auth = await getBearerToken(apiHost);
   const { authToken } = auth;
   const uniformClient = createClient(apiHost, authToken);
-  const user = await fetchUserAndEnsureFirstTeamExists({ auth, baseUrl: apiHost, spin: spin2, telemetry });
+  const user = await fetchUserAndEnsureFirstTeamExists({ auth, baseUrl: apiHost, spin, telemetry });
   const { teamId } = await chooseTeam(
     user,
     `Hey ${user.name}! Choose a Uniform team for your new project`,
@@ -7623,7 +7896,7 @@ async function newHandler({
     client: uniformClient,
     createNew: true,
     chooseExisting: false,
-    spin: spin2,
+    spin,
     teamId,
     user,
     explicitName: projectName,
@@ -7632,7 +7905,7 @@ async function newHandler({
     previewUrl: serverUrl + previewPath,
     telemetry
   });
-  let done = await spin2("Generating API keys...");
+  let done = await spin("Generating API keys...");
   const { readApiKey, writeApiKey } = await uniformClient.createApiKeys(teamId, projectId);
   await done();
   const dotEnvFile = [
@@ -7650,7 +7923,7 @@ async function newHandler({
   const cloneStartTimestamp = Date.now();
   const { runNpmInstall } = await cloneStarter({
     githubPath: githubUri,
-    spin: spin2,
+    spin,
     targetDir,
     dotEnvFile
   });
@@ -7658,7 +7931,7 @@ async function newHandler({
   const installStartTimestamp = Date.now();
   await runNpmInstall();
   telemetry.send("deps installed", { duration: Date.now() - installStartTimestamp });
-  done = await spin2("Creating components and compositions");
+  done = await spin("Creating components and compositions");
   await runNpm(targetDir, ["run", "uniform:push"]);
   await runNpm(targetDir, ["run", "uniform:publish"]);
   await done();
@@ -7693,7 +7966,7 @@ import inquirer5 from "inquirer";
 import path4 from "path";
 import slugify2 from "slugify";
 async function newMeshIntegrationHandler({
-  spin: spin2,
+  spin,
   apiHost,
   outputPath,
   telemetry
@@ -7702,7 +7975,7 @@ async function newMeshIntegrationHandler({
   const auth = await getBearerToken(apiHost);
   const { authToken } = auth;
   const uniformClient = createClient(apiHost, authToken);
-  const user = await fetchUserAndEnsureFirstTeamExists({ auth, baseUrl: apiHost, spin: spin2, telemetry });
+  const user = await fetchUserAndEnsureFirstTeamExists({ auth, baseUrl: apiHost, spin, telemetry });
   const { teamId } = await chooseTeam(
     user,
     `Hey ${user.name}! Choose a Uniform team to register your integration`,
@@ -7727,10 +8000,10 @@ async function newMeshIntegrationHandler({
   const { targetDir, typeSlug } = validateIntegrationName(answer.name, outputPath);
   const { runNpmInstall } = await cloneStarter({
     githubPath: `uniformdev/examples/examples/mesh-integration`,
-    spin: spin2,
+    spin,
     targetDir
   });
-  let done = await spin2("Registering integration to team...");
+  let done = await spin("Registering integration to team...");
   const pathToManifest = path4.resolve(targetDir, "mesh-manifest.json");
   if (!existsSync3(pathToManifest)) {
     throw new Error("Invalid integration starter cloned: missing `mesh-manifest.json`");
@@ -7752,13 +8025,13 @@ async function newMeshIntegrationHandler({
     client: uniformClient,
     createNew: true,
     chooseExisting: true,
-    spin: spin2,
+    spin,
     teamId,
     user,
     checkTargetDir: false,
     telemetry
   });
-  done = await spin2("Installing integration to project...");
+  done = await spin("Installing integration to project...");
   await uniformClient.installIntegration({ projectId, type: typeSlug });
   await done();
   console.log(`
@@ -7828,10 +8101,10 @@ var NewCmd = {
   ),
   describe: "Start a new Uniform project",
   handler: async function({ name, apiHost, outputPath, disableTelemetry }) {
-    const { stopAllSpinners, spin: spin2 } = makeSpinner();
+    const { stopAllSpinners, spin } = makeSpinner();
     const telemetry = new Telemetry("cli new", disableTelemetry || apiHost !== stableApiHost);
     try {
-      await newHandler({ spin: spin2, projectName: name, apiHost, outputPath, telemetry });
+      await newHandler({ spin, projectName: name, apiHost, outputPath, telemetry });
       stopAllSpinners();
       process.exit(0);
     } catch (err) {
@@ -7865,10 +8138,10 @@ var NewMeshCmd = {
   ),
   describe: "Start a new Uniform project",
   handler: async function({ apiHost, outputPath, disableTelemetry }) {
-    const { stopAllSpinners, spin: spin2 } = makeSpinner();
+    const { stopAllSpinners, spin } = makeSpinner();
     const telemetry = new Telemetry("cli new mesh", disableTelemetry || apiHost !== stableApiHost);
     try {
-      await newMeshIntegrationHandler({ spin: spin2, apiHost, outputPath, telemetry });
+      await newMeshIntegrationHandler({ spin, apiHost, outputPath, telemetry });
       stopAllSpinners();
       process.exit(0);
     } catch (err) {
@@ -7883,10 +8156,10 @@ var NewMeshCmd = {
 };
 
 // src/commands/optimize/index.ts
-import yargs25 from "yargs";
+import yargs26 from "yargs";
 
 // src/commands/optimize/manifest.ts
-import yargs24 from "yargs";
+import yargs25 from "yargs";
 
 // src/commands/optimize/manifest/download.ts
 import { gray as gray4, green as green3, red as red5, yellow as yellow2 } from "colorette";
@@ -7901,7 +8174,7 @@ var UniformBaseUrl = "https://uniform.app";
 var module = {
   command: "download [output]",
   describe: "Download intent manifest",
-  builder: (yargs33) => yargs33.option("apiKey", {
+  builder: (yargs34) => yargs34.option("apiKey", {
     alias: "k",
     demandOption: true,
     string: true,
@@ -8002,10 +8275,10 @@ var module2 = {
   command: "manifest <command>",
   describe: "Intent manifest commands",
   builder: () => {
-    return yargs24.command(download_default);
+    return yargs25.command(download_default);
   },
   handler: () => {
-    yargs24.showHelp();
+    yargs25.showHelp();
   }
 };
 var manifest_default = module2;
@@ -8016,29 +8289,29 @@ var OptimizeCommand = {
   aliases: ["opt"],
   describe: "Uniform Optimize commands",
   builder: () => {
-    return yargs25.command(manifest_default);
+    return yargs26.command(manifest_default);
   },
   handler: () => {
-    yargs25.showHelp();
+    yargs26.showHelp();
   }
 };
 
 // src/commands/project-map/index.ts
-import yargs28 from "yargs";
+import yargs29 from "yargs";
 
 // src/commands/project-map/commands/projectMapDefinition.ts
-import yargs26 from "yargs";
+import yargs27 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: (yargs33) => withFormatOptions(
+  builder: (yargs34) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs33.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
+          yargs34.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
         )
       )
     )
@@ -8062,7 +8335,7 @@ var ProjectMapDefinitionListModule = {
   command: "list",
   describe: "List of project maps",
   aliases: ["ls"],
-  builder: (yargs33) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs33)))),
+  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedProjectMapClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -8083,8 +8356,8 @@ function writeContextPackage2(filename, packageContents) {
 }
 
 // src/commands/project-map/commands/ProjectMapDefinition/_util.ts
-var selectIdentifier10 = (source) => source.id;
-var selectDisplayName10 = (source) => `${source.name} (pid: ${source.id})`;
+var selectIdentifier11 = (source) => source.id;
+var selectDisplayName11 = (source) => `${source.name} (pid: ${source.id})`;
 
 // src/commands/project-map/ProjectMapDefinitionEngineDataSource.ts
 function createProjectMapDefinitionEngineDataSource({
@@ -8094,15 +8367,16 @@ function createProjectMapDefinitionEngineDataSource({
     const projectMaps = (await client.getProjectMapDefinitions()).projectMaps;
     for await (const def of projectMaps) {
       const result = {
-        id: selectIdentifier10(def),
-        displayName: selectDisplayName10(def),
-        providerId: selectIdentifier10(def),
+        id: selectIdentifier11(def),
+        displayName: selectDisplayName11(def),
+        providerId: selectIdentifier11(def),
         object: def
       };
       yield result;
     }
   }
   return {
+    name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
       await client.deleteProjectMap({ projectMapId: providerId });
@@ -8119,11 +8393,11 @@ function createProjectMapDefinitionEngineDataSource({
 var ProjectMapDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -8168,9 +8442,10 @@ var ProjectMapDefinitionPullModule = {
     if (isPackage) {
       const packageContents = readContextPackage2(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.projectMaps ?? [],
-        selectIdentifier: selectIdentifier10,
-        selectDisplayName: selectDisplayName10,
+        selectIdentifier: selectIdentifier11,
+        selectDisplayName: selectDisplayName11,
         onSyncComplete: async (_, synced) => {
           packageContents.projectMaps = synced;
           writeContextPackage2(directory, packageContents);
@@ -8179,8 +8454,8 @@ var ProjectMapDefinitionPullModule = {
     } else {
       target = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier10,
-        selectDisplayName: selectDisplayName10,
+        selectIdentifier: selectIdentifier11,
+        selectDisplayName: selectDisplayName11,
         format
       });
     }
@@ -8200,11 +8475,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -8241,15 +8516,16 @@ var ProjectMapDefinitionPushModule = {
     if (isPackage) {
       const packageContents = readContextPackage2(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.projectMaps ?? [],
-        selectIdentifier: selectIdentifier10,
-        selectDisplayName: selectDisplayName10
+        selectIdentifier: selectIdentifier11,
+        selectDisplayName: selectDisplayName11
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier10,
-        selectDisplayName: selectDisplayName10
+        selectIdentifier: selectIdentifier11,
+        selectDisplayName: selectDisplayName11
       });
     }
     const target = createProjectMapDefinitionEngineDataSource({ client });
@@ -8270,9 +8546,9 @@ var ProjectMapDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs33.positional("id", { demandOption: true, describe: " UUID to delete" }))
+      withProjectOptions(yargs34.positional("id", { demandOption: true, describe: " UUID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -8288,10 +8564,10 @@ var ProjectMapDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a project map",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("filename", { demandOption: true, describe: "Project map file to put" })
+        yargs34.positional("filename", { demandOption: true, describe: "Project map file to put" })
       )
     )
   ),
@@ -8307,25 +8583,25 @@ var ProjectMapDefinitionUpdateModule = {
 var ProjectMapDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for ProjectMap Definitions",
-  builder: (yargs33) => yargs33.command(ProjectMapDefinitionPullModule).command(ProjectMapDefinitionPushModule).command(ProjectMapDefinitionGetModule).command(ProjectMapDefinitionRemoveModule).command(ProjectMapDefinitionListModule).command(ProjectMapDefinitionUpdateModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(ProjectMapDefinitionPullModule).command(ProjectMapDefinitionPushModule).command(ProjectMapDefinitionGetModule).command(ProjectMapDefinitionRemoveModule).command(ProjectMapDefinitionListModule).command(ProjectMapDefinitionUpdateModule).demandCommand(),
   handler: () => {
-    yargs26.help();
+    yargs27.help();
   }
 };
 
 // src/commands/project-map/commands/projectMapNode.ts
-import yargs27 from "yargs";
+import yargs28 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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs33.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to fetch" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to fetch from" })
+          yargs34.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to fetch" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to fetch from" })
         )
       )
     )
@@ -8351,12 +8627,12 @@ var ProjectMapNodeListModule = {
   command: "list <projectMapId>",
   describe: "List project map nodes",
   aliases: ["ls"],
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs33.positional("projectMapId", {
+            yargs34.positional("projectMapId", {
               demandOption: true,
               describe: "ProjectMap UUID to fetch from"
             })
@@ -8377,12 +8653,12 @@ var ProjectMapNodeListModule = {
 import { UncachedProjectMapClient as UncachedProjectMapClient9 } from "@uniformdev/project-map";
 
 // src/commands/project-map/commands/ProjectMapNode/_util.ts
-var selectIdentifier11 = (source, projectId) => [
+var selectIdentifier12 = (source, projectId) => [
   projectId + source.projectMapId + source.id,
   projectId + source.projectMapId + source.path
 ];
 var selectFilename = (source) => cleanFileName(`${source.pathSegment}_${source.id}`);
-var selectDisplayName11 = (source) => `${source.name} (pid: ${source.id})`;
+var selectDisplayName12 = (source) => `${source.name} (pid: ${source.id})`;
 
 // src/commands/project-map/ProjectMapNodeEngineDataSource.ts
 function createProjectMapNodeEngineDataSource({
@@ -8396,9 +8672,9 @@ function createProjectMapNodeEngineDataSource({
       for await (const node of nodes ?? []) {
         if (node) {
           const result = {
-            id: selectIdentifier11({ ...node, projectMapId: projectMap.id }, projectId),
-            displayName: selectDisplayName11(node),
-            providerId: selectIdentifier11({ ...node, projectMapId: projectMap.id }, projectId)[0],
+            id: selectIdentifier12({ ...node, projectMapId: projectMap.id }, projectId),
+            displayName: selectDisplayName12(node),
+            providerId: selectIdentifier12({ ...node, projectMapId: projectMap.id }, projectId)[0],
             object: { ...node, projectMapId: projectMap.id }
           };
           yield result;
@@ -8407,6 +8683,7 @@ function createProjectMapNodeEngineDataSource({
     }
   }
   return {
+    name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId, object) => {
       await client.deleteProjectMapNode({
@@ -8428,11 +8705,11 @@ function createProjectMapNodeEngineDataSource({
 var ProjectMapNodePullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps nodes to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -8475,14 +8752,15 @@ var ProjectMapNodePullModule = {
     let target;
     const isPackage = isPathAPackageFile(directory);
     const expandedSelectIdentifier = (object) => {
-      return selectIdentifier11(object, projectId);
+      return selectIdentifier12(object, projectId);
     };
     if (isPackage) {
       const packageContents = readContextPackage2(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.projectMapNodes ?? [],
         selectIdentifier: expandedSelectIdentifier,
-        selectDisplayName: selectDisplayName11,
+        selectDisplayName: selectDisplayName12,
         onSyncComplete: async (_, synced) => {
           packageContents.projectMapNodes = synced;
           writeContextPackage2(directory, packageContents);
@@ -8492,7 +8770,7 @@ var ProjectMapNodePullModule = {
       target = await createFileSyncEngineDataSource({
         directory,
         selectIdentifier: expandedSelectIdentifier,
-        selectDisplayName: selectDisplayName11,
+        selectDisplayName: selectDisplayName12,
         format,
         selectFilename
       });
@@ -8513,11 +8791,11 @@ import { UncachedProjectMapClient as UncachedProjectMapClient10 } from "@uniform
 var ProjectMapNodePushModule = {
   command: "push <directory>",
   describe: "Pushes all project maps nodes from files in a directory or package to Uniform",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -8557,20 +8835,21 @@ var ProjectMapNodePushModule = {
     let source;
     const isPackage = isPathAPackageFile(directory);
     const expandedSelectIdentifier = (object) => {
-      return selectIdentifier11(object, projectId);
+      return selectIdentifier12(object, projectId);
     };
     if (isPackage) {
       const packageContents = readContextPackage2(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.projectMapNodes ?? [],
         selectIdentifier: expandedSelectIdentifier,
-        selectDisplayName: selectDisplayName11
+        selectDisplayName: selectDisplayName12
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
         selectIdentifier: expandedSelectIdentifier,
-        selectDisplayName: selectDisplayName11,
+        selectDisplayName: selectDisplayName12,
         selectFilename
       });
     }
@@ -8592,10 +8871,10 @@ var ProjectMapNodeRemoveModule = {
   command: "remove <id> <projectMapId>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map node",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to delete" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to delete from" })
+        yargs34.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to delete" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to delete from" })
       )
     )
   ),
@@ -8612,10 +8891,10 @@ var ProjectMapNodeUpdateModule = {
   command: "update <filename> <projectMapId>",
   aliases: ["put"],
   describe: "Insert or update a project map node",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("filename", { demandOption: true, describe: "ProjectMap node file with nodes data" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to put into" })
+        yargs34.positional("filename", { demandOption: true, describe: "ProjectMap node file with nodes data" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to put into" })
       )
     )
   ),
@@ -8631,9 +8910,9 @@ var ProjectMapNodeUpdateModule = {
 var ProjectMapNodeModule = {
   command: "node <command>",
   describe: "Commands for ProjectMap Nodes",
-  builder: (yargs33) => yargs33.command(ProjectMapNodePullModule).command(ProjectMapNodePushModule).command(ProjectMapNodeGetModule).command(ProjectMapNodeRemoveModule).command(ProjectMapNodeListModule).command(ProjectMapNodeUpdateModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(ProjectMapNodePullModule).command(ProjectMapNodePushModule).command(ProjectMapNodeGetModule).command(ProjectMapNodeRemoveModule).command(ProjectMapNodeListModule).command(ProjectMapNodeUpdateModule).demandCommand(),
   handler: () => {
-    yargs27.help();
+    yargs28.help();
   }
 };
 
@@ -8642,28 +8921,28 @@ var ProjectMapCommand = {
   command: "project-map <command>",
   aliases: ["prm"],
   describe: "Uniform ProjectMap commands",
-  builder: (yargs33) => yargs33.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
   handler: () => {
-    yargs28.showHelp();
+    yargs29.showHelp();
   }
 };
 
 // src/commands/redirect/index.ts
-import yargs30 from "yargs";
+import yargs31 from "yargs";
 
 // src/commands/redirect/commands/redirect.ts
-import yargs29 from "yargs";
+import yargs30 from "yargs";
 
 // src/commands/redirect/commands/RedirectDefinition/get.ts
 import { UncachedRedirectClient } from "@uniformdev/redirect";
 var RedirectDefinitionGetModule = {
   command: "get <id>",
   describe: "Fetch a redirect",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs33.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
+          yargs34.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
         )
       )
     )
@@ -8687,7 +8966,7 @@ var RedirectDefinitionListModule = {
   command: "list",
   describe: "List of redirects",
   aliases: ["ls"],
-  builder: (yargs33) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs33)))),
+  builder: (yargs34) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs34)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedRedirectClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -8708,12 +8987,12 @@ function writeContextPackage3(filename, packageContents) {
 }
 
 // src/commands/redirect/commands/RedirectDefinition/_util.ts
-var selectIdentifier12 = (source) => source.id;
+var selectIdentifier13 = (source) => source.id;
 var selectFilename2 = (source) => {
   const index = source.sourceUrl.lastIndexOf("/");
   return cleanFileName(source.sourceUrl.substring(index + 1)) + `_${source.id}`;
 };
-var selectDisplayName12 = (source) => {
+var selectDisplayName13 = (source) => {
   let pathName = source.sourceUrl;
   if (pathName.length > 30) {
     const slashIndex = source.sourceUrl.indexOf("/", source.sourceUrl.length - 30);
@@ -8730,15 +9009,16 @@ function createRedirectDefinitionEngineDataSource({
     const redirects = client.getAllRedirects();
     for await (const redirect of redirects) {
       const result = {
-        id: selectIdentifier12(redirect.redirect),
-        displayName: selectDisplayName12(redirect.redirect),
-        providerId: selectIdentifier12(redirect.redirect),
+        id: selectIdentifier13(redirect.redirect),
+        displayName: selectDisplayName13(redirect.redirect),
+        providerId: selectIdentifier13(redirect.redirect),
         object: redirect.redirect
       };
       yield result;
     }
   }
   return {
+    name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
       await client.deleteRedirect(providerId);
@@ -8753,11 +9033,11 @@ function createRedirectDefinitionEngineDataSource({
 var RedirectDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all redirects to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.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", {
@@ -8802,9 +9082,10 @@ var RedirectDefinitionPullModule = {
     if (isPackage) {
       const packageContents = readContextPackage3(directory, false);
       target = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.redirects ?? [],
-        selectIdentifier: selectIdentifier12,
-        selectDisplayName: selectDisplayName12,
+        selectIdentifier: selectIdentifier13,
+        selectDisplayName: selectDisplayName13,
         onSyncComplete: async (_, synced) => {
           packageContents.redirects = synced;
           writeContextPackage3(directory, packageContents);
@@ -8814,8 +9095,8 @@ var RedirectDefinitionPullModule = {
       target = await createFileSyncEngineDataSource({
         directory,
         selectFilename: selectFilename2,
-        selectIdentifier: selectIdentifier12,
-        selectDisplayName: selectDisplayName12,
+        selectIdentifier: selectIdentifier13,
+        selectDisplayName: selectDisplayName13,
         format
       });
     }
@@ -8835,11 +9116,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: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.positional("directory", {
+          yargs34.positional("directory", {
             describe: "Directory to read redirects from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -8876,15 +9157,16 @@ var RedirectDefinitionPushModule = {
     if (isPackage) {
       const packageContents = readContextPackage3(directory, true);
       source = await createArraySyncEngineDataSource({
+        name: `Package file ${directory}`,
         objects: packageContents.redirects ?? [],
-        selectIdentifier: selectIdentifier12,
-        selectDisplayName: selectDisplayName12
+        selectIdentifier: selectIdentifier13,
+        selectDisplayName: selectDisplayName13
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectIdentifier12,
-        selectDisplayName: selectDisplayName12
+        selectIdentifier: selectIdentifier13,
+        selectDisplayName: selectDisplayName13
       });
     }
     const target = createRedirectDefinitionEngineDataSource({ client });
@@ -8905,9 +9187,9 @@ var RedirectDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a redirect",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs33.positional("id", { demandOption: true, describe: " UUID to delete" }))
+      withProjectOptions(yargs34.positional("id", { demandOption: true, describe: " UUID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -8923,10 +9205,10 @@ var RedirectDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a redirect",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs33.positional("filename", { demandOption: true, describe: "Redirect file to put" })
+        yargs34.positional("filename", { demandOption: true, describe: "Redirect file to put" })
       )
     )
   ),
@@ -8942,9 +9224,9 @@ var RedirectDefinitionUpdateModule = {
 var RedirectDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for Redirect Definitions",
-  builder: (yargs33) => yargs33.command(RedirectDefinitionPullModule).command(RedirectDefinitionPushModule).command(RedirectDefinitionGetModule).command(RedirectDefinitionRemoveModule).command(RedirectDefinitionListModule).command(RedirectDefinitionUpdateModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(RedirectDefinitionPullModule).command(RedirectDefinitionPushModule).command(RedirectDefinitionGetModule).command(RedirectDefinitionRemoveModule).command(RedirectDefinitionListModule).command(RedirectDefinitionUpdateModule).demandCommand(),
   handler: () => {
-    yargs29.help();
+    yargs30.help();
   }
 };
 
@@ -8953,39 +9235,66 @@ var RedirectCommand = {
   command: "redirect <command>",
   aliases: ["red"],
   describe: "Uniform Redirect commands",
-  builder: (yargs33) => yargs33.command(RedirectDefinitionModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(RedirectDefinitionModule).demandCommand(),
   handler: () => {
-    yargs30.showHelp();
+    yargs31.showHelp();
   }
 };
 
 // src/commands/sync/index.ts
-import yargs31 from "yargs";
+import yargs32 from "yargs";
 
 // src/commands/sync/commands/util.ts
 import ora2 from "ora";
-function spin(entityType) {
-  const spinner = ora2(entityType).start();
-  const consoleLog = console.log;
-  console.log = (...text) => {
+async function spinPromise(action, options) {
+  const { successText, failText } = typeof options === "object" ? options : { successText: void 0, failText: void 0 };
+  const spinner = ora2(options).start();
+  const consoleReplay = [];
+  const revertLog = patchConsole("log", spinner, consoleReplay);
+  const revertError = patchConsole("error", spinner, consoleReplay);
+  const revertWarning = patchConsole("warn", spinner, consoleReplay);
+  const unpatchConsole = () => {
+    revertLog();
+    revertError();
+    revertWarning();
+  };
+  let thrownError = void 0;
+  try {
+    const result = await action;
+    spinner.succeed(successText);
+    return result;
+  } catch (error) {
+    const indexOfConsoleMessages = spinner.text.indexOf("\n");
+    const capturedConsole = indexOfConsoleMessages > -1 ? spinner.text.slice(0, indexOfConsoleMessages) : "";
+    spinner.fail(failText === void 0 ? void 0 : failText(error, capturedConsole));
+    thrownError = error;
+  } finally {
+    unpatchConsole();
+    if (!thrownError) {
+      replayConsole(consoleReplay);
+    }
+  }
+  if (thrownError) {
+    throw thrownError;
+  }
+}
+function replayConsole(replay) {
+  for (const { fn, args } of replay) {
+    console[fn](...args);
+  }
+}
+function patchConsole(fn, ora3, replay = []) {
+  const original = console[fn];
+  console[fn] = (...text) => {
     if (text.length === 1 && typeof text[0] === "string") {
-      spinner.text += "\n" + text;
+      ora3.text += "\n" + text;
     } else {
-      consoleLog(...text);
+      original(...text);
     }
+    replay.push({ fn, args: text });
   };
-  return {
-    ...spinner,
-    stop: () => {
-      spinner.stop();
-      console.log = consoleLog;
-      return spinner;
-    },
-    succeed() {
-      spinner.succeed();
-      console.log = consoleLog;
-      return spinner;
-    }
+  return () => {
+    console[fn] = original;
   };
 }
 
@@ -8993,11 +9302,11 @@ function spin(entityType) {
 var SyncPullModule = {
   command: "pull",
   describe: "Pulls whole project to local files in a directory",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.option("what-if", {
+          yargs34.option("what-if", {
             alias: ["w"],
             describe: "What-if mode reports what would be done but changes no files",
             default: false,
@@ -9019,6 +9328,7 @@ var SyncPullModule = {
       locale: LocalePullModule,
       asset: AssetPullModule,
       category: CategoryPullModule,
+      workflow: WorkflowPullModule,
       dataType: DataTypePullModule,
       prompt: PromptPullModule,
       quirk: QuirkPullModule,
@@ -9046,26 +9356,34 @@ var SyncPullModule = {
       );
     }
     for (const [entityType, module3] of enabledEntities) {
-      const spinner = spin(entityType);
       const entityConfigSupportsPullState = (entityConfig2) => {
         return entityConfig2 !== void 0 && "state" in entityConfig2;
       };
       const entityConfig = (_b = config2.entitiesConfig) == null ? void 0 : _b[entityType];
       try {
-        await module3.handler({
-          ...otherParams,
-          state: entityConfigSupportsPullState(entityConfig) ? entityConfig.state ?? 0 : 0,
-          format: getFormat(entityType, config2),
-          onlyCompositions: entityType === "composition" ? true : void 0,
-          onlyPatterns: entityType === "componentPattern" ? true : void 0,
-          mode: getPullMode(entityType, config2),
-          directory: getPullFilename(entityType, config2, { isUsingDeprecatedPatternConfig }),
-          allowEmptySource: config2.allowEmptySource
-        });
-        spinner.succeed();
+        await spinPromise(
+          module3.handler({
+            ...otherParams,
+            state: entityConfigSupportsPullState(entityConfig) ? entityConfig.state ?? 0 : 0,
+            format: getFormat(entityType, config2),
+            onlyCompositions: entityType === "composition" ? true : void 0,
+            onlyPatterns: entityType === "componentPattern" ? true : void 0,
+            mode: getPullMode(entityType, config2),
+            directory: getPullFilename(entityType, config2, { isUsingDeprecatedPatternConfig }),
+            allowEmptySource: config2.allowEmptySource
+          }),
+          {
+            text: `${entityType}\u2026`,
+            successText: entityType,
+            failText(error) {
+              return `${entityType}
+
+ ${error.stack}`;
+            }
+          }
+        );
       } catch (e) {
-        spinner.stop();
-        throw e;
+        process.exit(1);
       }
     }
   }
@@ -9100,11 +9418,11 @@ var getFormat = (entityType, config2) => {
 var SyncPushModule = {
   command: "push",
   describe: "Pushes whole project data from files in a directory or package to Uniform",
-  builder: (yargs33) => withConfiguration(
+  builder: (yargs34) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs33.option("what-if", {
+          yargs34.option("what-if", {
             alias: ["w"],
             describe: "What-if mode reports what would be done but changes nothing",
             default: false,
@@ -9126,6 +9444,7 @@ var SyncPushModule = {
       locale: LocalePushModule,
       asset: AssetPushModule,
       category: CategoryPushModule,
+      workflow: WorkflowPushModule,
       dataType: DataTypePushModule,
       prompt: PromptPushModule,
       quirk: QuirkPushModule,
@@ -9153,22 +9472,30 @@ var SyncPushModule = {
       );
     }
     for (const [entityType, module3] of enabledEntities) {
-      const spinner = spin(entityType);
       try {
-        await module3.handler({
-          ...otherParams,
-          state: 0,
-          format: getFormat2(entityType, config2),
-          onlyCompositions: entityType === "composition" ? true : void 0,
-          onlyPatterns: entityType === "componentPattern" ? true : void 0,
-          mode: getPushMode(entityType, config2),
-          directory: getPushFilename(entityType, config2, { isUsingDeprecatedPatternConfig }),
-          allowEmptySource: config2.allowEmptySource
-        });
-        spinner.succeed();
+        await spinPromise(
+          module3.handler({
+            ...otherParams,
+            state: 0,
+            format: getFormat2(entityType, config2),
+            onlyCompositions: entityType === "composition" ? true : void 0,
+            onlyPatterns: entityType === "componentPattern" ? true : void 0,
+            mode: getPushMode(entityType, config2),
+            directory: getPushFilename(entityType, config2, { isUsingDeprecatedPatternConfig }),
+            allowEmptySource: config2.allowEmptySource
+          }),
+          {
+            text: `${entityType}...`,
+            successText: entityType,
+            failText(error) {
+              return `${entityType}
+
+ ${error.stack}`;
+            }
+          }
+        );
       } catch (e) {
-        spinner.stop();
-        throw e;
+        process.exit(1);
       }
     }
     if (((_b = config2.entitiesConfig) == null ? void 0 : _b.componentPattern) && ((_e = (_d = (_c = config2.entitiesConfig) == null ? void 0 : _c.componentPattern) == null ? void 0 : _d.push) == null ? void 0 : _e.disabled) !== true && ((_g = (_f = config2.entitiesConfig) == null ? void 0 : _f.componentPattern) == null ? void 0 : _g.publish)) {
@@ -9215,9 +9542,9 @@ var getFormat2 = (entityType, config2) => {
 var SyncCommand = {
   command: "sync <command>",
   describe: "Uniform Sync commands",
-  builder: (yargs33) => yargs33.command(SyncPullModule).command(SyncPushModule).demandCommand(),
+  builder: (yargs34) => yargs34.command(SyncPullModule).command(SyncPushModule).demandCommand(),
   handler: () => {
-    yargs31.showHelp();
+    yargs32.showHelp();
   }
 };
 
@@ -9484,7 +9811,7 @@ First found was: v${firstVersion}`;
 
 // src/index.ts
 dotenv.config();
-var yarggery = yargs32(hideBin(process.argv));
+var yarggery = yargs33(hideBin(process.argv));
 var inlineConfigurationFilePath = "config" in yarggery.argv && yarggery.argv.config;
 var configuration = loadConfig(inlineConfigurationFilePath || null);
 yarggery.option("verbose", {