@uniformdev/cli 20.50.2-alpha.149 → 20.50.2-alpha.167

package/dist/index.mjs

@@ -23,7 +23,7 @@ import {
   withFormatOptions,
   withProjectOptions,
   withTeamOptions
-} from "./chunk-7P2U2VCH.mjs";
+} from "./chunk-6GYRC5EF.mjs";
 
 // src/index.ts
 import * as dotenv from "dotenv";
@@ -630,6 +630,9 @@ export default uniformConfig({
 `;
 
 // src/sync/fileSyncEngineDataSource.ts
+function isErrorWithCode(error, code) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === code;
+}
 async function createFileSyncEngineDataSource({
   directory,
   format = "yaml",
@@ -690,7 +693,7 @@ ${e?.message}`));
       }
       await unlink(providerId);
     },
-    writeObject: async (object4) => {
+    writeObject: async (object4, existingObject) => {
       const filename = selectFilename3 ? join(directory, `${selectFilename3(object4.object)}.${format}`) : getFullFilename(object4.id);
       let contents = object4.object;
       if (selectSchemaUrl2) {
@@ -703,6 +706,18 @@ ${e?.message}`));
         console.log(`Writing file ${filename}`);
       }
       emitWithFormat(contents, format, filename);
+      if (existingObject?.providerId && existingObject.providerId !== filename) {
+        if (verbose) {
+          console.log(`Deleting file ${existingObject.providerId}`);
+        }
+        try {
+          await unlink(existingObject.providerId);
+        } catch (error) {
+          if (!isErrorWithCode(error, "ENOENT")) {
+            throw error;
+          }
+        }
+      }
     }
   };
 }
@@ -726,6 +741,7 @@ function writeUniformPackage(filename, packageContents) {
 // src/sync/syncEngine.ts
 import { diffJson, diffLines } from "diff";
 import mitt from "mitt";
+import PQueue from "p-queue";
 
 // src/sync/serializedDequal.ts
 var has = Object.prototype.hasOwnProperty;
@@ -792,7 +808,8 @@ async function syncEngine({
   onBeforeProcessObject,
   onBeforeCompareObjects,
   onBeforeWriteObject,
-  onError
+  onError,
+  actionConcurrency
   //verbose = false,
 }) {
   const status = new ReactiveStatusUpdate((status2) => syncEngineEvents.emit("statusUpdate", status2));
@@ -841,43 +858,46 @@ async function syncEngine({
     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);
+    const invalidTargetObjects = ids.map((i) => targetItems.get(i)).filter(
+      (invalidTargetObject) => typeof invalidTargetObject !== "undefined" && invalidTargetObject.object !== targetObject?.object
+    );
+    const targetIds = Array.isArray(targetObject?.id) ? targetObject.id : [targetObject?.id];
+    const processedIds = new Set([...ids, ...targetIds].filter((id) => typeof id === "string"));
+    const processUpdate = 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) {
+          onError(e, sourceObject2);
+        } else {
+          throw new SyncEngineError(e, sourceObject2);
+        }
+      } finally {
+        log2({
+          action: "update",
+          id: ids[0],
+          providerId: sourceObject2.providerId,
+          displayName: sourceObject2.displayName ?? sourceObject2.providerId,
+          whatIf,
+          diff: () => diffJson(targetObject2.object, sourceObject2.object)
+        });
+      }
+    };
     if (targetObject && invalidTargetObjects.length === 0) {
       sourceObject = onBeforeCompareObjects ? await onBeforeCompareObjects(sourceObject, targetObject) : sourceObject;
       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) {
-                onError(e, sourceObject2);
-              } else {
-                throw new SyncEngineError(e, sourceObject2);
-              }
-            } finally {
-              log2({
-                action: "update",
-                id: ids[0],
-                providerId: sourceObject2.providerId,
-                displayName: sourceObject2.displayName ?? sourceObject2.providerId,
-                whatIf,
-                diff: () => diffJson(targetObject2.object, sourceObject2.object)
-              });
-            }
-          };
-          actions.push(() => process2(sourceObject, targetObject));
+          actions.push(() => processUpdate(sourceObject, targetObject));
         }
       }
-      ids.forEach((i) => targetItems.delete(i));
+      processedIds.forEach((i) => targetItems.delete(i));
     } else {
-      status.changeCount++;
       const processUpsert = async (sourceObject2, id) => {
         try {
           if (!whatIf) {
@@ -903,38 +923,73 @@ async function syncEngine({
         }
       };
       if (invalidTargetObjects.length > 0) {
+        if (mode === "createOrUpdate" && !targetObject && invalidTargetObjects.length === 1) {
+          const matchedTargetObject = invalidTargetObjects[0];
+          sourceObject = onBeforeCompareObjects ? await onBeforeCompareObjects(sourceObject, matchedTargetObject) : sourceObject;
+          const compareResult = compareContents(sourceObject, matchedTargetObject);
+          if (!compareResult) {
+            status.changeCount++;
+            actions.push(() => processUpdate(sourceObject, matchedTargetObject));
+          }
+          (Array.isArray(matchedTargetObject.id) ? matchedTargetObject.id : [matchedTargetObject.id]).forEach(
+            (i) => targetItems.delete(i)
+          );
+          continue;
+        }
+        if (mode !== "mirror") {
+          continue;
+        }
+        status.changeCount++;
         [...invalidTargetObjects, targetObject].forEach((o) => {
           (Array.isArray(o?.id) ? o?.id : [o?.id])?.forEach((i) => i && targetItems.delete(i));
         });
-        const deletes = invalidTargetObjects.filter((invalidTargetObject) => typeof invalidTargetObject !== "undefined").map((invalidTargetObject) => () => processDelete(invalidTargetObject));
+        const deletes = invalidTargetObjects.map(
+          (invalidTargetObject) => () => processDelete(invalidTargetObject)
+        );
         if (targetObject) {
           deletes.push(() => processDelete(targetObject));
         }
-        actions.push(
-          () => Promise.all(deletes.map((deleteFn) => deleteFn())).then(() => processUpsert(sourceObject, ids[0]))
-        );
+        actions.push(async () => {
+          for (const deleteFn of deletes) {
+            await deleteFn();
+          }
+          await processUpsert(sourceObject, ids[0]);
+        });
       } else {
+        status.changeCount++;
         actions.push(() => processUpsert(sourceObject, ids[0]));
       }
     }
   }
-  status.changeCount += targetItems.size;
-  status.compared += targetItems.size;
+  const orphanTargetObjects = new Set(targetItems.values());
   if (mode === "mirror") {
-    if (!sourceHasItems && !allowEmptySource && targetItems.size > 0) {
+    status.changeCount += orphanTargetObjects.size;
+    status.compared += orphanTargetObjects.size;
+    if (!sourceHasItems && !allowEmptySource && orphanTargetObjects.size > 0) {
       throw new Error(
         `Sync source (${source.name}) is empty and mode is mirror. This would cause deletion of everything in the target (${target.name}), and most likely indicates an error in source definition.`
       );
     }
     const deletes = [];
-    targetItems.forEach((object4) => {
+    orphanTargetObjects.forEach((object4) => {
       deletes.push(() => processDelete(object4));
     });
-    await Promise.all(deletes.map((d) => d()));
+    await runSyncActions(deletes, actionConcurrency);
   }
-  await Promise.all(actions.map((a) => a()));
+  await runSyncActions(actions, actionConcurrency);
   await Promise.all([source.onSyncComplete?.(false), target.onSyncComplete?.(true)]);
 }
+var runSyncActions = async (actions, actionConcurrency) => {
+  if (actions.length === 0) {
+    return;
+  }
+  if (typeof actionConcurrency === "undefined") {
+    await Promise.all(actions.map((action) => action()));
+    return;
+  }
+  const queue = new PQueue({ concurrency: actionConcurrency });
+  await queue.addAll(actions);
+};
 var SyncEngineError = class _SyncEngineError extends Error {
   constructor(innerError, sourceObject) {
     super(
@@ -1108,7 +1163,7 @@ var getUserInfo = async (baseUrl, authToken) => {
     const projectClient = new ProjectClient({ apiHost: baseUrl, bearerToken: authToken });
     const [profile, projectsRes] = await Promise.all([
       fetchMemberProfile({ baseUrl, bearerToken: authToken }),
-      projectClient.getProjects()
+      projectClient.list()
     ]);
     return {
       name: profile.name,
@@ -1184,7 +1239,7 @@ var Telemetry = class {
     });
   }
   shutdown() {
-    this.send("exited", { exitCode: process.exitCode });
+    this.send("exited", { exitCode: process.exitCode ?? void 0 });
     return this.posthog?.shutdown();
   }
 };
@@ -2370,8 +2425,8 @@ import yargs22 from "yargs";
 import yargs5 from "yargs";
 
 // src/commands/canvas/commands/asset/_util.ts
-import { UncachedAssetClient } from "@uniformdev/assets";
-import { UncachedFileClient } from "@uniformdev/files";
+import { AssetClient } from "@uniformdev/assets";
+import { FileClient } from "@uniformdev/files";
 
 // src/cliLimitPolicy.ts
 import { createLimitPolicy } from "@uniformdev/canvas";
@@ -2386,10 +2441,10 @@ var cliLimitPolicy = createLimitPolicy({
 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 });
+  return new AssetClient({ ...options, limitPolicy: cliLimitPolicy, bypassCache: true });
 }
 function getFileClient(options) {
-  return new UncachedFileClient({ ...options, limitPolicy: cliLimitPolicy });
+  return new FileClient({ ...options, limitPolicy: cliLimitPolicy, bypassCache: true });
 }
 
 // src/commands/canvas/commands/asset/get.ts
@@ -2500,20 +2555,64 @@ import {
 } from "@uniformdev/canvas";
 import { isRichTextNodeType, isRichTextValue, walkRichTextTree } from "@uniformdev/richtext";
 import fsj4 from "fs-jetpack";
-import PQueue2 from "p-queue";
+import PQueue3 from "p-queue";
 import { join as join11 } from "path";
 
 // src/files/downloadFile.ts
+import { createWriteStream } from "fs";
 import fsj2 from "fs-jetpack";
-import { join as join9 } from "path";
+import { dirname as dirname2, join as join9 } from "path";
+import { Readable } from "stream";
+import { pipeline } from "stream/promises";
+var downloadedFilePathCacheByDirectory = /* @__PURE__ */ new Map();
+var tempDownloadFileCounter = 0;
+var getTempDownloadFilePath = (filePath) => {
+  tempDownloadFileCounter += 1;
+  return `${filePath}.${process.pid}.${Date.now()}.${tempDownloadFileCounter}.download`;
+};
+var getDownloadedFilePathCache = (filesDirectory) => {
+  const cached = downloadedFilePathCacheByDirectory.get(filesDirectory);
+  if (cached) {
+    return cached;
+  }
+  const cache = fsj2.cwd(filesDirectory).findAsync({ files: true, directories: false }).then((paths) => new Set(paths)).catch(() => /* @__PURE__ */ new Set());
+  downloadedFilePathCacheByDirectory.set(filesDirectory, cache);
+  return cache;
+};
+var filePathMatchesSourceId = (filePath, sourceId) => filePath === sourceId || filePath.startsWith(`${sourceId}.`);
+var hasFilePathMatchingSourceId = (filePaths, sourceId) => {
+  for (const filePath of filePaths) {
+    if (filePathMatchesSourceId(filePath, sourceId)) {
+      return true;
+    }
+  }
+  return false;
+};
+var writeResponseBodyToFile = async (response, filePath) => {
+  if (!response.body) {
+    throw new Error("Response does not contain a body");
+  }
+  const tempFilePath = getTempDownloadFilePath(filePath);
+  await fsj2.dirAsync(dirname2(filePath));
+  try {
+    const responseBody = response.body;
+    await pipeline(Readable.fromWeb(responseBody), createWriteStream(tempFilePath));
+    await fsj2.moveAsync(tempFilePath, filePath, { overwrite: true });
+  } catch (error) {
+    await fsj2.removeAsync(tempFilePath).catch(() => void 0);
+    throw error;
+  }
+};
 var downloadFile = async ({
   fileClient,
   fileUrl,
   directory
 }) => {
   const writeDirectory = getFilesDirectory(directory);
+  const filesDirectory = join9(writeDirectory, FILES_DIRECTORY_NAME);
   const fileName = urlToFileName(fileUrl.toString());
-  const fileAlreadyExists = await fsj2.existsAsync(join9(writeDirectory, FILES_DIRECTORY_NAME, fileName));
+  const filePath = join9(filesDirectory, fileName);
+  const fileAlreadyExists = await fsj2.existsAsync(filePath);
   if (fileAlreadyExists) {
     return { url: fileUrl };
   }
@@ -2523,11 +2622,10 @@ var downloadFile = async ({
     return null;
   }
   if (file.sourceId) {
+    const sourceId = file.sourceId;
     try {
-      const hashAlreadyExists = await fsj2.findAsync(join9(writeDirectory, FILES_DIRECTORY_NAME), {
-        matching: [file.sourceId, `${file.sourceId}.*`]
-      });
-      if (hashAlreadyExists.length > 0) {
+      const downloadedFilePaths = await getDownloadedFilePathCache(filesDirectory);
+      if (hasFilePathMatchingSourceId(downloadedFilePaths, sourceId)) {
         return { id: file.id, url: fileUrl };
       }
     } catch {
@@ -2538,8 +2636,12 @@ var downloadFile = async ({
   if (!response.ok) {
     return null;
   }
-  const fileBuffer = await response.arrayBuffer();
-  await fsj2.writeAsync(join9(writeDirectory, FILES_DIRECTORY_NAME, fileName), Buffer.from(fileBuffer));
+  await writeResponseBodyToFile(response, filePath);
+  const downloadedFilePathCache = downloadedFilePathCacheByDirectory.get(filesDirectory);
+  if (downloadedFilePathCache) {
+    const downloadedFilePaths = await downloadedFilePathCache;
+    downloadedFilePaths.add(fileName);
+  }
   return { id: file.id, url: fileUrl };
 };
 
@@ -2551,10 +2653,10 @@ import { createReadStream } from "fs";
 import fsj3 from "fs-jetpack";
 import { imageSizeFromFile } from "image-size/fromFile";
 import normalizeNewline from "normalize-newline";
-import PQueue from "p-queue";
+import PQueue2 from "p-queue";
 import { join as join10 } from "path";
 var uploadQueueByKey = /* @__PURE__ */ new Map();
-var fileUploadQueue = new PQueue({ concurrency: 10 });
+var fileUploadQueue = new PQueue2({ concurrency: 10 });
 var uploadFile = async ({
   fileClient,
   fileUrl,
@@ -2734,9 +2836,9 @@ var walkFileUrlsForCompositionOrEntry = ({
 };
 
 // src/files/files.ts
-var fileDownloadQueue = new PQueue2({ concurrency: 10 });
-var fileUploadQueue2 = new PQueue2({ concurrency: 10 });
-var fileUrlReplacementQueue = new PQueue2({ concurrency: 10 });
+var fileDownloadQueue = new PQueue3({ concurrency: 10 });
+var fileUploadQueue2 = new PQueue3({ concurrency: 10 });
+var fileUrlReplacementQueue = new PQueue3({ concurrency: 10 });
 var downloadFileForAsset = async ({
   asset,
   directory,
@@ -3040,13 +3142,13 @@ function createAssetEngineDataSource({
       if (verbose) {
         console.log(`Deleting asset ${providerId}`);
       }
-      await client.delete({ assetId: providerId });
+      await client.remove({ assetId: providerId });
     },
     writeObject: async ({ object: object4 }) => {
       if (verbose) {
         console.log(`Upserting asset ${object4.asset._id}`);
       }
-      await client.upsert(convertAssetToPutAsset(object4));
+      await client.save(convertAssetToPutAsset(object4));
     }
   };
 }
@@ -3063,6 +3165,7 @@ function writeCanvasPackage(filename, packageContents) {
 }
 
 // src/commands/canvas/commands/asset/pull.ts
+var ASSET_PULL_ACTION_CONCURRENCY = 10;
 var AssetPullModule = {
   command: "pull <directory>",
   describe: "Pulls all assets to local files in a directory",
@@ -3161,6 +3264,7 @@ var AssetPullModule = {
       target,
       mode,
       whatIf,
+      actionConcurrency: ASSET_PULL_ACTION_CONCURRENCY,
       allowEmptySource: allowEmptySource ?? true,
       log: createSyncEngineConsoleLogger({ diffMode }),
       onBeforeCompareObjects: async (sourceObject) => {
@@ -3188,6 +3292,7 @@ var AssetPullModule = {
 };
 
 // src/commands/canvas/commands/asset/push.ts
+var ASSET_PUSH_ACTION_CONCURRENCY = 10;
 var AssetPushModule = {
   command: "push <directory>",
   describe: "Pushes all assets from files in a directory to Uniform",
@@ -3263,6 +3368,7 @@ var AssetPushModule = {
       target,
       mode,
       whatIf,
+      actionConcurrency: ASSET_PUSH_ACTION_CONCURRENCY,
       allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode }),
       onBeforeCompareObjects: async (sourceObject, targetObject) => {
@@ -3339,7 +3445,7 @@ var AssetRemoveModule = {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getAssetClient({ apiKey, apiHost, fetch: fetch2, projectId });
     if (!whatIf) {
-      await client.delete({ assetId: id });
+      await client.remove({ assetId: id });
     } else {
       whatIfSimpleLog({ id, displayName: "Asset", action: "delete" });
     }
@@ -3367,7 +3473,7 @@ var AssetUpdateModule = {
     const file = readFileToObject(filename);
     const putAsset = convertAssetToPutAsset2(file);
     if (!whatIf) {
-      await client.upsert(putAsset);
+      await client.save(putAsset);
     } else {
       whatIfSimpleLog({
         id: putAsset.asset?._id ?? "",
@@ -3392,11 +3498,11 @@ var AssetModule = {
 import yargs6 from "yargs";
 
 // src/commands/canvas/commands/category/_util.ts
-import { UncachedCategoryClient } from "@uniformdev/canvas";
+import { CategoryClient } 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 });
+  return new CategoryClient({ ...options, limitPolicy: cliLimitPolicy, bypassCache: true });
 }
 
 // src/commands/canvas/commands/category/get.ts
@@ -3417,7 +3523,7 @@ var CategoryGetModule = {
   handler: async ({ apiHost, apiKey, proxy, id, format, project: projectId, filename, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getCategoryClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const res = await client.getCategories();
+    const res = await client.list();
     const category = res.categories.find((c) => c.id === id);
     if (!category) {
       console.error("Category did not exist");
@@ -3439,7 +3545,7 @@ var CategoryListModule = {
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getCategoryClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const res = await client.getCategories();
+    const res = await client.list();
     emitWithFormat(res.categories, format, filename);
   }
 };
@@ -3449,7 +3555,7 @@ function createCategoriesEngineDataSource({
   client
 }) {
   async function* getObjects() {
-    const categories = (await client.getCategories()).categories;
+    const categories = (await client.list()).categories;
     for (const def of categories) {
       const result = {
         id: selectIdentifier(def),
@@ -3464,10 +3570,10 @@ function createCategoriesEngineDataSource({
     name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
-      await client.removeCategory({ categoryId: providerId });
+      await client.remove({ categoryId: providerId });
     },
     writeObject: async (object4) => {
-      await client.upsertCategories([object4.object]);
+      await client.save([object4.object]);
     }
   };
 }
@@ -3638,7 +3744,7 @@ var CategoryRemoveModule = {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getCategoryClient({ apiKey, apiHost, fetch: fetch2, projectId });
     if (!whatIf) {
-      await client.removeCategory({ categoryId: id });
+      await client.remove({ categoryId: id });
     } else {
       whatIfSimpleLog({ id, displayName: "Category", action: "delete" });
     }
@@ -3664,7 +3770,7 @@ var CategoryUpdateModule = {
     const client = getCategoryClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const file = readFileToObject(filename);
     if (!whatIf) {
-      await client.upsertCategories([file]);
+      await client.save([file]);
     } else {
       whatIfSimpleLog({ id: file.id, displayName: `Category: ${file.name}`, action: "update" });
     }
@@ -3686,12 +3792,22 @@ var CategoryModule = {
 import yargs7 from "yargs";
 
 // src/commands/canvas/commands/component/_util.ts
-import { UncachedCanvasClient } from "@uniformdev/canvas";
+import {
+  ComponentDefinitionClient,
+  CompositionDeliveryClient,
+  CompositionManagementClient
+} 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 });
+function getComponentDefinitionClient(options) {
+  return new ComponentDefinitionClient({ ...options, limitPolicy: cliLimitPolicy });
+}
+function getCompositionManagementClient(options) {
+  return new CompositionManagementClient({ ...options, limitPolicy: cliLimitPolicy });
+}
+function getCompositionDeliveryClient(options) {
+  return new CompositionDeliveryClient({ ...options, limitPolicy: cliLimitPolicy });
 }
 
 // src/commands/canvas/commands/component/get.ts
@@ -3714,8 +3830,8 @@ var ComponentGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, project: projectId, filename, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const res = await client.getComponentDefinitions({ componentId: id, limit: 1 });
+    const client = getComponentDefinitionClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const res = await client.list({ componentId: id, limit: 1 });
     if (res.componentDefinitions.length === 0) {
       console.error("Component did not exist");
       process.exit(1);
@@ -3763,8 +3879,8 @@ var ComponentListModule = {
     verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const res = await client.getComponentDefinitions({ limit: limit2, offset });
+    const client = getComponentDefinitionClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const res = await client.list({ limit: limit2, offset });
     emitWithFormat(res.componentDefinitions, format, filename);
   }
 };
@@ -3777,7 +3893,7 @@ function createComponentDefinitionEngineDataSource({
 }) {
   async function* getObjects() {
     const componentDefinitions = paginateAsync(
-      async (offset, limit2) => (await client.getComponentDefinitions({ limit: limit2, offset })).componentDefinitions,
+      async (offset, limit2) => (await client.list({ limit: limit2, offset })).componentDefinitions,
       { pageSize: batchSize ?? 200, verbose, entityName: "components" }
     );
     for await (const def of componentDefinitions) {
@@ -3794,7 +3910,7 @@ function createComponentDefinitionEngineDataSource({
     name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
-      await client.removeComponentDefinition({ componentId: providerId });
+      await client.remove({ componentId: providerId });
     },
     writeObject: async (object4) => {
       if (object4.object.parameters === void 0) {
@@ -3802,7 +3918,7 @@ function createComponentDefinitionEngineDataSource({
           `Component definition parameters property set to undefined is ignored. If you want to remove all parameters, set it to an empty array instead (id: ${object4.object.id})`
         );
       }
-      await client.updateComponentDefinition({
+      await client.save({
         componentDefinition: object4.object
       });
     }
@@ -3857,7 +3973,7 @@ var ComponentPullModule = {
     resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = getComponentDefinitionClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const source = createComponentDefinitionEngineDataSource({
       client,
       batchSize: resolvedBatchSize,
@@ -3939,7 +4055,7 @@ var ComponentPushModule = {
     resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = getComponentDefinitionClient({ apiKey, apiHost, fetch: fetch2, projectId });
     let source;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -3994,9 +4110,9 @@ var ComponentRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose, whatIf }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = getComponentDefinitionClient({ apiKey, apiHost, fetch: fetch2, projectId });
     if (!whatIf) {
-      await client.removeComponentDefinition({ componentId: id });
+      await client.remove({ componentId: id });
     } else {
       whatIfSimpleLog({ id, displayName: `Component`, action: "delete" });
     }
@@ -4019,10 +4135,10 @@ var ComponentUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId, verbose, whatIf }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = getComponentDefinitionClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const file = readFileToObject(filename);
     if (!whatIf) {
-      await client.updateComponentDefinition({ componentDefinition: omit(file, ["$schema"]) });
+      await client.save({ componentDefinition: omit(file, ["$schema"]) });
     } else {
       whatIfSimpleLog({ id: file.id, displayName: `Component: ${file.name}`, action: "update" });
     }
@@ -4053,9 +4169,8 @@ function getEntryActualType(entry) {
 }
 async function validateCompositionType(client, id, expectedType) {
   try {
-    const composition = await client.getCompositionById({
+    const composition = await client.get({
       compositionId: id,
-      skipDataResolution: true,
       state: CANVAS_DRAFT_STATE2,
       withPatternType: true
     });
@@ -4077,11 +4192,10 @@ async function validateCompositionType(client, id, expectedType) {
   }
 }
 async function validateEntryType(client, id, expectedType) {
-  const res = await client.getEntries({
+  const res = await client.list({
     offset: 0,
     limit: 1,
     entryIDs: [id],
-    skipDataResolution: true,
     state: CANVAS_DRAFT_STATE2,
     pattern: expectedType === "entry-pattern" ? true : void 0
   });
@@ -4156,29 +4270,32 @@ function createCompositionGetHandler(expectedType) {
     project: projectId,
     resolvePatterns,
     resolveOverrides,
-    componentIDs,
     resolveData,
     diagnostics,
     resolutionDepth,
     verbose
   }) => {
-    const parameters = {
+    const fetch2 = nodeFetchProxy(proxy, verbose);
+    const sharedParameters = {
       compositionId: id,
       state: convertStateOption(state),
       skipPatternResolution: !resolvePatterns,
       skipOverridesResolution: !resolveOverrides,
-      withComponentIDs: componentIDs,
-      skipDataResolution: !resolveData,
-      diagnostics: resolveData ? diagnostics : void 0,
-      resolutionDepth: resolveData ? resolutionDepth : void 0,
       withPatternType: true
     };
     if (verbose) {
-      console.log(`\u{1F41B} get ${expectedType}:`, parameters);
-    }
-    const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, edgeApiHost, apiHost, fetch: fetch2, projectId });
-    const composition = await client.getCompositionById(parameters);
+      console.log(`\u{1F41B} get ${expectedType}:`, {
+        ...sharedParameters,
+        resolveData,
+        diagnostics,
+        resolutionDepth
+      });
+    }
+    const composition = resolveData ? await getCompositionDeliveryClient({ apiKey, edgeApiHost, apiHost, fetch: fetch2, projectId }).get({
+      ...sharedParameters,
+      diagnostics,
+      resolutionDepth
+    }) : await getCompositionManagementClient({ apiKey, apiHost, fetch: fetch2, projectId }).get(sharedParameters);
     const actualType = getCompositionActualType(composition);
     if (actualType !== expectedType) {
       console.error(formatCompositionTypeError(id, actualType, expectedType, "get"));
@@ -4216,11 +4333,6 @@ var CompositionGetModule = {
                   default: false,
                   describe: "Resolves pattern overrides in the composition and removes override definition data"
                 },
-                componentIDs: {
-                  type: "boolean",
-                  default: false,
-                  describe: "Include individual component UIDs"
-                },
                 resolveData: {
                   type: "boolean",
                   default: false,
@@ -4239,7 +4351,8 @@ var CompositionGetModule = {
               })
             )
           )
-        )
+        ),
+        { includeEdgeApiHost: true }
       )
     )
   ),
@@ -4288,11 +4401,6 @@ var CompositionListModule = {
                   default: false,
                   type: "boolean",
                   hidden: true
-                },
-                componentIDs: {
-                  type: "boolean",
-                  default: false,
-                  describe: "Include individual component UIDs"
                 }
               })
             )
@@ -4317,7 +4425,6 @@ var CompositionListModule = {
     state,
     resolvePatterns,
     resolveOverrides,
-    componentIDs,
     verbose
   }) => {
     const parameters = {
@@ -4328,15 +4435,14 @@ var CompositionListModule = {
       patternType,
       state: convertStateOption(state),
       skipPatternResolution: !resolvePatterns,
-      withComponentIDs: componentIDs,
       skipOverridesResolution: !resolveOverrides
     };
     if (verbose) {
       console.log(`\u{1F41B} list compositions:`, parameters);
     }
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const res = await client.getCompositionList(parameters);
+    const client = getCompositionManagementClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const res = await client.list(parameters);
     emitWithFormat(res.compositions, format, filename);
   }
 };
@@ -4375,12 +4481,6 @@ var ComponentPatternListModule = {
                   default: "component",
                   choices: ["all", "component", "composition"],
                   hidden: true
-                },
-                componentIDs: {
-                  alias: ["componentIDs"],
-                  type: "boolean",
-                  default: false,
-                  describe: "Include individual component UIDs"
                 }
               })
             )
@@ -4430,16 +4530,13 @@ function createComponentInstanceEngineDataSource({
           offset,
           pattern: onlyCompositions ? false : onlyPatterns ? true : void 0,
           state: stateId,
-          skipPatternResolution: true,
-          skipOverridesResolution: true,
-          withComponentIDs: true,
           patternType,
           editions: "all"
         };
         if (verbose) {
           console.log(`\u{1F41B} pull compositions: `, parameters);
         }
-        return (await client.getCompositionList(parameters)).compositions;
+        return (await client.list(parameters)).compositions;
       },
       { pageSize: batchSize ?? 100, verbose, entityName: "compositions" }
     );
@@ -4460,13 +4557,13 @@ function createComponentInstanceEngineDataSource({
       if (verbose) {
         console.log(`\u{1F41B} delete composition: (id: ${parseCompositionSerializedId(providerId)})`);
       }
-      await client.removeComposition(parseCompositionSerializedId(providerId));
+      await client.remove(parseCompositionSerializedId(providerId));
     },
     writeObject: async (object4) => {
       if (verbose) {
         console.log(`\u{1F41B} push composition: (id: ${object4.object.composition._id})`);
       }
-      await client.updateComposition({ ...object4.object, state: stateId });
+      await client.save({ ...object4.object, state: stateId });
     }
   };
 }
@@ -4527,7 +4624,7 @@ var CompositionPublishModule = {
     }
     const compositionIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = getCompositionManagementClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const source = createComponentInstanceEngineDataSource({
       client,
       state: "preview",
@@ -4686,7 +4783,7 @@ function componentInstancePullModuleFactory(type, entityType) {
       resolvedBatchSize
     }) => {
       const fetch2 = nodeFetchProxy(proxy, verbose);
-      const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+      const client = getCompositionManagementClient({ apiKey, apiHost, fetch: fetch2, projectId });
       const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
       const source = createComponentInstanceEngineDataSource({
         client,
@@ -4807,7 +4904,7 @@ async function fetchUniformLocales(options) {
     bypassCache: true,
     limitPolicy: cliLimitPolicy
   });
-  const locales = (await client.get()).results;
+  const locales = (await client.list()).results;
   return new Set(locales.map((locale) => locale.locale));
 }
 function validateEntityLocales(entity, uniformLocales, entityName) {
@@ -4885,7 +4982,7 @@ function componentInstancePushModuleFactory(type, entityType) {
       resolvedBatchSize
     }) => {
       const fetch2 = nodeFetchProxy(proxy, verbose);
-      const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+      const client = getCompositionManagementClient({ apiKey, apiHost, fetch: fetch2, projectId });
       let source;
       const isPackage = isPathAPackageFile(directory);
       if (isPackage) {
@@ -5008,7 +5105,7 @@ function createCompositionRemoveHandler(expectedType) {
       console.log(`\u{1F41B} remove ${expectedType}: (id: ${id})`);
     }
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = getCompositionManagementClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const validation = await validateCompositionType(client, id, expectedType);
     if (!validation.exists) {
       console.error(`Error: ${getCompositionDisplayName(expectedType)} with ID "${id}" not found.`);
@@ -5019,7 +5116,7 @@ function createCompositionRemoveHandler(expectedType) {
       process.exit(1);
     }
     if (!whatIf) {
-      await client.removeComposition({ compositionId: id });
+      await client.remove({ compositionId: id });
     } else {
       whatIfSimpleLog({ id, displayName: getCompositionDisplayName(expectedType), action: "delete" });
     }
@@ -5052,10 +5149,7 @@ var ComponentPatternRemoveModule = {
 };
 
 // src/commands/canvas/commands/composition/unpublish.ts
-import {
-  ApiClientError,
-  CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE2
-} from "@uniformdev/canvas";
+import { ApiClientError } from "@uniformdev/canvas";
 import { diffJson as diffJson2 } from "diff";
 var CompositionUnpublishModule = {
   command: "unpublish [ids]",
@@ -5110,7 +5204,7 @@ var CompositionUnpublishModule = {
     const compositionIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
     const targetItems = /* @__PURE__ */ new Map();
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = getCompositionManagementClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const source = createComponentInstanceEngineDataSource({
       client,
       state: "published",
@@ -5152,7 +5246,7 @@ var CompositionUnpublishModule = {
       }
       if (!whatIf) {
         actions.push(
-          client.removeComposition({ ...parseCompositionSerializedId(id), state: CANVAS_PUBLISHED_STATE2 }).catch((err) => {
+          client.unpublish(parseCompositionSerializedId(id)).catch((err) => {
             const isNotFound = err instanceof ApiClientError && err.statusCode === 404;
             if (isNotFound) {
               console.warn(
@@ -5230,7 +5324,7 @@ function createCompositionUpdateHandler(expectedType) {
       console.log(`\u{1F41B} update ${expectedType}: (filename: ${filename}, state: ${convertStateOption(state)})`);
     }
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = getCompositionManagementClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const file = readFileToObject(filename);
     const id = file.composition._id;
     const validation = await validateCompositionType(client, id, expectedType);
@@ -5239,7 +5333,7 @@ function createCompositionUpdateHandler(expectedType) {
       process.exit(1);
     }
     if (!whatIf) {
-      await client.updateComposition({ ...file, state: convertStateOption(state) });
+      await client.save({ ...file, state: convertStateOption(state) });
     } else {
       whatIfSimpleLog({
         id,
@@ -5343,12 +5437,6 @@ var CompositionPatternListModule = {
                   default: "composition",
                   choices: ["all", "component", "composition"],
                   hidden: true
-                },
-                componentIDs: {
-                  alias: ["componentIDs"],
-                  type: "boolean",
-                  default: false,
-                  describe: "Include individual composition pattern UIDs"
                 }
               })
             )
@@ -5551,11 +5639,21 @@ var CompositionPatternModule = {
 import yargs11 from "yargs";
 
 // src/commands/canvas/commands/contentType/_util.ts
-import { ContentClient } from "@uniformdev/canvas";
+import {
+  ContentTypeClient,
+  EntryDeliveryClient,
+  EntryManagementClient
+} 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 });
+function getContentTypeClient(options) {
+  return new ContentTypeClient({ ...options, limitPolicy: cliLimitPolicy });
+}
+function getEntryManagementClient(options) {
+  return new EntryManagementClient({ ...options, limitPolicy: cliLimitPolicy });
+}
+function getEntryDeliveryClient(options) {
+  return new EntryDeliveryClient({ ...options, limitPolicy: cliLimitPolicy });
 }
 
 // src/commands/canvas/commands/contentType/get.ts
@@ -5578,12 +5676,8 @@ var ContentTypeGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const res = await client.getContentTypes({ offset: 0, limit: 1e3 });
-    const found = res.contentTypes.find((f) => f.id === id);
-    if (!found) {
-      throw new Error(`Content type with ID ${id} not found`);
-    }
+    const client = getContentTypeClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const found = await client.get({ contentTypeId: id });
     emitWithFormat(found, format, filename);
   }
 };
@@ -5595,8 +5689,8 @@ var ContentTypeListModule = {
   builder: (yargs44) => withConfiguration(withDebugOptions(withFormatOptions(withApiOptions(withProjectOptions(yargs44))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const res = await client.getContentTypes({ offset: 0, limit: 1e3 });
+    const client = getContentTypeClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const res = await client.list({ offset: 0, limit: 1e3 });
     emitWithFormat(res.contentTypes, format, filename);
   }
 };
@@ -5609,7 +5703,7 @@ function createContentTypeEngineDataSource({
 }) {
   async function* getObjects() {
     const contentTypes = paginateAsync(
-      async (offset, limit2) => (await client.getContentTypes({ offset, limit: limit2 })).contentTypes,
+      async (offset, limit2) => (await client.list({ offset, limit: limit2 })).contentTypes,
       { pageSize: batchSize ?? 100, verbose, entityName: "content types" }
     );
     for await (const ct of contentTypes) {
@@ -5626,10 +5720,10 @@ function createContentTypeEngineDataSource({
     name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
-      await client.deleteContentType({ contentTypeId: providerId });
+      await client.remove({ contentTypeId: providerId });
     },
     writeObject: async ({ object: object4 }) => {
-      await client.upsertContentType({ contentType: object4 });
+      await client.save({ contentType: object4 });
     }
   };
 }
@@ -5682,7 +5776,7 @@ var ContentTypePullModule = {
     resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({
+    const client = getContentTypeClient({
       apiKey,
       apiHost,
       fetch: fetch2,
@@ -5773,7 +5867,7 @@ var ContentTypePushModule = {
     resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({
+    const client = getContentTypeClient({
       apiKey,
       apiHost,
       fetch: fetch2,
@@ -5829,9 +5923,9 @@ var ContentTypeRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId, verbose, whatIf }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = getContentTypeClient({ apiKey, apiHost, fetch: fetch2, projectId });
     if (!whatIf) {
-      await client.deleteContentType({ contentTypeId: id });
+      await client.remove({ contentTypeId: id });
     } else {
       whatIfSimpleLog({ id, displayName: `Content Type`, action: "delete" });
     }
@@ -5854,10 +5948,10 @@ var ContentTypeUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId, verbose, whatIf }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = getContentTypeClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const file = readFileToObject(filename);
     if (!whatIf) {
-      await client.upsertContentType({ contentType: file });
+      await client.save({ contentType: file });
     } else {
       whatIfSimpleLog({ id: file.id, displayName: `Content Type: ${file.name}`, action: "update" });
     }
@@ -5962,7 +6056,7 @@ var DataSourceUpdateModule = {
     const client = getDataSourceClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const file = JSON.parse(dataSource);
     if (!whatIf) {
-      await client.upsert({ data: file, integrationType });
+      await client.save({ data: file, integrationType });
     } else {
       whatIfSimpleLog({ id: file.id, displayName: `Data Source: ${file.displayName}`, action: "update" });
     }
@@ -6010,7 +6104,7 @@ var DataTypeGetModule = {
   handler: async ({ apiHost, apiKey, proxy, id, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getDataTypeClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const res = await client.get();
+    const res = await client.list();
     const found = res.results.find((f) => f.id === id);
     if (!found) {
       throw new Error(`Data type with ID ${id} not found`);
@@ -6028,7 +6122,7 @@ var DataTypeListModule = {
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
     const client = getDataTypeClient({ apiKey, apiHost, fetch: fetch2, projectId });
-    const res = await client.get();
+    const res = await client.list();
     emitWithFormat(res.results, format, filename);
   }
 };
@@ -6038,7 +6132,7 @@ function createDataTypeEngineDataSource({
   client
 }) {
   async function* getObjects() {
-    const dataTypes = (await client.get()).results;
+    const dataTypes = (await client.list()).results;
     for await (const dataType of dataTypes) {
       const result = {
         id: selectIdentifier4(dataType),
@@ -6056,7 +6150,7 @@ function createDataTypeEngineDataSource({
       await client.remove({ typeId: providerId });
     },
     writeObject: async (object4) => {
-      await client.upsert({
+      await client.save({
         data: object4.object
       });
     }
@@ -6265,7 +6359,7 @@ var DataTypeUpdateModule = {
     const client = getDataTypeClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const file = readFileToObject(filename);
     if (!whatIf) {
-      await client.upsert({ data: file });
+      await client.save({ data: file });
     } else {
       whatIfSimpleLog({ id: file.id, displayName: `Data Type: ${file.displayName}`, action: "update" });
     }
@@ -6301,32 +6395,27 @@ function createEntryGetHandler(expectedType) {
     resolveData,
     diagnostics,
     resolutionDepth,
-    withComponentIDs,
     verbose
   }) => {
     if (verbose) {
       console.log(`\u{1F41B} get ${expectedType}: (id: ${id})`);
     }
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, edgeApiHost, fetch: fetch2, projectId });
-    const res = await client.getEntries({
-      offset: 0,
-      limit: 1,
-      entryIDs: [id],
-      state: convertStateOption(state),
-      skipOverridesResolution: true,
+    const clientOptions = { apiKey, apiHost, edgeApiHost, fetch: fetch2, projectId };
+    const stateType = convertStateOption(state);
+    const entry = resolveData ? await getEntryDeliveryClient(clientOptions).get({
+      entryId: id,
+      state: stateType,
+      // Preserve the old resolved-read shape: data resources resolved, but
+      // patterns/overrides left unresolved.
       skipPatternResolution: true,
-      skipDataResolution: !resolveData,
-      diagnostics: resolveData ? diagnostics : void 0,
-      resolutionDepth: resolveData ? resolutionDepth : void 0,
-      withComponentIDs,
-      pattern: expectedType === "entry-pattern" ? true : void 0
+      skipOverridesResolution: true,
+      diagnostics,
+      resolutionDepth
+    }) : await getEntryManagementClient(clientOptions).get({
+      entryId: id,
+      state: stateType
     });
-    if (res.entries.length !== 1) {
-      console.error(`Error: ${getEntryDisplayName(expectedType)} with ID "${id}" not found.`);
-      process.exit(1);
-    }
-    const entry = res.entries[0];
     const actualType = getEntryActualType(entry);
     if (actualType !== expectedType) {
       console.error(formatEntryTypeError(id, actualType, expectedType, "get"));
@@ -6359,17 +6448,13 @@ var EntryGetModule = {
                   type: "number",
                   default: 1,
                   describe: "Controls how many levels deep content references should be resolved"
-                },
-                withComponentIDs: {
-                  type: "boolean",
-                  default: false,
-                  describe: "Include IDs of blocks in block fields"
                 }
               }),
               // for backwards compatibility, we default to the "published" state, unlike compositions
               "published"
             )
-          )
+          ),
+          { includeEdgeApiHost: true }
         )
       )
     )
@@ -6395,12 +6480,7 @@ var EntryListModule = {
                   type: "number",
                   default: LEGACY_DEFAULT_LIMIT
                 },
-                search: { describe: "Search query", type: "string", default: "" },
-                withComponentIDs: {
-                  type: "boolean",
-                  default: false,
-                  describe: "Include IDs of blocks in block fields"
-                }
+                search: { describe: "Search query", type: "string", default: "" }
               }),
               // for backwards compatibility, we default to the "published" state, unlike compositions
               "published"
@@ -6412,7 +6492,6 @@ var EntryListModule = {
   ),
   handler: async ({
     apiHost,
-    edgeApiHost,
     apiKey,
     proxy,
     format,
@@ -6422,21 +6501,16 @@ var EntryListModule = {
     limit: limit2,
     offset,
     search,
-    withComponentIDs,
     verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, edgeApiHost, fetch: fetch2, projectId });
-    const res = await client.getEntries({
+    const client = getEntryManagementClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const res = await client.list({
       offset,
       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),
-      skipOverridesResolution: true,
-      skipPatternResolution: true,
-      skipDataResolution: true,
-      withComponentIDs
+      state: convertStateOption(state)
     });
     emitWithFormat(res.entries, format, filename);
   }
@@ -6478,16 +6552,12 @@ function createEntryEngineDataSource({
     const entries = paginateAsync(
       async (offset, limit2) => {
         try {
-          return (await client.getEntries({
+          return (await client.list({
             offset,
             limit: limit2,
             entryIDs,
             pattern: onlyEntries ? false : onlyPatterns ? true : void 0,
-            skipDataResolution: true,
-            skipOverridesResolution: true,
-            skipPatternResolution: true,
             state: stateId,
-            withComponentIDs: true,
             editions: "all"
           })).entries;
         } catch (error) {
@@ -6513,10 +6583,10 @@ function createEntryEngineDataSource({
     name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
-      await client.deleteEntry(parseEntrySerializedId(providerId));
+      await client.remove(parseEntrySerializedId(providerId));
     },
     writeObject: async ({ object: object4 }) => {
-      await client.upsertEntry({ ...convertEntryToPutEntry(object4), state: stateId });
+      await client.save({ ...convertEntryToPutEntry(object4), state: stateId });
     }
   };
 }
@@ -6549,7 +6619,6 @@ var EntryPublishModule = {
   ),
   handler: async ({
     apiHost,
-    edgeApiHost,
     apiKey,
     proxy,
     ids,
@@ -6566,7 +6635,7 @@ var EntryPublishModule = {
     }
     const entryIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, edgeApiHost, fetch: fetch2, projectId });
+    const client = getEntryManagementClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const source = createEntryEngineDataSource({
       client,
       state: "preview",
@@ -6658,7 +6727,7 @@ var EntryPullModule = {
     resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({
+    const client = getEntryManagementClient({
       apiKey,
       apiHost,
       fetch: fetch2,
@@ -6767,7 +6836,7 @@ var EntryPushModule = {
     resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({
+    const client = getEntryManagementClient({
       apiKey,
       apiHost,
       fetch: fetch2,
@@ -6852,7 +6921,7 @@ function createEntryRemoveHandler(expectedType) {
       console.log(`\u{1F41B} remove ${expectedType}: (id: ${id})`);
     }
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = getEntryManagementClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const validation = await validateEntryType(client, id, expectedType);
     if (!validation.exists) {
       console.error(`Error: ${getEntryDisplayName(expectedType)} with ID "${id}" not found.`);
@@ -6863,7 +6932,7 @@ function createEntryRemoveHandler(expectedType) {
       process.exit(1);
     }
     if (!whatIf) {
-      await client.deleteEntry({ entryId: id });
+      await client.remove({ entryId: id });
     } else {
       whatIfSimpleLog({ id, displayName: getEntryDisplayName(expectedType), action: "delete" });
     }
@@ -6886,7 +6955,7 @@ var EntryRemoveModule = {
 };
 
 // src/commands/canvas/commands/entry/unpublish.ts
-import { ApiClientError as ApiClientError3, CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE3 } from "@uniformdev/canvas";
+import { ApiClientError as ApiClientError3 } from "@uniformdev/canvas";
 import { diffJson as diffJson3 } from "diff";
 var EntryUnpublishModule = {
   command: "unpublish [ids]",
@@ -6929,7 +6998,7 @@ var EntryUnpublishModule = {
     const entryIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
     const targetItems = /* @__PURE__ */ new Map();
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = getEntryManagementClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const source = createEntryEngineDataSource({
       client,
       state: "published",
@@ -6965,7 +7034,7 @@ var EntryUnpublishModule = {
       }
       if (!whatIf) {
         actions.push(
-          client.deleteEntry({ ...parseEntrySerializedId(id), state: CANVAS_PUBLISHED_STATE3 }).catch((err) => {
+          client.unpublish(parseEntrySerializedId(id)).catch((err) => {
             const isNotFound = err instanceof ApiClientError3 && err.statusCode === 404;
             if (isNotFound) {
               console.warn(
@@ -6994,7 +7063,6 @@ var EntryUnpublishModule = {
 function createEntryUpdateHandler(expectedType) {
   return async ({
     apiHost,
-    edgeApiHost,
     apiKey,
     proxy,
     filename,
@@ -7007,7 +7075,7 @@ function createEntryUpdateHandler(expectedType) {
       console.log(`\u{1F41B} update ${expectedType}: (filename: ${filename}, state: ${convertStateOption(state)})`);
     }
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, edgeApiHost, fetch: fetch2, projectId });
+    const client = getEntryManagementClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const file = readFileToObject(filename);
     const id = file.entry._id;
     const validation = await validateEntryType(client, id, expectedType);
@@ -7016,7 +7084,7 @@ function createEntryUpdateHandler(expectedType) {
       process.exit(1);
     }
     if (!whatIf) {
-      await client.upsertEntry({ ...file, state: convertStateOption(state) });
+      await client.save({ ...file, state: convertStateOption(state) });
     } else {
       whatIfSimpleLog({
         id,
@@ -7082,16 +7150,12 @@ var EntryPatternGetModule = {
                   type: "number",
                   default: 1,
                   describe: "Controls how many levels deep content references should be resolved"
-                },
-                withComponentIDs: {
-                  type: "boolean",
-                  default: false,
-                  describe: "Include IDs of blocks in block fields"
                 }
               }),
               "published"
             )
-          )
+          ),
+          { includeEdgeApiHost: true }
         )
       )
     )
@@ -7105,47 +7169,17 @@ var EntryPatternListModule = {
   describe: "List entry patterns",
   builder: (yargs44) => withConfiguration(
     withDebugOptions(
-      withFormatOptions(
-        withApiOptions(
-          withProjectOptions(
-            withStateOptions(
-              yargs44.option({
-                withComponentIDs: {
-                  type: "boolean",
-                  default: false,
-                  describe: "Include IDs of blocks in block fields"
-                }
-              }),
-              "published"
-            )
-          )
-        )
-      )
+      withFormatOptions(withApiOptions(withProjectOptions(withStateOptions(yargs44, "published"))))
     )
   ),
-  handler: async ({
-    apiHost,
-    edgeApiHost,
-    apiKey,
-    proxy,
-    format,
-    filename,
-    project: projectId,
-    state,
-    withComponentIDs,
-    verbose
-  }) => {
+  handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, state, verbose }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, edgeApiHost, fetch: fetch2, projectId });
-    const res = await client.getEntries({
+    const client = getEntryManagementClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const res = await client.list({
       offset: 0,
       limit: 1e3,
       state: convertStateOption(state),
-      skipOverridesResolution: true,
-      skipPatternResolution: true,
-      skipDataResolution: true,
-      pattern: true,
-      withComponentIDs
+      pattern: true
     });
     emitWithFormat(res.entries, format, filename);
   }
@@ -7179,7 +7213,6 @@ var EntryPatternPublishModule = {
   ),
   handler: async ({
     apiHost,
-    edgeApiHost,
     apiKey,
     proxy,
     ids,
@@ -7196,7 +7229,7 @@ var EntryPatternPublishModule = {
     }
     const entryIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, edgeApiHost, fetch: fetch2, projectId });
+    const client = getEntryManagementClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const source = createEntryEngineDataSource({
       client,
       state: "preview",
@@ -7288,7 +7321,7 @@ var EntryPatternPullModule = {
     resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({
+    const client = getEntryManagementClient({
       apiKey,
       apiHost,
       fetch: fetch2,
@@ -7402,7 +7435,7 @@ var EntryPatternPushModule = {
     resolvedBatchSize
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({
+    const client = getEntryManagementClient({
       apiKey,
       apiHost,
       fetch: fetch2,
@@ -7490,7 +7523,7 @@ var EntryPatternRemoveModule = {
 };
 
 // src/commands/canvas/commands/entryPattern/unpublish.ts
-import { ApiClientError as ApiClientError4, CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE4 } from "@uniformdev/canvas";
+import { ApiClientError as ApiClientError4 } from "@uniformdev/canvas";
 import { diffJson as diffJson4 } from "diff";
 var EntryPatternUnpublishModule = {
   command: "unpublish [ids]",
@@ -7533,7 +7566,7 @@ var EntryPatternUnpublishModule = {
     const entryIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
     const targetItems = /* @__PURE__ */ new Map();
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = getContentClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = getEntryManagementClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const source = createEntryEngineDataSource({
       client,
       state: "published",
@@ -7569,7 +7602,7 @@ var EntryPatternUnpublishModule = {
       }
       if (!whatIf) {
         actions.push(
-          client.deleteEntry({ ...parseEntrySerializedId(id), state: CANVAS_PUBLISHED_STATE4 }).catch((err) => {
+          client.unpublish(parseEntrySerializedId(id)).catch((err) => {
             const isNotFound = err instanceof ApiClientError4 && err.statusCode === 404;
             if (isNotFound) {
               console.warn(
@@ -7637,10 +7670,11 @@ function createLabelsEngineDataSource({
   verbose
 }) {
   async function* getObjects() {
-    const labels = paginateAsync(
-      async (offset, limit2) => (await client.getLabels({ offset, limit: limit2 })).labels,
-      { pageSize: batchSize ?? 100, verbose, entityName: "labels" }
-    );
+    const labels = paginateAsync(async (offset, limit2) => (await client.list({ offset, limit: limit2 })).labels, {
+      pageSize: batchSize ?? 100,
+      verbose,
+      entityName: "labels"
+    });
     for await (const label of labels) {
       const result = {
         id: label.label.publicId,
@@ -7655,10 +7689,10 @@ function createLabelsEngineDataSource({
     name: "Uniform API",
     objects: getObjects(),
     deleteObject: async (providerId) => {
-      await client.removeLabel({ labelId: providerId });
+      await client.remove({ labelId: providerId });
     },
     writeObject: async ({ object: object4 }) => {
-      await client.upsertLabel({ label: object4.label });
+      await client.save({ label: object4.label });
     }
   };
 }
@@ -7888,7 +7922,7 @@ function createLocaleEngineDataSource({
   client
 }) {
   async function* getObjects() {
-    const locales = (await client.get()).results;
+    const locales = (await client.list()).results;
     for await (const locale of locales) {
       const result = {
         id: locale.locale,
@@ -7906,7 +7940,7 @@ function createLocaleEngineDataSource({
       await client.remove({ locale: providerId });
     },
     writeObject: async (object4) => {
-      await client.upsert({
+      await client.save({
         locale: object4.object
       });
     }
@@ -8981,7 +9015,7 @@ function createWorkflowEngineDataSource({
   verbose
 }) {
   async function* getObjects() {
-    const workflows = paginateAsync(async (offset, limit2) => (await client.get({ offset, limit: limit2 })).results, {
+    const workflows = paginateAsync(async (offset, limit2) => (await client.list({ offset, limit: limit2 })).results, {
       pageSize: batchSize ?? 100,
       verbose,
       entityName: "workflows"
@@ -9004,7 +9038,7 @@ function createWorkflowEngineDataSource({
       await client.remove({ workflowId: providerId });
     },
     writeObject: async (object4) => {
-      await client.upsert({ workflow: object4.object });
+      await client.save({ workflow: object4.object });
     }
   };
 }
@@ -9500,11 +9534,11 @@ var AggregateModule = {
 import yargs24 from "yargs";
 
 // src/commands/context/commands/enrichment/_util.ts
-import { UncachedEnrichmentClient } from "@uniformdev/context/api";
+import { EnrichmentClient } 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 });
+  return new EnrichmentClient({ ...options, limitPolicy: cliLimitPolicy, bypassCache: true });
 }
 
 // src/commands/context/commands/enrichment/get.ts
@@ -9809,7 +9843,7 @@ var EnrichmentModule = {
 import yargs25 from "yargs";
 
 // src/commands/context/commands/manifest/get.ts
-import { ApiClientError as ApiClientError5, UncachedManifestClient } from "@uniformdev/context/api";
+import { ApiClientError as ApiClientError5, ManifestClient } from "@uniformdev/context/api";
 import { gray as gray4, green as green6, red as red6 } from "colorette";
 import { writeFile } from "fs";
 import { exit } from "process";
@@ -9837,11 +9871,12 @@ var ManifestGetModule = {
   ),
   handler: async ({ apiKey, apiHost, proxy, output, project, preview }) => {
     const fetch2 = nodeFetchProxy(proxy);
-    const client = new UncachedManifestClient({
+    const client = new ManifestClient({
       apiHost,
       projectId: project,
       apiKey,
-      fetch: fetch2
+      fetch: fetch2,
+      bypassCache: true
     });
     try {
       const manifest = await client.get({ preview });
@@ -9876,7 +9911,7 @@ var ManifestGetModule = {
 };
 
 // src/commands/context/commands/manifest/publish.ts
-import { ApiClientError as ApiClientError6, UncachedManifestClient as UncachedManifestClient2 } from "@uniformdev/context/api";
+import { ApiClientError as ApiClientError6, ManifestClient as ManifestClient2 } from "@uniformdev/context/api";
 import { gray as gray5, red as red7 } from "colorette";
 import { exit as exit2 } from "process";
 var ManifestPublishModule = {
@@ -9886,11 +9921,12 @@ var ManifestPublishModule = {
   handler: async ({ apiKey, apiHost, proxy, project }) => {
     const fetch2 = nodeFetchProxy(proxy);
     try {
-      const client = new UncachedManifestClient2({
+      const client = new ManifestClient2({
         apiHost,
         projectId: project,
         apiKey,
-        fetch: fetch2
+        fetch: fetch2,
+        bypassCache: true
       });
       await client.publish();
     } catch (e) {
@@ -9925,7 +9961,7 @@ var ManifestModule = {
 import yargs26 from "yargs";
 
 // src/commands/context/commands/quirk/get.ts
-import { UncachedQuirkClient } from "@uniformdev/context/api";
+import { QuirkClient } from "@uniformdev/context/api";
 var QuirkGetModule = {
   command: "get <id>",
   describe: "Fetch a quirk",
@@ -9940,7 +9976,7 @@ var QuirkGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, project: projectId, filename }) => {
     const fetch2 = nodeFetchProxy(proxy);
-    const client = new UncachedQuirkClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new QuirkClient({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     const res = await client.get({ quirkId: id, withIntegrations: true });
     if (res.quirks.length === 0) {
       console.error("Quirk did not exist");
@@ -9952,7 +9988,7 @@ var QuirkGetModule = {
 };
 
 // src/commands/context/commands/quirk/list.ts
-import { UncachedQuirkClient as UncachedQuirkClient2 } from "@uniformdev/context/api";
+import { QuirkClient as QuirkClient2 } from "@uniformdev/context/api";
 var QuirkListModule = {
   command: "list",
   describe: "List quirks",
@@ -9972,14 +10008,14 @@ var QuirkListModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId, withIntegrations }) => {
     const fetch2 = nodeFetchProxy(proxy);
-    const client = new UncachedQuirkClient2({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new QuirkClient2({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     const res = await client.get({ withIntegrations });
     emitWithFormat(res.quirks, format, filename);
   }
 };
 
 // src/commands/context/commands/quirk/pull.ts
-import { UncachedQuirkClient as UncachedQuirkClient3 } from "@uniformdev/context/api";
+import { QuirkClient as QuirkClient3 } from "@uniformdev/context/api";
 
 // src/commands/context/commands/quirk/_util.ts
 var selectIdentifier10 = (source) => source.id;
@@ -10059,7 +10095,7 @@ var QuirkPullModule = {
     verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedQuirkClient3({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new QuirkClient3({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     const source = createQuirkEngineDataSource({ client });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -10096,7 +10132,7 @@ var QuirkPullModule = {
 };
 
 // src/commands/context/commands/quirk/push.ts
-import { UncachedQuirkClient as UncachedQuirkClient4 } from "@uniformdev/context/api";
+import { QuirkClient as QuirkClient4 } from "@uniformdev/context/api";
 var QuirkPushModule = {
   command: "push <directory>",
   describe: "Pushes all quirks from files in a directory or package to Uniform",
@@ -10133,7 +10169,7 @@ var QuirkPushModule = {
     verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedQuirkClient4({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new QuirkClient4({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     let source;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -10165,7 +10201,7 @@ var QuirkPushModule = {
 };
 
 // src/commands/context/commands/quirk/remove.ts
-import { UncachedQuirkClient as UncachedQuirkClient5 } from "@uniformdev/context/api";
+import { QuirkClient as QuirkClient5 } from "@uniformdev/context/api";
 var QuirkRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -10179,13 +10215,13 @@ var QuirkRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
-    const client = new UncachedQuirkClient5({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new QuirkClient5({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     await client.remove({ quirkId: id });
   }
 };
 
 // src/commands/context/commands/quirk/update.ts
-import { UncachedQuirkClient as UncachedQuirkClient6 } from "@uniformdev/context/api";
+import { QuirkClient as QuirkClient6 } from "@uniformdev/context/api";
 var QuirkUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -10199,7 +10235,7 @@ var QuirkUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
-    const client = new UncachedQuirkClient6({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new QuirkClient6({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     const file = readFileToObject(filename);
     await client.upsert({ quirk: file });
   }
@@ -10220,7 +10256,7 @@ var QuirkModule = {
 import yargs27 from "yargs";
 
 // src/commands/context/commands/signal/get.ts
-import { UncachedSignalClient } from "@uniformdev/context/api";
+import { SignalClient } from "@uniformdev/context/api";
 var SignalGetModule = {
   command: "get <id>",
   describe: "Fetch a signal",
@@ -10235,7 +10271,7 @@ var SignalGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, project: projectId, filename }) => {
     const fetch2 = nodeFetchProxy(proxy);
-    const client = new UncachedSignalClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new SignalClient({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     const res = await client.get({ signalId: id });
     if (res.signals.length === 0) {
       console.error("Signal did not exist");
@@ -10247,7 +10283,7 @@ var SignalGetModule = {
 };
 
 // src/commands/context/commands/signal/list.ts
-import { UncachedSignalClient as UncachedSignalClient2 } from "@uniformdev/context/api";
+import { SignalClient as SignalClient2 } from "@uniformdev/context/api";
 var SignalListModule = {
   command: "list",
   describe: "List signals",
@@ -10255,14 +10291,14 @@ var SignalListModule = {
   builder: (yargs44) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs44)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
-    const client = new UncachedSignalClient2({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new SignalClient2({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     const res = await client.get();
     emitWithFormat(res.signals, format, filename);
   }
 };
 
 // src/commands/context/commands/signal/pull.ts
-import { UncachedSignalClient as UncachedSignalClient3 } from "@uniformdev/context/api";
+import { SignalClient as SignalClient3 } from "@uniformdev/context/api";
 
 // src/commands/context/commands/signal/_util.ts
 var selectIdentifier11 = (source) => source.id;
@@ -10342,7 +10378,7 @@ var SignalPullModule = {
     verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedSignalClient3({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new SignalClient3({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     const source = createSignalEngineDataSource({ client });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -10379,7 +10415,7 @@ var SignalPullModule = {
 };
 
 // src/commands/context/commands/signal/push.ts
-import { UncachedSignalClient as UncachedSignalClient4 } from "@uniformdev/context/api";
+import { SignalClient as SignalClient4 } from "@uniformdev/context/api";
 var SignalPushModule = {
   command: "push <directory>",
   describe: "Pushes all signals from files in a directory or package to Uniform",
@@ -10416,7 +10452,7 @@ var SignalPushModule = {
     verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedSignalClient4({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new SignalClient4({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     let source;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -10448,7 +10484,7 @@ var SignalPushModule = {
 };
 
 // src/commands/context/commands/signal/remove.ts
-import { UncachedSignalClient as UncachedSignalClient5 } from "@uniformdev/context/api";
+import { SignalClient as SignalClient5 } from "@uniformdev/context/api";
 var SignalRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -10462,13 +10498,13 @@ var SignalRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
-    const client = new UncachedSignalClient5({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new SignalClient5({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     await client.remove({ signalId: id });
   }
 };
 
 // src/commands/context/commands/signal/update.ts
-import { UncachedSignalClient as UncachedSignalClient6 } from "@uniformdev/context/api";
+import { SignalClient as SignalClient6 } from "@uniformdev/context/api";
 var SignalUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -10482,7 +10518,7 @@ var SignalUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
-    const client = new UncachedSignalClient6({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new SignalClient6({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     const file = readFileToObject(filename);
     await client.upsert({ signal: file });
   }
@@ -10503,7 +10539,7 @@ var SignalModule = {
 import yargs28 from "yargs";
 
 // src/commands/context/commands/test/get.ts
-import { UncachedTestClient } from "@uniformdev/context/api";
+import { TestClient } from "@uniformdev/context/api";
 var TestGetModule = {
   command: "get <id>",
   describe: "Fetch a test",
@@ -10518,7 +10554,7 @@ var TestGetModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, format, project: projectId, filename }) => {
     const fetch2 = nodeFetchProxy(proxy);
-    const client = new UncachedTestClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new TestClient({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     const res = await client.get({ testId: id });
     if (res.tests.length === 0) {
       console.error("Test did not exist");
@@ -10530,7 +10566,7 @@ var TestGetModule = {
 };
 
 // src/commands/context/commands/test/list.ts
-import { UncachedTestClient as UncachedTestClient2 } from "@uniformdev/context/api";
+import { TestClient as TestClient2 } from "@uniformdev/context/api";
 var TestListModule = {
   command: "list",
   describe: "List tests",
@@ -10538,14 +10574,14 @@ var TestListModule = {
   builder: (yargs44) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs44)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
-    const client = new UncachedTestClient2({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new TestClient2({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     const res = await client.get();
     emitWithFormat(res.tests, format, filename);
   }
 };
 
 // src/commands/context/commands/test/pull.ts
-import { UncachedTestClient as UncachedTestClient3 } from "@uniformdev/context/api";
+import { TestClient as TestClient3 } from "@uniformdev/context/api";
 
 // src/commands/context/commands/test/_util.ts
 var selectIdentifier12 = (source) => source.id;
@@ -10625,7 +10661,7 @@ var TestPullModule = {
     verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedTestClient3({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new TestClient3({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     const source = createTestEngineDataSource({ client });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -10662,7 +10698,7 @@ var TestPullModule = {
 };
 
 // src/commands/context/commands/test/push.ts
-import { UncachedTestClient as UncachedTestClient4 } from "@uniformdev/context/api";
+import { TestClient as TestClient4 } from "@uniformdev/context/api";
 var TestPushModule = {
   command: "push <directory>",
   describe: "Pushes all tests from files in a directory or package to Uniform",
@@ -10699,7 +10735,7 @@ var TestPushModule = {
     verbose
   }) => {
     const fetch2 = nodeFetchProxy(proxy, verbose);
-    const client = new UncachedTestClient4({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new TestClient4({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     let source;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -10731,7 +10767,7 @@ var TestPushModule = {
 };
 
 // src/commands/context/commands/test/remove.ts
-import { UncachedTestClient as UncachedTestClient5 } from "@uniformdev/context/api";
+import { TestClient as TestClient5 } from "@uniformdev/context/api";
 var TestRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -10745,13 +10781,13 @@ var TestRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
-    const client = new UncachedTestClient5({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new TestClient5({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     await client.remove({ testId: id });
   }
 };
 
 // src/commands/context/commands/test/update.ts
-import { UncachedTestClient as UncachedTestClient6 } from "@uniformdev/context/api";
+import { TestClient as TestClient6 } from "@uniformdev/context/api";
 var TestUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -10763,7 +10799,7 @@ var TestUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
     const fetch2 = nodeFetchProxy(proxy);
-    const client = new UncachedTestClient6({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new TestClient6({ apiKey, apiHost, fetch: fetch2, projectId, bypassCache: true });
     const file = readFileToObject(filename);
     await client.upsert({ test: file });
   }
@@ -12083,11 +12119,11 @@ import yargs38 from "yargs";
 import yargs36 from "yargs";
 
 // src/commands/project-map/commands/ProjectMapDefinition/_util.ts
-import { UncachedProjectMapClient } from "@uniformdev/project-map";
+import { ProjectMapClient } from "@uniformdev/project-map";
 var selectIdentifier14 = (source) => source.id;
 var selectDisplayName14 = (source) => `${source.name} (pid: ${source.id})`;
 function getProjectMapClient(options) {
-  return new UncachedProjectMapClient({ ...options, limitPolicy: cliLimitPolicy });
+  return new ProjectMapClient({ ...options, limitPolicy: cliLimitPolicy, bypassCache: true });
 }
 
 // src/commands/project-map/commands/ProjectMapDefinition/get.ts
@@ -12430,6 +12466,20 @@ var selectIdentifier15 = (source, projectId) => [
 ];
 var selectFilename = (source) => cleanFileName(`${source.pathSegment}_${source.id}`);
 var selectDisplayName15 = (source) => `${source.name} (pid: ${source.id})`;
+function alignProjectMapNodeWithTargetIdentifier(sourceObject, targetObject) {
+  if (!targetObject) {
+    return sourceObject;
+  }
+  return {
+    ...sourceObject,
+    id: targetObject.id,
+    providerId: targetObject.providerId,
+    object: {
+      ...sourceObject.object,
+      id: targetObject.object.id
+    }
+  };
+}
 
 // src/commands/project-map/ProjectMapNodeEngineDataSource.ts
 function createProjectMapNodeEngineDataSource({
@@ -12646,6 +12696,12 @@ var ProjectMapNodePushModule = {
         whatIf,
         allowEmptySource,
         log: createSyncEngineConsoleLogger({ diffMode }),
+        onBeforeCompareObjects: async (sourceObject, targetObject) => {
+          return alignProjectMapNodeWithTargetIdentifier(sourceObject, targetObject);
+        },
+        onBeforeWriteObject: async (sourceObject, targetObject) => {
+          return alignProjectMapNodeWithTargetIdentifier(sourceObject, targetObject);
+        },
         onError: (error, object4) => {
           if (error.message.includes(__INTERNAL_MISSING_PARENT_NODE_ERROR)) {
             nodesFailedDueToMissingParent.add(object4.object);
@@ -12740,7 +12796,7 @@ import yargs40 from "yargs";
 import yargs39 from "yargs";
 
 // src/commands/redirect/commands/RedirectDefinition/_util.ts
-import { UncachedRedirectClient } from "@uniformdev/redirect";
+import { RedirectClient } from "@uniformdev/redirect";
 var selectIdentifier16 = (source) => source.id;
 var selectFilename2 = (source) => {
   const index = source.sourceUrl.lastIndexOf("/");
@@ -12755,7 +12811,7 @@ var selectDisplayName16 = (source) => {
   return `${pathName} (id: ${source.id})`;
 };
 function getRedirectClient(options) {
-  return new UncachedRedirectClient({ ...options, limitPolicy: cliLimitPolicy });
+  return new RedirectClient({ ...options, limitPolicy: cliLimitPolicy, bypassCache: true });
 }
 
 // src/commands/redirect/commands/RedirectDefinition/get.ts
@@ -13049,7 +13105,7 @@ import yargs41 from "yargs";
 
 // src/webhooksClient.ts
 import { ApiClient as ApiClient4 } from "@uniformdev/context/api";
-import PQueue3 from "p-queue";
+import PQueue4 from "p-queue";
 import { Svix } from "svix";
 import * as z4 from "zod";
 var WEBHOOKS_DASHBOARD_BASE_PATH = "/api/v1/svix-dashboard";
@@ -13097,7 +13153,7 @@ var WebhooksClient = class extends ApiClient4 {
     };
   }
   async get() {
-    const webhooksAPIQueue = new PQueue3({ concurrency: 10 });
+    const webhooksAPIQueue = new PQueue4({ concurrency: 10 });
     const { appId, token } = await this.getToken();
     const svix = new Svix(token);
     const getEndpoints = async ({
@@ -13846,7 +13902,7 @@ var WhoamiCommand = {
   command: "whoami",
   describe: "Prints configured identity and connection context.",
   builder: (yargs44) => withConfiguration(
-    withFormatOptions(withApiOptions(yargs44)).option("project", {
+    withFormatOptions(withApiOptions(yargs44, { includeEdgeApiHost: true })).option("project", {
       describe: "Uniform project ID. Defaults to UNIFORM_CLI_PROJECT_ID or UNIFORM_PROJECT_ID env. Supports dotenv.",
       default: process.env.UNIFORM_CLI_PROJECT_ID ?? process.env.UNIFORM_PROJECT_ID,
       type: "string",