@uniformdev/cli 19.211.0 → 19.211.1-alpha.2

package/dist/index.mjs

@@ -16,7 +16,7 @@ import {
   withFormatOptions,
   withProjectOptions,
   withTeamOptions
-} from "./chunk-KAJUBJZI.mjs";
+} from "./chunk-3T7NQ5TX.mjs";
 
 // src/index.ts
 import * as dotenv from "dotenv";
@@ -29,9 +29,6 @@ import yargs18 from "yargs";
 // src/commands/canvas/commands/asset.ts
 import yargs from "yargs";
 
-// src/commands/canvas/commands/asset/get.ts
-import { UncachedAssetClient } from "@uniformdev/assets";
-
 // src/sync/arraySyncEngineDataSource.ts
 async function createArraySyncEngineDataSource({
   name,
@@ -188,7 +185,7 @@ async function createFileSyncEngineDataSource({
     for (const filename of filenames) {
       const fullFilename = join(directory, filename);
       try {
-        const contents = await readFileToObject(fullFilename);
+        const contents = readFileToObject(fullFilename);
         const displayName = selectDisplayName16(contents);
         const object = {
           id: selectIdentifier16(contents),
@@ -251,27 +248,76 @@ function writeUniformPackage(filename, packageContents) {
 
 // src/sync/syncEngine.ts
 import { diffJson, diffLines } from "diff";
-import isEqualWith from "lodash.isequalwith";
+import mitt from "mitt";
+
+// src/sync/serializedDequal.ts
+var has = Object.prototype.hasOwnProperty;
+var ignoredProperties = /* @__PURE__ */ new Set(["created", "modified", "updated"]);
+function serializedDequal(foo, bar) {
+  let ctor, len;
+  if (foo === bar) {
+    return true;
+  }
+  if (foo && bar && (ctor = foo.constructor) === bar.constructor) {
+    if (ctor === Date) {
+      return foo.getTime() === bar.getTime();
+    }
+    if (ctor === RegExp) {
+      return foo.toString() === bar.toString();
+    }
+    if (ctor === Array) {
+      const fooArray = foo;
+      const barArray = bar;
+      if (fooArray.length === barArray.length) {
+        for (let i = 0; i < fooArray.length; i++) {
+          if (!serializedDequal(fooArray[i], barArray[i])) {
+            return false;
+          }
+        }
+        return true;
+      }
+      return false;
+    }
+    if (!ctor || typeof foo === "object") {
+      const fooObject = foo;
+      const barObject = bar;
+      len = 0;
+      for (const ctor2 in fooObject) {
+        const isIgnored = ignoredProperties.has(ctor2);
+        if (
+          // custom property name skips
+          !isIgnored && has.call(fooObject, ctor2) && ++len && !has.call(barObject, ctor2)
+        ) {
+          return false;
+        }
+        if (!isIgnored && (!(ctor2 in barObject) || !serializedDequal(fooObject[ctor2], barObject[ctor2]))) {
+          return false;
+        }
+      }
+      const areKeysEqual = Object.keys(barObject).filter((key) => !ignoredProperties.has(key)).length === len;
+      return areKeysEqual;
+    }
+  }
+  return foo !== foo && bar !== bar;
+}
+
+// src/sync/syncEngine.ts
+var syncEngineEvents = mitt();
 async function syncEngine({
   source,
   target,
-  compareContents = (source2, target2) => {
-    return isEqualWith(
-      source2.object,
-      target2.object,
-      (_a, _b, key) => key === "created" || key === "modified" || key === "updated" ? true : void 0
-    );
-  },
+  compareContents = (foo, bar) => serializedDequal(foo.object, bar.object),
   mode,
   allowEmptySource = false,
   whatIf = false,
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
   log: log2 = () => {
   },
   onBeforeCompareObjects,
   onBeforeWriteObject,
   onError
+  //verbose = false,
 }) {
+  const status = new ReactiveStatusUpdate((status2) => syncEngineEvents.emit("statusUpdate", status2));
   const targetItems = /* @__PURE__ */ new Map();
   const deleteTracker = /* @__PURE__ */ new Set();
   const processDelete = async (object) => {
@@ -280,6 +326,7 @@ async function syncEngine({
     try {
       if (!whatIf) {
         await target.deleteObject(object.providerId, object);
+        status.changesApplied++;
       }
     } catch (e) {
       if (onError) {
@@ -294,11 +341,12 @@ async function syncEngine({
         providerId: object.providerId,
         displayName: object.displayName ?? object.providerId,
         whatIf,
-        diff: diffLines(JSON.stringify(object.object, null, 2), "")
+        diff: () => diffLines(JSON.stringify(object.object, null, 2), "")
       });
     }
   };
   for await (const obj of target.objects) {
+    status.fetched++;
     if (Array.isArray(obj.id)) {
       obj.id.forEach((o) => targetItems.set(o, obj));
     } else {
@@ -311,16 +359,20 @@ async function syncEngine({
     sourceHasItems = true;
     const ids = Array.isArray(sourceObject.id) ? sourceObject.id : [sourceObject.id];
     const targetObject = targetItems.get(ids[0]);
+    status.compared++;
     const invalidTargetObjects = ids.map((i) => targetItems.get(i)).filter((o) => o?.object !== targetObject?.object);
-    if (targetObject && invalidTargetObjects.length == 0) {
+    if (targetObject && invalidTargetObjects.length === 0) {
       sourceObject = onBeforeCompareObjects ? await onBeforeCompareObjects(sourceObject, targetObject) : sourceObject;
-      if (!compareContents(sourceObject, targetObject)) {
+      const compareResult = compareContents(sourceObject, targetObject);
+      if (!compareResult) {
         if (mode === "createOrUpdate" || mode === "mirror") {
+          status.changeCount++;
           const process2 = async (sourceObject2, targetObject2) => {
             try {
               if (!whatIf) {
                 const finalSourceObject = onBeforeWriteObject ? await onBeforeWriteObject(sourceObject2, targetObject2) : sourceObject2;
                 await target.writeObject(finalSourceObject, targetObject2);
+                status.changesApplied++;
               }
             } catch (e) {
               if (onError) {
@@ -335,7 +387,7 @@ async function syncEngine({
                 providerId: sourceObject2.providerId,
                 displayName: sourceObject2.displayName ?? sourceObject2.providerId,
                 whatIf,
-                diff: diffJson(targetObject2.object, sourceObject2.object)
+                diff: () => diffJson(targetObject2.object, sourceObject2.object)
               });
             }
           };
@@ -344,11 +396,13 @@ async function syncEngine({
       }
       ids.forEach((i) => targetItems.delete(i));
     } else {
-      const process2 = async (sourceObject2, id) => {
+      status.changeCount++;
+      const processUpsert = async (sourceObject2, id) => {
         try {
           if (!whatIf) {
             const finalSourceObject = onBeforeWriteObject ? await onBeforeWriteObject(sourceObject2) : sourceObject2;
             await target.writeObject(finalSourceObject);
+            status.changesApplied++;
           }
         } catch (e) {
           if (onError) {
@@ -363,7 +417,7 @@ async function syncEngine({
             providerId: id,
             displayName: sourceObject2.displayName ?? sourceObject2.providerId,
             whatIf,
-            diff: diffLines("", JSON.stringify(sourceObject2.object, null, 2))
+            diff: () => diffLines("", JSON.stringify(sourceObject2.object, null, 2))
           });
         }
       };
@@ -371,18 +425,20 @@ async function syncEngine({
         [...invalidTargetObjects, targetObject].forEach((o) => {
           (Array.isArray(o?.id) ? o?.id : [o?.id])?.forEach((i) => i && targetItems.delete(i));
         });
-        const deletes = invalidTargetObjects.filter((io) => typeof io !== "undefined").map((io) => {
-          return () => processDelete(io);
-        });
+        const deletes = invalidTargetObjects.filter((invalidTargetObject) => typeof invalidTargetObject !== "undefined").map((invalidTargetObject) => () => processDelete(invalidTargetObject));
         if (targetObject) {
           deletes.push(() => processDelete(targetObject));
         }
-        actions.push(() => Promise.all(deletes.map((d) => d())).then(() => process2(sourceObject, ids[0])));
+        actions.push(
+          () => Promise.all(deletes.map((deleteFn) => deleteFn())).then(() => processUpsert(sourceObject, ids[0]))
+        );
       } else {
-        actions.push(() => process2(sourceObject, ids[0]));
+        actions.push(() => processUpsert(sourceObject, ids[0]));
       }
     }
   }
+  status.changeCount += targetItems.size;
+  status.compared += targetItems.size;
   if (mode === "mirror") {
     if (!sourceHasItems && !allowEmptySource && targetItems.size > 0) {
       throw new Error(
@@ -408,6 +464,51 @@ ${innerError}`
     Object.setPrototypeOf(this, _SyncEngineError.prototype);
   }
 };
+var ReactiveStatusUpdate = class {
+  constructor(onChange) {
+    this._fetched = 0;
+    this._compared = 0;
+    this._changeCount = 0;
+    this._changesApplied = 0;
+    this.onChange = onChange;
+  }
+  emitChange() {
+    this.onChange?.({
+      fetched: this._fetched,
+      compared: this._compared,
+      changeCount: this._changeCount,
+      changesApplied: this._changesApplied
+    });
+  }
+  get fetched() {
+    return this._fetched;
+  }
+  set fetched(value) {
+    this._fetched = value;
+    this.emitChange();
+  }
+  get compared() {
+    return this._compared;
+  }
+  set compared(value) {
+    this._compared = value;
+    this.emitChange();
+  }
+  get changeCount() {
+    return this._changeCount;
+  }
+  set changeCount(value) {
+    this._changeCount = value;
+    this.emitChange();
+  }
+  get changesApplied() {
+    return this._changesApplied;
+  }
+  set changesApplied(value) {
+    this._changesApplied = value;
+    this.emitChange();
+  }
+};
 
 // src/sync/syncEngineConsoleLogger.ts
 import { gray, green, red as red2, white, yellow } from "colorette";
@@ -428,7 +529,8 @@ function createSyncEngineConsoleLogger(options) {
     }
     let diffString = "";
     if (diffMode === "on" || diffMode === "update" && action === "update") {
-      diffString = "\n" + diff.map((change) => {
+      const diffResult = diff();
+      diffString = "\n" + diffResult.map((change) => {
         if (change.added) {
           return green(change.value);
         }
@@ -451,6 +553,29 @@ function createPublishStatusSyncEngineConsoleLogger(options) {
   };
 }
 
+// src/commands/canvas/commands/asset/_util.ts
+import { UncachedAssetClient } from "@uniformdev/assets";
+import { UncachedFileClient } from "@uniformdev/files";
+
+// src/cliLimitPolicy.ts
+import { createLimitPolicy } from "@uniformdev/canvas";
+var limit = process.env.UNIFORM_CLI_CONCURRENCY_LIMIT ? parseInt(process.env.UNIFORM_CLI_CONCURRENCY_LIMIT) : 10;
+var cliLimitPolicy = createLimitPolicy({
+  throttle: { interval: 1e3, limit: 10 },
+  retry: { retries: 3, factor: 2 },
+  limit
+});
+
+// src/commands/canvas/commands/asset/_util.ts
+var selectAssetIdentifier = (e) => e.asset._id;
+var selectAssetDisplayName = (e) => `${e.asset.fields?.title?.value ?? "Untitled"} (pid: ${selectAssetIdentifier(e)})`;
+function getAssetClient(options) {
+  return new UncachedAssetClient({ ...options, limitPolicy: cliLimitPolicy });
+}
+function getFileClient(options) {
+  return new UncachedFileClient({ ...options, limitPolicy: cliLimitPolicy });
+}
+
 // src/commands/canvas/commands/asset/get.ts
 var AssetGetModule = {
   command: "get <id>",
@@ -460,7 +585,6 @@ var AssetGetModule = {
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             yargs38.positional("id", { demandOption: true, describe: "Asset ID to fetch" })
           )
         )
@@ -469,7 +593,7 @@ var AssetGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, filename, project: projectId, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedAssetClient({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getAssetClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.get({ offset: 0, limit: 1, assetId: id });
     if (!res) {
       throw new Error(`Asset with ID ${id} not found`);
@@ -479,23 +603,18 @@ var AssetGetModule = {
 };
 
 // src/commands/canvas/commands/asset/list.ts
-import { UncachedAssetClient as UncachedAssetClient2 } from "@uniformdev/assets";
 var AssetListModule = {
   command: "list",
   describe: "List assets",
   builder: (yargs38) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs38))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedAssetClient2({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getAssetClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.get({ offset: 0, limit: 1e3 });
     emitWithFormat(res.assets, format, filename);
   }
 };
 
-// src/commands/canvas/commands/asset/pull.ts
-import { UncachedAssetClient as UncachedAssetClient3 } from "@uniformdev/assets";
-import { UncachedFileClient } from "@uniformdev/files";
-
 // src/files/index.ts
 import { preferredType } from "@thi.ng/mime";
 import { FILE_READY_STATE, getFileNameFromUrl } from "@uniformdev/files";
@@ -833,10 +952,6 @@ var legacyUrlToFileName = (url) => {
 // src/commands/canvas/assetEngineDataSource.ts
 import { convertAssetToPutAsset } from "@uniformdev/assets";
 
-// src/commands/canvas/commands/asset/_util.ts
-var selectAssetIdentifier = (e) => e.asset._id;
-var selectAssetDisplayName = (e) => `${e.asset.fields?.title?.value ?? "Untitled"} (pid: ${selectAssetIdentifier(e)})`;
-
 // src/commands/canvas/util.ts
 import {
   CANVAS_DRAFT_STATE,
@@ -879,16 +994,16 @@ function createAssetEngineDataSource({
 }) {
   async function* getObjects() {
     const assets = paginateAsync(
-      async (offset, limit) => {
+      async (offset, limit2) => {
         if (verbose) {
-          console.log(`Fetching all assets from offset ${offset} with limit ${limit}`);
+          console.log(`Fetching all assets from offset ${offset} with limit ${limit2}`);
         }
         return (await client.get({
-          limit,
+          limit: limit2,
           offset
         })).assets;
       },
-      { pageSize: 100 }
+      { pageSize: 50 }
     );
     for await (const e of assets) {
       const result = {
@@ -973,13 +1088,13 @@ var AssetPullModule = {
     allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedAssetClient3({
+    const client = getAssetClient({
       apiKey,
       apiHost,
       fetch: fetch3,
       projectId
     });
-    const fileClient = new UncachedFileClient({ apiKey, apiHost, fetch: fetch3, projectId });
+    const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createAssetEngineDataSource({ client, verbose });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -1049,8 +1164,6 @@ var AssetPullModule = {
 };
 
 // src/commands/canvas/commands/asset/push.ts
-import { UncachedAssetClient as UncachedAssetClient4 } from "@uniformdev/assets";
-import { UncachedFileClient as UncachedFileClient2 } from "@uniformdev/files";
 var AssetPushModule = {
   command: "push <directory>",
   describe: "Pushes all assets from files in a directory to Uniform",
@@ -1087,7 +1200,7 @@ var AssetPushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedAssetClient4({
+    const client = getAssetClient({
       apiKey,
       apiHost,
       fetch: fetch3,
@@ -1112,7 +1225,7 @@ var AssetPushModule = {
       });
     }
     const target = createAssetEngineDataSource({ client, verbose });
-    const fileClient = new UncachedFileClient2({ apiKey, apiHost, fetch: fetch3, projectId });
+    const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch3, projectId });
     await syncEngine({
       source,
       target,
@@ -1152,9 +1265,6 @@ var AssetPushModule = {
   }
 };
 
-// src/commands/canvas/commands/asset/remove.ts
-import { UncachedAssetClient as UncachedAssetClient5 } from "@uniformdev/assets";
-
 // src/log.ts
 import { reset } from "colorette";
 function fillString(char, length) {
@@ -1179,7 +1289,7 @@ var whatIfSimpleLog = ({
   id,
   displayName,
   action
-}) => log({ id, displayName, action, whatIf: true, providerId: "none", diff: [] });
+}) => log({ id, displayName, action, whatIf: true, providerId: "none", diff: () => [] });
 
 // src/commands/canvas/commands/asset/remove.ts
 var AssetRemoveModule = {
@@ -1195,7 +1305,7 @@ var AssetRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose, whatIf }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedAssetClient5({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getAssetClient({ apiKey, apiHost, fetch: fetch3, projectId });
     if (!whatIf) {
       await client.delete({ assetId: id });
     } else {
@@ -1205,7 +1315,7 @@ var AssetRemoveModule = {
 };
 
 // src/commands/canvas/commands/asset/update.ts
-import { convertAssetToPutAsset as convertAssetToPutAsset2, UncachedAssetClient as UncachedAssetClient6 } from "@uniformdev/assets";
+import { convertAssetToPutAsset as convertAssetToPutAsset2 } from "@uniformdev/assets";
 var AssetUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -1221,7 +1331,7 @@ var AssetUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId, verbose, whatIf }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedAssetClient6({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getAssetClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
     const putAsset = convertAssetToPutAsset2(file);
     if (!whatIf) {
@@ -1249,8 +1359,15 @@ var AssetModule = {
 // src/commands/canvas/commands/category.ts
 import yargs2 from "yargs";
 
-// src/commands/canvas/commands/category/get.ts
+// src/commands/canvas/commands/category/_util.ts
 import { UncachedCategoryClient } from "@uniformdev/canvas";
+var selectIdentifier = (category) => category.id;
+var selectDisplayName = (category) => `${category.name} (pid: ${category.id})`;
+function getCategoryClient(options) {
+  return new UncachedCategoryClient({ ...options, limitPolicy: cliLimitPolicy });
+}
+
+// src/commands/canvas/commands/category/get.ts
 var CategoryGetModule = {
   command: "get <id>",
   describe: "Fetch a category",
@@ -1267,7 +1384,7 @@ var CategoryGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, project: projectId, filename, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCategoryClient({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCategoryClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.getCategories();
     const category = res.categories.find((c) => c.id === id);
     if (!category) {
@@ -1280,7 +1397,6 @@ var CategoryGetModule = {
 };
 
 // src/commands/canvas/commands/category/list.ts
-import { UncachedCategoryClient as UncachedCategoryClient2 } from "@uniformdev/canvas";
 var CategoryListModule = {
   command: "list",
   describe: "List categories",
@@ -1290,28 +1406,21 @@ var CategoryListModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCategoryClient2({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCategoryClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.getCategories();
     emitWithFormat(res.categories, format, filename);
   }
 };
 
-// src/commands/canvas/commands/category/pull.ts
-import { UncachedCategoryClient as UncachedCategoryClient3 } from "@uniformdev/canvas";
-
-// src/commands/canvas/commands/category/_util.ts
-var selectIdentifier = (category) => category.id;
-var selectDisplayName = (category) => `${category.name} (pid: ${category.id})`;
-
 // src/commands/canvas/categoriesEngineDataSource.ts
 function createCategoriesEngineDataSource({
   client
 }) {
   async function* getObjects() {
-    const componentDefinitions = paginateAsync(async () => (await client.getCategories()).categories, {
+    const categories = paginateAsync(async () => (await client.getCategories()).categories, {
       pageSize: 100
     });
-    for await (const def of componentDefinitions) {
+    for await (const def of categories) {
       const result = {
         id: selectIdentifier(def),
         displayName: selectDisplayName(def),
@@ -1377,7 +1486,7 @@ var CategoryPullModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCategoryClient3({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCategoryClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createCategoriesEngineDataSource({ client });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -1414,7 +1523,6 @@ var CategoryPullModule = {
 };
 
 // src/commands/canvas/commands/category/push.ts
-import { UncachedCategoryClient as UncachedCategoryClient4 } from "@uniformdev/canvas";
 var CategoryPushModule = {
   command: "push <directory>",
   describe: "Pushes all categories from files in a directory to Uniform Canvas",
@@ -1451,7 +1559,7 @@ var CategoryPushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCategoryClient4({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCategoryClient({ apiKey, apiHost, fetch: fetch3, projectId });
     let source;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -1483,7 +1591,6 @@ var CategoryPushModule = {
 };
 
 // src/commands/canvas/commands/category/remove.ts
-import { UncachedCategoryClient as UncachedCategoryClient5 } from "@uniformdev/canvas";
 var CategoryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -1499,7 +1606,7 @@ var CategoryRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose, whatIf }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCategoryClient5({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCategoryClient({ apiKey, apiHost, fetch: fetch3, projectId });
     if (!whatIf) {
       await client.removeCategory({ categoryId: id });
     } else {
@@ -1509,7 +1616,6 @@ var CategoryRemoveModule = {
 };
 
 // src/commands/canvas/commands/category/update.ts
-import { UncachedCategoryClient as UncachedCategoryClient6 } from "@uniformdev/canvas";
 var CategoryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -1525,7 +1631,7 @@ var CategoryUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId, verbose, whatIf }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCategoryClient6({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCategoryClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
     if (!whatIf) {
       await client.upsertCategories([file]);
@@ -1549,13 +1655,14 @@ var CategoryModule = {
 // src/commands/canvas/commands/component.ts
 import yargs3 from "yargs";
 
-// src/commands/canvas/commands/component/get.ts
-import { UncachedCanvasClient } from "@uniformdev/canvas";
-
 // src/commands/canvas/commands/component/_util.ts
+import { UncachedCanvasClient } from "@uniformdev/canvas";
 var selectIdentifier2 = (component) => component.id;
 var selectDisplayName2 = (component) => `${component.name} (pid: ${component.id})`;
 var selectSchemaUrl = () => "/schemas/json-schema/component-definition/v1.json";
+function getCanvasClient(options) {
+  return new UncachedCanvasClient({ ...options, limitPolicy: cliLimitPolicy });
+}
 
 // src/commands/canvas/commands/component/get.ts
 var ComponentGetModule = {
@@ -1577,7 +1684,7 @@ var ComponentGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, project: projectId, filename, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCanvasClient({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.getComponentDefinitions({ componentId: id, limit: 1 });
     if (res.componentDefinitions.length === 0) {
       console.error("Component did not exist");
@@ -1596,7 +1703,6 @@ var ComponentGetModule = {
 };
 
 // src/commands/canvas/commands/component/list.ts
-import { UncachedCanvasClient as UncachedCanvasClient2 } from "@uniformdev/canvas";
 var ComponentListModule = {
   command: "list",
   describe: "List component definitions",
@@ -1619,7 +1725,7 @@ var ComponentListModule = {
     apiHost,
     apiKey,
     proxy,
-    limit,
+    limit: limit2,
     offset,
     format,
     filename,
@@ -1627,23 +1733,20 @@ var ComponentListModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCanvasClient2({ apiKey, apiHost, fetch: fetch3, projectId });
-    const res = await client.getComponentDefinitions({ limit, offset });
+    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch3, projectId });
+    const res = await client.getComponentDefinitions({ limit: limit2, offset });
     emitWithFormat(res.componentDefinitions, format, filename);
   }
 };
 
-// src/commands/canvas/commands/component/pull.ts
-import { UncachedCanvasClient as UncachedCanvasClient3 } from "@uniformdev/canvas";
-
 // src/commands/canvas/componentDefinitionEngineDataSource.ts
 function createComponentDefinitionEngineDataSource({
   client
 }) {
   async function* getObjects() {
     const componentDefinitions = paginateAsync(
-      async (offset, limit) => (await client.getComponentDefinitions({ limit, offset })).componentDefinitions,
-      { pageSize: 100 }
+      async (offset, limit2) => (await client.getComponentDefinitions({ limit: limit2, offset })).componentDefinitions,
+      { pageSize: 200 }
     );
     for await (const def of componentDefinitions) {
       const result = {
@@ -1713,7 +1816,7 @@ var ComponentPullModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCanvasClient3({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createComponentDefinitionEngineDataSource({ client });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -1751,7 +1854,6 @@ var ComponentPullModule = {
 };
 
 // src/commands/canvas/commands/component/push.ts
-import { UncachedCanvasClient as UncachedCanvasClient4 } from "@uniformdev/canvas";
 var ComponentPushModule = {
   command: "push <directory>",
   describe: "Pushes all component definitions from files in a directory to Uniform Canvas",
@@ -1788,7 +1890,7 @@ var ComponentPushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCanvasClient4({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch3, projectId });
     let source;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -1821,7 +1923,6 @@ var ComponentPushModule = {
 };
 
 // src/commands/canvas/commands/component/remove.ts
-import { UncachedCanvasClient as UncachedCanvasClient5 } from "@uniformdev/canvas";
 var ComponentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -1840,7 +1941,7 @@ var ComponentRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose, whatIf }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCanvasClient5({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch3, projectId });
     if (!whatIf) {
       await client.removeComponentDefinition({ componentId: id });
     } else {
@@ -1850,7 +1951,6 @@ var ComponentRemoveModule = {
 };
 
 // src/commands/canvas/commands/component/update.ts
-import { UncachedCanvasClient as UncachedCanvasClient6 } from "@uniformdev/canvas";
 var ComponentUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -1866,10 +1966,10 @@ var ComponentUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId, verbose, whatIf }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCanvasClient6({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
     if (!whatIf) {
-      await client.updateComponentDefinition({ componentDefinition: file });
+      await client.updateComponentDefinition({ componentDefinition: omit(file, ["$schema"]) });
     } else {
       whatIfSimpleLog({ id: file.id, displayName: `Component: ${file.name}`, action: "update" });
     }
@@ -1891,7 +1991,6 @@ var ComponentModule = {
 import yargs4 from "yargs";
 
 // src/commands/canvas/commands/composition/get.ts
-import { UncachedCanvasClient as UncachedCanvasClient7 } from "@uniformdev/canvas";
 var CompositionGetModule = {
   command: "get <id>",
   describe: "Fetch a composition",
@@ -1974,7 +2073,7 @@ var CompositionGetModule = {
       console.log(`\u{1F41B} get composition:`, parameters);
     }
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCanvasClient7({ apiKey, edgeApiHost, apiHost, fetch: fetch3, projectId });
+    const client = getCanvasClient({ apiKey, edgeApiHost, apiHost, fetch: fetch3, projectId });
     const res = prepCompositionForDisk(await client.getCompositionById(parameters));
     emitWithFormat(res, format, filename);
   }
@@ -1987,7 +2086,6 @@ var ComponentPatternGetModule = {
 };
 
 // src/commands/canvas/commands/composition/list.ts
-import { UncachedCanvasClient as UncachedCanvasClient8 } from "@uniformdev/canvas";
 var CompositionListModule = {
   command: "list",
   describe: "List compositions",
@@ -2039,7 +2137,7 @@ var CompositionListModule = {
     apiHost,
     apiKey,
     proxy,
-    limit,
+    limit: limit2,
     offset,
     search,
     format,
@@ -2055,7 +2153,7 @@ var CompositionListModule = {
     verbose
   }) => {
     const parameters = {
-      limit,
+      limit: limit2,
       offset,
       search: search && search.length > 0 ? search : void 0,
       pattern: onlyCompositions ? false : onlyPatterns ? true : void 0,
@@ -2069,7 +2167,7 @@ var CompositionListModule = {
       console.log(`\u{1F41B} list compositions:`, parameters);
     }
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCanvasClient8({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.getCompositionList(parameters);
     emitWithFormat(res.compositions, format, filename);
   }
@@ -2125,9 +2223,6 @@ var ComponentPatternListModule = {
   )
 };
 
-// src/commands/canvas/commands/composition/publish.ts
-import { UncachedCanvasClient as UncachedCanvasClient9 } from "@uniformdev/canvas";
-
 // src/commands/canvas/commands/composition/_util.ts
 var selectIdentifier3 = (response) => {
   let baseId = response.composition._id;
@@ -2159,10 +2254,10 @@ function createComponentInstanceEngineDataSource({
   const stateId = convertStateOption(state);
   async function* getObjects() {
     const componentInstances = paginateAsync(
-      async (offset, limit) => {
+      async (offset, limit2) => {
         const parameters = {
           ...clientOptions,
-          limit,
+          limit: limit2,
           offset,
           pattern: onlyCompositions ? false : onlyPatterns ? true : void 0,
           state: stateId,
@@ -2258,7 +2353,7 @@ var CompositionPublishModule = {
     }
     const compositionIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCanvasClient9({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createComponentInstanceEngineDataSource({
       client,
       state: "preview",
@@ -2333,8 +2428,6 @@ var ComponentPatternPublishModule = {
 };
 
 // src/commands/canvas/commands/composition/pull.ts
-import { UncachedCanvasClient as UncachedCanvasClient10 } from "@uniformdev/canvas";
-import { UncachedFileClient as UncachedFileClient3 } from "@uniformdev/files";
 var CompositionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all compositions to local files in a directory",
@@ -2393,8 +2486,8 @@ var CompositionPullModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCanvasClient10({ apiKey, apiHost, fetch: fetch3, projectId });
-    const fileClient = new UncachedFileClient3({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch3, projectId });
+    const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createComponentInstanceEngineDataSource({
       client,
       state,
@@ -2499,8 +2592,6 @@ var ComponentPatternPullModule = {
 };
 
 // src/commands/canvas/commands/composition/push.ts
-import { UncachedCanvasClient as UncachedCanvasClient11 } from "@uniformdev/canvas";
-import { UncachedFileClient as UncachedFileClient4 } from "@uniformdev/files";
 var CompositionPushModule = {
   command: "push <directory>",
   describe: "Pushes all compositions from files in a directory to Uniform Canvas",
@@ -2552,7 +2643,7 @@ var CompositionPushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCanvasClient11({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch3, projectId });
     let source;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -2579,7 +2670,7 @@ var CompositionPushModule = {
       patternType,
       verbose
     });
-    const fileClient = new UncachedFileClient4({ apiKey, apiHost, fetch: fetch3, projectId });
+    const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch3, projectId });
     await syncEngine({
       source,
       target,
@@ -2642,7 +2733,6 @@ var ComponentPatternPushModule = {
 };
 
 // src/commands/canvas/commands/composition/remove.ts
-import { UncachedCanvasClient as UncachedCanvasClient12 } from "@uniformdev/canvas";
 var CompositionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -2664,7 +2754,7 @@ var CompositionRemoveModule = {
       console.log(`\u{1F41B} remove composition: (id: ${id})`);
     }
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCanvasClient12({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch3, projectId });
     if (!whatIf) {
       await client.removeComposition({ compositionId: id });
     } else {
@@ -2680,10 +2770,7 @@ var ComponentPatternRemoveModule = {
 };
 
 // src/commands/canvas/commands/composition/unpublish.ts
-import {
-  CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE2,
-  UncachedCanvasClient as UncachedCanvasClient13
-} from "@uniformdev/canvas";
+import { CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE2 } from "@uniformdev/canvas";
 import { diffJson as diffJson2 } from "diff";
 var CompositionUnpublishModule = {
   command: "unpublish [ids]",
@@ -2734,7 +2821,7 @@ var CompositionUnpublishModule = {
     const compositionIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
     const targetItems = /* @__PURE__ */ new Map();
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCanvasClient13({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createComponentInstanceEngineDataSource({
       client,
       state: "published",
@@ -2779,7 +2866,7 @@ var CompositionUnpublishModule = {
         providerId: sourceObject.providerId,
         displayName: sourceObject.displayName ?? sourceObject.providerId,
         whatIf,
-        diff: diffJson2(targetObject.object, sourceObject.object)
+        diff: () => diffJson2(targetObject.object, sourceObject.object)
       });
     }
   }
@@ -2823,7 +2910,6 @@ var ComponentPatternUnpublishModule = {
 };
 
 // src/commands/canvas/commands/composition/update.ts
-import { UncachedCanvasClient as UncachedCanvasClient14 } from "@uniformdev/canvas";
 var CompositionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -2847,7 +2933,7 @@ var CompositionUpdateModule = {
       console.log(`\u{1F41B} update composition: (filename: ${filename}, state: ${convertStateOption(state)})`);
     }
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedCanvasClient14({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
     if (!whatIf) {
       await client.updateComposition({ ...file, state: convertStateOption(state) });
@@ -3133,8 +3219,15 @@ var CompositionPatternModule = {
 // src/commands/canvas/commands/contentType.ts
 import yargs7 from "yargs";
 
-// src/commands/canvas/commands/contentType/get.ts
+// src/commands/canvas/commands/contentType/_util.ts
 import { ContentClient } from "@uniformdev/canvas";
+var selectContentTypeIdentifier = (ct) => ct.id;
+var selectContentTypeDisplayName = (ct) => `${ct.name} (pid: ${ct.id})`;
+function getContentClient(options) {
+  return new ContentClient({ ...options, limitPolicy: cliLimitPolicy, bypassCache: true });
+}
+
+// src/commands/canvas/commands/contentType/get.ts
 var ContentTypeGetModule = {
   command: "get <id>",
   describe: "Get a content type",
@@ -3154,7 +3247,7 @@ var ContentTypeGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, filename, project: projectId, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getContentClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.getContentTypes({ offset: 0, limit: 1e3 });
     const found = res.contentTypes.find((f) => f.id === id);
     if (!found) {
@@ -3165,26 +3258,18 @@ var ContentTypeGetModule = {
 };
 
 // src/commands/canvas/commands/contentType/list.ts
-import { ContentClient as ContentClient2 } from "@uniformdev/canvas";
 var ContentTypeListModule = {
   command: "list",
   describe: "List content types",
   builder: (yargs38) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs38))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getContentClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.getContentTypes({ offset: 0, limit: 1e3 });
     emitWithFormat(res.contentTypes, format, filename);
   }
 };
 
-// src/commands/canvas/commands/contentType/pull.ts
-import { ContentClient as ContentClient3 } from "@uniformdev/canvas";
-
-// src/commands/canvas/commands/contentType/_util.ts
-var selectContentTypeIdentifier = (ct) => ct.id;
-var selectContentTypeDisplayName = (ct) => `${ct.name} (pid: ${ct.id})`;
-
 // src/commands/canvas/contentTypeEngineDataSource.ts
 function createContentTypeEngineDataSource({
   client
@@ -3257,12 +3342,11 @@ var ContentTypePullModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient3({
+    const client = getContentClient({
       apiKey,
       apiHost,
       fetch: fetch3,
-      projectId,
-      bypassCache: true
+      projectId
     });
     const source = createContentTypeEngineDataSource({ client });
     let target;
@@ -3300,7 +3384,6 @@ var ContentTypePullModule = {
 };
 
 // src/commands/canvas/commands/contentType/push.ts
-import { ContentClient as ContentClient4 } from "@uniformdev/canvas";
 var ContentTypePushModule = {
   command: "push <directory>",
   describe: "Pushes all content types from files in a directory to Uniform",
@@ -3342,12 +3425,11 @@ var ContentTypePushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient4({
+    const client = getContentClient({
       apiKey,
       apiHost,
       fetch: fetch3,
-      projectId,
-      bypassCache: true
+      projectId
     });
     let source;
     const isPackage = isPathAPackageFile(directory);
@@ -3380,7 +3462,6 @@ var ContentTypePushModule = {
 };
 
 // src/commands/canvas/commands/contentType/remove.ts
-import { ContentClient as ContentClient5 } from "@uniformdev/canvas";
 var ContentTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -3396,7 +3477,7 @@ var ContentTypeRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose, whatIf }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient5({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getContentClient({ apiKey, apiHost, fetch: fetch3, projectId });
     if (!whatIf) {
       await client.deleteContentType({ contentTypeId: id });
     } else {
@@ -3406,7 +3487,6 @@ var ContentTypeRemoveModule = {
 };
 
 // src/commands/canvas/commands/contentType/update.ts
-import { ContentClient as ContentClient6 } from "@uniformdev/canvas";
 var ContentTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -3422,7 +3502,7 @@ var ContentTypeUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId, verbose, whatIf }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient6({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getContentClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
     if (!whatIf) {
       await client.upsertContentType({ contentType: file });
@@ -3446,8 +3526,13 @@ var ContentTypeModule = {
 // src/commands/canvas/commands/dataSource.ts
 import yargs8 from "yargs";
 
-// src/commands/canvas/commands/dataSource/get.ts
+// src/commands/canvas/commands/dataSource/_util.ts
 import { DataSourceClient } from "@uniformdev/canvas";
+function getDataSourceClient(options) {
+  return new DataSourceClient({ ...options, bypassCache: true, limitPolicy: cliLimitPolicy });
+}
+
+// src/commands/canvas/commands/dataSource/get.ts
 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.",
@@ -3455,7 +3540,6 @@ var DataSourceGetModule = {
     withApiOptions(
       withDebugOptions(
         withProjectOptions(
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
           yargs38.positional("id", { demandOption: true, describe: "Data source public ID to fetch" })
         )
       )
@@ -3463,14 +3547,13 @@ var DataSourceGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new DataSourceClient({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getDataSourceClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.get({ dataSourceId: id });
     emitWithFormat(res.result, "json", void 0);
   }
 };
 
 // src/commands/canvas/commands/dataSource/remove.ts
-import { DataSourceClient as DataSourceClient2 } from "@uniformdev/canvas";
 var DataSourceRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -3486,7 +3569,7 @@ var DataSourceRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose, whatIf }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new DataSourceClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getDataSourceClient({ apiKey, apiHost, fetch: fetch3, projectId });
     if (!whatIf) {
       await client.remove({ dataSourceId: id });
     } else {
@@ -3496,7 +3579,6 @@ var DataSourceRemoveModule = {
 };
 
 // src/commands/canvas/commands/dataSource/update.ts
-import { DataSourceClient as DataSourceClient3 } from "@uniformdev/canvas";
 var DataSourceUpdateModule = {
   command: "update <dataSource>",
   aliases: ["put"],
@@ -3525,7 +3607,7 @@ var DataSourceUpdateModule = {
     whatIf
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new DataSourceClient3({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getDataSourceClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = JSON.parse(dataSource);
     if (!whatIf) {
       await client.upsert({ data: file, integrationType });
@@ -3549,8 +3631,15 @@ var DataSourceModule = {
 // src/commands/canvas/commands/dataType.ts
 import yargs9 from "yargs";
 
-// src/commands/canvas/commands/dataType/get.ts
+// src/commands/canvas/commands/dataType/_util.ts
 import { DataTypeClient } from "@uniformdev/canvas";
+var selectIdentifier4 = (dataType) => dataType.id;
+var selectDisplayName4 = (dataType) => `${dataType.displayName} (pid: ${dataType.id})`;
+function getDataTypeClient(options) {
+  return new DataTypeClient({ ...options, limitPolicy: cliLimitPolicy, bypassCache: true });
+}
+
+// src/commands/canvas/commands/dataType/get.ts
 var DataTypeGetModule = {
   command: "get <id>",
   describe: "Get a data type",
@@ -3560,7 +3649,6 @@ var DataTypeGetModule = {
       withDebugOptions(
         withApiOptions(
           withProjectOptions(
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             yargs38.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
           )
         )
@@ -3569,7 +3657,7 @@ var DataTypeGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, filename, project: projectId, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new DataTypeClient({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getDataTypeClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.get();
     const found = res.results.find((f) => f.id === id);
     if (!found) {
@@ -3580,7 +3668,6 @@ var DataTypeGetModule = {
 };
 
 // src/commands/canvas/commands/dataType/list.ts
-import { DataTypeClient as DataTypeClient2 } from "@uniformdev/canvas";
 var DataTypeListModule = {
   command: "list",
   describe: "List data types",
@@ -3588,19 +3675,12 @@ var DataTypeListModule = {
   builder: (yargs38) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs38))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new DataTypeClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getDataTypeClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.get();
     emitWithFormat(res.results, format, filename);
   }
 };
 
-// src/commands/canvas/commands/dataType/pull.ts
-import { DataTypeClient as DataTypeClient3 } from "@uniformdev/canvas";
-
-// src/commands/canvas/commands/dataType/_util.ts
-var selectIdentifier4 = (dataType) => dataType.id;
-var selectDisplayName4 = (dataType) => `${dataType.displayName} (pid: ${dataType.id})`;
-
 // src/commands/canvas/dataTypeEngineDataSource.ts
 function createDataTypeEngineDataSource({
   client
@@ -3675,12 +3755,11 @@ var DataTypePullModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new DataTypeClient3({
+    const client = getDataTypeClient({
       apiKey,
       apiHost,
       fetch: fetch3,
-      projectId,
-      bypassCache: true
+      projectId
     });
     const source = createDataTypeEngineDataSource({ client });
     let target;
@@ -3718,7 +3797,6 @@ var DataTypePullModule = {
 };
 
 // src/commands/canvas/commands/dataType/push.ts
-import { DataTypeClient as DataTypeClient4 } from "@uniformdev/canvas";
 var DataTypePushModule = {
   command: "push <directory>",
   describe: "Pushes all data types from files in a directory to Uniform",
@@ -3755,12 +3833,11 @@ var DataTypePushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new DataTypeClient4({
+    const client = getDataTypeClient({
       apiKey,
       apiHost,
       fetch: fetch3,
-      projectId,
-      bypassCache: true
+      projectId
     });
     let source;
     const isPackage = isPathAPackageFile(directory);
@@ -3793,7 +3870,6 @@ var DataTypePushModule = {
 };
 
 // src/commands/canvas/commands/dataType/remove.ts
-import { DataTypeClient as DataTypeClient5 } from "@uniformdev/canvas";
 var DataTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -3809,7 +3885,7 @@ var DataTypeRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId, whatIf }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new DataTypeClient5({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getDataTypeClient({ apiKey, apiHost, fetch: fetch3, projectId });
     if (!whatIf) {
       await client.remove({ typeId: id });
     } else {
@@ -3819,7 +3895,6 @@ var DataTypeRemoveModule = {
 };
 
 // src/commands/canvas/commands/dataType/update.ts
-import { DataTypeClient as DataTypeClient6 } from "@uniformdev/canvas";
 var DataTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -3835,7 +3910,7 @@ var DataTypeUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId, verbose, whatIf }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new DataTypeClient6({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getDataTypeClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
     if (!whatIf) {
       await client.upsert({ data: file });
@@ -3860,7 +3935,6 @@ var DataTypeModule = {
 import yargs10 from "yargs";
 
 // src/commands/canvas/commands/entry/get.ts
-import { ContentClient as ContentClient7 } from "@uniformdev/canvas";
 var EntryGetModule = {
   command: "get <id>",
   describe: "Get an entry",
@@ -3911,7 +3985,7 @@ var EntryGetModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient7({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getContentClient({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId });
     const res = await client.getEntries({
       offset: 0,
       limit: 1,
@@ -3931,7 +4005,6 @@ 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",
@@ -3968,16 +4041,16 @@ var EntryListModule = {
     filename,
     project: projectId,
     state,
-    limit,
+    limit: limit2,
     offset,
     search,
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient8({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getContentClient({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId });
     const res = await client.getEntries({
       offset,
-      limit: search.length > 0 && limit === LEGACY_DEFAULT_LIMIT ? 100 : limit,
+      limit: search.length > 0 && limit2 === LEGACY_DEFAULT_LIMIT ? 100 : limit2,
       // Search API requires a lower default limit (100)
       search: search.length > 0 ? search : void 0,
       state: convertStateOption(state),
@@ -3989,9 +4062,6 @@ var EntryListModule = {
   }
 };
 
-// src/commands/canvas/commands/entry/publish.ts
-import { ContentClient as ContentClient10 } from "@uniformdev/canvas";
-
 // src/commands/canvas/entryEngineDataSource.ts
 import { ApiClientError, convertEntryToPutEntry } from "@uniformdev/canvas";
 
@@ -4024,11 +4094,11 @@ function createEntryEngineDataSource({
   const stateId = convertStateOption(state);
   async function* getObjects() {
     const entries = paginateAsync(
-      async (offset, limit) => {
+      async (offset, limit2) => {
         try {
           return (await client.getEntries({
             offset,
-            limit,
+            limit: limit2,
             entryIDs,
             pattern: onlyEntries ? false : onlyPatterns ? true : void 0,
             skipDataResolution: true,
@@ -4099,7 +4169,7 @@ var EntryPublishModule = {
     }
     const entryIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient10({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getContentClient({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId });
     const source = createEntryEngineDataSource({
       client,
       state: "preview",
@@ -4124,8 +4194,6 @@ var EntryPublishModule = {
 };
 
 // src/commands/canvas/commands/entry/pull.ts
-import { ContentClient as ContentClient11 } from "@uniformdev/canvas";
-import { UncachedFileClient as UncachedFileClient5 } from "@uniformdev/files";
 var EntryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all entries to local files in a directory",
@@ -4172,14 +4240,13 @@ var EntryPullModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient11({
+    const client = getContentClient({
       apiKey,
       apiHost,
       fetch: fetch3,
-      projectId,
-      bypassCache: true
+      projectId
     });
-    const fileClient = new UncachedFileClient5({ apiKey, apiHost, fetch: fetch3, projectId });
+    const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createEntryEngineDataSource({ client, state, onlyEntries: true });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -4228,8 +4295,6 @@ var EntryPullModule = {
 };
 
 // src/commands/canvas/commands/entry/push.ts
-import { ContentClient as ContentClient12 } from "@uniformdev/canvas";
-import { UncachedFileClient as UncachedFileClient6 } from "@uniformdev/files";
 var EntryPushModule = {
   command: "push <directory>",
   describe: "Pushes all entries from files in a directory to Uniform",
@@ -4269,12 +4334,11 @@ var EntryPushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient12({
+    const client = getContentClient({
       apiKey,
       apiHost,
       fetch: fetch3,
-      projectId,
-      bypassCache: true
+      projectId
     });
     let source;
     const isPackage = isPathAPackageFile(directory);
@@ -4295,7 +4359,7 @@ var EntryPushModule = {
       });
     }
     const target = createEntryEngineDataSource({ client, state, onlyEntries: true });
-    const fileClient = new UncachedFileClient6({ apiKey, apiHost, fetch: fetch3, projectId });
+    const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch3, projectId });
     await syncEngine({
       source,
       target,
@@ -4319,7 +4383,6 @@ var EntryPushModule = {
 };
 
 // src/commands/canvas/commands/entry/remove.ts
-import { ContentClient as ContentClient13 } from "@uniformdev/canvas";
 var EntryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -4335,7 +4398,7 @@ var EntryRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose, whatIf }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient13({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getContentClient({ apiKey, apiHost, fetch: fetch3, projectId });
     if (!whatIf) {
       await client.deleteEntry({ entryId: id });
     } else {
@@ -4345,7 +4408,7 @@ var EntryRemoveModule = {
 };
 
 // src/commands/canvas/commands/entry/unpublish.ts
-import { CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE3, ContentClient as ContentClient14 } from "@uniformdev/canvas";
+import { CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE3 } from "@uniformdev/canvas";
 import { diffJson as diffJson3 } from "diff";
 var EntryUnpublishModule = {
   command: "unpublish [ids]",
@@ -4375,7 +4438,7 @@ var EntryUnpublishModule = {
     const entryIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
     const targetItems = /* @__PURE__ */ new Map();
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient14({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getContentClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createEntryEngineDataSource({
       client,
       state: "published",
@@ -4413,14 +4476,13 @@ var EntryUnpublishModule = {
         providerId: sourceObject.providerId,
         displayName: sourceObject.displayName ?? sourceObject.providerId,
         whatIf,
-        diff: diffJson3(targetObject.object, sourceObject.object)
+        diff: () => diffJson3(targetObject.object, sourceObject.object)
       });
     }
   }
 };
 
 // src/commands/canvas/commands/entry/update.ts
-import { ContentClient as ContentClient15 } from "@uniformdev/canvas";
 var EntryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -4448,7 +4510,7 @@ var EntryUpdateModule = {
     whatIf
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient15({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getContentClient({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
     if (!whatIf) {
       await client.upsertEntry({ ...file, state: convertStateOption(state) });
@@ -4472,7 +4534,6 @@ var EntryModule = {
 import yargs11 from "yargs";
 
 // src/commands/canvas/commands/entryPattern/get.ts
-import { ContentClient as ContentClient16 } from "@uniformdev/canvas";
 var EntryPatternGetModule = {
   command: "get <id>",
   describe: "Get an entry pattern",
@@ -4495,7 +4556,7 @@ var EntryPatternGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, filename, project: projectId, state, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient16({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getContentClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.getEntries({
       offset: 0,
       limit: 1,
@@ -4514,7 +4575,6 @@ var EntryPatternGetModule = {
 };
 
 // src/commands/canvas/commands/entryPattern/list.ts
-import { ContentClient as ContentClient17 } from "@uniformdev/canvas";
 var EntryPatternListModule = {
   command: "list",
   describe: "List entry patterns",
@@ -4535,7 +4595,7 @@ var EntryPatternListModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient17({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getContentClient({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId });
     const res = await client.getEntries({
       offset: 0,
       limit: 1e3,
@@ -4550,7 +4610,6 @@ var EntryPatternListModule = {
 };
 
 // src/commands/canvas/commands/entryPattern/publish.ts
-import { ContentClient as ContentClient18 } from "@uniformdev/canvas";
 var EntryPatternPublishModule = {
   command: "publish [ids]",
   describe: "Publishes entry pattern(s)",
@@ -4580,7 +4639,7 @@ var EntryPatternPublishModule = {
     }
     const entryIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient18({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getContentClient({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId });
     const source = createEntryEngineDataSource({
       client,
       state: "preview",
@@ -4605,8 +4664,6 @@ var EntryPatternPublishModule = {
 };
 
 // src/commands/canvas/commands/entryPattern/pull.ts
-import { ContentClient as ContentClient19 } from "@uniformdev/canvas";
-import { UncachedFileClient as UncachedFileClient7 } from "@uniformdev/files";
 var EntryPatternPullModule = {
   command: "pull <directory>",
   describe: "Pulls all entry patterns to local files in a directory",
@@ -4653,14 +4710,13 @@ var EntryPatternPullModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient19({
+    const client = getContentClient({
       apiKey,
       apiHost,
       fetch: fetch3,
-      projectId,
-      bypassCache: true
+      projectId
     });
-    const fileClient = new UncachedFileClient7({ apiKey, apiHost, fetch: fetch3, projectId });
+    const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createEntryEngineDataSource({ client, state, onlyPatterns: true });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -4709,8 +4765,6 @@ var EntryPatternPullModule = {
 };
 
 // src/commands/canvas/commands/entryPattern/push.ts
-import { ContentClient as ContentClient20 } from "@uniformdev/canvas";
-import { UncachedFileClient as UncachedFileClient8 } from "@uniformdev/files";
 var EntryPatternPushModule = {
   command: "push <directory>",
   describe: "Pushes all entry patterns from files in a directory to Uniform",
@@ -4755,12 +4809,11 @@ var EntryPatternPushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient20({
+    const client = getContentClient({
       apiKey,
       apiHost,
       fetch: fetch3,
-      projectId,
-      bypassCache: true
+      projectId
     });
     let source;
     const isPackage = isPathAPackageFile(directory);
@@ -4781,7 +4834,7 @@ var EntryPatternPushModule = {
       });
     }
     const target = createEntryEngineDataSource({ client, state, onlyPatterns: true });
-    const fileClient = new UncachedFileClient8({ apiKey, apiHost, fetch: fetch3, projectId });
+    const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch3, projectId });
     await syncEngine({
       source,
       target,
@@ -4805,7 +4858,6 @@ var EntryPatternPushModule = {
 };
 
 // src/commands/canvas/commands/entryPattern/remove.ts
-import { ContentClient as ContentClient21 } from "@uniformdev/canvas";
 var EntryPatternRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -4821,7 +4873,7 @@ var EntryPatternRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose, whatIf }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient21({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getContentClient({ apiKey, apiHost, fetch: fetch3, projectId });
     if (!whatIf) {
       await client.deleteEntry({ entryId: id });
     } else {
@@ -4831,7 +4883,7 @@ var EntryPatternRemoveModule = {
 };
 
 // src/commands/canvas/commands/entryPattern/unpublish.ts
-import { CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE4, ContentClient as ContentClient22 } from "@uniformdev/canvas";
+import { CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE4 } from "@uniformdev/canvas";
 import { diffJson as diffJson4 } from "diff";
 var EntryPatternUnpublishModule = {
   command: "unpublish [ids]",
@@ -4861,7 +4913,7 @@ var EntryPatternUnpublishModule = {
     const entryIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
     const targetItems = /* @__PURE__ */ new Map();
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient22({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getContentClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createEntryEngineDataSource({
       client,
       state: "published",
@@ -4899,14 +4951,13 @@ var EntryPatternUnpublishModule = {
         providerId: sourceObject.providerId,
         displayName: sourceObject.displayName ?? sourceObject.providerId,
         whatIf,
-        diff: diffJson4(targetObject.object, sourceObject.object)
+        diff: () => diffJson4(targetObject.object, sourceObject.object)
       });
     }
   }
 };
 
 // src/commands/canvas/commands/entryPattern/update.ts
-import { ContentClient as ContentClient23 } from "@uniformdev/canvas";
 var EntryPatternUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -4934,7 +4985,7 @@ var EntryPatternUpdateModule = {
     whatIf
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new ContentClient23({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getContentClient({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
     if (!whatIf) {
       await client.upsertEntry({ ...file, state: convertStateOption(state) });
@@ -4961,9 +5012,6 @@ var EntryPatternModule = {
 // src/commands/canvas/commands/locale.ts
 import yargs12 from "yargs";
 
-// src/commands/canvas/commands/locale/pull.ts
-import { LocaleClient } from "@uniformdev/canvas";
-
 // src/commands/canvas/localesEngineDataSource.ts
 function createLocaleEngineDataSource({
   client
@@ -4994,6 +5042,12 @@ function createLocaleEngineDataSource({
   };
 }
 
+// src/commands/canvas/commands/locale/_util.ts
+import { LocaleClient } from "@uniformdev/canvas";
+function getLocaleClient(options) {
+  return new LocaleClient({ ...options, bypassCache: true, limitPolicy: cliLimitPolicy });
+}
+
 // src/commands/canvas/commands/locale/pull.ts
 var LocalePullModule = {
   command: "pull <directory>",
@@ -5038,12 +5092,11 @@ var LocalePullModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new LocaleClient({
+    const client = getLocaleClient({
       apiKey,
       apiHost,
       fetch: fetch3,
-      projectId,
-      bypassCache: true
+      projectId
     });
     const source = createLocaleEngineDataSource({ client });
     let target;
@@ -5081,7 +5134,6 @@ var LocalePullModule = {
 };
 
 // src/commands/canvas/commands/locale/push.ts
-import { LocaleClient as LocaleClient2 } from "@uniformdev/canvas";
 var LocalePushModule = {
   command: "push <directory>",
   describe: "Pushes all locales from files in a directory to Uniform",
@@ -5118,12 +5170,11 @@ var LocalePushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new LocaleClient2({
+    const client = getLocaleClient({
       apiKey,
       apiHost,
       fetch: fetch3,
-      projectId,
-      bypassCache: true
+      projectId
     });
     let source;
     const isPackage = isPathAPackageFile(directory);
@@ -5395,8 +5446,15 @@ var PatternModule = {
 // src/commands/canvas/commands/previewUrl.ts
 import yargs14 from "yargs";
 
-// src/commands/canvas/commands/previewUrl/get.ts
+// src/commands/canvas/commands/previewUrl/_util.ts
 import { PreviewClient } from "@uniformdev/canvas";
+var selectIdentifier5 = (previewUrl) => previewUrl.id;
+var selectDisplayName5 = (previewUrl) => `${previewUrl.name} (pid: ${previewUrl.id})`;
+function getPreviewClient(options) {
+  return new PreviewClient({ ...options, bypassCache: true, limitPolicy: cliLimitPolicy });
+}
+
+// src/commands/canvas/commands/previewUrl/get.ts
 var PreviewUrlGetModule = {
   command: "get <id>",
   describe: "Fetch a preview URL",
@@ -5413,7 +5471,7 @@ var PreviewUrlGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, project: projectId, filename, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PreviewClient({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getPreviewClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const previewUrl = await client.getPreviewUrl({ id });
     if (!previewUrl) {
       console.error("Preview URL did not exist");
@@ -5425,7 +5483,6 @@ var PreviewUrlGetModule = {
 };
 
 // src/commands/canvas/commands/previewUrl/list.ts
-import { PreviewClient as PreviewClient2 } from "@uniformdev/canvas";
 var PreviewUrlListModule = {
   command: "list",
   describe: "List preview URLs",
@@ -5435,19 +5492,12 @@ var PreviewUrlListModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PreviewClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getPreviewClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.getPreviewUrls();
     emitWithFormat(res.previewUrls, format, filename);
   }
 };
 
-// src/commands/canvas/commands/previewUrl/pull.ts
-import { PreviewClient as PreviewClient3 } from "@uniformdev/canvas";
-
-// src/commands/canvas/commands/previewUrl/_util.ts
-var selectIdentifier5 = (previewUrl) => previewUrl.id;
-var selectDisplayName5 = (previewUrl) => `${previewUrl.name} (pid: ${previewUrl.id})`;
-
 // src/commands/canvas/previewUrlEngineDataSource.ts
 function createPreviewUrlEngineDataSource({
   client
@@ -5520,7 +5570,7 @@ var PreviewUrlPullModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PreviewClient3({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getPreviewClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createPreviewUrlEngineDataSource({ client });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -5557,7 +5607,6 @@ var PreviewUrlPullModule = {
 };
 
 // src/commands/canvas/commands/previewUrl/push.ts
-import { PreviewClient as PreviewClient4 } from "@uniformdev/canvas";
 var PreviewUrlPushModule = {
   command: "push <directory>",
   describe: "Pushes all preview urls from files in a directory to Uniform Canvas",
@@ -5594,7 +5643,7 @@ var PreviewUrlPushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PreviewClient4({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getPreviewClient({ apiKey, apiHost, fetch: fetch3, projectId });
     let source;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -5626,7 +5675,6 @@ var PreviewUrlPushModule = {
 };
 
 // src/commands/canvas/commands/previewUrl/remove.ts
-import { PreviewClient as PreviewClient5 } from "@uniformdev/canvas";
 var PreviewUrlRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -5642,7 +5690,7 @@ var PreviewUrlRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose, whatIf }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PreviewClient5({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getPreviewClient({ apiKey, apiHost, fetch: fetch3, projectId });
     if (!whatIf) {
       await client.deletePreviewUrl({ id });
     } else {
@@ -5652,7 +5700,6 @@ var PreviewUrlRemoveModule = {
 };
 
 // src/commands/canvas/commands/previewUrl/update.ts
-import { PreviewClient as PreviewClient6 } from "@uniformdev/canvas";
 var PreviewUrlUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -5668,7 +5715,7 @@ var PreviewUrlUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId, whatIf, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PreviewClient6({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getPreviewClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
     if (!whatIf) {
       await client.upsertPreviewUrl(file);
@@ -5693,7 +5740,6 @@ var PreviewUrlModule = {
 import yargs15 from "yargs";
 
 // src/commands/canvas/commands/previewViewport/get.ts
-import { PreviewClient as PreviewClient7 } from "@uniformdev/canvas";
 var PreviewViewportGetModule = {
   command: "get <id>",
   describe: "Fetch a preview viewport",
@@ -5710,7 +5756,7 @@ var PreviewViewportGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, project: projectId, filename, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PreviewClient7({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getPreviewClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const previewViewport = await client.getPreviewViewport({ id });
     if (!previewViewport) {
       console.error("Preview viewport did not exist");
@@ -5722,7 +5768,6 @@ var PreviewViewportGetModule = {
 };
 
 // src/commands/canvas/commands/previewViewport/list.ts
-import { PreviewClient as PreviewClient8 } from "@uniformdev/canvas";
 var PreviewViewportListModule = {
   command: "list",
   describe: "List preview viewports",
@@ -5732,15 +5777,12 @@ var PreviewViewportListModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PreviewClient8({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getPreviewClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.getPreviewViewports();
     emitWithFormat(res.previewViewports, format, filename);
   }
 };
 
-// src/commands/canvas/commands/previewViewport/pull.ts
-import { PreviewClient as PreviewClient9 } from "@uniformdev/canvas";
-
 // src/commands/canvas/commands/previewViewport/_util.ts
 var selectIdentifier6 = (previewViewport) => previewViewport.id;
 var selectDisplayName6 = (previewViewport) => `${previewViewport.name} (pid: ${previewViewport.id})`;
@@ -5817,7 +5859,7 @@ var PreviewViewportPullModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PreviewClient9({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getPreviewClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createPreviewViewportEngineDataSource({ client });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -5854,7 +5896,6 @@ var PreviewViewportPullModule = {
 };
 
 // src/commands/canvas/commands/previewViewport/push.ts
-import { PreviewClient as PreviewClient10 } from "@uniformdev/canvas";
 var PreviewViewportPushModule = {
   command: "push <directory>",
   describe: "Pushes all preview viewports from files in a directory to Uniform Canvas",
@@ -5891,7 +5932,7 @@ var PreviewViewportPushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PreviewClient10({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getPreviewClient({ apiKey, apiHost, fetch: fetch3, projectId });
     let source;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -5923,7 +5964,6 @@ var PreviewViewportPushModule = {
 };
 
 // src/commands/canvas/commands/previewViewport/remove.ts
-import { PreviewClient as PreviewClient11 } from "@uniformdev/canvas";
 var PreviewViewportRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -5939,7 +5979,7 @@ var PreviewViewportRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose, whatIf }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PreviewClient11({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getPreviewClient({ apiKey, apiHost, fetch: fetch3, projectId });
     if (!whatIf) {
       await client.deletePreviewViewport({ id });
     } else {
@@ -5949,7 +5989,6 @@ var PreviewViewportRemoveModule = {
 };
 
 // src/commands/canvas/commands/previewViewport/update.ts
-import { PreviewClient as PreviewClient12 } from "@uniformdev/canvas";
 var PreviewViewportUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -5965,7 +6004,7 @@ var PreviewViewportUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId, whatIf, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PreviewClient12({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getPreviewClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
     if (!whatIf) {
       await client.upsertPreviewViewport(file);
@@ -5989,8 +6028,13 @@ var PreviewViewportModule = {
 // src/commands/canvas/commands/prompts.ts
 import yargs16 from "yargs";
 
-// src/commands/canvas/commands/prompts/get.ts
+// src/commands/canvas/commands/prompts/_util.ts
 import { PromptClient } from "@uniformdev/canvas";
+var selectPromptIdentifier = (e) => e.id;
+var selectPromptDisplayName = (e) => `${e.name ?? "Untitled"} (pid: ${e.id})`;
+var getPromptClient = (options) => new PromptClient({ ...options, bypassCache: true, limitPolicy: cliLimitPolicy });
+
+// src/commands/canvas/commands/prompts/get.ts
 var PromptGetModule = {
   command: "get <id>",
   describe: "Get a prompt",
@@ -5999,7 +6043,6 @@ var PromptGetModule = {
       withFormatOptions(
         withApiOptions(
           withProjectOptions(
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             yargs38.positional("id", { demandOption: true, describe: "Prompt ID to fetch" })
           )
         )
@@ -6008,7 +6051,7 @@ var PromptGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, filename, project: projectId, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PromptClient({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getPromptClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.get({ promptId: id });
     if (!res) {
       throw new Error(`Prompt with ID ${id} not found`);
@@ -6018,26 +6061,18 @@ var PromptGetModule = {
 };
 
 // src/commands/canvas/commands/prompts/list.ts
-import { PromptClient as PromptClient2 } from "@uniformdev/canvas";
 var PromptListModule = {
   command: "list",
   describe: "List prompts",
   builder: (yargs38) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs38))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PromptClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getPromptClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.get();
     emitWithFormat(res, format, filename);
   }
 };
 
-// src/commands/canvas/commands/prompts/pull.ts
-import { PromptClient as PromptClient3 } from "@uniformdev/canvas";
-
-// src/commands/canvas/commands/prompts/_util.ts
-var selectPromptIdentifier = (e) => e.id;
-var selectPromptDisplayName = (e) => `${e.name ?? "Untitled"} (pid: ${e.id})`;
-
 // src/commands/canvas/promptEngineDataSource.ts
 function createPromptEngineDataSource({
   client
@@ -6112,12 +6147,11 @@ var PromptPullModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PromptClient3({
+    const client = getPromptClient({
       apiKey,
       apiHost,
       fetch: fetch3,
-      projectId,
-      bypassCache: true
+      projectId
     });
     const source = createPromptEngineDataSource({ client });
     let target;
@@ -6155,7 +6189,6 @@ var PromptPullModule = {
 };
 
 // src/commands/canvas/commands/prompts/push.ts
-import { PromptClient as PromptClient4 } from "@uniformdev/canvas";
 var PromptPushModule = {
   command: "push <directory>",
   describe: "Pushes all prompts from files in a directory to Uniform",
@@ -6192,12 +6225,11 @@ var PromptPushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PromptClient4({
+    const client = getPromptClient({
       apiKey,
       apiHost,
       fetch: fetch3,
-      projectId,
-      bypassCache: true
+      projectId
     });
     let source;
     const isPackage = isPathAPackageFile(directory);
@@ -6230,7 +6262,6 @@ var PromptPushModule = {
 };
 
 // src/commands/canvas/commands/prompts/remove.ts
-import { PromptClient as PromptClient5 } from "@uniformdev/canvas";
 var PromptRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -6244,7 +6275,7 @@ var PromptRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose, whatIf }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PromptClient5({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getPromptClient({ apiKey, apiHost, fetch: fetch3, projectId });
     if (!whatIf) {
       await client.remove({ promptId: id });
     } else {
@@ -6254,7 +6285,6 @@ var PromptRemoveModule = {
 };
 
 // src/commands/canvas/commands/prompts/update.ts
-import { PromptClient as PromptClient6 } from "@uniformdev/canvas";
 var PromptUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -6270,7 +6300,7 @@ var PromptUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId, verbose, whatIf }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new PromptClient6({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getPromptClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
     if (!whatIf) {
       await client.upsert({ data: file });
@@ -6294,12 +6324,11 @@ var PromptModule = {
 // src/commands/canvas/commands/workflow.ts
 import yargs17 from "yargs";
 
-// src/commands/canvas/commands/workflow/pull.ts
-import { WorkflowClient } from "@uniformdev/canvas";
-
 // src/commands/canvas/commands/workflow/_util.ts
+import { WorkflowClient } from "@uniformdev/canvas";
 var selectIdentifier7 = (workflow) => workflow.id;
 var selectDisplayName7 = (workflow) => `${workflow.name} (pid: ${workflow.id})`;
+var getWorkflowClient = (options) => new WorkflowClient({ ...options, bypassCache: true, limitPolicy: cliLimitPolicy });
 
 // src/commands/canvas/workflowEngineDataSource.ts
 function createWorkflowEngineDataSource({
@@ -6376,7 +6405,7 @@ var WorkflowPullModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new WorkflowClient({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getWorkflowClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createWorkflowEngineDataSource({ client });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -6413,7 +6442,6 @@ var WorkflowPullModule = {
 };
 
 // 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",
@@ -6450,7 +6478,7 @@ var WorkflowPushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new WorkflowClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = getWorkflowClient({ apiKey, apiHost, fetch: fetch3, projectId });
     let source;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -6509,8 +6537,13 @@ import yargs25 from "yargs";
 // src/commands/context/commands/aggregate.ts
 import yargs19 from "yargs";
 
+// src/commands/context/commands/aggregate/_util.ts
+import { AggregateClient } from "@uniformdev/context/api";
+var selectIdentifier8 = (source) => source.id;
+var selectDisplayName8 = (source) => `${source.name} (pid: ${source.id})`;
+var getAggregateClient = (options) => new AggregateClient({ ...options, bypassCache: true, limitPolicy: cliLimitPolicy });
+
 // src/commands/context/commands/aggregate/get.ts
-import { UncachedAggregateClient } from "@uniformdev/context/api";
 var AggregateGetModule = {
   command: "get <id>",
   describe: "Fetch an aggregate",
@@ -6525,7 +6558,7 @@ var AggregateGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, project: projectId, filename }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedAggregateClient({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getAggregateClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.get({ aggregateId: id });
     if (res.aggregates.length === 0) {
       console.error("Aggregate did not exist");
@@ -6537,7 +6570,6 @@ var AggregateGetModule = {
 };
 
 // src/commands/context/commands/aggregate/list.ts
-import { UncachedAggregateClient as UncachedAggregateClient2 } from "@uniformdev/context/api";
 var AggregateListModule = {
   command: "list",
   describe: "List aggregates",
@@ -6545,19 +6577,12 @@ var AggregateListModule = {
   builder: (yargs38) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs38)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedAggregateClient2({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getAggregateClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.get({});
     emitWithFormat(res.aggregates, format, filename);
   }
 };
 
-// src/commands/context/commands/aggregate/pull.ts
-import { UncachedAggregateClient as UncachedAggregateClient3 } from "@uniformdev/context/api";
-
-// src/commands/context/commands/aggregate/_util.ts
-var selectIdentifier8 = (source) => source.id;
-var selectDisplayName8 = (source) => `${source.name} (pid: ${source.id})`;
-
 // src/commands/context/aggregateEngineDataSource.ts
 function createAggregateEngineDataSource({
   client,
@@ -6652,7 +6677,7 @@ var AggregatePullModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedAggregateClient3({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getAggregateClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createAggregateEngineDataSource({ client });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -6689,7 +6714,6 @@ var AggregatePullModule = {
 };
 
 // src/commands/context/commands/aggregate/push.ts
-import { UncachedAggregateClient as UncachedAggregateClient4 } from "@uniformdev/context/api";
 var AggregatePushModule = {
   command: "push <directory>",
   describe: "Pushes all aggregates from files in a directory or package to Uniform",
@@ -6726,7 +6750,7 @@ var AggregatePushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedAggregateClient4({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getAggregateClient({ apiKey, apiHost, fetch: fetch3, projectId });
     let source;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -6759,7 +6783,6 @@ var AggregatePushModule = {
 };
 
 // src/commands/context/commands/aggregate/remove.ts
-import { UncachedAggregateClient as UncachedAggregateClient5 } from "@uniformdev/context/api";
 var AggregateRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -6773,13 +6796,12 @@ var AggregateRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedAggregateClient5({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getAggregateClient({ apiKey, apiHost, fetch: fetch3, projectId });
     await client.remove({ aggregateId: id });
   }
 };
 
 // src/commands/context/commands/aggregate/update.ts
-import { UncachedAggregateClient as UncachedAggregateClient6 } from "@uniformdev/context/api";
 var AggregateUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -6793,7 +6815,7 @@ var AggregateUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedAggregateClient6({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getAggregateClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
     await client.upsert({ aggregate: file });
   }
@@ -6813,8 +6835,15 @@ var AggregateModule = {
 // src/commands/context/commands/enrichment.ts
 import yargs20 from "yargs";
 
-// src/commands/context/commands/enrichment/get.ts
+// src/commands/context/commands/enrichment/_util.ts
 import { UncachedEnrichmentClient } from "@uniformdev/context/api";
+var selectIdentifier9 = (source) => source.id;
+var selectDisplayName9 = (source) => `${source.name} (pid: ${source.id})`;
+function getEnrichmentClient(options) {
+  return new UncachedEnrichmentClient({ ...options, limitPolicy: cliLimitPolicy });
+}
+
+// src/commands/context/commands/enrichment/get.ts
 var EnrichmentGetModule = {
   command: "get <id>",
   describe: "Fetch an enrichment category and its values",
@@ -6829,7 +6858,7 @@ var EnrichmentGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, project: projectId, filename }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedEnrichmentClient({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getEnrichmentClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = (await client.get())?.enrichments?.filter((enr) => enr.id === id);
     if (res.length === 0) {
       console.error("Enrichment did not exist");
@@ -6841,7 +6870,6 @@ var EnrichmentGetModule = {
 };
 
 // src/commands/context/commands/enrichment/list.ts
-import { UncachedEnrichmentClient as UncachedEnrichmentClient2 } from "@uniformdev/context/api";
 var EnrichmentListModule = {
   command: "list",
   describe: "List enrichments",
@@ -6849,19 +6877,12 @@ var EnrichmentListModule = {
   builder: (yargs38) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs38)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedEnrichmentClient2({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getEnrichmentClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.get();
     emitWithFormat(res.enrichments, format, filename);
   }
 };
 
-// src/commands/context/commands/enrichment/pull.ts
-import { UncachedEnrichmentClient as UncachedEnrichmentClient3 } from "@uniformdev/context/api";
-
-// src/commands/context/commands/enrichment/_util.ts
-var selectIdentifier9 = (source) => source.id;
-var selectDisplayName9 = (source) => `${source.name} (pid: ${source.id})`;
-
 // src/commands/context/enrichmentEngineDataSource.ts
 function createEnrichmentEngineDataSource({
   client
@@ -6988,7 +7009,7 @@ var EnrichmentPullModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedEnrichmentClient3({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getEnrichmentClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createEnrichmentEngineDataSource({ client });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -7025,7 +7046,6 @@ var EnrichmentPullModule = {
 };
 
 // src/commands/context/commands/enrichment/push.ts
-import { UncachedEnrichmentClient as UncachedEnrichmentClient4 } from "@uniformdev/context/api";
 var EnrichmentPushModule = {
   command: "push <directory>",
   describe: "Pushes all enrichments from files in a directory or package to Uniform",
@@ -7060,7 +7080,7 @@ var EnrichmentPushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedEnrichmentClient4({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getEnrichmentClient({ apiKey, apiHost, fetch: fetch3, projectId });
     let source;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -7092,7 +7112,6 @@ var EnrichmentPushModule = {
 };
 
 // src/commands/context/commands/enrichment/remove.ts
-import { UncachedEnrichmentClient as UncachedEnrichmentClient5 } from "@uniformdev/context/api";
 var EnrichmentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -7106,7 +7125,7 @@ var EnrichmentRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedEnrichmentClient5({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getEnrichmentClient({ apiKey, apiHost, fetch: fetch3, projectId });
     await client.removeCategory({ enrichmentId: id });
   }
 };
@@ -8120,13 +8139,13 @@ import yargs26 from "yargs";
 import { readFileSync } from "fs";
 
 // src/commands/integration/commands/definition/edgehancer/EdgehancerClient.ts
-import { createLimitPolicy } from "@uniformdev/canvas";
+import { createLimitPolicy as createLimitPolicy2 } from "@uniformdev/canvas";
 import { ApiClient } from "@uniformdev/context/api";
 var ENDPOINT = "/api/v1/integration-edgehancers";
 var EdgehancerClient = class extends ApiClient {
   constructor(options) {
     if (!options.limitPolicy) {
-      options.limitPolicy = createLimitPolicy({});
+      options.limitPolicy = createLimitPolicy2({});
     }
     super(options);
     this.options = options;
@@ -8216,13 +8235,13 @@ var IntegrationEdgehancerModule = {
 };
 
 // src/commands/integration/commands/definition/DefinitionClient.ts
-import { createLimitPolicy as createLimitPolicy2 } from "@uniformdev/canvas";
+import { createLimitPolicy as createLimitPolicy3 } from "@uniformdev/canvas";
 import { ApiClient as ApiClient2 } from "@uniformdev/context/api";
 var ENDPOINT2 = "/api/v1/integration-definitions";
 var DefinitionClient = class extends ApiClient2 {
   constructor(options) {
     if (!options.limitPolicy) {
-      options.limitPolicy = createLimitPolicy2({});
+      options.limitPolicy = createLimitPolicy3({});
     }
     super(options);
     this.options = options;
@@ -8301,13 +8320,13 @@ var IntegrationDefinitionModule = {
 };
 
 // src/commands/integration/commands/InstallClient.ts
-import { createLimitPolicy as createLimitPolicy3 } from "@uniformdev/canvas";
+import { createLimitPolicy as createLimitPolicy4 } from "@uniformdev/canvas";
 import { ApiClient as ApiClient3 } from "@uniformdev/context/api";
 var ENDPOINT3 = "/api/v1/integration-installations";
 var InstallClient = class extends ApiClient3 {
   constructor(options) {
     if (!options.limitPolicy) {
-      options.limitPolicy = createLimitPolicy3({});
+      options.limitPolicy = createLimitPolicy4({});
     }
     super(options);
     this.options = options;
@@ -8349,10 +8368,10 @@ var IntegrationInstallModule = {
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, type, configuration: configuration2, project: projectId }) => {
+  handler: async ({ apiHost, apiKey, proxy, type, configuration, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new InstallClient({ apiKey, apiHost, fetch: fetch3, projectId });
-    const data = configuration2 ? JSON.parse(configuration2) : void 0;
+    const data = configuration ? JSON.parse(configuration) : void 0;
     await client.install({ data, type });
   }
 };
@@ -8412,7 +8431,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.211.0",
+  version: "19.212.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -8461,7 +8480,7 @@ var package_default = {
     "isomorphic-git": "1.25.2",
     "js-yaml": "^4.1.0",
     jsonwebtoken: "9.0.2",
-    "lodash.isequalwith": "^4.4.0",
+    mitt: "^3.0.1",
     open: "10.1.0",
     ora: "8.0.1",
     "p-queue": "7.3.4",
@@ -8478,7 +8497,6 @@ var package_default = {
     "@types/inquirer": "9.0.7",
     "@types/js-yaml": "4.0.9",
     "@types/jsonwebtoken": "9.0.5",
-    "@types/lodash.isequalwith": "4.4.9",
     "@types/node": "22.7.8",
     "@types/yargs": "17.0.32"
   },
@@ -9574,8 +9592,15 @@ import yargs33 from "yargs";
 // src/commands/project-map/commands/projectMapDefinition.ts
 import yargs31 from "yargs";
 
-// src/commands/project-map/commands/ProjectMapDefinition/get.ts
+// src/commands/project-map/commands/ProjectMapDefinition/_util.ts
 import { UncachedProjectMapClient } from "@uniformdev/project-map";
+var selectIdentifier13 = (source) => source.id;
+var selectDisplayName13 = (source) => `${source.name} (pid: ${source.id})`;
+function getProjectMapClient(options) {
+  return new UncachedProjectMapClient({ ...options, limitPolicy: cliLimitPolicy });
+}
+
+// src/commands/project-map/commands/ProjectMapDefinition/get.ts
 var ProjectMapDefinitionGetModule = {
   command: "get <id>",
   describe: "Fetch a project map",
@@ -9590,7 +9615,7 @@ var ProjectMapDefinitionGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, project: projectId, filename }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedProjectMapClient({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getProjectMapClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.getProjectMapDefinition({ projectMapId: id });
     if (res.projectMaps.length === 0) {
       console.error("ProjectMap does not exist");
@@ -9602,7 +9627,6 @@ var ProjectMapDefinitionGetModule = {
 };
 
 // src/commands/project-map/commands/ProjectMapDefinition/list.ts
-import { UncachedProjectMapClient as UncachedProjectMapClient2 } from "@uniformdev/project-map";
 var ProjectMapDefinitionListModule = {
   command: "list",
   describe: "List of project maps",
@@ -9610,15 +9634,12 @@ var ProjectMapDefinitionListModule = {
   builder: (yargs38) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs38)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedProjectMapClient2({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getProjectMapClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.getProjectMapDefinitions();
     emitWithFormat(res.projectMaps, format, filename);
   }
 };
 
-// src/commands/project-map/commands/ProjectMapDefinition/pull.ts
-import { UncachedProjectMapClient as UncachedProjectMapClient3 } from "@uniformdev/project-map";
-
 // src/commands/project-map/package.ts
 function readContextPackage2(filename, assertExists, verbose) {
   if (verbose) {
@@ -9630,10 +9651,6 @@ function writeContextPackage2(filename, packageContents) {
   writeUniformPackage(filename, packageContents);
 }
 
-// src/commands/project-map/commands/ProjectMapDefinition/_util.ts
-var selectIdentifier13 = (source) => source.id;
-var selectDisplayName13 = (source) => `${source.name} (pid: ${source.id})`;
-
 // src/commands/project-map/ProjectMapDefinitionEngineDataSource.ts
 function createProjectMapDefinitionEngineDataSource({
   client
@@ -9708,7 +9725,7 @@ var ProjectMapDefinitionPullModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedProjectMapClient3({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getProjectMapClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createProjectMapDefinitionEngineDataSource({ client });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -9745,7 +9762,6 @@ var ProjectMapDefinitionPullModule = {
 };
 
 // src/commands/project-map/commands/ProjectMapDefinition/push.ts
-import { UncachedProjectMapClient as UncachedProjectMapClient4 } from "@uniformdev/project-map";
 var ProjectMapDefinitionPushModule = {
   command: "push <directory>",
   describe: "Pushes all project maps from files in a directory or package to Uniform",
@@ -9782,7 +9798,7 @@ var ProjectMapDefinitionPushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedProjectMapClient4({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getProjectMapClient({ apiKey, apiHost, fetch: fetch3, projectId });
     let source;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -9814,7 +9830,6 @@ var ProjectMapDefinitionPushModule = {
 };
 
 // src/commands/project-map/commands/ProjectMapDefinition/remove.ts
-import { UncachedProjectMapClient as UncachedProjectMapClient5 } from "@uniformdev/project-map";
 var ProjectMapDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -9826,13 +9841,12 @@ var ProjectMapDefinitionRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedProjectMapClient5({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getProjectMapClient({ apiKey, apiHost, fetch: fetch3, projectId });
     await client.deleteProjectMap({ projectMapId: id });
   }
 };
 
 // src/commands/project-map/commands/ProjectMapDefinition/update.ts
-import { UncachedProjectMapClient as UncachedProjectMapClient6 } from "@uniformdev/project-map";
 var ProjectMapDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -9846,7 +9860,7 @@ var ProjectMapDefinitionUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedProjectMapClient6({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getProjectMapClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
     await client.upsertProjectMap({ projectMap: file });
   }
@@ -9866,7 +9880,6 @@ var ProjectMapDefinitionModule = {
 import yargs32 from "yargs";
 
 // src/commands/project-map/commands/ProjectMapNode/get.ts
-import { UncachedProjectMapClient as UncachedProjectMapClient7 } from "@uniformdev/project-map";
 var ProjectMapNodeGetModule = {
   command: "get <id> <projectMapId>",
   describe: "Fetch a project map node",
@@ -9881,7 +9894,7 @@ var ProjectMapNodeGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, projectMapId, format, project: projectId, filename }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedProjectMapClient7({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getProjectMapClient({ apiKey, apiHost, fetch: fetch3, projectId });
     console.log("Debugging params for node get", { projectMapId, id, projectId });
     const res = await client.getNodes({ projectMapId, id });
     if (res.nodes?.length === 0) {
@@ -9894,7 +9907,6 @@ var ProjectMapNodeGetModule = {
 };
 
 // src/commands/project-map/commands/ProjectMapNode/list.ts
-import { UncachedProjectMapClient as UncachedProjectMapClient8 } from "@uniformdev/project-map";
 var ProjectMapNodeListModule = {
   command: "list <projectMapId>",
   describe: "List project map nodes",
@@ -9915,15 +9927,12 @@ var ProjectMapNodeListModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, projectMapId, format, filename, project: projectId, state }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedProjectMapClient8({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getProjectMapClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.getNodes({ projectMapId, state: convertStateOption(state) });
     emitWithFormat({ nodes: res.nodes ?? [], projectMapId }, format, filename);
   }
 };
 
-// src/commands/project-map/commands/ProjectMapNode/pull.ts
-import { UncachedProjectMapClient as UncachedProjectMapClient9 } from "@uniformdev/project-map";
-
 // src/commands/project-map/commands/ProjectMapNode/_util.ts
 var selectIdentifier14 = (source, projectId) => [
   projectId + source.projectMapId + source.id,
@@ -9965,10 +9974,18 @@ function createProjectMapNodeEngineDataSource({
     },
     writeObject: async (object) => {
       const nodeToUpsert = { ...object.object };
-      await client.upsertProjectMapNodes({
-        projectMapId: object.object.projectMapId,
-        nodes: [{ node: nodeToUpsert }]
-      });
+      try {
+        await client.upsertProjectMapNodes({
+          projectMapId: object.object.projectMapId,
+          nodes: [{ node: nodeToUpsert }]
+        });
+      } catch (error) {
+        throw new Error(
+          `writing project map node '${object.object.path}' (id: ${object.object.id}) failed
+
+  ${error}`
+        );
+      }
     }
   };
 }
@@ -10017,7 +10034,7 @@ var ProjectMapNodePullModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedProjectMapClient9({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getProjectMapClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createProjectMapNodeEngineDataSource({ client, projectId });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -10059,8 +10076,7 @@ var ProjectMapNodePullModule = {
 
 // src/commands/project-map/commands/ProjectMapNode/push.ts
 import {
-  __INTERNAL_MISSING_PARENT_NODE_ERROR,
-  UncachedProjectMapClient as UncachedProjectMapClient10
+  __INTERNAL_MISSING_PARENT_NODE_ERROR
 } from "@uniformdev/project-map";
 var ProjectMapNodePushModule = {
   command: "push <directory>",
@@ -10098,7 +10114,7 @@ var ProjectMapNodePushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedProjectMapClient10({
+    const client = getProjectMapClient({
       apiKey,
       apiHost,
       fetch: fetch3,
@@ -10168,7 +10184,6 @@ var ProjectMapNodePushModule = {
 };
 
 // src/commands/project-map/commands/ProjectMapNode/remove.ts
-import { UncachedProjectMapClient as UncachedProjectMapClient11 } from "@uniformdev/project-map";
 var ProjectMapNodeRemoveModule = {
   command: "remove <id> <projectMapId>",
   aliases: ["delete", "rm"],
@@ -10182,13 +10197,12 @@ var ProjectMapNodeRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, projectMapId, id, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedProjectMapClient11({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getProjectMapClient({ apiKey, apiHost, fetch: fetch3, projectId });
     await client.deleteProjectMapNode({ projectMapId, nodeId: id });
   }
 };
 
 // src/commands/project-map/commands/ProjectMapNode/update.ts
-import { UncachedProjectMapClient as UncachedProjectMapClient12 } from "@uniformdev/project-map";
 var ProjectMapNodeUpdateModule = {
   command: "update <filename> <projectMapId>",
   aliases: ["put"],
@@ -10202,7 +10216,7 @@ var ProjectMapNodeUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, projectMapId, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedProjectMapClient12({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getProjectMapClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
     await client.upsertProjectMapNodes({ nodes: [{ node: file }], projectMapId });
   }
@@ -10235,8 +10249,26 @@ import yargs35 from "yargs";
 // src/commands/redirect/commands/redirect.ts
 import yargs34 from "yargs";
 
-// src/commands/redirect/commands/RedirectDefinition/get.ts
+// src/commands/redirect/commands/RedirectDefinition/_util.ts
 import { UncachedRedirectClient } from "@uniformdev/redirect";
+var selectIdentifier15 = (source) => source.id;
+var selectFilename2 = (source) => {
+  const index = source.sourceUrl.lastIndexOf("/");
+  return cleanFileName(source.sourceUrl.substring(index + 1)) + `_${source.id}`;
+};
+var selectDisplayName15 = (source) => {
+  let pathName = source.sourceUrl;
+  if (pathName.length > 30) {
+    const slashIndex = source.sourceUrl.indexOf("/", source.sourceUrl.length - 30);
+    pathName = "..." + pathName.substring(slashIndex);
+  }
+  return `${pathName} (id: ${source.id})`;
+};
+function getRedirectClient(options) {
+  return new UncachedRedirectClient({ ...options, limitPolicy: cliLimitPolicy });
+}
+
+// src/commands/redirect/commands/RedirectDefinition/get.ts
 var RedirectDefinitionGetModule = {
   command: "get <id>",
   describe: "Fetch a redirect",
@@ -10251,7 +10283,7 @@ var RedirectDefinitionGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, project: projectId, filename }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedRedirectClient({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getRedirectClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.getRedirect({ id });
     if (!res) {
       console.error("Redirect does not exist");
@@ -10263,7 +10295,6 @@ var RedirectDefinitionGetModule = {
 };
 
 // src/commands/redirect/commands/RedirectDefinition/list.ts
-import { UncachedRedirectClient as UncachedRedirectClient2 } from "@uniformdev/redirect";
 var RedirectDefinitionListModule = {
   command: "list",
   describe: "List of redirects",
@@ -10271,15 +10302,12 @@ var RedirectDefinitionListModule = {
   builder: (yargs38) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs38)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedRedirectClient2({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getRedirectClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const res = await client.getRedirects({});
     emitWithFormat(res, format, filename);
   }
 };
 
-// src/commands/redirect/commands/RedirectDefinition/pull.ts
-import { UncachedRedirectClient as UncachedRedirectClient3 } from "@uniformdev/redirect";
-
 // src/commands/redirect/package.ts
 function readContextPackage3(filename, assertExists, verbose) {
   if (verbose) {
@@ -10291,21 +10319,6 @@ function writeContextPackage3(filename, packageContents) {
   writeUniformPackage(filename, packageContents);
 }
 
-// src/commands/redirect/commands/RedirectDefinition/_util.ts
-var selectIdentifier15 = (source) => source.id;
-var selectFilename2 = (source) => {
-  const index = source.sourceUrl.lastIndexOf("/");
-  return cleanFileName(source.sourceUrl.substring(index + 1)) + `_${source.id}`;
-};
-var selectDisplayName15 = (source) => {
-  let pathName = source.sourceUrl;
-  if (pathName.length > 30) {
-    const slashIndex = source.sourceUrl.indexOf("/", source.sourceUrl.length - 30);
-    pathName = "..." + pathName.substring(slashIndex);
-  }
-  return `${pathName} (id: ${source.id})`;
-};
-
 // src/commands/redirect/RedirectEngineDataSource.ts
 function createRedirectDefinitionEngineDataSource({
   client
@@ -10378,7 +10391,7 @@ var RedirectDefinitionPullModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedRedirectClient3({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getRedirectClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createRedirectDefinitionEngineDataSource({ client });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -10416,7 +10429,6 @@ var RedirectDefinitionPullModule = {
 };
 
 // src/commands/redirect/commands/RedirectDefinition/push.ts
-import { UncachedRedirectClient as UncachedRedirectClient4 } from "@uniformdev/redirect";
 var RedirectDefinitionPushModule = {
   command: "push <directory>",
   describe: "Pushes all redirects from files in a directory or package to Uniform",
@@ -10453,7 +10465,7 @@ var RedirectDefinitionPushModule = {
     verbose
   }) => {
     const fetch3 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedRedirectClient4({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getRedirectClient({ apiKey, apiHost, fetch: fetch3, projectId });
     let source;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -10485,7 +10497,6 @@ var RedirectDefinitionPushModule = {
 };
 
 // src/commands/redirect/commands/RedirectDefinition/remove.ts
-import { UncachedRedirectClient as UncachedRedirectClient5 } from "@uniformdev/redirect";
 var RedirectDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -10497,13 +10508,12 @@ var RedirectDefinitionRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedRedirectClient5({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getRedirectClient({ apiKey, apiHost, fetch: fetch3, projectId });
     await client.deleteRedirect(id);
   }
 };
 
 // src/commands/redirect/commands/RedirectDefinition/update.ts
-import { UncachedRedirectClient as UncachedRedirectClient6 } from "@uniformdev/redirect";
 var RedirectDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -10517,7 +10527,7 @@ var RedirectDefinitionUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new UncachedRedirectClient6({ apiKey, apiHost, fetch: fetch3, projectId });
+    const client = getRedirectClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const file = readFileToObject(filename);
     await client.upsertRedirect(file);
   }
@@ -10553,28 +10563,53 @@ 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 revertLog = patchConsole({
+    fn: "log",
+    ora: spinner,
+    replay: consoleReplay,
+    defaultText: options.text
+  });
+  const revertError = patchConsole({
+    fn: "error",
+    ora: spinner,
+    replay: consoleReplay,
+    defaultText: options.text
+  });
+  const revertWarning = patchConsole({
+    fn: "warn",
+    ora: spinner,
+    replay: consoleReplay,
+    defaultText: options.text
+  });
   const unpatchConsole = () => {
     revertLog();
     revertError();
     revertWarning();
   };
   let thrownError = void 0;
+  const executeReplay = () => {
+    unpatchConsole();
+    replayConsole(consoleReplay);
+  };
+  const executeReplayOnSigint = () => {
+    executeReplay();
+    process.exit(1);
+  };
+  process.on("SIGINT", executeReplayOnSigint);
   try {
     const result = await action;
-    spinner.succeed(successText);
+    const finalStatusText = spinner.text.startsWith(options.text) && spinner.text.length > options.text.length ? spinner.text.slice(options.text.length).trim() : `\u2699\uFE0F compared: ${numPad(0)} changes: 0`;
+    const padding = " ".repeat(Math.max(4, 40 - successText.length));
+    spinner.succeed(successText + padding + finalStatusText);
     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));
+    executeReplay();
+    spinner.fail(failText?.(error));
     thrownError = error;
   } finally {
-    unpatchConsole();
+    process.off("SIGINT", executeReplayOnSigint);
     if (!thrownError) {
-      replayConsole(consoleReplay);
+      executeReplay();
     }
   }
   if (thrownError) {
@@ -10586,20 +10621,51 @@ function replayConsole(replay) {
     console[fn](...args);
   }
 }
-function patchConsole(fn, ora3, replay = []) {
+function patchConsole({
+  fn,
+  ora: ora3,
+  replay = [],
+  defaultText
+}) {
   const original = console[fn];
-  console[fn] = (...text) => {
-    if (text.length === 1 && typeof text[0] === "string") {
-      ora3.text += "\n" + text;
+  const handleSyncStatusUpdate = ({
+    compared,
+    changeCount,
+    changesApplied,
+    fetched
+  }) => {
+    if (compared === 0 && fetched === 0) {
+      return;
+    }
+    const clauses = [];
+    if (fetched > 0 && compared === 0) {
+      clauses.push(`fetching: ${numPad(fetched)}`);
+    }
+    if (compared > 0) {
+      clauses.push(`compared: ${numPad(compared)}`);
+    }
+    if (changesApplied === 0) {
+      clauses.push(`changes: ${changeCount}`);
     } else {
-      original(...text);
+      clauses.push(`applied: ${changesApplied}/${changeCount}`);
     }
+    const statusText = clauses.join(" ");
+    const padding = " ".repeat(Math.max(4, 40 - defaultText.length));
+    ora3.text = `${defaultText}${padding}\u2699\uFE0F ${statusText}`;
+  };
+  syncEngineEvents.on("statusUpdate", handleSyncStatusUpdate);
+  console[fn] = (...text) => {
     replay.push({ fn, args: text });
   };
   return () => {
     console[fn] = original;
+    syncEngineEvents.off("statusUpdate", handleSyncStatusUpdate);
   };
 }
+function numPad(num, spaces = 6) {
+  const numbah = num.toString(10);
+  return numbah + " ".repeat(Math.max(0, spaces - numbah.length));
+}
 
 // src/commands/sync/commands/pull.ts
 var SyncPullModule = {
@@ -10768,19 +10834,102 @@ var SyncPushModule = {
       }
     }
     if (config2.entitiesConfig?.componentPattern && config2.entitiesConfig?.componentPattern?.push?.disabled !== true && config2.entitiesConfig?.componentPattern?.publish) {
-      await ComponentPatternPublishModule.handler({ ...otherParams, all: true });
+      try {
+        await spinPromise(
+          ComponentPatternPublishModule.handler({
+            ...otherParams,
+            patternType: "component",
+            onlyPatterns: true,
+            all: true
+          }),
+          {
+            text: "publishing component patterns...",
+            successText: "published component patterns",
+            failText(error) {
+              return `publishing component patterns
+
+ ${error.stack ?? error.message}`;
+            }
+          }
+        );
+      } catch {
+        process.exit(1);
+      }
     }
     if (config2.entitiesConfig?.compositionPattern && config2.entitiesConfig?.compositionPattern?.push?.disabled !== true && config2.entitiesConfig?.compositionPattern?.publish) {
-      await CompositionPatternPublishModule.handler({ ...otherParams, all: true });
+      try {
+        await spinPromise(
+          CompositionPatternPublishModule.handler({
+            ...otherParams,
+            all: true,
+            onlyPatterns: true,
+            patternType: "composition"
+          }),
+          {
+            text: "publishing composition patterns...",
+            successText: "published composition patterns",
+            failText(error) {
+              return `publishing composition patterns
+
+ ${error.stack ?? error.message}`;
+            }
+          }
+        );
+      } catch {
+        process.exit(1);
+      }
     }
     if (config2.entitiesConfig?.composition && config2.entitiesConfig?.composition?.push?.disabled !== true && config2.entitiesConfig?.composition?.publish) {
-      await CompositionPublishModule.handler({ ...otherParams, all: true });
+      try {
+        await spinPromise(
+          CompositionPublishModule.handler({
+            ...otherParams,
+            all: true,
+            onlyCompositions: true
+          }),
+          {
+            text: "publishing compositions...",
+            successText: "published compositions",
+            failText(error) {
+              return `publishing compositions
+
+ ${error.stack ?? error.message}`;
+            }
+          }
+        );
+      } catch {
+        process.exit(1);
+      }
     }
     if (config2.entitiesConfig?.entry && config2.entitiesConfig?.entry?.push?.disabled !== true && config2.entitiesConfig?.entry?.publish) {
-      await EntryPublishModule.handler({ ...otherParams, all: true });
+      try {
+        await spinPromise(EntryPublishModule.handler({ ...otherParams, all: true }), {
+          text: "publishing entries...",
+          successText: "published entries",
+          failText(error) {
+            return `publishing entries
+
+ ${error.stack ?? error.message}`;
+          }
+        });
+      } catch {
+        process.exit(1);
+      }
     }
     if (config2.entitiesConfig?.entryPattern && config2.entitiesConfig?.entryPattern?.push?.disabled !== true && config2.entitiesConfig?.entryPattern?.publish) {
-      await EntryPatternPublishModule.handler({ ...otherParams, all: true });
+      try {
+        await spinPromise(EntryPatternPublishModule.handler({ ...otherParams, all: true }), {
+          text: "publishing entry patterns...",
+          successText: "published entry patterns",
+          failText(error) {
+            return `publishing entry patterns
+
+ ${error.stack ?? error.message}`;
+          }
+        });
+      } catch {
+        process.exit(1);
+      }
     }
   }
 };
@@ -11067,12 +11216,9 @@ First found was: v${firstVersion}`;
 // src/index.ts
 dotenv.config();
 var yarggery = yargs37(hideBin(process.argv));
-var inlineConfigurationFilePath = "config" in yarggery.argv && yarggery.argv.config;
-var configuration = loadConfig(inlineConfigurationFilePath || null);
+var defaultConfig2 = loadConfig(null);
 yarggery.option("verbose", {
   describe: "Include verbose logging",
   default: false,
   type: "boolean"
-}).scriptName("uniform").config(configuration).config("config", function() {
-  return {};
-}).command(CanvasCommand).command(ContextCommand).command(ProjectMapCommand).command(RedirectCommand).command(SyncCommand).command(NewCmd).command(NewMeshCmd).command(OptimizeCommand).command(IntegrationCommand).demandCommand(1, "").strict().help().middleware([checkForUpdateMiddleware, checkLocalDepsVersions]).argv;
+}).scriptName("uniform").config(defaultConfig2).config("config", "Specify a custom Uniform CLI config file", (configPath) => loadConfig(configPath)).command(CanvasCommand).command(ContextCommand).command(ProjectMapCommand).command(RedirectCommand).command(SyncCommand).command(NewCmd).command(NewMeshCmd).command(OptimizeCommand).command(IntegrationCommand).recommendCommands().demandCommand(1, "").strict().help().middleware([checkForUpdateMiddleware, checkLocalDepsVersions]).parse();