@uniformdev/cli 19.79.1-alpha.11 → 19.79.1-alpha.13

package/dist/index.mjs

@@ -7,7 +7,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// ../../node_modules/.pnpm/tsup@7.2.0_postcss@8.4.31_ts-node@10.9.1_typescript@5.2.2/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.0.1_@microsoft+api-extractor@7.39.0_postcss@8.4.32_typescript@5.3.3/node_modules/tsup/assets/esm_shims.js
 import { fileURLToPath } from "url";
 import path from "path";
 var getFilename = () => fileURLToPath(import.meta.url);
@@ -16,11 +16,11 @@ var __dirname = /* @__PURE__ */ getDirname();
 
 // src/index.ts
 import * as dotenv from "dotenv";
-import yargs26 from "yargs";
+import yargs31 from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // src/commands/canvas/index.ts
-import yargs10 from "yargs";
+import yargs12 from "yargs";
 
 // src/commands/canvas/commands/asset.ts
 import yargs from "yargs";
@@ -137,14 +137,14 @@ import httpsProxyAgent from "https-proxy-agent";
 import unfetch from "isomorphic-unfetch";
 import { dump, load } from "js-yaml";
 import { dirname, extname, isAbsolute, resolve, sep } from "path";
-function withConfiguration(yargs27) {
-  return yargs27.option("serialization", {
+function withConfiguration(yargs32) {
+  return yargs32.option("serialization", {
     skipValidation: true,
     hidden: true
   });
 }
-function withApiOptions(yargs27) {
-  return yargs27.option("apiKey", {
+function withApiOptions(yargs32) {
+  return yargs32.option("apiKey", {
     describe: "Uniform API key. Defaults to UNIFORM_CLI_API_KEY or UNIFORM_API_KEY env. Supports dotenv.",
     default: process.env.UNIFORM_CLI_API_KEY ?? // deprecated
     process.env.CANVAS_CLI_API_KEY ?? // deprecated
@@ -183,8 +183,8 @@ function nodeFetchProxy(proxy) {
   };
   return wrappedFetch;
 }
-function withProjectOptions(yargs27) {
-  return yargs27.option("project", {
+function withProjectOptions(yargs32) {
+  return yargs32.option("project", {
     describe: "Uniform project ID. Defaults to UNIFORM_CLI_PROJECT_ID or UNIFORM_PROJECT_ID env. Supports dotenv.",
     default: process.env.UNIFORM_CLI_PROJECT_ID ?? // deprecated
     process.env.CANVAS_CLI_PROJECT_ID ?? // deprecated
@@ -194,8 +194,17 @@ function withProjectOptions(yargs27) {
     alias: ["p"]
   });
 }
-function withFormatOptions(yargs27) {
-  return yargs27.option("format", {
+function withTeamOptions(yargs32) {
+  return yargs32.option("team", {
+    describe: "Uniform team ID. Defaults to UNIFORM_CLI_TEAM_ID or UNIFORM_TEAM_ID env. Supports dotenv.",
+    default: process.env.UNIFORM_CLI_TEAM_ID ?? process.env.UNIFORM_TEAM_ID,
+    demandOption: true,
+    type: "string",
+    alias: ["p"]
+  });
+}
+function withFormatOptions(yargs32) {
+  return yargs32.option("format", {
     alias: ["f"],
     describe: "Output format",
     default: "yaml",
@@ -207,8 +216,8 @@ function withFormatOptions(yargs27) {
     type: "string"
   });
 }
-function withDiffOptions(yargs27) {
-  return yargs27.option("diff", {
+function withDiffOptions(yargs32) {
+  return yargs32.option("diff", {
     describe: "Whether to show diffs in stdout. off = no diffs; update = on for updates; on = updates, creates, deletes. Can be set by UNIFORM_CLI_DIFF_MODE environment variable.",
     default: process.env.UNIFORM_CLI_DIFF_MODE ?? "off",
     type: "string",
@@ -295,6 +304,7 @@ async function* paginateAsync(fetchPage, options) {
 var defaultSyncConfiguration = {
   entitiesConfig: {},
   directory: "uniform-data",
+  allowEmptySource: false,
   format: "yaml",
   mode: "mirror"
 };
@@ -632,12 +642,12 @@ function createPublishStatusSyncEngineConsoleLogger(options) {
 var AssetGetModule = {
   command: "get <id>",
   describe: "Get an asset",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs27.positional("id", { demandOption: true, describe: "Asset ID to fetch" })
+          yargs32.positional("id", { demandOption: true, describe: "Asset ID to fetch" })
         )
       )
     )
@@ -658,7 +668,7 @@ import { UncachedAssetClient as UncachedAssetClient2 } from "@uniformdev/assets"
 var AssetListModule = {
   command: "list",
   describe: "List assets",
-  builder: (yargs27) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs27)))),
+  builder: (yargs32) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs32)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedAssetClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -669,6 +679,7 @@ var AssetListModule = {
 
 // 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";
@@ -679,20 +690,60 @@ import sizeOf from "image-size";
 import PQueue from "p-queue";
 import { dirname as dirname2, join as join2 } from "path";
 var FILES_DIRECTORY_NAME = "files";
+var escapeRegExp = (string) => {
+  return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+};
 var urlToHash = (url) => {
-  const hash = createHash("sha256");
-  hash.update(url);
-  return hash.digest("hex");
+  return Buffer.from(
+    // We take only the first 64 characters of the pathname as
+    // that's enough to guarantee uniqueness
+    new URL(url).pathname.substring(0, 64)
+  ).toString("base64");
+};
+var hashToPartialPathname = (hash) => {
+  try {
+    return Buffer.from(hash, "base64").toString("utf8");
+  } catch {
+    return null;
+  }
+};
+var findUrlMatchingPartialPathname = (source, pathname) => {
+  const escapedPathname = escapeRegExp(pathname);
+  const regex = new RegExp(`"(https://([^"]*?)?img.uniform.(rocks|global)${escapedPathname}([^"]*?))"`);
+  const match = source.match(regex);
+  if (match && match[1]) {
+    return match[1];
+  }
+  return null;
+};
+var urlToFileExtension = (url) => {
+  try {
+    const urlObject = new URL(url);
+    const fileNameChunks = urlObject.pathname.split(".");
+    return fileNameChunks.length > 1 ? fileNameChunks.at(-1) ?? null : null;
+  } catch {
+    return null;
+  }
 };
-var urlToFileName = (url) => {
-  const fileName = urlToHash(url);
-  const fileNameChunks = url.split(".");
-  const fileExtension = fileNameChunks.length > 1 ? fileNameChunks.at(-1) : "";
+var urlToFileName = (url, hash) => {
+  const fileName = hash ?? urlToHash(url);
+  const fileExtension = urlToFileExtension(url);
   return `${fileName}${fileExtension ? `.${fileExtension}` : ""}`;
 };
+var getFilesDirectory = (directory) => {
+  const isPackage = isPathAPackageFile(directory);
+  return isPackage ? dirname2(directory) : (
+    // If we are syncing to a directory, we want to write all files into a
+    // top-lvl folder. That way any entities that contain files will sync to the
+    // same directory, so there is no duplication
+    join2(directory, "..")
+  );
+};
+var getUniformFileUrlMatches = (string) => {
+  return string.matchAll(/"(https:\/\/([^"]*?)?img\.uniform\.(rocks|global)\/([^"]*?))"/g);
+};
 var deleteDownloadedFileByUrl = async (url, options) => {
-  const isPackage = isPathAPackageFile(options.directory);
-  const writeDirectory = isPackage ? dirname2(options.directory) : options.directory;
+  const writeDirectory = getFilesDirectory(options.directory);
   const fileName = urlToFileName(url);
   const fileToDelete = join2(writeDirectory, FILES_DIRECTORY_NAME, fileName);
   try {
@@ -703,18 +754,14 @@ var deleteDownloadedFileByUrl = async (url, options) => {
 };
 var extractAndDownloadUniformFilesForObject = async (object, options) => {
   const objectAsString = JSON.stringify(object);
-  const uniformFileUrlMatches = objectAsString.matchAll(
-    /"(https:\/\/(.*)?img\.uniform\.(rocks|global)\/(.*?))"/g
-  );
-  const isPackage = isPathAPackageFile(options.directory);
-  const writeDirectory = isPackage ? dirname2(options.directory) : options.directory;
+  const uniformFileUrlMatches = getUniformFileUrlMatches(objectAsString);
+  const writeDirectory = getFilesDirectory(options.directory);
   if (uniformFileUrlMatches) {
     const fileDownloadQueue = new PQueue({ concurrency: 10 });
     for (const match of uniformFileUrlMatches) {
       const url = new URL(match[1]);
       fileDownloadQueue.add(async () => {
         try {
-          const fetchUrl = `${url.origin}${url.pathname}?format=original`;
           const fileName = urlToFileName(url.toString());
           const fileAlreadyExists = await fsj.existsAsync(
             join2(writeDirectory, FILES_DIRECTORY_NAME, fileName)
@@ -722,6 +769,23 @@ var extractAndDownloadUniformFilesForObject = async (object, options) => {
           if (fileAlreadyExists) {
             return;
           }
+          const file = await options.fileClient.get({ url: url.toString() }).catch(() => null);
+          if (!file) {
+            console.warn(`Skipping file ${url} as it does not exist in the project anymore`);
+            return;
+          }
+          if (file.sourceId) {
+            try {
+              const hashAlreadyExists = await fsj.findAsync(join2(writeDirectory, FILES_DIRECTORY_NAME), {
+                matching: [file.sourceId, `${file.sourceId}.*`]
+              });
+              if (hashAlreadyExists.length > 0) {
+                return;
+              }
+            } catch {
+            }
+          }
+          const fetchUrl = `${url.origin}${url.pathname}?format=original`;
           const response = await fetch(fetchUrl);
           if (!response.ok) {
             return;
@@ -739,39 +803,45 @@ var extractAndDownloadUniformFilesForObject = async (object, options) => {
 };
 var extractAndUploadUniformFilesForObject = async (object, options) => {
   let objectAsString = JSON.stringify(object);
-  const uniformFileUrlMatches = objectAsString.matchAll(
-    /"(https:\/\/(.*)?img\.uniform\.(rocks|global)\/(.*?))"/g
-  );
+  const uniformFileUrlMatches = getUniformFileUrlMatches(objectAsString);
+  const writeDirectory = getFilesDirectory(options.directory);
   const isPackage = isPathAPackageFile(options.directory);
-  const writeDirectory = isPackage ? dirname2(options.directory) : options.directory;
+  const legacyWriteDirectory = isPackage ? dirname2(options.directory) : options.directory;
   if (uniformFileUrlMatches) {
     const fileUploadQueue = new PQueue({ concurrency: 3 });
     for (const match of uniformFileUrlMatches) {
       const url = match[1];
       const hash = urlToHash(url);
+      const legacyHash = legacyUrlToHash(url);
       fileUploadQueue.add(async () => {
         try {
           const fileAlreadyExistsChecks = await Promise.all([
             options.fileClient.get({ url }).catch(() => null),
-            options.fileClient.get({ sourceId: hash }).catch(() => null)
+            options.fileClient.get({ sourceId: hash }).catch(() => null),
+            options.fileClient.get({ sourceId: legacyHash }).catch(() => null)
           ]);
-          if (fileAlreadyExistsChecks.some((check) => check !== null)) {
+          const file = fileAlreadyExistsChecks.find((check) => check !== null);
+          if (file) {
+            objectAsString = objectAsString.replaceAll(`"${url}"`, `"${file.url}"`);
             return;
           }
           const localFileName = urlToFileName(url);
-          const fileExistsLocally = await fsj.existsAsync(
-            join2(writeDirectory, FILES_DIRECTORY_NAME, localFileName)
-          );
+          let expectedFilePath = join2(writeDirectory, FILES_DIRECTORY_NAME, localFileName);
+          let fileExistsLocally = await fsj.existsAsync(expectedFilePath);
+          if (!fileExistsLocally) {
+            const localFileName2 = legacyUrlToFileName(url);
+            expectedFilePath = join2(legacyWriteDirectory, FILES_DIRECTORY_NAME, localFileName2);
+            fileExistsLocally = await fsj.existsAsync(expectedFilePath);
+          }
           if (!fileExistsLocally) {
-            console.warn(`Skipping file ${url} as we couldn't find a local copy`);
+            console.warn(
+              `Skipping file ${url} as we couldn't find a local copy (looked at ${expectedFilePath})`
+            );
             return;
           }
-          const fileBuffer = await fsj.readAsync(
-            join2(writeDirectory, FILES_DIRECTORY_NAME, localFileName),
-            "buffer"
-          );
+          const fileBuffer = await fsj.readAsync(expectedFilePath, "buffer");
           if (!fileBuffer) {
-            console.warn(`Skipping file ${url} as we couldn't read it`);
+            console.warn(`Skipping file ${url} (${expectedFilePath}) as we couldn't read it`);
             return;
           }
           const fileName = getFileNameFromUrl(url);
@@ -803,25 +873,29 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
             }
           });
           if (!uploadResponse.ok) {
-            console.warn(`Failed to upload file ${url}`);
+            console.warn(`Failed to upload file ${url} (${expectedFilePath})`);
             return;
           }
+          let error;
           const checkForFile = async () => {
-            const file = await options.fileClient.get({ id });
-            if (!file || file.state !== FILE_READY_STATE || !file.url) {
-              await new Promise((resolve2) => setTimeout(resolve2, 500));
+            if (error) {
+              throw error;
+            }
+            const file2 = await options.fileClient.get({ id });
+            if (!file2 || file2.state !== FILE_READY_STATE || !file2.url) {
+              await new Promise((resolve2) => setTimeout(resolve2, 1e3));
               return checkForFile();
             }
-            return file.url;
+            return file2.url;
           };
           const abortTimeout = setTimeout(() => {
-            throw new Error(`Failed to upload file ${url}`);
-          }, 1e4);
+            error = new Error(`Failed to upload file ${url} (${expectedFilePath}) - upload timed out`);
+          }, 6e4);
           const uploadedFileUrl = await checkForFile();
           clearTimeout(abortTimeout);
           objectAsString = objectAsString.replaceAll(`"${url}"`, `"${uploadedFileUrl}"`);
-        } catch {
-          console.warn(`Failed to upload file ${url}`);
+        } catch (e) {
+          console.warn(`Failed to upload file ${url}`, e);
         }
       });
     }
@@ -831,19 +905,19 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
 };
 var swapOutUniformFileUrlsForTargetProject = async (object, options) => {
   let objectAsString = JSON.stringify(object);
-  const uniformFileUrlMatches = objectAsString.matchAll(
-    /"(https:\/\/(.*)?img\.uniform\.(rocks|global)\/(.*?))"/g
-  );
+  const uniformFileUrlMatches = getUniformFileUrlMatches(objectAsString);
   if (uniformFileUrlMatches) {
     const fileUrlReplacementQueue = new PQueue({ concurrency: 3 });
     for (const match of uniformFileUrlMatches) {
       const url = match[1];
       const hash = urlToHash(url);
+      const legacyHash = legacyUrlToHash(url);
       fileUrlReplacementQueue.add(async () => {
         try {
           const fileAlreadyExistsChecks = await Promise.all([
             options.fileClient.get({ url }).catch(() => null),
-            options.fileClient.get({ sourceId: hash }).catch(() => null)
+            options.fileClient.get({ sourceId: hash }).catch(() => null),
+            options.fileClient.get({ sourceId: legacyHash }).catch(() => null)
           ]);
           const file = fileAlreadyExistsChecks.find((check) => check !== null);
           if (!file) {
@@ -858,19 +932,74 @@ var swapOutUniformFileUrlsForTargetProject = async (object, options) => {
   }
   return JSON.parse(objectAsString);
 };
+var replaceRemoteUrlsWithLocalReferences = async (sourceObject, targetObject, options) => {
+  let sourceObjectAsString = JSON.stringify(sourceObject);
+  const targetObjectAsString = JSON.stringify(targetObject);
+  const uniformFileUrlMatches = getUniformFileUrlMatches(sourceObjectAsString);
+  const writeDirectory = getFilesDirectory(options.directory);
+  if (uniformFileUrlMatches) {
+    const fileUrlReplacementQueue = new PQueue({ concurrency: 3 });
+    for (const match of uniformFileUrlMatches) {
+      const url = match[1];
+      fileUrlReplacementQueue.add(async () => {
+        try {
+          const localFileName = urlToFileName(url);
+          const fileExistsLocally = await fsj.existsAsync(
+            join2(writeDirectory, FILES_DIRECTORY_NAME, localFileName)
+          );
+          if (fileExistsLocally) {
+            return;
+          }
+          const file = await options.fileClient.get({ url }).catch(() => null);
+          if (!file || !file.sourceId) {
+            return;
+          }
+          const originalPartialPath = hashToPartialPathname(file.sourceId);
+          if (!originalPartialPath) {
+            return;
+          }
+          const originalUrl = findUrlMatchingPartialPathname(targetObjectAsString, originalPartialPath);
+          if (!originalUrl) {
+            return;
+          }
+          sourceObjectAsString = sourceObjectAsString.replaceAll(`"${url}"`, `"${originalUrl}"`);
+        } catch {
+        }
+      });
+    }
+    await fileUrlReplacementQueue.onIdle();
+  }
+  return JSON.parse(sourceObjectAsString);
+};
 var updateAssetFileIdBasedOnUrl = async (asset, options) => {
-  var _a, _b, _c;
-  const fileUrl = (_b = (_a = asset.asset.fields) == null ? void 0 : _a.url) == null ? void 0 : _b.value;
-  if (!fileUrl || !((_c = asset.asset.fields) == null ? void 0 : _c.file)) {
+  var _a;
+  if (!asset.asset.fields) {
+    return asset;
+  }
+  const fileUrl = (_a = asset.asset.fields.url) == null ? void 0 : _a.value;
+  if (!fileUrl) {
     return asset;
   }
   const file = await options.fileClient.get({ url: fileUrl }).catch(() => null);
   if (!file) {
     return asset;
   }
-  asset.asset.fields.file.value = file.id;
+  asset.asset.fields.file = {
+    type: "file",
+    value: file.id
+  };
   return asset;
 };
+var legacyUrlToHash = (url) => {
+  const hash = createHash("sha256");
+  hash.update(url);
+  return hash.digest("hex");
+};
+var legacyUrlToFileName = (url) => {
+  const fileName = legacyUrlToHash(url);
+  const fileExtension = urlToFileExtension(url);
+  return `${fileName}${fileExtension ? `.${fileExtension}` : ""}`;
+};
 
 // src/commands/canvas/assetEngineDataSource.ts
 import { convertAssetToPutAsset } from "@uniformdev/assets";
@@ -895,8 +1024,8 @@ function prepCompositionForDisk(composition) {
   delete prepped.state;
   return prepped;
 }
-function withStateOptions(yargs27) {
-  return yargs27.option("state", {
+function withStateOptions(yargs32) {
+  return yargs32.option("state", {
     type: "string",
     describe: `Composition state to fetch.`,
     choices: ["preview", "published"],
@@ -962,11 +1091,11 @@ function writeCanvasPackage(filename, packageContents) {
 var AssetPullModule = {
   command: "pull <directory>",
   describe: "Pulls all assets to local files in a directory",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to save the assets to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -1000,7 +1129,8 @@ var AssetPullModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedAssetClient3({
@@ -1009,6 +1139,7 @@ var AssetPullModule = {
       fetch: fetch3,
       projectId
     });
+    const fileClient = new UncachedFileClient({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createAssetEngineDataSource({ client });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -1048,16 +1179,29 @@ var AssetPullModule = {
       target,
       mode,
       whatIf,
-      allowEmptySource: true,
+      allowEmptySource: allowEmptySource ?? true,
       log: createSyncEngineConsoleLogger({ diffMode }),
-      onBeforeCompareObjects: async (sourceObject) => {
+      onBeforeCompareObjects: async (sourceObject, targetObject) => {
+        var _a, _b;
         delete sourceObject.object.asset._author;
-        return sourceObject;
+        const sourceObjectWithPotentiallySwappedUrl = await replaceRemoteUrlsWithLocalReferences(
+          sourceObject,
+          targetObject,
+          {
+            directory,
+            fileClient
+          }
+        );
+        if (((_a = sourceObjectWithPotentiallySwappedUrl.object.asset.fields) == null ? void 0 : _a.url) && ((_b = targetObject.object.asset.fields) == null ? void 0 : _b.url) && sourceObjectWithPotentiallySwappedUrl.object.asset.fields.url.value === targetObject.object.asset.fields.url.value) {
+          targetObject.object.asset.fields.file = sourceObjectWithPotentiallySwappedUrl.object.asset.fields.file;
+        }
+        return sourceObjectWithPotentiallySwappedUrl;
       },
       onBeforeWriteObject: async (sourceObject) => {
         delete sourceObject.object.asset._author;
         return extractAndDownloadUniformFilesForObject(sourceObject, {
-          directory
+          directory,
+          fileClient
         });
       }
     });
@@ -1066,15 +1210,15 @@ var AssetPullModule = {
 
 // src/commands/canvas/commands/asset/push.ts
 import { UncachedAssetClient as UncachedAssetClient4 } from "@uniformdev/assets";
-import { UncachedFileClient } from "@uniformdev/files";
+import { UncachedFileClient as UncachedFileClient2 } from "@uniformdev/files";
 var AssetPushModule = {
   command: "push <directory>",
   describe: "Pushes all assets from files in a directory to Uniform",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to read the assets from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -1101,7 +1245,8 @@ var AssetPushModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedAssetClient4({
@@ -1127,12 +1272,13 @@ var AssetPushModule = {
       });
     }
     const target = createAssetEngineDataSource({ client });
-    const fileClient = new UncachedFileClient({ apiKey, apiHost, fetch: fetch3, projectId });
+    const fileClient = new UncachedFileClient2({ apiKey, apiHost, fetch: fetch3, projectId });
     await syncEngine({
       source,
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode }),
       onBeforeCompareObjects: async (sourceObject, targetObject) => {
         if (targetObject) {
@@ -1172,9 +1318,9 @@ var AssetRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an asset",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs27.positional("id", { demandOption: true, describe: "Asset ID to delete" }))
+      withProjectOptions(yargs32.positional("id", { demandOption: true, describe: "Asset ID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -1190,10 +1336,10 @@ var AssetUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an asset",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("filename", { demandOption: true, describe: "Asset file to put" })
+        yargs32.positional("filename", { demandOption: true, describe: "Asset file to put" })
       )
     )
   ),
@@ -1209,7 +1355,7 @@ var AssetUpdateModule = {
 var AssetModule = {
   command: "asset <command>",
   describe: "Commands for Assets",
-  builder: (yargs27) => yargs27.command(AssetGetModule).command(AssetListModule).command(AssetRemoveModule).command(AssetUpdateModule).command(AssetPullModule).command(AssetPushModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(AssetGetModule).command(AssetListModule).command(AssetRemoveModule).command(AssetUpdateModule).command(AssetPullModule).command(AssetPushModule).demandCommand(),
   handler: () => {
     yargs.help();
   }
@@ -1223,11 +1369,11 @@ import { UncachedCategoryClient } from "@uniformdev/canvas";
 var CategoryGetModule = {
   command: "get <id>",
   describe: "Fetch a category",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs27.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
+          yargs32.positional("id", { demandOption: true, describe: "Category UUID to fetch" })
         )
       )
     )
@@ -1252,7 +1398,7 @@ var CategoryListModule = {
   command: "list",
   describe: "List categories",
   aliases: ["ls"],
-  builder: (yargs27) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs27.options({}))))),
+  builder: (yargs32) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs32.options({}))))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCategoryClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -1301,11 +1447,11 @@ function createCategoriesEngineDataSource({
 var CategoryPullModule = {
   command: "pull <directory>",
   describe: "Pulls all categories to local files in a directory",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to save the categories to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -1339,7 +1485,8 @@ var CategoryPullModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCategoryClient3({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -1370,7 +1517,7 @@ var CategoryPullModule = {
       target,
       mode,
       whatIf,
-      allowEmptySource: true,
+      allowEmptySource: allowEmptySource ?? true,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -1381,11 +1528,11 @@ import { UncachedCategoryClient as UncachedCategoryClient4 } from "@uniformdev/c
 var CategoryPushModule = {
   command: "push <directory>",
   describe: "Pushes all categories from files in a directory to Uniform Canvas",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to read the categories from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -1412,7 +1559,8 @@ var CategoryPushModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCategoryClient4({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -1438,6 +1586,7 @@ var CategoryPushModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -1449,10 +1598,10 @@ var CategoryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a category",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("id", { demandOption: true, describe: "Category UUID to delete" })
+        yargs32.positional("id", { demandOption: true, describe: "Category UUID to delete" })
       )
     )
   ),
@@ -1469,10 +1618,10 @@ var CategoryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a category",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("filename", { demandOption: true, describe: "Category file to put" })
+        yargs32.positional("filename", { demandOption: true, describe: "Category file to put" })
       )
     )
   ),
@@ -1489,7 +1638,7 @@ var CategoryModule = {
   command: "category <command>",
   aliases: ["cat"],
   describe: "Commands for Canvas categories",
-  builder: (yargs27) => yargs27.command(CategoryPullModule).command(CategoryPushModule).command(CategoryGetModule).command(CategoryRemoveModule).command(CategoryListModule).command(CategoryUpdateModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(CategoryPullModule).command(CategoryPushModule).command(CategoryGetModule).command(CategoryRemoveModule).command(CategoryListModule).command(CategoryUpdateModule).demandCommand(),
   handler: () => {
     yargs2.help();
   }
@@ -1510,11 +1659,11 @@ var selectSchemaUrl = () => "/schemas/json-schema/component-definition/v1.json";
 var ComponentGetModule = {
   command: "get <id>",
   describe: "Fetch a component definition",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs27.positional("id", {
+          yargs32.positional("id", {
             demandOption: true,
             describe: "Component definition public ID to fetch"
           })
@@ -1548,11 +1697,11 @@ var ComponentListModule = {
   command: "list",
   describe: "List component definitions",
   aliases: ["ls"],
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs27.options({
+          yargs32.options({
             offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
             limit: { describe: "Number of rows to fetch", type: "number", default: 20 }
           })
@@ -1607,11 +1756,11 @@ function createComponentDefinitionEngineDataSource({
 var ComponentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all component definitions to local files in a directory",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -1645,7 +1794,8 @@ var ComponentPullModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCanvasClient3({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -1677,7 +1827,7 @@ var ComponentPullModule = {
       target,
       mode,
       whatIf,
-      allowEmptySource: true,
+      allowEmptySource: allowEmptySource ?? true,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -1688,11 +1838,11 @@ import { UncachedCanvasClient as UncachedCanvasClient4 } from "@uniformdev/canva
 var ComponentPushModule = {
   command: "push <directory>",
   describe: "Pushes all component definitions from files in a directory to Uniform Canvas",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to read the component definitions from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -1719,7 +1869,8 @@ var ComponentPushModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCanvasClient4({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -1746,6 +1897,7 @@ var ComponentPushModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -1757,10 +1909,10 @@ var ComponentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a component definition",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("id", { demandOption: true, describe: "Component definition public ID to delete" })
+        yargs32.positional("id", { demandOption: true, describe: "Component definition public ID to delete" })
       )
     )
   ),
@@ -1777,10 +1929,10 @@ var ComponentUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a component definition",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("filename", { demandOption: true, describe: "Component definition file to put" })
+        yargs32.positional("filename", { demandOption: true, describe: "Component definition file to put" })
       )
     )
   ),
@@ -1797,7 +1949,7 @@ var ComponentModule = {
   command: "component <command>",
   aliases: ["def"],
   describe: "Commands for Canvas component definitions",
-  builder: (yargs27) => yargs27.command(ComponentPullModule).command(ComponentPushModule).command(ComponentGetModule).command(ComponentRemoveModule).command(ComponentListModule).command(ComponentUpdateModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(ComponentPullModule).command(ComponentPushModule).command(ComponentGetModule).command(ComponentRemoveModule).command(ComponentListModule).command(ComponentUpdateModule).demandCommand(),
   handler: () => {
     yargs3.help();
   }
@@ -1811,12 +1963,12 @@ import { UncachedCanvasClient as UncachedCanvasClient7 } from "@uniformdev/canva
 var CompositionGetModule = {
   command: "get <id>",
   describe: "Fetch a composition",
-  builder: (yargs27) => withFormatOptions(
+  builder: (yargs32) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs27.positional("id", { demandOption: true, describe: "Composition/pattern public ID to fetch" }).option({
+            yargs32.positional("id", { demandOption: true, describe: "Composition/pattern public ID to fetch" }).option({
               resolvePatterns: {
                 type: "boolean",
                 default: false,
@@ -1887,12 +2039,12 @@ var CompositionListModule = {
   command: "list",
   describe: "List compositions",
   aliases: ["ls"],
-  builder: (yargs27) => withFormatOptions(
+  builder: (yargs32) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs27.options({
+            yargs32.options({
               offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
               limit: { describe: "Number of rows to fetch", type: "number", default: 20 },
               resolvePatterns: {
@@ -2013,11 +2165,11 @@ function createComponentInstanceEngineDataSource({
 var CompositionPublishModule = {
   command: "publish [ids]",
   describe: "Publishes composition(s)",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("ids", {
+          yargs32.positional("ids", {
             describe: "Publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
@@ -2089,15 +2241,16 @@ var CompositionPublishModule = {
 
 // 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",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs27.positional("directory", {
+            yargs32.positional("directory", {
               describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -2144,10 +2297,12 @@ var CompositionPullModule = {
     whatIf,
     state,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCanvasClient10({ apiKey, apiHost, fetch: fetch3, projectId });
+    const fileClient = new UncachedFileClient3({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createComponentInstanceEngineDataSource({ client, state, onlyCompositions, onlyPatterns });
     const isPackage = isPathAPackageFile(directory);
     let target;
@@ -2175,11 +2330,18 @@ var CompositionPullModule = {
       target,
       mode,
       whatIf,
-      allowEmptySource: true,
+      allowEmptySource: allowEmptySource ?? true,
       log: createSyncEngineConsoleLogger({ diffMode }),
+      onBeforeCompareObjects: async (sourceObject, targetObject) => {
+        return replaceRemoteUrlsWithLocalReferences(sourceObject, targetObject, {
+          directory,
+          fileClient
+        });
+      },
       onBeforeWriteObject: async (sourceObject) => {
         return extractAndDownloadUniformFilesForObject(sourceObject, {
-          directory
+          directory,
+          fileClient
         });
       }
     });
@@ -2188,16 +2350,16 @@ var CompositionPullModule = {
 
 // src/commands/canvas/commands/composition/push.ts
 import { UncachedCanvasClient as UncachedCanvasClient11 } from "@uniformdev/canvas";
-import { UncachedFileClient as UncachedFileClient2 } from "@uniformdev/files";
+import { UncachedFileClient as UncachedFileClient4 } from "@uniformdev/files";
 var CompositionPushModule = {
   command: "push <directory>",
   describe: "Pushes all compositions from files in a directory to Uniform Canvas",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs27.positional("directory", {
+            yargs32.positional("directory", {
               describe: "Directory to read the compositions/patterns from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("what-if", {
@@ -2237,7 +2399,8 @@ var CompositionPushModule = {
     project: projectId,
     onlyCompositions,
     onlyPatterns,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedCanvasClient11({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -2258,12 +2421,13 @@ var CompositionPushModule = {
       });
     }
     const target = createComponentInstanceEngineDataSource({ client, state, onlyCompositions, onlyPatterns });
-    const fileClient = new UncachedFileClient2({ apiKey, apiHost, fetch: fetch3, projectId });
+    const fileClient = new UncachedFileClient4({ apiKey, apiHost, fetch: fetch3, projectId });
     await syncEngine({
       source,
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode }),
       onBeforeCompareObjects: async (sourceObject) => {
         return swapOutUniformFileUrlsForTargetProject(sourceObject, {
@@ -2286,10 +2450,10 @@ var CompositionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a composition",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("id", { demandOption: true, describe: "Composition/pattern public ID to delete" })
+        yargs32.positional("id", { demandOption: true, describe: "Composition/pattern public ID to delete" })
       )
     )
   ),
@@ -2306,10 +2470,10 @@ import { diffJson as diffJson2 } from "diff";
 var CompositionUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a composition(s)",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("ids", {
+        yargs32.positional("ids", {
           describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
           type: "string"
         }).option("all", {
@@ -2403,11 +2567,11 @@ var CompositionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a composition",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
-          yargs27.positional("filename", { demandOption: true, describe: "Composition/pattern file to put" })
+          yargs32.positional("filename", { demandOption: true, describe: "Composition/pattern file to put" })
         )
       )
     )
@@ -2425,7 +2589,7 @@ var CompositionModule = {
   command: "composition <command>",
   describe: "Commands for Canvas compositions",
   aliases: ["comp"],
-  builder: (yargs27) => yargs27.command(CompositionPullModule).command(CompositionPushModule).command(CompositionGetModule).command(CompositionRemoveModule).command(CompositionListModule).command(CompositionUpdateModule).command(CompositionPublishModule).command(CompositionUnpublishModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(CompositionPullModule).command(CompositionPushModule).command(CompositionGetModule).command(CompositionRemoveModule).command(CompositionListModule).command(CompositionUpdateModule).command(CompositionPublishModule).command(CompositionUnpublishModule).demandCommand(),
   handler: () => {
     yargs4.help();
   }
@@ -2439,12 +2603,12 @@ import { ContentClient } from "@uniformdev/canvas";
 var ContentTypeGetModule = {
   command: "get <id>",
   describe: "Get a content type",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs27.positional("id", { demandOption: true, describe: "Content type public ID to fetch" })
+          yargs32.positional("id", { demandOption: true, describe: "Content type public ID to fetch" })
         )
       )
     )
@@ -2466,7 +2630,7 @@ import { ContentClient as ContentClient2 } from "@uniformdev/canvas";
 var ContentTypeListModule = {
   command: "list",
   describe: "List content types",
-  builder: (yargs27) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs27)))),
+  builder: (yargs32) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs32)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new ContentClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -2513,11 +2677,11 @@ function createContentTypeEngineDataSource({
 var ContentTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all content types to local files in a directory",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to save the content types to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -2551,7 +2715,8 @@ var ContentTypePullModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new ContentClient3({
@@ -2588,7 +2753,7 @@ var ContentTypePullModule = {
       target,
       mode,
       whatIf,
-      allowEmptySource: true,
+      allowEmptySource: allowEmptySource ?? true,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -2599,11 +2764,11 @@ import { ContentClient as ContentClient4 } from "@uniformdev/canvas";
 var ContentTypePushModule = {
   command: "push <directory>",
   describe: "Pushes all content types from files in a directory to Uniform",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to read the content types from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -2630,7 +2795,8 @@ var ContentTypePushModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new ContentClient4({
@@ -2662,6 +2828,7 @@ var ContentTypePushModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -2673,10 +2840,10 @@ var ContentTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a content type",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
+        yargs32.positional("id", { demandOption: true, describe: "Content type public ID to delete" })
       )
     )
   ),
@@ -2693,10 +2860,10 @@ var ContentTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a content type",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("filename", { demandOption: true, describe: "Content type file to put" })
+        yargs32.positional("filename", { demandOption: true, describe: "Content type file to put" })
       )
     )
   ),
@@ -2713,27 +2880,106 @@ var ContentTypeModule = {
   command: "contenttype <command>",
   aliases: ["ct"],
   describe: "Commands for Content Types",
-  builder: (yargs27) => yargs27.command(ContentTypeGetModule).command(ContentTypeListModule).command(ContentTypeRemoveModule).command(ContentTypeUpdateModule).command(ContentTypePullModule).command(ContentTypePushModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(ContentTypeGetModule).command(ContentTypeListModule).command(ContentTypeRemoveModule).command(ContentTypeUpdateModule).command(ContentTypePullModule).command(ContentTypePushModule).demandCommand(),
   handler: () => {
     yargs5.help();
   }
 };
 
-// src/commands/canvas/commands/dataType.ts
+// src/commands/canvas/commands/dataSource.ts
 import yargs6 from "yargs";
 
+// src/commands/canvas/commands/dataSource/get.ts
+import { DataSourceClient } from "@uniformdev/canvas";
+var DataSourceGetModule = {
+  command: "get <id>",
+  describe: "Get a data source by ID and writes to stdout. Please note this may contain secret data, use discretion.",
+  builder: (yargs32) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        yargs32.positional("id", { demandOption: true, describe: "Data source public ID to fetch" })
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new DataSourceClient({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    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"],
+  describe: "Delete a data source",
+  builder: (yargs32) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs32.positional("id", { demandOption: true, describe: "Data source public ID to delete" })
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new DataSourceClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    await client.remove({ dataSourceId: id });
+  }
+};
+
+// src/commands/canvas/commands/dataSource/update.ts
+import { DataSourceClient as DataSourceClient3 } from "@uniformdev/canvas";
+var DataSourceUpdateModule = {
+  command: "update <dataSource>",
+  aliases: ["put"],
+  describe: "Insert or update a data source",
+  builder: (yargs32) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs32.positional("dataSource", { demandOption: true, describe: "Data source JSON to put" }).option("integrationType", {
+          describe: "Integration type that exposes the connector type for this data source (as defined in integration manifest).",
+          type: "string",
+          demandOption: true
+        })
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, dataSource, integrationType, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new DataSourceClient3({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    await client.upsert({ data: JSON.parse(dataSource), integrationType });
+  }
+};
+
+// src/commands/canvas/commands/dataSource.ts
+var DataSourceModule = {
+  command: "datasource <command>",
+  aliases: ["ds"],
+  describe: "Commands for Data Source definitions",
+  builder: (yargs32) => yargs32.command(DataSourceGetModule).command(DataSourceRemoveModule).command(DataSourceUpdateModule).demandCommand(),
+  handler: () => {
+    yargs6.help();
+  }
+};
+
+// src/commands/canvas/commands/dataType.ts
+import yargs7 from "yargs";
+
 // src/commands/canvas/commands/dataType/get.ts
 import { DataTypeClient } from "@uniformdev/canvas";
 var DataTypeGetModule = {
   command: "get <id>",
   describe: "Get a data type",
   aliases: ["ls"],
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs27.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
+          yargs32.positional("id", { demandOption: true, describe: "Data type public ID to fetch" })
         )
       )
     )
@@ -2756,7 +3002,7 @@ var DataTypeListModule = {
   command: "list",
   describe: "List data types",
   aliases: ["ls"],
-  builder: (yargs27) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs27)))),
+  builder: (yargs32) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs32)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new DataTypeClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -2805,11 +3051,11 @@ function createDataTypeEngineDataSource({
 var DataTypePullModule = {
   command: "pull <directory>",
   describe: "Pulls all data types to local files in a directory",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to save the data types to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -2843,7 +3089,8 @@ var DataTypePullModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new DataTypeClient3({
@@ -2880,7 +3127,7 @@ var DataTypePullModule = {
       target,
       mode,
       whatIf,
-      allowEmptySource: true,
+      allowEmptySource: allowEmptySource ?? true,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -2891,11 +3138,11 @@ import { DataTypeClient as DataTypeClient4 } from "@uniformdev/canvas";
 var DataTypePushModule = {
   command: "push <directory>",
   describe: "Pushes all data types from files in a directory to Uniform",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to read the data types from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -2922,7 +3169,8 @@ var DataTypePushModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new DataTypeClient4({
@@ -2954,6 +3202,7 @@ var DataTypePushModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -2965,10 +3214,10 @@ var DataTypeRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a data type",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
+        yargs32.positional("id", { demandOption: true, describe: "Data type public ID to delete" })
       )
     )
   ),
@@ -2985,10 +3234,10 @@ var DataTypeUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a data type",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("filename", { demandOption: true, describe: "Data type file to put" })
+        yargs32.positional("filename", { demandOption: true, describe: "Data type file to put" })
       )
     )
   ),
@@ -3005,26 +3254,26 @@ var DataTypeModule = {
   command: "datatype <command>",
   aliases: ["dt"],
   describe: "Commands for Data Type definitions",
-  builder: (yargs27) => yargs27.command(DataTypeGetModule).command(DataTypePullModule).command(DataTypePushModule).command(DataTypeRemoveModule).command(DataTypeListModule).command(DataTypeUpdateModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(DataTypeGetModule).command(DataTypePullModule).command(DataTypePushModule).command(DataTypeRemoveModule).command(DataTypeListModule).command(DataTypeUpdateModule).demandCommand(),
   handler: () => {
-    yargs6.help();
+    yargs7.help();
   }
 };
 
 // src/commands/canvas/commands/entry.ts
-import yargs7 from "yargs";
+import yargs8 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",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs27.positional("id", { demandOption: true, describe: "Entry public ID to fetch" })
+          yargs32.positional("id", { demandOption: true, describe: "Entry public ID to fetch" })
         )
       )
     )
@@ -3036,7 +3285,9 @@ var EntryGetModule = {
       offset: 0,
       limit: 1,
       entryIDs: [id],
-      skipOverridesResolution: true
+      skipOverridesResolution: true,
+      skipPatternResolution: true,
+      skipDataResolution: true
     });
     if (res.entries.length !== 1) {
       throw new Error(`Entry with ID ${id} not found`);
@@ -3050,16 +3301,22 @@ import { ContentClient as ContentClient8 } from "@uniformdev/canvas";
 var EntryListModule = {
   command: "list",
   describe: "List entries",
-  builder: (yargs27) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs27)))),
+  builder: (yargs32) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs32)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new ContentClient8({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
-    const res = await client.getEntries({ offset: 0, limit: 1e3, skipOverridesResolution: true });
+    const res = await client.getEntries({
+      offset: 0,
+      limit: 1e3,
+      skipOverridesResolution: true,
+      skipPatternResolution: true,
+      skipDataResolution: true
+    });
     emitWithFormat(res.entries, format, filename);
   }
 };
 
-// src/commands/canvas/commands/entry/pull.ts
+// src/commands/canvas/commands/entry/publish.ts
 import { ContentClient as ContentClient10 } from "@uniformdev/canvas";
 
 // src/commands/canvas/entryEngineDataSource.ts
@@ -3072,18 +3329,27 @@ var selectEntryDisplayName = (e) => `${e.entry._name ?? "Untitled"} (pid: ${e.en
 // src/commands/canvas/entryEngineDataSource.ts
 function createEntryEngineDataSource({
   client,
-  state
+  state,
+  onlyEntries,
+  onlyPatterns,
+  entryIDs
 }) {
   const stateId = convertCompositionState(state);
   async function* getObjects() {
-    const { entries } = await client.getEntries({
-      offset: 0,
-      limit: 1e3,
-      skipDataResolution: true,
-      skipOverridesResolution: true,
-      state: stateId,
-      withComponentIDs: true
-    });
+    const entries = paginateAsync(
+      async (offset, limit) => (await client.getEntries({
+        offset,
+        limit,
+        entryIDs,
+        pattern: onlyEntries ? false : onlyPatterns ? true : void 0,
+        skipDataResolution: true,
+        skipOverridesResolution: true,
+        skipPatternResolution: true,
+        state: stateId,
+        withComponentIDs: true
+      })).entries,
+      { pageSize: 100 }
+    );
     for await (const e of entries) {
       const result = {
         id: selectEntryIdentifier(e),
@@ -3105,16 +3371,96 @@ function createEntryEngineDataSource({
   };
 }
 
+// src/commands/canvas/commands/entry/publish.ts
+var EntryPublishModule = {
+  command: "publish [ids]",
+  describe: "Publishes entry(ies)",
+  builder: (yargs32) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withDiffOptions(
+          yargs32.positional("ids", {
+            describe: "Publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
+            type: "string"
+          }).option("all", {
+            alias: ["a"],
+            describe: "Publishes all entries. Use --ids to publish selected entries instead.",
+            default: false,
+            type: "boolean"
+          }).option("what-if", {
+            alias: ["w"],
+            describe: "What-if mode reports what would be done but does not perform any publishing",
+            default: false,
+            type: "boolean"
+          }).option("onlyEntries", {
+            describe: "Only publishing entries and not patterns",
+            default: false,
+            type: "boolean"
+          }).option("onlyPatterns", {
+            describe: "Only pulling patterns and not entries",
+            default: false,
+            type: "boolean",
+            hidden: true
+          })
+        )
+      )
+    )
+  ),
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    ids,
+    all,
+    whatIf,
+    project: projectId,
+    onlyEntries,
+    onlyPatterns
+  }) => {
+    if (!all && !ids || all && ids) {
+      console.error(`Specify --all or entry ID(s) to publish.`);
+      process.exit(1);
+    }
+    const entryIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new ContentClient10({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const source = createEntryEngineDataSource({
+      client,
+      state: "preview",
+      entryIDs: entryIDsArray,
+      onlyEntries,
+      onlyPatterns
+    });
+    const target = createEntryEngineDataSource({
+      client,
+      state: "published",
+      entryIDs: entryIDsArray,
+      onlyEntries,
+      onlyPatterns
+    });
+    await syncEngine({
+      source,
+      target,
+      // Publishing is one-direction operation, so no need to support automatic un-publishing
+      mode: "createOrUpdate",
+      whatIf,
+      log: createPublishStatusSyncEngineConsoleLogger({ status: "publish" })
+    });
+  }
+};
+
 // 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",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs27.positional("directory", {
+            yargs32.positional("directory", {
               describe: "Directory to save the entries to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -3150,16 +3496,18 @@ var EntryPullModule = {
     whatIf,
     state,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient10({
+    const client = new ContentClient11({
       apiKey,
       apiHost,
       fetch: fetch3,
       projectId,
       bypassCache: true
     });
+    const fileClient = new UncachedFileClient5({ apiKey, apiHost, fetch: fetch3, projectId });
     const source = createEntryEngineDataSource({ client, state });
     let target;
     const isPackage = isPathAPackageFile(directory);
@@ -3170,15 +3518,387 @@ var EntryPullModule = {
         selectIdentifier: selectEntryIdentifier,
         selectDisplayName: selectEntryDisplayName,
         onSyncComplete: async (_, synced) => {
-          packageContents.entries = synced;
+          packageContents.entries = synced;
+          writeCanvasPackage(directory, packageContents);
+        }
+      });
+    } else {
+      target = await createFileSyncEngineDataSource({
+        directory,
+        selectIdentifier: selectEntryIdentifier,
+        selectDisplayName: selectEntryDisplayName,
+        format
+      });
+    }
+    await syncEngine({
+      source,
+      target,
+      mode,
+      whatIf,
+      allowEmptySource: allowEmptySource ?? true,
+      log: createSyncEngineConsoleLogger({ diffMode }),
+      onBeforeCompareObjects: async (sourceObject, targetObject) => {
+        return replaceRemoteUrlsWithLocalReferences(sourceObject, targetObject, {
+          directory,
+          fileClient
+        });
+      },
+      onBeforeWriteObject: async (sourceObject) => {
+        return extractAndDownloadUniformFilesForObject(sourceObject, {
+          directory,
+          fileClient
+        });
+      }
+    });
+  }
+};
+
+// 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",
+  builder: (yargs32) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withStateOptions(
+          withDiffOptions(
+            yargs32.positional("directory", {
+              describe: "Directory to read the entries from. If a filename is used, a package will be read instead.",
+              type: "string"
+            }).option("what-if", {
+              alias: ["w"],
+              describe: "What-if mode reports what would be done but changes nothing",
+              default: false,
+              type: "boolean"
+            }).option("mode", {
+              alias: ["m"],
+              describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
+              choices: ["create", "createOrUpdate", "mirror"],
+              default: "mirror",
+              type: "string"
+            })
+          )
+        )
+      )
+    )
+  ),
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    directory,
+    mode,
+    whatIf,
+    state,
+    project: projectId,
+    diff: diffMode,
+    allowEmptySource
+  }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new ContentClient12({
+      apiKey,
+      apiHost,
+      fetch: fetch3,
+      projectId,
+      bypassCache: true
+    });
+    let source;
+    const isPackage = isPathAPackageFile(directory);
+    if (isPackage) {
+      const packageContents = readCanvasPackage(directory, true);
+      source = await createArraySyncEngineDataSource({
+        objects: packageContents.entries ?? [],
+        selectIdentifier: selectEntryIdentifier,
+        selectDisplayName: selectEntryDisplayName
+      });
+    } else {
+      source = await createFileSyncEngineDataSource({
+        directory,
+        selectIdentifier: selectEntryIdentifier,
+        selectDisplayName: selectEntryDisplayName
+      });
+    }
+    const target = createEntryEngineDataSource({ client, state });
+    const fileClient = new UncachedFileClient6({ apiKey, apiHost, fetch: fetch3, projectId });
+    await syncEngine({
+      source,
+      target,
+      mode,
+      whatIf,
+      allowEmptySource,
+      log: createSyncEngineConsoleLogger({ diffMode }),
+      onBeforeCompareObjects: async (sourceObject) => {
+        return swapOutUniformFileUrlsForTargetProject(sourceObject, {
+          fileClient
+        });
+      },
+      onBeforeWriteObject: async (sourceObject) => {
+        return extractAndUploadUniformFilesForObject(sourceObject, {
+          directory,
+          fileClient
+        });
+      }
+    });
+  }
+};
+
+// src/commands/canvas/commands/entry/remove.ts
+import { ContentClient as ContentClient13 } from "@uniformdev/canvas";
+var EntryRemoveModule = {
+  command: "remove <id>",
+  aliases: ["delete", "rm"],
+  describe: "Delete an entry",
+  builder: (yargs32) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs32.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new ContentClient13({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    await client.deleteEntry({ entryId: id });
+  }
+};
+
+// src/commands/canvas/commands/entry/unpublish.ts
+import { CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE3, ContentClient as ContentClient14 } from "@uniformdev/canvas";
+import { diffJson as diffJson3 } from "diff";
+var EntryUnpublishModule = {
+  command: "unpublish [ids]",
+  describe: "Unpublish an entry(ies)",
+  builder: (yargs32) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs32.positional("ids", {
+          describe: "Un-publishes entry(ies) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
+          type: "string"
+        }).option("all", {
+          alias: ["a"],
+          describe: "Un-publishes all entries. Use --all to un-publish selected entries instead.",
+          default: false,
+          type: "boolean"
+        }).option("what-if", {
+          alias: ["w"],
+          describe: "What-if mode reports what would be done but does not perform any un-publishing",
+          default: false,
+          type: "boolean"
+        }).option("onlyEntries", {
+          describe: "Only un-publishing entries and not patterns",
+          default: false,
+          type: "boolean"
+        }).option("onlyPatterns", {
+          describe: "Only un-publishing patterns and not entries",
+          default: false,
+          type: "boolean",
+          hidden: true
+        })
+      )
+    )
+  ),
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    ids,
+    all,
+    onlyEntries,
+    onlyPatterns,
+    project: projectId,
+    whatIf
+  }) => {
+    if (!all && !ids || all && ids) {
+      console.error(`Specify --all or entry ID(s) to publish.`);
+      process.exit(1);
+    }
+    const entryIDsArray = ids ? ids.split(",").map((id) => id.trim()) : void 0;
+    const targetItems = /* @__PURE__ */ new Map();
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new ContentClient14({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const source = createEntryEngineDataSource({
+      client,
+      state: "published",
+      entryIDs: entryIDsArray,
+      onlyEntries,
+      onlyPatterns
+    });
+    const target = createEntryEngineDataSource({
+      client,
+      state: "preview",
+      entryIDs: entryIDsArray,
+      onlyEntries,
+      onlyPatterns
+    });
+    const actions = [];
+    const log = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
+    for await (const obj of target.objects) {
+      if (Array.isArray(obj.id)) {
+        obj.id.forEach((o) => targetItems.set(o, obj));
+      } else {
+        targetItems.set(obj.id, obj);
+      }
+    }
+    for await (const sourceObject of source.objects) {
+      const id = Array.isArray(sourceObject.id) ? sourceObject.id[0] : sourceObject.id;
+      const targetObject = targetItems.get(id);
+      if (!targetObject) {
+        console.log(`Entry ${id} was not found`);
+        return;
+      }
+      actions.push(client.deleteEntry({ entryId: id, state: CANVAS_PUBLISHED_STATE3 }));
+      log({
+        action: "update",
+        id,
+        providerId: sourceObject.providerId,
+        displayName: sourceObject.displayName ?? sourceObject.providerId,
+        whatIf,
+        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"],
+  describe: "Insert or update an entry",
+  builder: (yargs32) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs32.positional("filename", { demandOption: true, describe: "Entry file to put" })
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new ContentClient15({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const file = readFileToObject(filename);
+    await client.upsertEntry(file);
+  }
+};
+
+// src/commands/canvas/commands/entry.ts
+var EntryModule = {
+  command: "entry <command>",
+  describe: "Commands for Entries",
+  builder: (yargs32) => yargs32.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).command(EntryPublishModule).command(EntryUnpublishModule).demandCommand(),
+  handler: () => {
+    yargs8.help();
+  }
+};
+
+// src/commands/canvas/commands/locale.ts
+import yargs9 from "yargs";
+
+// src/commands/canvas/commands/locale/pull.ts
+import { LocaleClient } from "@uniformdev/canvas";
+
+// src/commands/canvas/localesEngineDataSource.ts
+function createLocaleEngineDataSource({
+  client
+}) {
+  async function* getObjects() {
+    const locales = (await client.get()).results;
+    for await (const locale of locales) {
+      const result = {
+        id: locale.locale,
+        displayName: locale.displayName,
+        providerId: locale.locale,
+        object: locale
+      };
+      yield result;
+    }
+  }
+  return {
+    objects: getObjects(),
+    deleteObject: async (providerId) => {
+      await client.remove({ locale: providerId });
+    },
+    writeObject: async (object) => {
+      await client.upsert({
+        locale: object.object
+      });
+    }
+  };
+}
+
+// src/commands/canvas/commands/locale/pull.ts
+var LocalePullModule = {
+  command: "pull <directory>",
+  describe: "Pulls all locales to local files in a directory",
+  builder: (yargs32) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        withDiffOptions(
+          yargs32.positional("directory", {
+            describe: "Directory to save the locales to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
+            type: "string"
+          }).option("format", {
+            alias: ["f"],
+            describe: "Output format",
+            default: "yaml",
+            choices: ["yaml", "json"],
+            type: "string"
+          }).option("what-if", {
+            alias: ["w"],
+            describe: "What-if mode reports what would be done but changes no files",
+            default: false,
+            type: "boolean"
+          }).option("mode", {
+            alias: ["m"],
+            describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
+            choices: ["create", "createOrUpdate", "mirror"],
+            default: "mirror",
+            type: "string"
+          })
+        )
+      )
+    )
+  ),
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    directory,
+    format,
+    mode,
+    whatIf,
+    project: projectId,
+    diff: diffMode,
+    allowEmptySource
+  }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new LocaleClient({
+      apiKey,
+      apiHost,
+      fetch: fetch3,
+      projectId,
+      bypassCache: true
+    });
+    const source = createLocaleEngineDataSource({ client });
+    let target;
+    const isPackage = isPathAPackageFile(directory);
+    if (isPackage) {
+      const packageContents = readCanvasPackage(directory, false);
+      target = await createArraySyncEngineDataSource({
+        objects: packageContents.locales ?? [],
+        selectIdentifier: (i) => i.locale,
+        selectDisplayName: (i) => i.displayName,
+        onSyncComplete: async (_, synced) => {
+          packageContents.locales = synced;
           writeCanvasPackage(directory, packageContents);
         }
       });
     } else {
       target = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectEntryIdentifier,
-        selectDisplayName: selectEntryDisplayName,
+        selectIdentifier: (i) => i.locale,
+        selectDisplayName: (i) => i.displayName,
         format
       });
     }
@@ -3187,38 +3907,36 @@ var EntryPullModule = {
       target,
       mode,
       whatIf,
-      allowEmptySource: true,
+      allowEmptySource: allowEmptySource ?? true,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
 };
 
-// src/commands/canvas/commands/entry/push.ts
-import { ContentClient as ContentClient11 } from "@uniformdev/canvas";
-var EntryPushModule = {
+// src/commands/canvas/commands/locale/push.ts
+import { LocaleClient as LocaleClient2 } from "@uniformdev/canvas";
+var LocalePushModule = {
   command: "push <directory>",
-  describe: "Pushes all entries from files in a directory to Uniform",
-  builder: (yargs27) => withConfiguration(
+  describe: "Pushes all locales from files in a directory to Uniform",
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        withStateOptions(
-          withDiffOptions(
-            yargs27.positional("directory", {
-              describe: "Directory to read the entries from. If a filename is used, a package will be read instead.",
-              type: "string"
-            }).option("what-if", {
-              alias: ["w"],
-              describe: "What-if mode reports what would be done but changes nothing",
-              default: false,
-              type: "boolean"
-            }).option("mode", {
-              alias: ["m"],
-              describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
-              choices: ["create", "createOrUpdate", "mirror"],
-              default: "mirror",
-              type: "string"
-            })
-          )
+        withDiffOptions(
+          yargs32.positional("directory", {
+            describe: "Directory to read the locales from. If a filename is used, a package will be read instead.",
+            type: "string"
+          }).option("what-if", {
+            alias: ["w"],
+            describe: "What-if mode reports what would be done but changes nothing",
+            default: false,
+            type: "boolean"
+          }).option("mode", {
+            alias: ["m"],
+            describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
+            choices: ["create", "createOrUpdate", "mirror"],
+            default: "mirror",
+            type: "string"
+          })
         )
       )
     )
@@ -3230,12 +3948,12 @@ var EntryPushModule = {
     directory,
     mode,
     whatIf,
-    state,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient11({
+    const client = new LocaleClient2({
       apiKey,
       apiHost,
       fetch: fetch3,
@@ -3247,81 +3965,41 @@ var EntryPushModule = {
     if (isPackage) {
       const packageContents = readCanvasPackage(directory, true);
       source = await createArraySyncEngineDataSource({
-        objects: packageContents.entries ?? [],
-        selectIdentifier: selectEntryIdentifier,
-        selectDisplayName: selectEntryDisplayName
+        objects: packageContents.locales ?? [],
+        selectIdentifier: (locale) => locale.locale,
+        selectDisplayName: (locale) => locale.displayName
       });
     } else {
       source = await createFileSyncEngineDataSource({
         directory,
-        selectIdentifier: selectEntryIdentifier,
-        selectDisplayName: selectEntryDisplayName
+        selectIdentifier: (locale) => locale.locale,
+        selectDisplayName: (locale) => locale.displayName
       });
     }
-    const target = createEntryEngineDataSource({ client, state });
+    const target = createLocaleEngineDataSource({ client });
     await syncEngine({
       source,
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
 };
 
-// src/commands/canvas/commands/entry/remove.ts
-import { ContentClient as ContentClient12 } from "@uniformdev/canvas";
-var EntryRemoveModule = {
-  command: "remove <id>",
-  aliases: ["delete", "rm"],
-  describe: "Delete an entry",
-  builder: (yargs27) => withConfiguration(
-    withApiOptions(
-      withProjectOptions(
-        yargs27.positional("id", { demandOption: true, describe: "Entry public ID to delete" })
-      )
-    )
-  ),
-  handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
-    const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient12({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
-    await client.deleteEntry({ entryId: id });
-  }
-};
-
-// src/commands/canvas/commands/entry/update.ts
-import { ContentClient as ContentClient13 } from "@uniformdev/canvas";
-var EntryUpdateModule = {
-  command: "update <filename>",
-  aliases: ["put"],
-  describe: "Insert or update an entry",
-  builder: (yargs27) => withConfiguration(
-    withApiOptions(
-      withProjectOptions(
-        yargs27.positional("filename", { demandOption: true, describe: "Entry file to put" })
-      )
-    )
-  ),
-  handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
-    const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient13({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
-    const file = readFileToObject(filename);
-    await client.upsertEntry(file);
-  }
-};
-
-// src/commands/canvas/commands/entry.ts
-var EntryModule = {
-  command: "entry <command>",
-  describe: "Commands for Entries",
-  builder: (yargs27) => yargs27.command(EntryGetModule).command(EntryListModule).command(EntryRemoveModule).command(EntryUpdateModule).command(EntryPullModule).command(EntryPushModule).demandCommand(),
+// src/commands/canvas/commands/locale.ts
+var LocaleModule = {
+  command: "locale <command>",
+  describe: "Commands for locale definitions",
+  builder: (yargs32) => yargs32.command(LocalePullModule).command(LocalePushModule),
   handler: () => {
-    yargs7.help();
+    yargs9.help();
   }
 };
 
 // src/commands/canvas/commands/pattern.ts
-import yargs8 from "yargs";
+import yargs10 from "yargs";
 
 // src/commands/canvas/commands/pattern/get.ts
 var PatternGetModule = {
@@ -3333,12 +4011,12 @@ var PatternGetModule = {
 var PatternListModule = {
   ...CompositionListModule,
   describe: "List patterns",
-  builder: (yargs27) => withFormatOptions(
+  builder: (yargs32) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs27.options({
+            yargs32.options({
               offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
               limit: { describe: "Number of rows to fetch", type: "number", default: 20 },
               resolvePatterns: {
@@ -3376,11 +4054,11 @@ var PatternListModule = {
 var PatternPublishModule = {
   ...CompositionPublishModule,
   describe: "Publishes pattern(s)",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("ids", {
+          yargs32.positional("ids", {
             describe: "Publishes pattern(s) by ID. Comma-separate multiple IDs. Use --all to publish all instead.",
             type: "string"
           }).option("all", {
@@ -3418,12 +4096,12 @@ var PatternPublishModule = {
 var PatternPullModule = {
   ...CompositionPullModule,
   describe: "Pulls all patterns to local files in a directory",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs27.positional("directory", {
+            yargs32.positional("directory", {
               describe: "Directory to save the component definitions to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -3461,12 +4139,12 @@ var PatternPullModule = {
 var PatternPushModule = {
   ...CompositionPushModule,
   describe: "Pushes all patterns from files in a directory to Uniform Canvas",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs27.positional("directory", {
+            yargs32.positional("directory", {
               describe: "Directory to read the compositions/patterns from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("what-if", {
@@ -3504,10 +4182,10 @@ var PatternRemoveModule = {
 var PatternUnpublishModule = {
   command: "unpublish [ids]",
   describe: "Unpublish a pattern(s)",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("ids", {
+        yargs32.positional("ids", {
           describe: "Un-publishes composition(s) by ID. Comma-separate multiple IDs. Use --all to un-publish all instead.",
           type: "string"
         }).option("all", {
@@ -3546,26 +4224,26 @@ var PatternUpdateModule = {
 var PatternModule = {
   command: "pattern <command>",
   describe: "Commands for Canvas patterns",
-  builder: (yargs27) => yargs27.command(PatternPullModule).command(PatternPushModule).command(PatternGetModule).command(PatternRemoveModule).command(PatternListModule).command(PatternUpdateModule).command(PatternPublishModule).command(PatternUnpublishModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(PatternPullModule).command(PatternPushModule).command(PatternGetModule).command(PatternRemoveModule).command(PatternListModule).command(PatternUpdateModule).command(PatternPublishModule).command(PatternUnpublishModule).demandCommand(),
   handler: () => {
-    yargs8.help();
+    yargs10.help();
   }
 };
 
 // src/commands/canvas/commands/prompts.ts
-import yargs9 from "yargs";
+import yargs11 from "yargs";
 
 // src/commands/canvas/commands/prompts/get.ts
 import { PromptClient } from "@uniformdev/canvas";
 var PromptGetModule = {
   command: "get <id>",
   describe: "Get a prompt",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          yargs27.positional("id", { demandOption: true, describe: "Prompt ID to fetch" })
+          yargs32.positional("id", { demandOption: true, describe: "Prompt ID to fetch" })
         )
       )
     )
@@ -3586,7 +4264,7 @@ import { PromptClient as PromptClient2 } from "@uniformdev/canvas";
 var PromptListModule = {
   command: "list",
   describe: "List prompts",
-  builder: (yargs27) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs27)))),
+  builder: (yargs32) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs32)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new PromptClient2({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
@@ -3633,12 +4311,12 @@ function createPromptEngineDataSource({
 var PromptPullModule = {
   command: "pull <directory>",
   describe: "Pulls all entries to local files in a directory",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs27.positional("directory", {
+            yargs32.positional("directory", {
               describe: "Directory to save the entries to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
               type: "string"
             }).option("format", {
@@ -3673,7 +4351,8 @@ var PromptPullModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new PromptClient3({
@@ -3710,7 +4389,7 @@ var PromptPullModule = {
       target,
       mode,
       whatIf,
-      allowEmptySource: true,
+      allowEmptySource: allowEmptySource ?? true,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -3721,12 +4400,12 @@ import { PromptClient as PromptClient4 } from "@uniformdev/canvas";
 var PromptPushModule = {
   command: "push <directory>",
   describe: "Pushes all prompts from files in a directory to Uniform",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withStateOptions(
           withDiffOptions(
-            yargs27.positional("directory", {
+            yargs32.positional("directory", {
               describe: "Directory to read the prompts from. If a filename is used, a package will be read instead.",
               type: "string"
             }).option("what-if", {
@@ -3754,7 +4433,8 @@ var PromptPushModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new PromptClient4({
@@ -3786,6 +4466,7 @@ var PromptPushModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -3797,9 +4478,9 @@ var PromptRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a prompt",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs27.positional("id", { demandOption: true, describe: "Prompt ID to delete" }))
+      withProjectOptions(yargs32.positional("id", { demandOption: true, describe: "Prompt ID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -3815,10 +4496,10 @@ var PromptUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a prompt",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("filename", { demandOption: true, describe: "Prompt file to put" })
+        yargs32.positional("filename", { demandOption: true, describe: "Prompt file to put" })
       )
     )
   ),
@@ -3835,9 +4516,9 @@ var PromptModule = {
   command: "prompt <command>",
   aliases: ["dt"],
   describe: "Commands for AI Prompt definitions",
-  builder: (yargs27) => yargs27.command(PromptGetModule).command(PromptListModule).command(PromptPullModule).command(PromptPushModule).command(PromptRemoveModule).command(PromptUpdateModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(PromptGetModule).command(PromptListModule).command(PromptPullModule).command(PromptPushModule).command(PromptRemoveModule).command(PromptUpdateModule).demandCommand(),
   handler: () => {
-    yargs9.help();
+    yargs11.help();
   }
 };
 
@@ -3846,28 +4527,28 @@ var CanvasCommand = {
   command: "canvas <command>",
   aliases: ["cv", "pm", "presentation"],
   describe: "Uniform Canvas commands",
-  builder: (yargs27) => yargs27.command(CompositionModule).command(ComponentModule).command(DataTypeModule).command(CategoryModule).command(PatternModule).command(ContentTypeModule).command(EntryModule).command(PromptModule).command(AssetModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(CompositionModule).command(ComponentModule).command(DataTypeModule).command(DataSourceModule).command(CategoryModule).command(PatternModule).command(ContentTypeModule).command(EntryModule).command(PromptModule).command(AssetModule).command(LocaleModule).demandCommand(),
   handler: () => {
-    yargs10.showHelp();
+    yargs12.showHelp();
   }
 };
 
 // src/commands/context/index.ts
-import yargs17 from "yargs";
+import yargs19 from "yargs";
 
 // src/commands/context/commands/aggregate.ts
-import yargs11 from "yargs";
+import yargs13 from "yargs";
 
 // src/commands/context/commands/aggregate/get.ts
 import { UncachedAggregateClient } from "@uniformdev/context/api";
 var AggregateGetModule = {
   command: "get <id>",
   describe: "Fetch an aggregate",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs27.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
+          yargs32.positional("id", { demandOption: true, describe: "Aggregate public ID to fetch" })
         )
       )
     )
@@ -3891,7 +4572,7 @@ var AggregateListModule = {
   command: "list",
   describe: "List aggregates",
   aliases: ["ls"],
-  builder: (yargs27) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs27)))),
+  builder: (yargs32) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs32)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedAggregateClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -3957,11 +4638,11 @@ function writeContextPackage(filename, packageContents) {
 var AggregatePullModule = {
   command: "pull <directory>",
   describe: "Pulls all aggregates to local files in a directory",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to save the aggregates to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -3995,7 +4676,8 @@ var AggregatePullModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedAggregateClient3({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -4026,6 +4708,7 @@ var AggregatePullModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -4036,11 +4719,11 @@ import { UncachedAggregateClient as UncachedAggregateClient4 } from "@uniformdev
 var AggregatePushModule = {
   command: "push <directory>",
   describe: "Pushes all aggregates from files in a directory or package to Uniform",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to read the aggregates from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -4067,7 +4750,8 @@ var AggregatePushModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedAggregateClient4({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -4093,6 +4777,7 @@ var AggregatePushModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
     await target.complete();
@@ -4105,10 +4790,10 @@ var AggregateRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an aggregate",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
+        yargs32.positional("id", { demandOption: true, describe: "Aggregate public ID to delete" })
       )
     )
   ),
@@ -4125,10 +4810,10 @@ var AggregateUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update an aggregate",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
+        yargs32.positional("filename", { demandOption: true, describe: "Aggregate file to put" })
       )
     )
   ),
@@ -4145,25 +4830,25 @@ var AggregateModule = {
   command: "aggregate <command>",
   aliases: ["agg", "intent", "audience"],
   describe: "Commands for Context aggregates (intents, audiences)",
-  builder: (yargs27) => yargs27.command(AggregatePullModule).command(AggregatePushModule).command(AggregateGetModule).command(AggregateRemoveModule).command(AggregateListModule).command(AggregateUpdateModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(AggregatePullModule).command(AggregatePushModule).command(AggregateGetModule).command(AggregateRemoveModule).command(AggregateListModule).command(AggregateUpdateModule).demandCommand(),
   handler: () => {
-    yargs11.help();
+    yargs13.help();
   }
 };
 
 // src/commands/context/commands/enrichment.ts
-import yargs12 from "yargs";
+import yargs14 from "yargs";
 
 // src/commands/context/commands/enrichment/get.ts
 import { UncachedEnrichmentClient } from "@uniformdev/context/api";
 var EnrichmentGetModule = {
   command: "get <id>",
   describe: "Fetch an enrichment category and its values",
-  builder: (yargs27) => withFormatOptions(
+  builder: (yargs32) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs27.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
+          yargs32.positional("id", { demandOption: true, describe: "Enrichment category public ID to fetch" })
         )
       )
     )
@@ -4188,7 +4873,7 @@ var EnrichmentListModule = {
   command: "list",
   describe: "List enrichments",
   aliases: ["ls"],
-  builder: (yargs27) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs27)))),
+  builder: (yargs32) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs32)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedEnrichmentClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -4289,11 +4974,11 @@ var createEnrichmentValueEngineDataSource = ({
 var EnrichmentPullModule = {
   command: "pull <directory>",
   describe: "Pulls all enrichments to local files in a directory",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to save the enrichments to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -4327,7 +5012,8 @@ var EnrichmentPullModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedEnrichmentClient3({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -4358,6 +5044,7 @@ var EnrichmentPullModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -4368,11 +5055,11 @@ import { UncachedEnrichmentClient as UncachedEnrichmentClient4 } from "@uniformd
 var EnrichmentPushModule = {
   command: "push <directory>",
   describe: "Pushes all enrichments from files in a directory or package to Uniform",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to read the enrichments from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -4399,7 +5086,8 @@ var EnrichmentPushModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedEnrichmentClient4({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -4425,6 +5113,7 @@ var EnrichmentPushModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -4436,10 +5125,10 @@ var EnrichmentRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete an enrichment category and its values",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
+        yargs32.positional("id", { demandOption: true, describe: "Enrichment category public ID to delete" })
       )
     )
   ),
@@ -4455,14 +5144,14 @@ var EnrichmentModule = {
   command: "enrichment <command>",
   aliases: ["enr"],
   describe: "Commands for Context enrichments",
-  builder: (yargs27) => yargs27.command(EnrichmentPullModule).command(EnrichmentPushModule).command(EnrichmentGetModule).command(EnrichmentRemoveModule).command(EnrichmentListModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(EnrichmentPullModule).command(EnrichmentPushModule).command(EnrichmentGetModule).command(EnrichmentRemoveModule).command(EnrichmentListModule).demandCommand(),
   handler: () => {
-    yargs12.help();
+    yargs14.help();
   }
 };
 
 // src/commands/context/commands/manifest.ts
-import yargs13 from "yargs";
+import yargs15 from "yargs";
 
 // src/commands/context/commands/manifest/get.ts
 import { ApiClientError, UncachedManifestClient } from "@uniformdev/context/api";
@@ -4473,10 +5162,10 @@ var ManifestGetModule = {
   command: "get [output]",
   aliases: ["dl", "download"],
   describe: "Download the Uniform Context manifest for a project",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.option("preview", {
+        yargs32.option("preview", {
           describe: "If set, fetches the unpublished preview manifest (The API key must have permission)",
           default: false,
           type: "boolean",
@@ -4538,7 +5227,7 @@ import { exit as exit2 } from "process";
 var ManifestPublishModule = {
   command: "publish",
   describe: "Publish the Uniform Context manifest for a project",
-  builder: (yargs27) => withConfiguration(withApiOptions(withProjectOptions(yargs27))),
+  builder: (yargs32) => withConfiguration(withApiOptions(withProjectOptions(yargs32))),
   handler: async ({ apiKey, apiHost, proxy, project }) => {
     const fetch3 = nodeFetchProxy(proxy);
     try {
@@ -4571,25 +5260,25 @@ var ManifestModule = {
   command: "manifest <command>",
   describe: "Commands for context manifests",
   aliases: ["man"],
-  builder: (yargs27) => yargs27.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(ManifestGetModule).command(ManifestPublishModule).demandCommand(),
   handler: () => {
-    yargs13.help();
+    yargs15.help();
   }
 };
 
 // src/commands/context/commands/quirk.ts
-import yargs14 from "yargs";
+import yargs16 from "yargs";
 
 // src/commands/context/commands/quirk/get.ts
 import { UncachedQuirkClient } from "@uniformdev/context/api";
 var QuirkGetModule = {
   command: "get <id>",
   describe: "Fetch a quirk",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs27.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
+          yargs32.positional("id", { demandOption: true, describe: "Quirk public ID to fetch" })
         )
       )
     )
@@ -4613,11 +5302,11 @@ var QuirkListModule = {
   command: "list",
   describe: "List quirks",
   aliases: ["ls"],
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs27.option("withIntegrations", {
+          yargs32.option("withIntegrations", {
             alias: ["i"],
             describe: "Whether to include meta-quirks created by integrations in the list. Defaults to false.",
             type: "boolean"
@@ -4674,11 +5363,11 @@ function createQuirkEngineDataSource({
 var QuirkPullModule = {
   command: "pull <directory>",
   describe: "Pulls all quirks to local files in a directory",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to save the quirks to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -4712,7 +5401,8 @@ var QuirkPullModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedQuirkClient3({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -4743,6 +5433,7 @@ var QuirkPullModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -4753,11 +5444,11 @@ import { UncachedQuirkClient as UncachedQuirkClient4 } from "@uniformdev/context
 var QuirkPushModule = {
   command: "push <directory>",
   describe: "Pushes all quirks from files in a directory or package to Uniform",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to read the quirks from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -4784,7 +5475,8 @@ var QuirkPushModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedQuirkClient4({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -4810,6 +5502,7 @@ var QuirkPushModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -4821,10 +5514,10 @@ var QuirkRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a quirk",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
+        yargs32.positional("id", { demandOption: true, describe: "Quirk public ID to delete" })
       )
     )
   ),
@@ -4841,10 +5534,10 @@ var QuirkUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a quirk",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("filename", { demandOption: true, describe: "Quirk file to put" })
+        yargs32.positional("filename", { demandOption: true, describe: "Quirk file to put" })
       )
     )
   ),
@@ -4861,25 +5554,25 @@ var QuirkModule = {
   command: "quirk <command>",
   aliases: ["qk"],
   describe: "Commands for Context quirks",
-  builder: (yargs27) => yargs27.command(QuirkPullModule).command(QuirkPushModule).command(QuirkGetModule).command(QuirkRemoveModule).command(QuirkListModule).command(QuirkUpdateModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(QuirkPullModule).command(QuirkPushModule).command(QuirkGetModule).command(QuirkRemoveModule).command(QuirkListModule).command(QuirkUpdateModule).demandCommand(),
   handler: () => {
-    yargs14.help();
+    yargs16.help();
   }
 };
 
 // src/commands/context/commands/signal.ts
-import yargs15 from "yargs";
+import yargs17 from "yargs";
 
 // src/commands/context/commands/signal/get.ts
 import { UncachedSignalClient } from "@uniformdev/context/api";
 var SignalGetModule = {
   command: "get <id>",
   describe: "Fetch a signal",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs27.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
+          yargs32.positional("id", { demandOption: true, describe: "Signal public ID to fetch" })
         )
       )
     )
@@ -4903,7 +5596,7 @@ var SignalListModule = {
   command: "list",
   describe: "List signals",
   aliases: ["ls"],
-  builder: (yargs27) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs27)))),
+  builder: (yargs32) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs32)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedSignalClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -4952,11 +5645,11 @@ function createSignalEngineDataSource({
 var SignalPullModule = {
   command: "pull <directory>",
   describe: "Pulls all signals to local files in a directory",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to save the signals to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -4990,7 +5683,8 @@ var SignalPullModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedSignalClient3({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -5021,6 +5715,7 @@ var SignalPullModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -5031,11 +5726,11 @@ import { UncachedSignalClient as UncachedSignalClient4 } from "@uniformdev/conte
 var SignalPushModule = {
   command: "push <directory>",
   describe: "Pushes all signals from files in a directory or package to Uniform",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to read the signals from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -5062,7 +5757,8 @@ var SignalPushModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedSignalClient4({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -5088,6 +5784,7 @@ var SignalPushModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -5099,10 +5796,10 @@ var SignalRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a signal",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
+        yargs32.positional("id", { demandOption: true, describe: "Signal public ID to delete" })
       )
     )
   ),
@@ -5119,10 +5816,10 @@ var SignalUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a signal",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("filename", { demandOption: true, describe: "Signal file to put" })
+        yargs32.positional("filename", { demandOption: true, describe: "Signal file to put" })
       )
     )
   ),
@@ -5139,25 +5836,25 @@ var SignalModule = {
   command: "signal <command>",
   aliases: ["sig"],
   describe: "Commands for Context signals",
-  builder: (yargs27) => yargs27.command(SignalPullModule).command(SignalPushModule).command(SignalGetModule).command(SignalRemoveModule).command(SignalListModule).command(SignalUpdateModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(SignalPullModule).command(SignalPushModule).command(SignalGetModule).command(SignalRemoveModule).command(SignalListModule).command(SignalUpdateModule).demandCommand(),
   handler: () => {
-    yargs15.help();
+    yargs17.help();
   }
 };
 
 // src/commands/context/commands/test.ts
-import yargs16 from "yargs";
+import yargs18 from "yargs";
 
 // src/commands/context/commands/test/get.ts
 import { UncachedTestClient } from "@uniformdev/context/api";
 var TestGetModule = {
   command: "get <id>",
   describe: "Fetch a test",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs27.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
+          yargs32.positional("id", { demandOption: true, describe: "Test public ID to fetch" })
         )
       )
     )
@@ -5181,7 +5878,7 @@ var TestListModule = {
   command: "list",
   describe: "List tests",
   aliases: ["ls"],
-  builder: (yargs27) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs27)))),
+  builder: (yargs32) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs32)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedTestClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -5230,11 +5927,11 @@ function createTestEngineDataSource({
 var TestPullModule = {
   command: "pull <directory>",
   describe: "Pulls all tests to local files in a directory",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to save the tests to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -5268,7 +5965,8 @@ var TestPullModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedTestClient3({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -5299,6 +5997,7 @@ var TestPullModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -5309,11 +6008,11 @@ import { UncachedTestClient as UncachedTestClient4 } from "@uniformdev/context/a
 var TestPushModule = {
   command: "push <directory>",
   describe: "Pushes all tests from files in a directory or package to Uniform",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to read the tests from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -5340,7 +6039,8 @@ var TestPushModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedTestClient4({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -5366,6 +6066,7 @@ var TestPushModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -5377,10 +6078,10 @@ var TestRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a test",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("id", { demandOption: true, describe: "Test public ID to delete" })
+        yargs32.positional("id", { demandOption: true, describe: "Test public ID to delete" })
       )
     )
   ),
@@ -5397,9 +6098,9 @@ var TestUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a test",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs27.positional("filename", { demandOption: true, describe: "Test file to put" }))
+      withProjectOptions(yargs32.positional("filename", { demandOption: true, describe: "Test file to put" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
@@ -5414,9 +6115,9 @@ var TestUpdateModule = {
 var TestModule = {
   command: "test <command>",
   describe: "Commands for Context A/B tests",
-  builder: (yargs27) => yargs27.command(TestPullModule).command(TestPushModule).command(TestGetModule).command(TestRemoveModule).command(TestListModule).command(TestUpdateModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(TestPullModule).command(TestPushModule).command(TestGetModule).command(TestRemoveModule).command(TestListModule).command(TestUpdateModule).demandCommand(),
   handler: () => {
-    yargs16.help();
+    yargs18.help();
   }
 };
 
@@ -5425,9 +6126,290 @@ var ContextCommand = {
   command: "context <command>",
   aliases: ["ctx"],
   describe: "Uniform Context commands",
-  builder: (yargs27) => yargs27.command(ManifestModule).command(SignalModule).command(EnrichmentModule).command(AggregateModule).command(QuirkModule).command(TestModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(ManifestModule).command(SignalModule).command(EnrichmentModule).command(AggregateModule).command(QuirkModule).command(TestModule).demandCommand(),
+  handler: () => {
+    yargs19.showHelp();
+  }
+};
+
+// src/commands/integration/index.ts
+import yargs22 from "yargs";
+
+// src/commands/integration/commands/definition.ts
+import yargs21 from "yargs";
+
+// src/commands/integration/commands/definition/edgehancer/edgehancer.ts
+import yargs20 from "yargs";
+
+// src/commands/integration/commands/definition/edgehancer/deploy.ts
+import { readFileSync as readFileSync2 } from "fs";
+
+// src/commands/integration/commands/definition/edgehancer/EdgehancerClient.ts
+import { createLimitPolicy } 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({});
+    }
+    super(options);
+    this.options = options;
+  }
+  async deploy(definition) {
+    const { teamId } = this.options;
+    const fetchUri = this.createUrl(ENDPOINT);
+    return await this.apiClient(fetchUri, {
+      method: "PUT",
+      body: JSON.stringify({ ...definition, teamId }),
+      expectNoContent: true
+    });
+  }
+  async remove(edgehancer) {
+    const { teamId } = this.options;
+    const fetchUri = this.createUrl(ENDPOINT);
+    return await this.apiClient(fetchUri, {
+      method: "DELETE",
+      body: JSON.stringify({ teamId, ...edgehancer }),
+      expectNoContent: true
+    });
+  }
+};
+
+// src/commands/integration/commands/definition/edgehancer/util.ts
+function withEdgehancerIdOptions(yargs32) {
+  return yargs32.option("connectorType", {
+    describe: "Integration data connector type to edgehance, as defined in the integration manifest file.",
+    demandOption: true,
+    type: "string"
+  }).option("archetype", {
+    describe: "Data connector archetype to edgehance. Must be defined within the connectorType.",
+    demandOption: true,
+    type: "string"
+  }).option("hook", {
+    describe: "Edgehancer hook to deploy to.",
+    demandOption: true,
+    choices: ["preRequest", "request"],
+    type: "string"
+  });
+}
+
+// src/commands/integration/commands/definition/edgehancer/deploy.ts
+var IntegrationEdgehancerDeployModule = {
+  command: "deploy <filename>",
+  describe: "Deploys a custom edgehancer hook to run when a data resource of a specific archetype is fetched. The API key used must have team admin permissions.",
+  builder: (yargs32) => withConfiguration(
+    withApiOptions(
+      withTeamOptions(
+        withEdgehancerIdOptions(
+          yargs32.positional("filename", {
+            demandOption: true,
+            describe: "ESM code file to run for the target edgehancer hook. Refer to the documentation for expected types."
+          })
+        )
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, filename, team: teamId, archetype, connectorType, hook }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch3, teamId });
+    const code = readFileSync2(filename, "utf8");
+    await client.deploy({ archetype, code, connectorType, hook });
+  }
+};
+
+// src/commands/integration/commands/definition/edgehancer/remove.ts
+var IntegrationEdgehancerRemoveModule = {
+  command: "remove",
+  describe: "Deletes a custom edgehancer hook from a data connector archetype. The API key used must have team admin permissions.",
+  builder: (yargs32) => withConfiguration(withApiOptions(withTeamOptions(withEdgehancerIdOptions(yargs32)))),
+  handler: async ({ apiHost, apiKey, proxy, team: teamId, archetype, connectorType, hook }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch3, teamId });
+    await client.remove({ archetype, connectorType, hook });
+  }
+};
+
+// src/commands/integration/commands/definition/edgehancer/edgehancer.ts
+var IntegrationEdgehancerModule = {
+  command: "edgehancer <command>",
+  describe: "Commands for managing custom integration edgehancers at the team level.",
+  builder: (yargs32) => yargs32.command(IntegrationEdgehancerDeployModule).command(IntegrationEdgehancerRemoveModule).demandCommand(),
+  handler: () => {
+    yargs20.help();
+  }
+};
+
+// src/commands/integration/commands/definition/DefinitionClient.ts
+import { createLimitPolicy as createLimitPolicy2 } 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({});
+    }
+    super(options);
+    this.options = options;
+  }
+  async register(manifest) {
+    const { teamId } = this.options;
+    const fetchUri = this.createUrl(ENDPOINT2);
+    return await this.apiClient(fetchUri, {
+      method: "PUT",
+      body: JSON.stringify({ data: manifest, teamId }),
+      expectNoContent: true
+    });
+  }
+  async remove(integrationType) {
+    const { teamId } = this.options;
+    const fetchUri = this.createUrl(ENDPOINT2);
+    return await this.apiClient(fetchUri, {
+      method: "DELETE",
+      body: JSON.stringify({ teamId, type: integrationType }),
+      expectNoContent: true
+    });
+  }
+};
+
+// src/commands/integration/commands/definition/register.ts
+var IntegrationDefinitionRegisterModule = {
+  command: "register <filename>",
+  describe: "Registers a custom integration definition on a team. The API key used must have team admin permissions.",
+  builder: (yargs32) => withConfiguration(
+    withApiOptions(
+      withTeamOptions(
+        yargs32.positional("filename", {
+          demandOption: true,
+          describe: "Integration definition manifest to register"
+        })
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, filename, team: teamId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new DefinitionClient({ apiKey, apiHost, fetch: fetch3, teamId });
+    const file = readFileToObject(filename);
+    await client.register(file);
+  }
+};
+
+// src/commands/integration/commands/definition/remove.ts
+var IntegrationDefinitionRemoveModule = {
+  command: "remove <type>",
+  describe: "Deletes a custom integration definition from a team. This will uninstall it on any active projects. Existing usages of the integration may break. The API key used must have team admin permissions.",
+  builder: (yargs32) => withConfiguration(
+    withApiOptions(
+      withTeamOptions(
+        yargs32.positional("type", {
+          demandOption: true,
+          describe: "Integration type (from its manifest) to remove."
+        })
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, type, team: teamId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new DefinitionClient({ apiKey, apiHost, fetch: fetch3, teamId });
+    await client.remove(type);
+  }
+};
+
+// src/commands/integration/commands/definition.ts
+var IntegrationDefinitionModule = {
+  command: "definition <command>",
+  describe: "Commands for managing custom integration definitions at the team level.",
+  builder: (yargs32) => yargs32.command(IntegrationDefinitionRemoveModule).command(IntegrationDefinitionRegisterModule).command(IntegrationEdgehancerModule).demandCommand(),
+  handler: () => {
+    yargs21.help();
+  }
+};
+
+// src/commands/integration/commands/InstallClient.ts
+import { createLimitPolicy as createLimitPolicy3 } 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({});
+    }
+    super(options);
+    this.options = options;
+  }
+  async install(definition) {
+    const { projectId } = this.options;
+    const fetchUri = this.createUrl(ENDPOINT3);
+    return await this.apiClient(fetchUri, {
+      method: "PUT",
+      body: JSON.stringify({ ...definition, projectId }),
+      expectNoContent: true
+    });
+  }
+  async remove(type) {
+    const { projectId } = this.options;
+    const fetchUri = this.createUrl(ENDPOINT3);
+    return await this.apiClient(fetchUri, {
+      method: "DELETE",
+      body: JSON.stringify({ projectId, type }),
+      expectNoContent: true
+    });
+  }
+};
+
+// src/commands/integration/commands/install.ts
+var IntegrationInstallModule = {
+  command: "install <type>",
+  describe: "Installs an integration to a project. The integration may be built-in or custom. Custom integrations must be registered to the parent team first.",
+  builder: (yargs32) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs32.positional("type", {
+          demandOption: true,
+          describe: "Integration type to install (as defined in its manifest)"
+        }).option("configuration", {
+          describe: "Optional JSON configuration data for the integration, to pre-configure it. The schema is specific to each integration.",
+          type: "string"
+        })
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, type, configuration: configuration2, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new InstallClient({ apiKey, apiHost, fetch: fetch3, projectId });
+    const data = configuration2 ? JSON.parse(configuration2) : void 0;
+    await client.install({ data, type });
+  }
+};
+
+// src/commands/integration/commands/uninstall.ts
+var IntegrationUninstallModule = {
+  command: "uninstall <type>",
+  describe: "Uninstalls an integration from a project. Existing usages of the integration may break.",
+  builder: (yargs32) => withConfiguration(
+    withApiOptions(
+      withProjectOptions(
+        yargs32.positional("type", {
+          demandOption: true,
+          describe: "Integration type to uninstall (as defined in its manifest)"
+        })
+      )
+    )
+  ),
+  handler: async ({ apiHost, apiKey, proxy, type, project: projectId }) => {
+    const fetch3 = nodeFetchProxy(proxy);
+    const client = new InstallClient({ apiKey, apiHost, fetch: fetch3, projectId });
+    await client.remove(type);
+  }
+};
+
+// src/commands/integration/index.ts
+var IntegrationCommand = {
+  command: "integration <command>",
+  describe: "Integration management commands",
+  builder: (yargs32) => yargs32.command(IntegrationDefinitionModule).command(IntegrationInstallModule).command(IntegrationUninstallModule).demandCommand(),
   handler: () => {
-    yargs17.showHelp();
+    yargs22.showHelp();
   }
 };
 
@@ -5455,7 +6437,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.79.0",
+  version: "19.112.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -5490,16 +6472,16 @@ var package_default = {
     "graphql-request": "6.1.0",
     "https-proxy-agent": "^7.0.0",
     "image-size": "^1.0.2",
-    inquirer: "9.2.11",
-    "isomorphic-git": "1.24.5",
+    inquirer: "9.2.12",
+    "isomorphic-git": "1.25.2",
     "isomorphic-unfetch": "^4.0.0",
     "js-yaml": "^4.1.0",
     jsonwebtoken: "9.0.2",
     "lodash.isequalwith": "^4.4.0",
     open: "9.1.0",
-    ora: "7.0.1",
+    ora: "8.0.1",
     "p-queue": "7.3.4",
-    "posthog-node": "3.1.3",
+    "posthog-node": "3.2.1",
     "registry-auth-token": "^5.0.0",
     "registry-url": "^6.0.0",
     slugify: "1.6.6",
@@ -5507,13 +6489,13 @@ var package_default = {
     zod: "3.22.4"
   },
   devDependencies: {
-    "@types/diff": "5.0.8",
-    "@types/inquirer": "9.0.3",
+    "@types/diff": "5.0.9",
+    "@types/inquirer": "9.0.7",
     "@types/js-yaml": "4.0.9",
     "@types/jsonwebtoken": "9.0.5",
-    "@types/lodash.isequalwith": "4.4.7",
-    "@types/node": "18.17.18",
-    "@types/yargs": "17.0.24"
+    "@types/lodash.isequalwith": "4.4.9",
+    "@types/node": "20.10.6",
+    "@types/yargs": "17.0.32"
   },
   bin: {
     uniform: "./cli.js"
@@ -6270,7 +7252,7 @@ npm run dev
 }
 
 // src/commands/new/commands/new-mesh-integration.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync4, readdirSync, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync3, mkdirSync as mkdirSync4, readdirSync, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
 import inquirer5 from "inquirer";
 import path4 from "path";
 import slugify2 from "slugify";
@@ -6317,13 +7299,13 @@ async function newMeshIntegrationHandler({
   if (!existsSync3(pathToManifest)) {
     throw new Error("Invalid integration starter cloned: missing `mesh-manifest.json`");
   }
-  const manifestContents = readFileSync2(pathToManifest, "utf-8");
+  const manifestContents = readFileSync3(pathToManifest, "utf-8");
   const manifestJson = JSON.parse(manifestContents);
   manifestJson.type = typeSlug;
   manifestJson.displayName = name;
   writeFileSync2(pathToManifest, JSON.stringify(manifestJson, null, 2), "utf-8");
   const packageJsonPath = path4.resolve(targetDir, "package.json");
-  const packageJson = JSON.parse(readFileSync2(packageJsonPath, "utf-8"));
+  const packageJson = JSON.parse(readFileSync3(packageJsonPath, "utf-8"));
   packageJson.name = typeSlug;
   writeFileSync2(packageJsonPath, JSON.stringify(packageJson, null, 2), "utf-8");
   const fullMeshAppKey = await uniformClient.registerMeshIntegration({ teamId, manifest: manifestJson });
@@ -6465,10 +7447,10 @@ var NewMeshCmd = {
 };
 
 // src/commands/optimize/index.ts
-import yargs19 from "yargs";
+import yargs24 from "yargs";
 
 // src/commands/optimize/manifest.ts
-import yargs18 from "yargs";
+import yargs23 from "yargs";
 
 // src/commands/optimize/manifest/download.ts
 import { gray as gray4, green as green3, red as red5, yellow as yellow2 } from "colorette";
@@ -6483,7 +7465,7 @@ var UniformBaseUrl = "https://uniform.app";
 var module = {
   command: "download [output]",
   describe: "Download intent manifest",
-  builder: (yargs27) => yargs27.option("apiKey", {
+  builder: (yargs32) => yargs32.option("apiKey", {
     alias: "k",
     demandOption: true,
     string: true,
@@ -6584,10 +7566,10 @@ var module2 = {
   command: "manifest <command>",
   describe: "Intent manifest commands",
   builder: () => {
-    return yargs18.command(download_default);
+    return yargs23.command(download_default);
   },
   handler: () => {
-    yargs18.showHelp();
+    yargs23.showHelp();
   }
 };
 var manifest_default = module2;
@@ -6598,29 +7580,29 @@ var OptimizeCommand = {
   aliases: ["opt"],
   describe: "Uniform Optimize commands",
   builder: () => {
-    return yargs19.command(manifest_default);
+    return yargs24.command(manifest_default);
   },
   handler: () => {
-    yargs19.showHelp();
+    yargs24.showHelp();
   }
 };
 
 // src/commands/project-map/index.ts
-import yargs22 from "yargs";
+import yargs27 from "yargs";
 
 // src/commands/project-map/commands/projectMapDefinition.ts
-import yargs20 from "yargs";
+import yargs25 from "yargs";
 
 // src/commands/project-map/commands/ProjectMapDefinition/get.ts
 import { UncachedProjectMapClient } from "@uniformdev/project-map";
 var ProjectMapDefinitionGetModule = {
   command: "get <id>",
   describe: "Fetch a project map",
-  builder: (yargs27) => withFormatOptions(
+  builder: (yargs32) => withFormatOptions(
     withConfiguration(
       withApiOptions(
         withProjectOptions(
-          yargs27.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
+          yargs32.positional("id", { demandOption: true, describe: "ProjectMap UUID to fetch" })
         )
       )
     )
@@ -6644,7 +7626,7 @@ var ProjectMapDefinitionListModule = {
   command: "list",
   describe: "List of project maps",
   aliases: ["ls"],
-  builder: (yargs27) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs27)))),
+  builder: (yargs32) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs32)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedProjectMapClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -6701,11 +7683,11 @@ function createProjectMapDefinitionEngineDataSource({
 var ProjectMapDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps to local files in a directory",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to save project maps to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -6739,7 +7721,8 @@ var ProjectMapDefinitionPullModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedProjectMapClient3({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -6770,7 +7753,7 @@ var ProjectMapDefinitionPullModule = {
       target,
       mode,
       whatIf,
-      allowEmptySource: true,
+      allowEmptySource: allowEmptySource ?? true,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -6781,11 +7764,11 @@ import { UncachedProjectMapClient as UncachedProjectMapClient4 } from "@uniformd
 var ProjectMapDefinitionPushModule = {
   command: "push <directory>",
   describe: "Pushes all project maps from files in a directory or package to Uniform",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to read project maps from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -6812,7 +7795,8 @@ var ProjectMapDefinitionPushModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedProjectMapClient4({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -6838,6 +7822,7 @@ var ProjectMapDefinitionPushModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -6849,9 +7834,9 @@ var ProjectMapDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs27.positional("id", { demandOption: true, describe: " UUID to delete" }))
+      withProjectOptions(yargs32.positional("id", { demandOption: true, describe: " UUID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -6867,10 +7852,10 @@ var ProjectMapDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a project map",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("filename", { demandOption: true, describe: "Project map file to put" })
+        yargs32.positional("filename", { demandOption: true, describe: "Project map file to put" })
       )
     )
   ),
@@ -6886,25 +7871,25 @@ var ProjectMapDefinitionUpdateModule = {
 var ProjectMapDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for ProjectMap Definitions",
-  builder: (yargs27) => yargs27.command(ProjectMapDefinitionPullModule).command(ProjectMapDefinitionPushModule).command(ProjectMapDefinitionGetModule).command(ProjectMapDefinitionRemoveModule).command(ProjectMapDefinitionListModule).command(ProjectMapDefinitionUpdateModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(ProjectMapDefinitionPullModule).command(ProjectMapDefinitionPushModule).command(ProjectMapDefinitionGetModule).command(ProjectMapDefinitionRemoveModule).command(ProjectMapDefinitionListModule).command(ProjectMapDefinitionUpdateModule).demandCommand(),
   handler: () => {
-    yargs20.help();
+    yargs25.help();
   }
 };
 
 // src/commands/project-map/commands/projectMapNode.ts
-import yargs21 from "yargs";
+import yargs26 from "yargs";
 
 // src/commands/project-map/commands/ProjectMapNode/get.ts
 import { UncachedProjectMapClient as UncachedProjectMapClient7 } from "@uniformdev/project-map";
 var ProjectMapNodeGetModule = {
   command: "get <id> <projectMapId>",
   describe: "Fetch a project map node",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs27.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to fetch" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to fetch from" })
+          yargs32.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to fetch" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to fetch from" })
         )
       )
     )
@@ -6930,22 +7915,24 @@ var ProjectMapNodeListModule = {
   command: "list <projectMapId>",
   describe: "List project map nodes",
   aliases: ["ls"],
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs27.positional("projectMapId", {
-            demandOption: true,
-            describe: "ProjectMap UUID to fetch from"
-          })
+          withStateOptions(
+            yargs32.positional("projectMapId", {
+              demandOption: true,
+              describe: "ProjectMap UUID to fetch from"
+            })
+          )
         )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, projectMapId, format, filename, project: projectId }) => {
+  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 res = await client.getNodes({ projectMapId });
+    const res = await client.getNodes({ projectMapId, state: convertCompositionState(state) });
     emitWithFormat({ nodes: res.nodes ?? [], projectMapId }, format, filename);
   }
 };
@@ -7005,11 +7992,11 @@ function createProjectMapNodeEngineDataSource({
 var ProjectMapNodePullModule = {
   command: "pull <directory>",
   describe: "Pulls all project maps nodes to local files in a directory",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to save project maps to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -7043,7 +8030,8 @@ var ProjectMapNodePullModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedProjectMapClient9({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -7078,7 +8066,7 @@ var ProjectMapNodePullModule = {
       target,
       mode,
       whatIf,
-      allowEmptySource: true,
+      allowEmptySource: allowEmptySource ?? true,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -7089,11 +8077,11 @@ import { UncachedProjectMapClient as UncachedProjectMapClient10 } from "@uniform
 var ProjectMapNodePushModule = {
   command: "push <directory>",
   describe: "Pushes all project maps nodes from files in a directory or package to Uniform",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to read project maps from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -7120,7 +8108,8 @@ var ProjectMapNodePushModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedProjectMapClient10({
@@ -7155,6 +8144,7 @@ var ProjectMapNodePushModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -7166,10 +8156,10 @@ var ProjectMapNodeRemoveModule = {
   command: "remove <id> <projectMapId>",
   aliases: ["delete", "rm"],
   describe: "Delete a project map node",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to delete" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to delete from" })
+        yargs32.positional("id", { demandOption: true, describe: "ProjectMap Node UUID to delete" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to delete from" })
       )
     )
   ),
@@ -7186,10 +8176,10 @@ var ProjectMapNodeUpdateModule = {
   command: "update <filename> <projectMapId>",
   aliases: ["put"],
   describe: "Insert or update a project map node",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("filename", { demandOption: true, describe: "ProjectMap node file with nodes data" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to put into" })
+        yargs32.positional("filename", { demandOption: true, describe: "ProjectMap node file with nodes data" }).positional("projectMapId", { demandOption: true, describe: "ProjectMap UUID to put into" })
       )
     )
   ),
@@ -7205,9 +8195,9 @@ var ProjectMapNodeUpdateModule = {
 var ProjectMapNodeModule = {
   command: "node <command>",
   describe: "Commands for ProjectMap Nodes",
-  builder: (yargs27) => yargs27.command(ProjectMapNodePullModule).command(ProjectMapNodePushModule).command(ProjectMapNodeGetModule).command(ProjectMapNodeRemoveModule).command(ProjectMapNodeListModule).command(ProjectMapNodeUpdateModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(ProjectMapNodePullModule).command(ProjectMapNodePushModule).command(ProjectMapNodeGetModule).command(ProjectMapNodeRemoveModule).command(ProjectMapNodeListModule).command(ProjectMapNodeUpdateModule).demandCommand(),
   handler: () => {
-    yargs21.help();
+    yargs26.help();
   }
 };
 
@@ -7216,28 +8206,28 @@ var ProjectMapCommand = {
   command: "project-map <command>",
   aliases: ["prm"],
   describe: "Uniform ProjectMap commands",
-  builder: (yargs27) => yargs27.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(ProjectMapNodeModule).command(ProjectMapDefinitionModule).demandCommand(),
   handler: () => {
-    yargs22.showHelp();
+    yargs27.showHelp();
   }
 };
 
 // src/commands/redirect/index.ts
-import yargs24 from "yargs";
+import yargs29 from "yargs";
 
 // src/commands/redirect/commands/redirect.ts
-import yargs23 from "yargs";
+import yargs28 from "yargs";
 
 // src/commands/redirect/commands/RedirectDefinition/get.ts
 import { UncachedRedirectClient } from "@uniformdev/redirect";
 var RedirectDefinitionGetModule = {
   command: "get <id>",
   describe: "Fetch a redirect",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withFormatOptions(
       withApiOptions(
         withProjectOptions(
-          yargs27.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
+          yargs32.positional("id", { demandOption: true, describe: "Redirect UUID to fetch" })
         )
       )
     )
@@ -7261,7 +8251,7 @@ var RedirectDefinitionListModule = {
   command: "list",
   describe: "List of redirects",
   aliases: ["ls"],
-  builder: (yargs27) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs27)))),
+  builder: (yargs32) => withConfiguration(withFormatOptions(withApiOptions(withProjectOptions(yargs32)))),
   handler: async ({ apiHost, apiKey, proxy, format, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedRedirectClient2({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -7327,11 +8317,11 @@ function createRedirectDefinitionEngineDataSource({
 var RedirectDefinitionPullModule = {
   command: "pull <directory>",
   describe: "Pulls all redirects to local files in a directory",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to save redirects to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
             type: "string"
           }).option("format", {
@@ -7365,7 +8355,8 @@ var RedirectDefinitionPullModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedRedirectClient3({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -7397,7 +8388,7 @@ var RedirectDefinitionPullModule = {
       target,
       mode,
       whatIf,
-      allowEmptySource: true,
+      allowEmptySource: allowEmptySource ?? true,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -7408,11 +8399,11 @@ import { UncachedRedirectClient as UncachedRedirectClient4 } from "@uniformdev/r
 var RedirectDefinitionPushModule = {
   command: "push <directory>",
   describe: "Pushes all redirects from files in a directory or package to Uniform",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.positional("directory", {
+          yargs32.positional("directory", {
             describe: "Directory to read redirects from. If a filename is used, a package will be read instead.",
             type: "string"
           }).option("what-if", {
@@ -7439,7 +8430,8 @@ var RedirectDefinitionPushModule = {
     mode,
     whatIf,
     project: projectId,
-    diff: diffMode
+    diff: diffMode,
+    allowEmptySource
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new UncachedRedirectClient4({ apiKey, apiHost, fetch: fetch3, projectId });
@@ -7465,6 +8457,7 @@ var RedirectDefinitionPushModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -7476,9 +8469,9 @@ var RedirectDefinitionRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
   describe: "Delete a redirect",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
-      withProjectOptions(yargs27.positional("id", { demandOption: true, describe: " UUID to delete" }))
+      withProjectOptions(yargs32.positional("id", { demandOption: true, describe: " UUID to delete" }))
     )
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
@@ -7494,10 +8487,10 @@ var RedirectDefinitionUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
   describe: "Insert or update a redirect",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        yargs27.positional("filename", { demandOption: true, describe: "Redirect file to put" })
+        yargs32.positional("filename", { demandOption: true, describe: "Redirect file to put" })
       )
     )
   ),
@@ -7513,9 +8506,9 @@ var RedirectDefinitionUpdateModule = {
 var RedirectDefinitionModule = {
   command: "definition <command>",
   describe: "Commands for Redirect Definitions",
-  builder: (yargs27) => yargs27.command(RedirectDefinitionPullModule).command(RedirectDefinitionPushModule).command(RedirectDefinitionGetModule).command(RedirectDefinitionRemoveModule).command(RedirectDefinitionListModule).command(RedirectDefinitionUpdateModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(RedirectDefinitionPullModule).command(RedirectDefinitionPushModule).command(RedirectDefinitionGetModule).command(RedirectDefinitionRemoveModule).command(RedirectDefinitionListModule).command(RedirectDefinitionUpdateModule).demandCommand(),
   handler: () => {
-    yargs23.help();
+    yargs28.help();
   }
 };
 
@@ -7524,14 +8517,14 @@ var RedirectCommand = {
   command: "redirect <command>",
   aliases: ["red"],
   describe: "Uniform Redirect commands",
-  builder: (yargs27) => yargs27.command(RedirectDefinitionModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(RedirectDefinitionModule).demandCommand(),
   handler: () => {
-    yargs24.showHelp();
+    yargs29.showHelp();
   }
 };
 
 // src/commands/sync/index.ts
-import yargs25 from "yargs";
+import yargs30 from "yargs";
 
 // src/commands/sync/commands/util.ts
 import ora2 from "ora";
@@ -7550,10 +8543,12 @@ function spin(entityType) {
     stop: () => {
       spinner.stop();
       console.log = consoleLog;
+      return spinner;
     },
     succeed() {
       spinner.succeed();
       console.log = consoleLog;
+      return spinner;
     }
   };
 }
@@ -7562,11 +8557,11 @@ function spin(entityType) {
 var SyncPullModule = {
   command: "pull",
   describe: "Pulls whole project to local files in a directory",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.option("what-if", {
+          yargs32.option("what-if", {
             alias: ["w"],
             describe: "What-if mode reports what would be done but changes no files",
             default: false,
@@ -7577,8 +8572,11 @@ var SyncPullModule = {
     )
   ),
   handler: async ({ serialization, ...otherParams }) => {
+    var _a;
     const config2 = serialization;
     const enabledEntities = Object.entries({
+      locale: LocalePullModule,
+      asset: AssetPullModule,
       category: CategoryPullModule,
       dataType: DataTypePullModule,
       prompt: PromptPullModule,
@@ -7594,11 +8592,10 @@ var SyncPullModule = {
       projectMapNode: ProjectMapNodePullModule,
       redirect: RedirectDefinitionPullModule,
       entry: EntryPullModule,
-      contentType: ContentTypePullModule,
-      asset: AssetPullModule
+      contentType: ContentTypePullModule
     }).filter(([entityType]) => {
-      var _a, _b, _c, _d, _e, _f;
-      return Boolean((_a = config2.entitiesConfig) == null ? void 0 : _a[entityType]) && ((_c = (_b = config2.entitiesConfig) == null ? void 0 : _b[entityType]) == null ? void 0 : _c.disabled) !== true && ((_f = (_e = (_d = config2.entitiesConfig) == null ? void 0 : _d[entityType]) == null ? void 0 : _e.pull) == null ? void 0 : _f.disabled) !== true;
+      var _a2, _b, _c, _d, _e, _f;
+      return Boolean((_a2 = config2.entitiesConfig) == null ? void 0 : _a2[entityType]) && ((_c = (_b = config2.entitiesConfig) == null ? void 0 : _b[entityType]) == null ? void 0 : _c.disabled) !== true && ((_f = (_e = (_d = config2.entitiesConfig) == null ? void 0 : _d[entityType]) == null ? void 0 : _e.pull) == null ? void 0 : _f.disabled) !== true;
     });
     if (enabledEntities.length === 0) {
       throw new Error(
@@ -7607,15 +8604,20 @@ var SyncPullModule = {
     }
     for (const [entityType, module3] of enabledEntities) {
       const spinner = spin(entityType);
+      const entityConfigSupportsPullState = (entityConfig2) => {
+        return entityConfig2 !== void 0 && "state" in entityConfig2;
+      };
+      const entityConfig = (_a = config2.entitiesConfig) == null ? void 0 : _a[entityType];
       try {
         await module3.handler({
           ...otherParams,
-          state: 0,
+          state: entityConfigSupportsPullState(entityConfig) ? entityConfig.state ?? 0 : 0,
           format: getFormat(entityType, config2),
           onlyCompositions: entityType === "composition" ? true : void 0,
           onlyPatterns: entityType === "pattern" ? true : void 0,
           mode: getPullMode(entityType, config2),
-          directory: getPullFilename(entityType, config2)
+          directory: getPullFilename(entityType, config2),
+          allowEmptySource: config2.allowEmptySource
         });
         spinner.succeed();
       } catch (e) {
@@ -7653,11 +8655,11 @@ var getFormat = (entityType, config2) => {
 var SyncPushModule = {
   command: "push",
   describe: "Pushes whole project data from files in a directory or package to Uniform",
-  builder: (yargs27) => withConfiguration(
+  builder: (yargs32) => withConfiguration(
     withApiOptions(
       withProjectOptions(
         withDiffOptions(
-          yargs27.option("what-if", {
+          yargs32.option("what-if", {
             alias: ["w"],
             describe: "What-if mode reports what would be done but changes nothing",
             default: false,
@@ -7668,9 +8670,11 @@ var SyncPushModule = {
     )
   ),
   handler: async ({ serialization, ...otherParams }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
     const config2 = serialization;
     const enabledEntities = Object.entries({
+      locale: LocalePushModule,
+      asset: AssetPushModule,
       category: CategoryPushModule,
       dataType: DataTypePushModule,
       prompt: PromptPushModule,
@@ -7686,8 +8690,7 @@ var SyncPushModule = {
       projectMapNode: ProjectMapNodePushModule,
       redirect: RedirectDefinitionPushModule,
       contentType: ContentTypePushModule,
-      entry: EntryPushModule,
-      asset: AssetPushModule
+      entry: EntryPushModule
     }).filter(([entityType]) => {
       var _a2, _b2, _c2, _d2, _e2, _f2;
       return Boolean((_a2 = config2.entitiesConfig) == null ? void 0 : _a2[entityType]) && ((_c2 = (_b2 = config2.entitiesConfig) == null ? void 0 : _b2[entityType]) == null ? void 0 : _c2.disabled) !== true && ((_f2 = (_e2 = (_d2 = config2.entitiesConfig) == null ? void 0 : _d2[entityType]) == null ? void 0 : _e2.push) == null ? void 0 : _f2.disabled) !== true;
@@ -7707,7 +8710,8 @@ var SyncPushModule = {
           onlyCompositions: entityType === "composition" ? true : void 0,
           onlyPatterns: entityType === "pattern" ? true : void 0,
           mode: getPushMode(entityType, config2),
-          directory: getPushFilename(entityType, config2)
+          directory: getPushFilename(entityType, config2),
+          allowEmptySource: config2.allowEmptySource
         });
         spinner.succeed();
       } catch (e) {
@@ -7721,6 +8725,9 @@ var SyncPushModule = {
     if (((_g = config2.entitiesConfig) == null ? void 0 : _g.composition) && ((_j = (_i = (_h = config2.entitiesConfig) == null ? void 0 : _h.composition) == null ? void 0 : _i.push) == null ? void 0 : _j.disabled) !== true && ((_l = (_k = config2.entitiesConfig) == null ? void 0 : _k.composition) == null ? void 0 : _l.publish)) {
       await CompositionPublishModule.handler({ ...otherParams, all: true });
     }
+    if (((_m = config2.entitiesConfig) == null ? void 0 : _m.entry) && ((_p = (_o = (_n = config2.entitiesConfig) == null ? void 0 : _n.entry) == null ? void 0 : _o.push) == null ? void 0 : _p.disabled) !== true && ((_r = (_q = config2.entitiesConfig) == null ? void 0 : _q.entry) == null ? void 0 : _r.publish)) {
+      await EntryPublishModule.handler({ ...otherParams, all: true });
+    }
   }
 };
 var getPushMode = (entityType, config2) => {
@@ -7751,9 +8758,9 @@ var getFormat2 = (entityType, config2) => {
 var SyncCommand = {
   command: "sync <command>",
   describe: "Uniform Sync commands",
-  builder: (yargs27) => yargs27.command(SyncPullModule).command(SyncPushModule).demandCommand(),
+  builder: (yargs32) => yargs32.command(SyncPullModule).command(SyncPushModule).demandCommand(),
   handler: () => {
-    yargs25.showHelp();
+    yargs30.showHelp();
   }
 };
 
@@ -7765,18 +8772,19 @@ import { reset } from "colorette";
 function fillString(char, length) {
   return Array.from({ length }).map(() => char).join("");
 }
+var stdErrLog = (message) => process.stderr.write(message + "\n");
 function logCallout(options) {
   const message = typeof options === "string" ? options : options.message;
   const messageLines = message.trim().split("\n");
   const longestLine = messageLines.reduce((longest, next) => next.length > longest.length ? next : longest);
   const bar = "**" + fillString("*", reset(longestLine).length);
-  console.log("");
-  console.log(bar);
+  stdErrLog("");
+  stdErrLog(bar);
   for (const line of messageLines) {
-    console.log(` ${line}`);
+    stdErrLog(` ${line}`);
   }
-  console.log(bar);
-  console.log("");
+  stdErrLog(bar);
+  stdErrLog("");
 }
 
 // src/updateCheck.ts
@@ -8019,7 +9027,7 @@ First found was: v${firstVersion}`;
 
 // src/index.ts
 dotenv.config();
-var yarggery = yargs26(hideBin(process.argv));
+var yarggery = yargs31(hideBin(process.argv));
 var inlineConfigurationFilePath = "config" in yarggery.argv && yarggery.argv.config;
 var configuration = loadConfig(inlineConfigurationFilePath || null);
 yarggery.option("verbose", {
@@ -8028,4 +9036,4 @@ yarggery.option("verbose", {
   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).demandCommand(1, "").strict().help().middleware([checkForUpdateMiddleware, checkLocalDepsVersions]).argv;
+}).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;