lingo.dev 0.100.0 → 0.101.0

package/build/cli.cjs

@@ -22,16 +22,17 @@ function getSettings(explicitApiKey) {
   _envVarsInfo();
   return {
     auth: {
-      apiKey: explicitApiKey || env.LINGODOTDEV_API_KEY || _optionalChain([systemFile, 'access', _34 => _34.auth, 'optionalAccess', _35 => _35.apiKey]) || defaults2.auth.apiKey,
-      apiUrl: env.LINGODOTDEV_API_URL || _optionalChain([systemFile, 'access', _36 => _36.auth, 'optionalAccess', _37 => _37.apiUrl]) || defaults2.auth.apiUrl,
-      webUrl: env.LINGODOTDEV_WEB_URL || _optionalChain([systemFile, 'access', _38 => _38.auth, 'optionalAccess', _39 => _39.webUrl]) || defaults2.auth.webUrl
+      apiKey: explicitApiKey || env.LINGODOTDEV_API_KEY || _optionalChain([systemFile, 'access', _35 => _35.auth, 'optionalAccess', _36 => _36.apiKey]) || defaults2.auth.apiKey,
+      apiUrl: env.LINGODOTDEV_API_URL || _optionalChain([systemFile, 'access', _37 => _37.auth, 'optionalAccess', _38 => _38.apiUrl]) || defaults2.auth.apiUrl,
+      webUrl: env.LINGODOTDEV_WEB_URL || _optionalChain([systemFile, 'access', _39 => _39.auth, 'optionalAccess', _40 => _40.webUrl]) || defaults2.auth.webUrl
     },
     llm: {
-      openaiApiKey: env.OPENAI_API_KEY || _optionalChain([systemFile, 'access', _40 => _40.llm, 'optionalAccess', _41 => _41.openaiApiKey]),
-      anthropicApiKey: env.ANTHROPIC_API_KEY || _optionalChain([systemFile, 'access', _42 => _42.llm, 'optionalAccess', _43 => _43.anthropicApiKey]),
-      groqApiKey: env.GROQ_API_KEY || _optionalChain([systemFile, 'access', _44 => _44.llm, 'optionalAccess', _45 => _45.groqApiKey]),
-      googleApiKey: env.GOOGLE_API_KEY || _optionalChain([systemFile, 'access', _46 => _46.llm, 'optionalAccess', _47 => _47.googleApiKey]),
-      openrouterApiKey: env.OPENROUTER_API_KEY || _optionalChain([systemFile, 'access', _48 => _48.llm, 'optionalAccess', _49 => _49.openrouterApiKey])
+      openaiApiKey: env.OPENAI_API_KEY || _optionalChain([systemFile, 'access', _41 => _41.llm, 'optionalAccess', _42 => _42.openaiApiKey]),
+      anthropicApiKey: env.ANTHROPIC_API_KEY || _optionalChain([systemFile, 'access', _43 => _43.llm, 'optionalAccess', _44 => _44.anthropicApiKey]),
+      groqApiKey: env.GROQ_API_KEY || _optionalChain([systemFile, 'access', _45 => _45.llm, 'optionalAccess', _46 => _46.groqApiKey]),
+      googleApiKey: env.GOOGLE_API_KEY || _optionalChain([systemFile, 'access', _47 => _47.llm, 'optionalAccess', _48 => _48.googleApiKey]),
+      openrouterApiKey: env.OPENROUTER_API_KEY || _optionalChain([systemFile, 'access', _49 => _49.llm, 'optionalAccess', _50 => _50.openrouterApiKey]),
+      mistralApiKey: env.MISTRAL_API_KEY || _optionalChain([systemFile, 'access', _51 => _51.llm, 'optionalAccess', _52 => _52.mistralApiKey])
     }
   };
 }
@@ -61,7 +62,8 @@ var SettingsSchema = _zod2.default.object({
     anthropicApiKey: _zod2.default.string().optional(),
     groqApiKey: _zod2.default.string().optional(),
     googleApiKey: _zod2.default.string().optional(),
-    openrouterApiKey: _zod2.default.string().optional()
+    openrouterApiKey: _zod2.default.string().optional(),
+    mistralApiKey: _zod2.default.string().optional()
   })
 });
 var SETTINGS_KEYS = flattenZodObject(
@@ -86,7 +88,8 @@ function _loadEnv() {
     ANTHROPIC_API_KEY: _zod2.default.string().optional(),
     GROQ_API_KEY: _zod2.default.string().optional(),
     GOOGLE_API_KEY: _zod2.default.string().optional(),
-    OPENROUTER_API_KEY: _zod2.default.string().optional()
+    OPENROUTER_API_KEY: _zod2.default.string().optional(),
+    MISTRAL_API_KEY: _zod2.default.string().optional()
   }).passthrough().parse(process.env);
 }
 function _loadSystemFile() {
@@ -104,7 +107,8 @@ function _loadSystemFile() {
       anthropicApiKey: _zod2.default.string().optional(),
       groqApiKey: _zod2.default.string().optional(),
       googleApiKey: _zod2.default.string().optional(),
-      openrouterApiKey: _zod2.default.string().optional()
+      openrouterApiKey: _zod2.default.string().optional(),
+      mistralApiKey: _zod2.default.string().optional()
     }).optional()
   }).passthrough().parse(data);
 }
@@ -137,42 +141,48 @@ Please use LINGODOTDEV_API_KEY instead.
 function _envVarsInfo() {
   const env = _loadEnv();
   const systemFile = _loadSystemFile();
-  if (env.LINGODOTDEV_API_KEY && _optionalChain([systemFile, 'access', _50 => _50.auth, 'optionalAccess', _51 => _51.apiKey])) {
+  if (env.LINGODOTDEV_API_KEY && _optionalChain([systemFile, 'access', _53 => _53.auth, 'optionalAccess', _54 => _54.apiKey])) {
     console.info(
       "\x1B[36m%s\x1B[0m",
       `\u2139\uFE0F  Using LINGODOTDEV_API_KEY env var instead of credentials from user config`
     );
   }
-  if (env.OPENAI_API_KEY && _optionalChain([systemFile, 'access', _52 => _52.llm, 'optionalAccess', _53 => _53.openaiApiKey])) {
+  if (env.OPENAI_API_KEY && _optionalChain([systemFile, 'access', _55 => _55.llm, 'optionalAccess', _56 => _56.openaiApiKey])) {
     console.info(
       "\x1B[36m%s\x1B[0m",
       `\u2139\uFE0F  Using OPENAI_API_KEY env var instead of key from user config.`
     );
   }
-  if (env.ANTHROPIC_API_KEY && _optionalChain([systemFile, 'access', _54 => _54.llm, 'optionalAccess', _55 => _55.anthropicApiKey])) {
+  if (env.ANTHROPIC_API_KEY && _optionalChain([systemFile, 'access', _57 => _57.llm, 'optionalAccess', _58 => _58.anthropicApiKey])) {
     console.info(
       "\x1B[36m%s\x1B[0m",
       `\u2139\uFE0F  Using ANTHROPIC_API_KEY env var instead of key from user config`
     );
   }
-  if (env.GROQ_API_KEY && _optionalChain([systemFile, 'access', _56 => _56.llm, 'optionalAccess', _57 => _57.groqApiKey])) {
+  if (env.GROQ_API_KEY && _optionalChain([systemFile, 'access', _59 => _59.llm, 'optionalAccess', _60 => _60.groqApiKey])) {
     console.info(
       "\x1B[36m%s\x1B[0m",
       `\u2139\uFE0F  Using GROQ_API_KEY env var instead of key from user config`
     );
   }
-  if (env.GOOGLE_API_KEY && _optionalChain([systemFile, 'access', _58 => _58.llm, 'optionalAccess', _59 => _59.googleApiKey])) {
+  if (env.GOOGLE_API_KEY && _optionalChain([systemFile, 'access', _61 => _61.llm, 'optionalAccess', _62 => _62.googleApiKey])) {
     console.info(
       "\x1B[36m%s\x1B[0m",
       `\u2139\uFE0F  Using GOOGLE_API_KEY env var instead of key from user config`
     );
   }
-  if (env.OPENROUTER_API_KEY && _optionalChain([systemFile, 'access', _60 => _60.llm, 'optionalAccess', _61 => _61.openrouterApiKey])) {
+  if (env.OPENROUTER_API_KEY && _optionalChain([systemFile, 'access', _63 => _63.llm, 'optionalAccess', _64 => _64.openrouterApiKey])) {
     console.info(
       "\x1B[36m%s\x1B[0m",
       `\u2139\uFE0F  Using OPENROUTER_API_KEY env var instead of key from user config`
     );
   }
+  if (env.MISTRAL_API_KEY && _optionalChain([systemFile, 'access', _65 => _65.llm, 'optionalAccess', _66 => _66.mistralApiKey])) {
+    console.info(
+      "\x1B[36m%s\x1B[0m",
+      `\u2139\uFE0F  Using MISTRAL_API_KEY env var instead of key from user config`
+    );
+  }
   if (env.LINGODOTDEV_API_URL) {
     console.info(
       "\x1B[36m%s\x1B[0m",
@@ -217,9 +227,12 @@ var CLIError = class extends Error {
 // src/cli/utils/cloudflare-status.ts
 async function checkCloudflareStatus() {
   try {
-    const response = await fetch("https://www.cloudflarestatus.com/api/v2/status.json", {
-      signal: AbortSignal.timeout(5e3)
-    });
+    const response = await fetch(
+      "https://www.cloudflarestatus.com/api/v2/status.json",
+      {
+        signal: AbortSignal.timeout(5e3)
+      }
+    );
     if (response.ok) {
       return await response.json();
     }
@@ -248,7 +261,7 @@ function createAuthenticator(params) {
         });
         if (res.ok) {
           const payload = await res.json();
-          if (!_optionalChain([payload, 'optionalAccess', _62 => _62.email])) {
+          if (!_optionalChain([payload, 'optionalAccess', _67 => _67.email])) {
             return null;
           }
           return {
@@ -378,7 +391,9 @@ async function renderBanner() {
 }
 async function renderHero() {
   console.log(
-    `\u26A1\uFE0F ${_chalk2.default.hex(colors.green)("Lingo.dev")} - open-source, AI-powered i18n CLI for web & mobile localization.`
+    `\u26A1\uFE0F ${_chalk2.default.hex(colors.green)(
+      "Lingo.dev"
+    )} - open-source, AI-powered i18n CLI for web & mobile localization.`
   );
   console.log("");
   const label1 = "\u2B50 GitHub Repo:";
@@ -386,13 +401,19 @@ async function renderHero() {
   const label3 = "\u{1F4AC} 24/7 Support:";
   const maxLabelWidth = 17;
   console.log(
-    `${_chalk2.default.hex(colors.blue)(label1.padEnd(maxLabelWidth))} ${_chalk2.default.hex(colors.blue)("https://lingo.dev/go/gh")}`
+    `${_chalk2.default.hex(colors.blue)(label1.padEnd(maxLabelWidth))} ${_chalk2.default.hex(
+      colors.blue
+    )("https://lingo.dev/go/gh")}`
   );
   console.log(
-    `${_chalk2.default.hex(colors.blue)(label2.padEnd(maxLabelWidth + 1))} ${_chalk2.default.hex(colors.blue)("https://lingo.dev/go/docs")}`
+    `${_chalk2.default.hex(colors.blue)(label2.padEnd(maxLabelWidth + 1))} ${_chalk2.default.hex(
+      colors.blue
+    )("https://lingo.dev/go/docs")}`
   );
   console.log(
-    `${_chalk2.default.hex(colors.blue)(label3.padEnd(maxLabelWidth + 1))} ${_chalk2.default.hex(colors.blue)("hi@lingo.dev")}`
+    `${_chalk2.default.hex(colors.blue)(label3.padEnd(maxLabelWidth + 1))} ${_chalk2.default.hex(
+      colors.blue
+    )("hi@lingo.dev")}`
   );
 }
 async function waitForUserPrompt(message) {
@@ -545,6 +566,10 @@ function _getConfigFilePath() {
 
 
 
+
+
+
+
 var _prompts = require('@inquirer/prompts');
 
 // src/cli/utils/find-locale-paths.ts
@@ -583,13 +608,17 @@ function findLocaleFilesWithExtension(ext2) {
     ignore: ["node_modules/**", "package*.json", "i18n.json", "lingo.json"]
   });
   const localeFilePattern = new RegExp(`/([a-z]{2}(-[A-Z]{2})?)${ext2}$`);
-  const localeDirectoryPattern = new RegExp(`/([a-z]{2}(-[A-Z]{2})?)/[^/]+${ext2}$`);
+  const localeDirectoryPattern = new RegExp(
+    `/([a-z]{2}(-[A-Z]{2})?)/[^/]+${ext2}$`
+  );
   const potentialLocaleFiles = files.filter(
     (file) => localeFilePattern.test(file) || localeDirectoryPattern.test(file)
   );
   const potantialLocaleFilesAndPatterns = potentialLocaleFiles.map((file) => {
     const matchPotentialLocales = Array.from(
-      file.matchAll(new RegExp(`/([a-z]{2}(-[A-Z]{2})?|[^/]+)(?=/|${ext2})`, "g"))
+      file.matchAll(
+        new RegExp(`/([a-z]{2}(-[A-Z]{2})?|[^/]+)(?=/|${ext2})`, "g")
+      )
     );
     const potantialLocales = matchPotentialLocales.map((match2) => match2[1]);
     return { file, potantialLocales };
@@ -603,10 +632,12 @@ function findLocaleFilesWithExtension(ext2) {
     }
     return { file, locale: null };
   }).filter(({ locale }) => locale !== null);
-  const localeFilesAndPatterns = potantialLocaleFilesAndPatterns.map(({ file, locale }) => {
-    const pattern = file.replaceAll(new RegExp(`/${locale}${ext2}`, "g"), `/[locale]${ext2}`).replaceAll(new RegExp(`/${locale}/`, "g"), `/[locale]/`).replaceAll(new RegExp(`/${locale}/`, "g"), `/[locale]/`);
-    return { pattern, file };
-  });
+  const localeFilesAndPatterns = potantialLocaleFilesAndPatterns.map(
+    ({ file, locale }) => {
+      const pattern = file.replaceAll(new RegExp(`/${locale}${ext2}`, "g"), `/[locale]${ext2}`).replaceAll(new RegExp(`/${locale}/`, "g"), `/[locale]/`).replaceAll(new RegExp(`/${locale}/`, "g"), `/[locale]/`);
+      return { pattern, file };
+    }
+  );
   const grouppedFilesAndPatterns = _lodash2.default.groupBy(localeFilesAndPatterns, "pattern");
   const patterns = Object.keys(grouppedFilesAndPatterns);
   const defaultPatterns = [`i18n/[locale]${ext2}`];
@@ -764,7 +795,9 @@ async function initCICD(spinner) {
     message: "Would you like to use Lingo.dev in your CI/CD?"
   });
   if (!init) {
-    spinner.warn("CI/CD not initialized. To set it up later, see docs: https://lingo.dev/ci");
+    spinner.warn(
+      "CI/CD not initialized. To set it up later, see docs: https://lingo.dev/ci"
+    );
     return;
   }
   const selectedPlatforms = await _prompts.checkbox.call(void 0, {
@@ -895,7 +928,9 @@ var throwHelpError = (option, value) => {
 Do you need support for ${value} ${option}? Type "help" and we will.`
   );
 };
-var init_default = new (0, _interactivecommander.InteractiveCommand)().command("init").description("Initialize Lingo.dev project").helpOption("-h, --help", "Show help").addOption(new (0, _interactivecommander.InteractiveOption)("-f --force", "Overwrite existing config").prompt(void 0).default(false)).addOption(
+var init_default = new (0, _interactivecommander.InteractiveCommand)().command("init").description("Initialize Lingo.dev project").helpOption("-h, --help", "Show help").addOption(
+  new (0, _interactivecommander.InteractiveOption)("-f --force", "Overwrite existing config").prompt(void 0).default(false)
+).addOption(
   new (0, _interactivecommander.InteractiveOption)("-s --source <locale>", "Source locale").argParser((value) => {
     try {
       __spec.resolveLocaleCode.call(void 0, value);
@@ -924,7 +959,10 @@ var init_default = new (0, _interactivecommander.InteractiveCommand)().command("
     return value;
   }).default("json")
 ).addOption(
-  new (0, _interactivecommander.InteractiveOption)("-p, --paths [path...]", "List of paths for the bucket").argParser((value) => {
+  new (0, _interactivecommander.InteractiveOption)(
+    "-p, --paths [path...]",
+    "List of paths for the bucket"
+  ).argParser((value) => {
     if (!value || value.length === 0) return [];
     const values = value.includes(",") ? value.split(",") : value.split(" ");
     for (const p of values) {
@@ -985,7 +1023,9 @@ var init_default = new (0, _interactivecommander.InteractiveCommand)().command("
       }
       if (selectedPatterns.length === 0) {
         const useDefault = await _prompts.confirm.call(void 0, {
-          message: `Use (and create) default path ${defaultPatterns.join(", ")}?`
+          message: `Use (and create) default path ${defaultPatterns.join(
+            ", "
+          )}?`
         });
         if (useDefault) {
           ensurePatterns(defaultPatterns, options.source);
@@ -1009,7 +1049,9 @@ var init_default = new (0, _interactivecommander.InteractiveCommand)().command("
   spinner.succeed("Lingo.dev project initialized");
   if (isInteractive) {
     await initCICD(spinner);
-    const openDocs = await _prompts.confirm.call(void 0, { message: "Would you like to see our docs?" });
+    const openDocs = await _prompts.confirm.call(void 0, {
+      message: "Would you like to see our docs?"
+    });
     if (openDocs) {
       openUrl("/go/docs");
     }
@@ -1034,13 +1076,15 @@ var init_default = new (0, _interactivecommander.InteractiveCommand)().command("
         });
         const auth2 = await newAuthenticator.whoami();
         if (auth2) {
-          _ora2.default.call(void 0, ).succeed(`Authenticated as ${_optionalChain([auth2, 'optionalAccess', _63 => _63.email])}`);
+          _ora2.default.call(void 0, ).succeed(`Authenticated as ${_optionalChain([auth2, 'optionalAccess', _68 => _68.email])}`);
         } else {
           _ora2.default.call(void 0, ).fail("Authentication failed.");
         }
       }
     } else {
-      _ora2.default.call(void 0, ).warn("You are not logged in. Run `npx lingo.dev@latest auth --login` to login.");
+      _ora2.default.call(void 0, ).warn(
+        "You are not logged in. Run `npx lingo.dev@latest auth --login` to login."
+      );
     }
   } else {
     _ora2.default.call(void 0, ).succeed(`Authenticated as ${auth.email}`);
@@ -1119,7 +1163,7 @@ function getBuckets(i18nConfig) {
       const includeItems = bucketEntry.include.map(
         (item) => resolveBucketItem(item)
       );
-      const excludeItems = _optionalChain([bucketEntry, 'access', _64 => _64.exclude, 'optionalAccess', _65 => _65.map, 'call', _66 => _66(
+      const excludeItems = _optionalChain([bucketEntry, 'access', _69 => _69.exclude, 'optionalAccess', _70 => _70.map, 'call', _71 => _71(
         (item) => resolveBucketItem(item)
       )]);
       const config = {
@@ -1157,7 +1201,7 @@ function extractPathPatterns(sourceLocale, include, exclude) {
       delimiter: pattern.delimiter
     }))
   );
-  const excludedPatterns = _optionalChain([exclude, 'optionalAccess', _67 => _67.flatMap, 'call', _68 => _68(
+  const excludedPatterns = _optionalChain([exclude, 'optionalAccess', _72 => _72.flatMap, 'call', _73 => _73(
     (pattern) => expandPlaceholderedGlob(
       pattern.path,
       __spec.resolveOverriddenLocale.call(void 0, sourceLocale, pattern.delimiter)
@@ -1229,7 +1273,13 @@ function resolveBucketItem(bucketItem) {
 
 // src/cli/cmd/show/files.ts
 
-var files_default = new (0, _interactivecommander.Command)().command("files").description("Print out the list of files managed by Lingo.dev").option("--source", "Only show source files, files containing the original translations").option("--target", "Only show target files, files containing translated content").helpOption("-h, --help", "Show help").action(async (type) => {
+var files_default = new (0, _interactivecommander.Command)().command("files").description("Print out the list of files managed by Lingo.dev").option(
+  "--source",
+  "Only show source files, files containing the original translations"
+).option(
+  "--target",
+  "Only show target files, files containing translated content"
+).helpOption("-h, --help", "Show help").action(async (type) => {
   const ora = _ora2.default.call(void 0, );
   try {
     try {
@@ -1243,12 +1293,26 @@ var files_default = new (0, _interactivecommander.Command)().command("files").de
       const buckets = getBuckets(i18nConfig);
       for (const bucket of buckets) {
         for (const bucketConfig of bucket.paths) {
-          const sourceLocale = __spec.resolveOverriddenLocale.call(void 0, i18nConfig.locale.source, bucketConfig.delimiter);
-          const sourcePath = bucketConfig.pathPattern.replace(/\[locale\]/g, sourceLocale);
-          const targetPaths = i18nConfig.locale.targets.map((_targetLocale) => {
-            const targetLocale = __spec.resolveOverriddenLocale.call(void 0, _targetLocale, bucketConfig.delimiter);
-            return bucketConfig.pathPattern.replace(/\[locale\]/g, targetLocale);
-          });
+          const sourceLocale = __spec.resolveOverriddenLocale.call(void 0, 
+            i18nConfig.locale.source,
+            bucketConfig.delimiter
+          );
+          const sourcePath = bucketConfig.pathPattern.replace(
+            /\[locale\]/g,
+            sourceLocale
+          );
+          const targetPaths = i18nConfig.locale.targets.map(
+            (_targetLocale) => {
+              const targetLocale = __spec.resolveOverriddenLocale.call(void 0, 
+                _targetLocale,
+                bucketConfig.delimiter
+              );
+              return bucketConfig.pathPattern.replace(
+                /\[locale\]/g,
+                targetLocale
+              );
+            }
+          );
           const result = [];
           if (!type.source && !type.target) {
             result.push(sourcePath, ...targetPaths);
@@ -1328,7 +1392,9 @@ Available keys:
     console.error(
       _dedent2.default`
           ${_chalk2.default.red("\u2716")} Unknown configuration key: ${_chalk2.default.bold(key)}
-          Run ${_chalk2.default.dim("lingo.dev config unset --help")} to see available keys.
+          Run ${_chalk2.default.dim(
+        "lingo.dev config unset --help"
+      )} to see available keys.
         `
     );
     process.exitCode = 1;
@@ -1410,12 +1476,12 @@ function composeLoaders(...loaders) {
   return {
     init: async () => {
       for (const loader of loaders) {
-        await _optionalChain([loader, 'access', _69 => _69.init, 'optionalCall', _70 => _70()]);
+        await _optionalChain([loader, 'access', _74 => _74.init, 'optionalCall', _75 => _75()]);
       }
     },
     setDefaultLocale(locale) {
       for (const loader of loaders) {
-        _optionalChain([loader, 'access', _71 => _71.setDefaultLocale, 'optionalCall', _72 => _72(locale)]);
+        _optionalChain([loader, 'access', _76 => _76.setDefaultLocale, 'optionalCall', _77 => _77(locale)]);
       }
       return this;
     },
@@ -1448,7 +1514,7 @@ function createLoader(lDefinition) {
       if (state.initCtx) {
         return state.initCtx;
       }
-      state.initCtx = await _optionalChain([lDefinition, 'access', _73 => _73.init, 'optionalCall', _74 => _74()]);
+      state.initCtx = await _optionalChain([lDefinition, 'access', _78 => _78.init, 'optionalCall', _79 => _79()]);
       return state.initCtx;
     },
     setDefaultLocale(locale) {
@@ -1553,7 +1619,7 @@ function createNormalizeLoader() {
       return normalized;
     },
     push: async (locale, data, originalInput) => {
-      const keysMap = _nullishCoalesce(_optionalChain([originalInput, 'optionalAccess', _75 => _75.keysMap]), () => ( {}));
+      const keysMap = _nullishCoalesce(_optionalChain([originalInput, 'optionalAccess', _80 => _80.keysMap]), () => ( {}));
       const input2 = mapDenormalizedKeys(data, keysMap);
       const denormalized = _flat.unflatten.call(void 0, input2, {
         delimiter: "/",
@@ -1627,13 +1693,17 @@ function createTextFileLoader(pathPattern) {
       const trimmedResult = result.trim();
       return trimmedResult;
     },
-    async push(locale, data, _33, originalLocale) {
+    async push(locale, data, _34, originalLocale) {
       const draftPath = pathPattern.replaceAll("[locale]", locale);
       const finalPath = path12.default.resolve(draftPath);
       const dirPath = path12.default.dirname(finalPath);
       await _promises4.default.mkdir(dirPath, { recursive: true });
       const trimmedPayload = data.trim();
-      const trailingNewLine = await getTrailingNewLine(pathPattern, locale, originalLocale);
+      const trailingNewLine = await getTrailingNewLine(
+        pathPattern,
+        locale,
+        originalLocale
+      );
       let finalPayload = trimmedPayload + trailingNewLine;
       await _promises4.default.writeFile(finalPath, finalPayload, {
         encoding: "utf-8",
@@ -1656,8 +1726,8 @@ async function getTrailingNewLine(pathPattern, locale, originalLocale) {
   if (!templateData) {
     templateData = await readFileForLocale(pathPattern, originalLocale);
   }
-  if (_optionalChain([templateData, 'optionalAccess', _76 => _76.match, 'call', _77 => _77(/[\r\n]$/)])) {
-    const ending = _optionalChain([templateData, 'optionalAccess', _78 => _78.includes, 'call', _79 => _79("\r\n")]) ? "\r\n" : _optionalChain([templateData, 'optionalAccess', _80 => _80.includes, 'call', _81 => _81("\r")]) ? "\r" : "\n";
+  if (_optionalChain([templateData, 'optionalAccess', _81 => _81.match, 'call', _82 => _82(/[\r\n]$/)])) {
+    const ending = _optionalChain([templateData, 'optionalAccess', _83 => _83.includes, 'call', _84 => _84("\r\n")]) ? "\r\n" : _optionalChain([templateData, 'optionalAccess', _85 => _85.includes, 'call', _86 => _86("\r")]) ? "\r" : "\n";
     return ending;
   }
   return "";
@@ -1727,15 +1797,22 @@ function createRootKeyLoader(replaceAll = false) {
 function createFlutterLoader() {
   return createLoader({
     async pull(locale, input2) {
-      const result = _lodash2.default.pickBy(input2, (value, key) => !key.startsWith("@"));
+      const result = _lodash2.default.pickBy(input2, (value, key) => !_isMetadataKey(key));
       return result;
     },
     async push(locale, data, originalInput) {
-      const result = _lodash2.default.merge({}, originalInput, { "@@locale": locale }, data);
+      const metadata = _lodash2.default.pickBy(
+        originalInput,
+        (value, key) => _isMetadataKey(key)
+      );
+      const result = _lodash2.default.merge({}, metadata, { "@@locale": locale }, data);
       return result;
     }
   });
 }
+function _isMetadataKey(key) {
+  return key.startsWith("@");
+}
 
 // src/cli/loaders/android.ts
 var _xml2js = require('xml2js');
@@ -1921,7 +1998,7 @@ var _sync3 = require('csv-stringify/sync');
 
 function detectKeyColumnName(csvString) {
   const row = _sync.parse.call(void 0, csvString)[0];
-  const firstColumn = _optionalChain([row, 'optionalAccess', _82 => _82[0], 'optionalAccess', _83 => _83.trim, 'call', _84 => _84()]);
+  const firstColumn = _optionalChain([row, 'optionalAccess', _87 => _87[0], 'optionalAccess', _88 => _88.trim, 'call', _89 => _89()]);
   return firstColumn || "KEY";
 }
 function createCsvLoader() {
@@ -1930,7 +2007,9 @@ function createCsvLoader() {
 function _createCsvLoader() {
   return createLoader({
     async pull(locale, input2) {
-      const keyColumnName = detectKeyColumnName(input2.split("\n").find((l) => l.length));
+      const keyColumnName = detectKeyColumnName(
+        input2.split("\n").find((l) => l.length)
+      );
       const inputParsed = _sync.parse.call(void 0, input2, {
         columns: true,
         skip_empty_lines: true,
@@ -1958,7 +2037,9 @@ function _createCsvLoader() {
         ...row,
         [locale]: items[row[keyColumnName]] || row[locale] || ""
       }));
-      const existingKeys = new Set(inputParsed.map((row) => row[keyColumnName]));
+      const existingKeys = new Set(
+        inputParsed.map((row) => row[keyColumnName])
+      );
       Object.entries(items).forEach(([key, value]) => {
         if (!existingKeys.has(key)) {
           const newRow = {
@@ -2019,7 +2100,7 @@ function createHtmlLoader() {
             break;
           }
           const siblings = Array.from(parent.childNodes).filter(
-            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _85 => _85.textContent, 'optionalAccess', _86 => _86.trim, 'call', _87 => _87()])
+            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _90 => _90.textContent, 'optionalAccess', _91 => _91.trim, 'call', _92 => _92()])
           );
           const index = siblings.indexOf(current);
           if (index !== -1) {
@@ -2054,15 +2135,23 @@ function createHtmlLoader() {
               result[getPath(element, attr)] = value;
             }
           });
-          Array.from(element.childNodes).filter((n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _88 => _88.textContent, 'optionalAccess', _89 => _89.trim, 'call', _90 => _90()])).forEach(processNode);
+          Array.from(element.childNodes).filter(
+            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _93 => _93.textContent, 'optionalAccess', _94 => _94.trim, 'call', _95 => _95()])
+          ).forEach(processNode);
         }
       };
-      Array.from(document.head.childNodes).filter((n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _91 => _91.textContent, 'optionalAccess', _92 => _92.trim, 'call', _93 => _93()])).forEach(processNode);
-      Array.from(document.body.childNodes).filter((n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _94 => _94.textContent, 'optionalAccess', _95 => _95.trim, 'call', _96 => _96()])).forEach(processNode);
+      Array.from(document.head.childNodes).filter(
+        (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _96 => _96.textContent, 'optionalAccess', _97 => _97.trim, 'call', _98 => _98()])
+      ).forEach(processNode);
+      Array.from(document.body.childNodes).filter(
+        (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _99 => _99.textContent, 'optionalAccess', _100 => _100.trim, 'call', _101 => _101()])
+      ).forEach(processNode);
       return result;
     },
     async push(locale, data, originalInput) {
-      const dom = new (0, _jsdom.JSDOM)(_nullishCoalesce(originalInput, () => ( "<!DOCTYPE html><html><head></head><body></body></html>")));
+      const dom = new (0, _jsdom.JSDOM)(
+        _nullishCoalesce(originalInput, () => ( "<!DOCTYPE html><html><head></head><body></body></html>"))
+      );
       const document = dom.window.document;
       const htmlElement = document.documentElement;
       htmlElement.setAttribute("lang", locale);
@@ -2080,7 +2169,7 @@ function createHtmlLoader() {
         for (let i = 0; i < indices.length; i++) {
           const index = parseInt(indices[i]);
           const siblings = Array.from(parent.childNodes).filter(
-            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _97 => _97.textContent, 'optionalAccess', _98 => _98.trim, 'call', _99 => _99()])
+            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _102 => _102.textContent, 'optionalAccess', _103 => _103.trim, 'call', _104 => _104()])
           );
           if (index >= siblings.length) {
             if (i === indices.length - 1) {
@@ -2131,19 +2220,26 @@ function createMarkdownLoader() {
           yaml: yamlEngine
         }
       });
-      const sections = content.split(SECTION_REGEX).map((section) => _nullishCoalesce(_optionalChain([section, 'optionalAccess', _100 => _100.trim, 'call', _101 => _101()]), () => ( ""))).filter(Boolean);
+      const sections = content.split(SECTION_REGEX).map((section) => _nullishCoalesce(_optionalChain([section, 'optionalAccess', _105 => _105.trim, 'call', _106 => _106()]), () => ( ""))).filter(Boolean);
       return {
         ...Object.fromEntries(
           sections.map((section, index) => [`${MD_SECTION_PREFIX}${index}`, section]).filter(([, section]) => Boolean(section))
         ),
-        ...Object.fromEntries(Object.entries(frontmatter).map(([key, value]) => [`${FM_ATTR_PREFIX}${key}`, value]))
+        ...Object.fromEntries(
+          Object.entries(frontmatter).map(([key, value]) => [
+            `${FM_ATTR_PREFIX}${key}`,
+            value
+          ])
+        )
       };
     },
     async push(locale, data) {
       const frontmatter = Object.fromEntries(
         Object.entries(data).filter(([key]) => key.startsWith(FM_ATTR_PREFIX)).map(([key, value]) => [key.replace(FM_ATTR_PREFIX, ""), value])
       );
-      let content = Object.entries(data).filter(([key]) => key.startsWith(MD_SECTION_PREFIX)).sort(([a], [b]) => Number(a.split("-").pop()) - Number(b.split("-").pop())).map(([, value]) => _nullishCoalesce(_optionalChain([value, 'optionalAccess', _102 => _102.trim, 'call', _103 => _103()]), () => ( ""))).filter(Boolean).join("\n\n");
+      let content = Object.entries(data).filter(([key]) => key.startsWith(MD_SECTION_PREFIX)).sort(
+        ([a], [b]) => Number(a.split("-").pop()) - Number(b.split("-").pop())
+      ).map(([, value]) => _nullishCoalesce(_optionalChain([value, 'optionalAccess', _107 => _107.trim, 'call', _108 => _108()]), () => ( ""))).filter(Boolean).join("\n\n");
       if (Object.keys(frontmatter).length > 0) {
         content = `
 ${content}`;
@@ -2176,7 +2272,7 @@ function createPropertiesLoader() {
       return result;
     },
     async push(locale, payload) {
-      const result = Object.entries(payload).filter(([_33, value]) => value != null).map(([key, value]) => `${key}=${value}`).join("\n");
+      const result = Object.entries(payload).filter(([_34, value]) => value != null).map(([key, value]) => `${key}=${value}`).join("\n");
       return result;
     }
   });
@@ -2187,7 +2283,7 @@ function isSkippableLine(line) {
 function parsePropertyLine(line) {
   const [key, ...valueParts] = line.split("=");
   return {
-    key: _optionalChain([key, 'optionalAccess', _104 => _104.trim, 'call', _105 => _105()]) || "",
+    key: _optionalChain([key, 'optionalAccess', _109 => _109.trim, 'call', _110 => _110()]) || "",
     value: valueParts.join("=").trim()
   };
 }
@@ -2268,12 +2364,14 @@ function createXcodeXcstringsLoader(defaultLocale) {
     async pull(locale, input2, initCtx) {
       const resultData = {};
       const isSourceLanguage = locale === defaultLocale;
-      for (const [translationKey, _translationEntity] of Object.entries(input2.strings)) {
+      for (const [translationKey, _translationEntity] of Object.entries(
+        input2.strings
+      )) {
         const rootTranslationEntity = _translationEntity;
         if (rootTranslationEntity.shouldTranslate === false) {
           continue;
         }
-        const langTranslationEntity = _optionalChain([rootTranslationEntity, 'optionalAccess', _106 => _106.localizations, 'optionalAccess', _107 => _107[locale]]);
+        const langTranslationEntity = _optionalChain([rootTranslationEntity, 'optionalAccess', _111 => _111.localizations, 'optionalAccess', _112 => _112[locale]]);
         if (langTranslationEntity) {
           if ("stringUnit" in langTranslationEntity) {
             resultData[translationKey] = langTranslationEntity.stringUnit.value;
@@ -2282,7 +2380,7 @@ function createXcodeXcstringsLoader(defaultLocale) {
               resultData[translationKey] = {};
               const pluralForms = langTranslationEntity.variations.plural;
               for (const form in pluralForms) {
-                if (_optionalChain([pluralForms, 'access', _108 => _108[form], 'optionalAccess', _109 => _109.stringUnit, 'optionalAccess', _110 => _110.value])) {
+                if (_optionalChain([pluralForms, 'access', _113 => _113[form], 'optionalAccess', _114 => _114.stringUnit, 'optionalAccess', _115 => _115.value])) {
                   resultData[translationKey][form] = pluralForms[form].stringUnit.value;
                 }
               }
@@ -2297,7 +2395,10 @@ function createXcodeXcstringsLoader(defaultLocale) {
     async push(locale, payload, originalInput) {
       const langDataToMerge = {};
       langDataToMerge.strings = {};
-      const input2 = _lodash2.default.cloneDeep(originalInput) || { sourceLanguage: locale, strings: {} };
+      const input2 = _lodash2.default.cloneDeep(originalInput) || {
+        sourceLanguage: locale,
+        strings: {}
+      };
       for (const [key, value] of Object.entries(payload)) {
         if (value === null || value === void 0) {
           continue;
@@ -2305,7 +2406,7 @@ function createXcodeXcstringsLoader(defaultLocale) {
         const hasDoNotTranslateFlag = originalInput && originalInput.strings && originalInput.strings[key] && originalInput.strings[key].shouldTranslate === false;
         if (typeof value === "string") {
           langDataToMerge.strings[key] = {
-            extractionState: _optionalChain([originalInput, 'optionalAccess', _111 => _111.strings, 'optionalAccess', _112 => _112[key], 'optionalAccess', _113 => _113.extractionState]),
+            extractionState: _optionalChain([originalInput, 'optionalAccess', _116 => _116.strings, 'optionalAccess', _117 => _117[key], 'optionalAccess', _118 => _118.extractionState]),
             localizations: {
               [locale]: {
                 stringUnit: {
@@ -2343,11 +2444,22 @@ function createXcodeXcstringsLoader(defaultLocale) {
           }
         }
       }
-      const result = _lodash2.default.merge({}, originalInput, langDataToMerge);
+      const originalInputWithoutLocale = originalInput ? _removeLocale(originalInput, locale) : {};
+      const result = _lodash2.default.merge({}, originalInputWithoutLocale, langDataToMerge);
       return result;
     }
   });
 }
+function _removeLocale(input2, locale) {
+  const { sourceLanguage, strings } = input2;
+  const newStrings = _lodash2.default.cloneDeep(strings);
+  for (const [key, value] of Object.entries(newStrings)) {
+    if (_optionalChain([value, 'access', _119 => _119.localizations, 'optionalAccess', _120 => _120[locale]])) {
+      delete value.localizations[locale];
+    }
+  }
+  return { sourceLanguage, strings: newStrings };
+}
 
 // src/cli/loaders/prettier.ts
 
@@ -2425,36 +2537,29 @@ async function formatDataWithPrettier(data, filePath, options) {
 
 var _isurl = require('is-url'); var _isurl2 = _interopRequireDefault(_isurl);
 var _datefns = require('date-fns');
-function createUnlocalizableLoader(isCacheRestore = false, returnUnlocalizedKeys = false) {
-  const rules = {
-    isEmpty: (v) => _lodash2.default.isEmpty(v),
-    isNumber: (v) => typeof v === "number" || /^[0-9]+$/.test(v),
-    isBoolean: (v) => _lodash2.default.isBoolean(v),
-    isIsoDate: (v) => _lodash2.default.isString(v) && _isIsoDate(v),
-    isSystemId: (v) => _lodash2.default.isString(v) && _isSystemId(v),
-    isUrl: (v) => _lodash2.default.isString(v) && _isurl2.default.call(void 0, v)
-  };
+function createUnlocalizableLoader(returnUnlocalizedKeys = false) {
   return createLoader({
     async pull(locale, input2) {
-      const passthroughKeys = Object.entries(input2).filter(([key, value]) => {
-        for (const [ruleName, rule] of Object.entries(rules)) {
-          if (rule(value)) {
-            return true;
-          }
-        }
-        return false;
-      }).map(([key, _33]) => key);
-      const result = _lodash2.default.omitBy(input2, (_33, key) => passthroughKeys.includes(key));
+      const unlocalizableKeys = _getUnlocalizableKeys(input2);
+      const result = _lodash2.default.omitBy(
+        input2,
+        (_34, key) => unlocalizableKeys.includes(key)
+      );
       if (returnUnlocalizedKeys) {
-        result.unlocalizable = _lodash2.default.omitBy(input2, (_33, key) => !passthroughKeys.includes(key));
+        result.unlocalizable = _lodash2.default.omitBy(
+          input2,
+          (_34, key) => !unlocalizableKeys.includes(key)
+        );
       }
       return result;
     },
     async push(locale, data, originalInput) {
-      if (isCacheRestore) {
-        return _lodash2.default.merge({}, data);
-      }
-      const result = _lodash2.default.merge({}, originalInput, data);
+      const unlocalizableKeys = _getUnlocalizableKeys(originalInput);
+      const result = _lodash2.default.merge(
+        {},
+        data,
+        _lodash2.default.omitBy(originalInput, (_34, key) => !unlocalizableKeys.includes(key))
+      );
       return result;
     }
   });
@@ -2465,6 +2570,27 @@ function _isSystemId(v) {
 function _isIsoDate(v) {
   return _datefns.isValid.call(void 0, _datefns.parseISO.call(void 0, v));
 }
+function _getUnlocalizableKeys(input2) {
+  const rules = {
+    isEmpty: (v) => _lodash2.default.isEmpty(v),
+    isNumber: (v) => typeof v === "number" || /^[0-9]+$/.test(v),
+    isBoolean: (v) => _lodash2.default.isBoolean(v),
+    isIsoDate: (v) => _lodash2.default.isString(v) && _isIsoDate(v),
+    isSystemId: (v) => _lodash2.default.isString(v) && _isSystemId(v),
+    isUrl: (v) => _lodash2.default.isString(v) && _isurl2.default.call(void 0, v)
+  };
+  if (!input2) {
+    return [];
+  }
+  return Object.entries(input2).filter(([key, value]) => {
+    for (const [ruleName, rule] of Object.entries(rules)) {
+      if (rule(value)) {
+        return true;
+      }
+    }
+    return false;
+  }).map(([key, _34]) => key);
+}
 
 // src/cli/loaders/po/index.ts
 
@@ -2488,7 +2614,7 @@ function createPoDataLoader(params) {
         Object.entries(entries).forEach(([msgid, entry]) => {
           if (msgid && entry.msgid) {
             const context = entry.msgctxt || "";
-            const fullEntry = _optionalChain([parsedPo, 'access', _114 => _114.translations, 'access', _115 => _115[context], 'optionalAccess', _116 => _116[msgid]]);
+            const fullEntry = _optionalChain([parsedPo, 'access', _121 => _121.translations, 'access', _122 => _122[context], 'optionalAccess', _123 => _123[msgid]]);
             if (fullEntry) {
               result[msgid] = fullEntry;
             }
@@ -2498,8 +2624,8 @@ function createPoDataLoader(params) {
       return result;
     },
     async push(locale, data, originalInput, originalLocale, pullInput) {
-      const currentSections = _optionalChain([pullInput, 'optionalAccess', _117 => _117.split, 'call', _118 => _118("\n\n"), 'access', _119 => _119.filter, 'call', _120 => _120(Boolean)]) || [];
-      const originalSections = _optionalChain([originalInput, 'optionalAccess', _121 => _121.split, 'call', _122 => _122("\n\n"), 'access', _123 => _123.filter, 'call', _124 => _124(Boolean)]) || [];
+      const currentSections = _optionalChain([pullInput, 'optionalAccess', _124 => _124.split, 'call', _125 => _125("\n\n"), 'access', _126 => _126.filter, 'call', _127 => _127(Boolean)]) || [];
+      const originalSections = _optionalChain([originalInput, 'optionalAccess', _128 => _128.split, 'call', _129 => _129("\n\n"), 'access', _130 => _130.filter, 'call', _131 => _131(Boolean)]) || [];
       const result = originalSections.map((section) => {
         const sectionPo = _gettextparser2.default.po.parse(section);
         if (Object.keys(sectionPo.translations).length === 0) {
@@ -2568,8 +2694,8 @@ function createPoContentLoader() {
         {
           ...entry,
           msgstr: [
-            _optionalChain([data, 'access', _125 => _125[entry.msgid], 'optionalAccess', _126 => _126.singular]),
-            _optionalChain([data, 'access', _127 => _127[entry.msgid], 'optionalAccess', _128 => _128.plural]) || null
+            _optionalChain([data, 'access', _132 => _132[entry.msgid], 'optionalAccess', _133 => _133.singular]),
+            _optionalChain([data, 'access', _134 => _134[entry.msgid], 'optionalAccess', _135 => _135.plural]) || null
           ].filter(Boolean)
         }
       ]).fromPairs().value();
@@ -2736,16 +2862,24 @@ function createDatoFilterLoader() {
       for (const [modelId, modelInfo] of _lodash2.default.entries(result)) {
         for (const record of modelInfo.records) {
           for (const [fieldId, fieldValue] of _lodash2.default.entries(record)) {
-            const fieldInfo = modelInfo.fields.find((field) => field.api_key === fieldId);
+            const fieldInfo = modelInfo.fields.find(
+              (field) => field.api_key === fieldId
+            );
             if (fieldInfo) {
               const sourceFieldValue = _lodash2.default.get(fieldValue, [originalLocale]);
-              const targetFieldValue = _lodash2.default.get(data, [modelId, record.id, fieldId]);
+              const targetFieldValue = _lodash2.default.get(data, [
+                modelId,
+                record.id,
+                fieldId
+              ]);
               if (targetFieldValue) {
                 _lodash2.default.set(record, [fieldId, locale], targetFieldValue);
               } else {
                 _lodash2.default.set(record, [fieldId, locale], sourceFieldValue);
               }
-              _lodash2.default.chain(fieldValue).keys().reject((loc) => loc === locale || loc === originalLocale).filter((loc) => _lodash2.default.isEmpty(_lodash2.default.get(fieldValue, [loc]))).forEach((loc) => _lodash2.default.set(record, [fieldId, loc], sourceFieldValue)).value();
+              _lodash2.default.chain(fieldValue).keys().reject((loc) => loc === locale || loc === originalLocale).filter((loc) => _lodash2.default.isEmpty(_lodash2.default.get(fieldValue, [loc]))).forEach(
+                (loc) => _lodash2.default.set(record, [fieldId, loc], sourceFieldValue)
+              ).value();
             }
           }
         }
@@ -2763,7 +2897,9 @@ function createDatoFilterLoader() {
 var _cmaclientnode = require('@datocms/cma-client-node');
 function createDatoClient(params) {
   if (!params.apiKey) {
-    throw new Error("Missing required environment variable: DATO_API_TOKEN. Please set this variable and try again.");
+    throw new Error(
+      "Missing required environment variable: DATO_API_TOKEN. Please set this variable and try again."
+    );
   }
   const dato = _cmaclientnode.buildClient.call(void 0, {
     apiToken: params.apiKey,
@@ -2810,11 +2946,16 @@ function createDatoClient(params) {
     findModels: async () => {
       try {
         const models = await dato.itemTypes.list();
-        const modelsWithoutBlocks = models.filter((model) => !model.modular_block);
+        const modelsWithoutBlocks = models.filter(
+          (model) => !model.modular_block
+        );
         return modelsWithoutBlocks;
       } catch (_error) {
         throw new Error(
-          [`Failed to find models in DatoCMS.`, `Error: ${JSON.stringify(_error, null, 2)}`].join("\n\n")
+          [
+            `Failed to find models in DatoCMS.`,
+            `Error: ${JSON.stringify(_error, null, 2)}`
+          ].join("\n\n")
         );
       }
     },
@@ -2845,7 +2986,9 @@ function createDatoClient(params) {
           only_valid: "true",
           ids: !records.length ? void 0 : records.join(",")
         }
-      }).catch((error) => Promise.reject(_optionalChain([error, 'optionalAccess', _129 => _129.response, 'optionalAccess', _130 => _130.body, 'optionalAccess', _131 => _131.data, 'optionalAccess', _132 => _132[0]]) || error));
+      }).catch(
+        (error) => Promise.reject(_optionalChain([error, 'optionalAccess', _136 => _136.response, 'optionalAccess', _137 => _137.body, 'optionalAccess', _138 => _138.data, 'optionalAccess', _139 => _139[0]]) || error)
+      );
     },
     findRecordsForModel: async (modelId, records) => {
       try {
@@ -2855,9 +2998,11 @@ function createDatoClient(params) {
           filter: {
             type: modelId,
             only_valid: "true",
-            ids: !_optionalChain([records, 'optionalAccess', _133 => _133.length]) ? void 0 : records.join(",")
+            ids: !_optionalChain([records, 'optionalAccess', _140 => _140.length]) ? void 0 : records.join(",")
           }
-        }).catch((error) => Promise.reject(_optionalChain([error, 'optionalAccess', _134 => _134.response, 'optionalAccess', _135 => _135.body, 'optionalAccess', _136 => _136.data, 'optionalAccess', _137 => _137[0]]) || error));
+        }).catch(
+          (error) => Promise.reject(_optionalChain([error, 'optionalAccess', _141 => _141.response, 'optionalAccess', _142 => _142.body, 'optionalAccess', _143 => _143.data, 'optionalAccess', _144 => _144[0]]) || error)
+        );
         return result;
       } catch (_error) {
         throw new Error(
@@ -2871,9 +3016,11 @@ function createDatoClient(params) {
     },
     updateRecord: async (id, payload) => {
       try {
-        await dato.items.update(id, payload).catch((error) => Promise.reject(_optionalChain([error, 'optionalAccess', _138 => _138.response, 'optionalAccess', _139 => _139.body, 'optionalAccess', _140 => _140.data, 'optionalAccess', _141 => _141[0]]) || error));
+        await dato.items.update(id, payload).catch(
+          (error) => Promise.reject(_optionalChain([error, 'optionalAccess', _145 => _145.response, 'optionalAccess', _146 => _146.body, 'optionalAccess', _147 => _147.data, 'optionalAccess', _148 => _148[0]]) || error)
+        );
       } catch (_error) {
-        if (_optionalChain([_error, 'optionalAccess', _142 => _142.attributes, 'optionalAccess', _143 => _143.details, 'optionalAccess', _144 => _144.message])) {
+        if (_optionalChain([_error, 'optionalAccess', _149 => _149.attributes, 'optionalAccess', _150 => _150.details, 'optionalAccess', _151 => _151.message])) {
           throw new Error(
             [
               `${_error.attributes.details.message}`,
@@ -2894,9 +3041,11 @@ function createDatoClient(params) {
     },
     enableFieldLocalization: async (args) => {
       try {
-        await dato.fields.update(`${args.modelId}::${args.fieldId}`, { localized: true }).catch((error) => Promise.reject(_optionalChain([error, 'optionalAccess', _145 => _145.response, 'optionalAccess', _146 => _146.body, 'optionalAccess', _147 => _147.data, 'optionalAccess', _148 => _148[0]]) || error));
+        await dato.fields.update(`${args.modelId}::${args.fieldId}`, { localized: true }).catch(
+          (error) => Promise.reject(_optionalChain([error, 'optionalAccess', _152 => _152.response, 'optionalAccess', _153 => _153.body, 'optionalAccess', _154 => _154.data, 'optionalAccess', _155 => _155[0]]) || error)
+        );
       } catch (_error) {
-        if (_optionalChain([_error, 'optionalAccess', _149 => _149.attributes, 'optionalAccess', _150 => _150.code]) === "NOT_FOUND") {
+        if (_optionalChain([_error, 'optionalAccess', _156 => _156.attributes, 'optionalAccess', _157 => _157.code]) === "NOT_FOUND") {
           throw new Error(
             [
               `Field "${args.fieldId}" not found in model "${args.modelId}".`,
@@ -2904,9 +3053,12 @@ function createDatoClient(params) {
             ].join("\n\n")
           );
         }
-        if (_optionalChain([_error, 'optionalAccess', _151 => _151.attributes, 'optionalAccess', _152 => _152.details, 'optionalAccess', _153 => _153.message])) {
+        if (_optionalChain([_error, 'optionalAccess', _158 => _158.attributes, 'optionalAccess', _159 => _159.details, 'optionalAccess', _160 => _160.message])) {
           throw new Error(
-            [`${_error.attributes.details.message}`, `Error: ${JSON.stringify(_error, null, 2)}`].join("\n\n")
+            [
+              `${_error.attributes.details.message}`,
+              `Error: ${JSON.stringify(_error, null, 2)}`
+            ].join("\n\n")
           );
         }
         throw new Error(
@@ -2958,9 +3110,16 @@ function createDatoApiLoader(config, onConfigUpdate) {
           result.models[modelId] = { fields: [], records: [] };
           const fieldInfos = await getFieldDetails(dato, fields);
           const fieldChoices = createFieldChoices(fieldInfos);
-          const selectedFields = await promptFieldSelection(modelName, fieldChoices);
+          const selectedFields = await promptFieldSelection(
+            modelName,
+            fieldChoices
+          );
           for (const fieldInfo of fieldInfos) {
-            const isLocalized = await updateFieldLocalization(dato, fieldInfo, selectedFields.includes(fieldInfo.id));
+            const isLocalized = await updateFieldLocalization(
+              dato,
+              fieldInfo,
+              selectedFields.includes(fieldInfo.id)
+            );
             if (isLocalized) {
               result.models[modelId].fields.push(fieldInfo);
               updatedConfig.models[modelId].fields = _lodash2.default.uniq([
@@ -2970,9 +3129,18 @@ function createDatoApiLoader(config, onConfigUpdate) {
             }
           }
           const records = await dato.findRecordsForModel(modelId);
-          const recordChoices = createRecordChoices(records, _optionalChain([config, 'access', _154 => _154.models, 'access', _155 => _155[modelId], 'optionalAccess', _156 => _156.records]) || [], project);
-          const selectedRecords = await promptRecordSelection(modelName, recordChoices);
-          result.models[modelId].records = records.filter((record) => selectedRecords.includes(record.id));
+          const recordChoices = createRecordChoices(
+            records,
+            _optionalChain([config, 'access', _161 => _161.models, 'access', _162 => _162[modelId], 'optionalAccess', _163 => _163.records]) || [],
+            project
+          );
+          const selectedRecords = await promptRecordSelection(
+            modelName,
+            recordChoices
+          );
+          result.models[modelId].records = records.filter(
+            (record) => selectedRecords.includes(record.id)
+          );
           updatedConfig.models[modelId].records = selectedRecords;
         }
       }
@@ -2982,14 +3150,14 @@ function createDatoApiLoader(config, onConfigUpdate) {
     },
     async pull(locale, input2, initCtx) {
       const result = {};
-      for (const modelId of _lodash2.default.keys(_optionalChain([initCtx, 'optionalAccess', _157 => _157.models]) || {})) {
-        let records = _optionalChain([initCtx, 'optionalAccess', _158 => _158.models, 'access', _159 => _159[modelId], 'access', _160 => _160.records]) || [];
+      for (const modelId of _lodash2.default.keys(_optionalChain([initCtx, 'optionalAccess', _164 => _164.models]) || {})) {
+        let records = _optionalChain([initCtx, 'optionalAccess', _165 => _165.models, 'access', _166 => _166[modelId], 'access', _167 => _167.records]) || [];
         const recordIds = records.map((record) => record.id);
         records = await dato.findRecords(recordIds);
         console.log(`Fetched ${records.length} records for model ${modelId}`);
         if (records.length > 0) {
           result[modelId] = {
-            fields: _optionalChain([initCtx, 'optionalAccess', _161 => _161.models, 'optionalAccess', _162 => _162[modelId], 'optionalAccess', _163 => _163.fields]) || [],
+            fields: _optionalChain([initCtx, 'optionalAccess', _168 => _168.models, 'optionalAccess', _169 => _169[modelId], 'optionalAccess', _170 => _170.fields]) || [],
             records
           };
         }
@@ -3000,7 +3168,9 @@ function createDatoApiLoader(config, onConfigUpdate) {
       for (const modelId of _lodash2.default.keys(data)) {
         for (let i = 0; i < data[modelId].records.length; i++) {
           const record = data[modelId].records[i];
-          console.log(`Updating record ${i + 1}/${data[modelId].records.length} for model ${modelId}...`);
+          console.log(
+            `Updating record ${i + 1}/${data[modelId].records.length} for model ${modelId}...`
+          );
           await dato.updateRecord(record.id, record);
         }
       }
@@ -3039,7 +3209,9 @@ async function promptFieldSelection(modelName, choices) {
 }
 async function updateFieldLocalization(dato, fieldInfo, shouldBeLocalized) {
   if (shouldBeLocalized !== fieldInfo.localized) {
-    console.log(`${shouldBeLocalized ? "Enabling" : "Disabling"} localization for ${fieldInfo.label}...`);
+    console.log(
+      `${shouldBeLocalized ? "Enabling" : "Disabling"} localization for ${fieldInfo.label}...`
+    );
     await dato.updateField(fieldInfo.id, { localized: shouldBeLocalized });
   }
   return shouldBeLocalized;
@@ -3048,7 +3220,7 @@ function createRecordChoices(records, selectedIds = [], project) {
   return records.map((record) => ({
     name: `${record.id} - https://${project.internal_domain}/editor/item_types/${record.item_type.id}/items/${record.id}`,
     value: record.id,
-    checked: _optionalChain([selectedIds, 'optionalAccess', _164 => _164.includes, 'call', _165 => _165(record.id)])
+    checked: _optionalChain([selectedIds, 'optionalAccess', _171 => _171.includes, 'call', _172 => _172(record.id)])
   }));
 }
 async function promptRecordSelection(modelName, choices) {
@@ -3112,9 +3284,21 @@ function createDatoExtractLoader() {
         for (const [virtualRecordId, record] of _lodash2.default.entries(modelInfo)) {
           for (const [fieldName, fieldValue] of _lodash2.default.entries(record)) {
             const [, recordId] = virtualRecordId.split("_");
-            const originalFieldValue = _lodash2.default.get(originalInput, [modelId, recordId, fieldName]);
-            const rawValue = createRawDatoValue(fieldValue, originalFieldValue, true);
-            _lodash2.default.set(result, [modelId, recordId, fieldName], rawValue || originalFieldValue);
+            const originalFieldValue = _lodash2.default.get(originalInput, [
+              modelId,
+              recordId,
+              fieldName
+            ]);
+            const rawValue = createRawDatoValue(
+              fieldValue,
+              originalFieldValue,
+              true
+            );
+            _lodash2.default.set(
+              result,
+              [modelId, recordId, fieldName],
+              rawValue || originalFieldValue
+            );
           }
         }
       }
@@ -3184,7 +3368,11 @@ function createRawDatoValue(parsedDatoValue, originalRawDatoValue, isClean = fal
     case "single_block":
       return deserializeBlock(parsedDatoValue, originalRawDatoValue, isClean);
     case "rich_text":
-      return deserializeBlockList(parsedDatoValue, originalRawDatoValue, isClean);
+      return deserializeBlockList(
+        parsedDatoValue,
+        originalRawDatoValue,
+        isClean
+      );
     case "json":
       return JSON.stringify(parsedDatoValue, null, 2);
     case "video":
@@ -3201,7 +3389,11 @@ function serializeStructuredText(rawStructuredText) {
   return serializeStructuredTextNode(rawStructuredText);
   function serializeStructuredTextNode(node, path17 = [], acc = {}) {
     if ("document" in node) {
-      return serializeStructuredTextNode(node.document, [...path17, "document"], acc);
+      return serializeStructuredTextNode(
+        node.document,
+        [...path17, "document"],
+        acc
+      );
     }
     if (!_lodash2.default.isNil(node.value)) {
       acc[[...path17, "value"].join(".")] = node.value;
@@ -3210,7 +3402,11 @@ function serializeStructuredText(rawStructuredText) {
     }
     if (node.children) {
       for (let i = 0; i < node.children.length; i++) {
-        serializeStructuredTextNode(node.children[i], [...path17, i.toString()], acc);
+        serializeStructuredTextNode(
+          node.children[i],
+          [...path17, i.toString()],
+          acc
+        );
       }
     }
     return acc;
@@ -3253,7 +3449,11 @@ function deserializeVideo(parsedVideo, originalRawVideo) {
 function deserializeBlock(payload, rawNode, isClean = false) {
   const result = _lodash2.default.cloneDeep(rawNode);
   for (const [attributeName, attributeValue] of _lodash2.default.entries(rawNode.attributes)) {
-    const rawValue = createRawDatoValue(payload[attributeName], attributeValue, isClean);
+    const rawValue = createRawDatoValue(
+      payload[attributeName],
+      attributeValue,
+      isClean
+    );
     _lodash2.default.set(result, ["attributes", attributeName], rawValue);
   }
   if (isClean) {
@@ -3265,13 +3465,19 @@ function deserializeSeo(parsedSeo, originalRawSeo) {
   return _lodash2.default.chain(parsedSeo).pick(["title", "description"]).defaults(originalRawSeo).value();
 }
 function deserializeBlockList(parsedBlockList, originalRawBlockList, isClean = false) {
-  return _lodash2.default.chain(parsedBlockList).map((block, i) => deserializeBlock(block, originalRawBlockList[i], isClean)).value();
+  return _lodash2.default.chain(parsedBlockList).map(
+    (block, i) => deserializeBlock(block, originalRawBlockList[i], isClean)
+  ).value();
 }
 function deserializeStructuredText(parsedStructuredText, originalRawStructuredText) {
   const result = _lodash2.default.cloneDeep(originalRawStructuredText);
   for (const [path17, value] of _lodash2.default.entries(parsedStructuredText)) {
     const realPath = _lodash2.default.chain(path17.split(".")).flatMap((s) => !_lodash2.default.isNaN(_lodash2.default.toNumber(s)) ? ["children", s] : s).value();
-    const deserializedValue = createRawDatoValue(value, _lodash2.default.get(originalRawStructuredText, realPath), true);
+    const deserializedValue = createRawDatoValue(
+      value,
+      _lodash2.default.get(originalRawStructuredText, realPath),
+      true
+    );
     _lodash2.default.set(result, realPath, deserializedValue);
   }
   return result;
@@ -3284,13 +3490,21 @@ function _isJson(rawDatoValue) {
   }
 }
 function _isFile(rawDatoValue) {
-  return _lodash2.default.isObject(rawDatoValue) && ["alt", "title", "custom_data", "focal_point", "upload_id"].every((key) => _lodash2.default.has(rawDatoValue, key));
-}
-function _isVideo(rawDatoValue) {
-  return _lodash2.default.isObject(rawDatoValue) && ["url", "title", "width", "height", "provider", "provider_uid", "thumbnail_url"].every(
+  return _lodash2.default.isObject(rawDatoValue) && ["alt", "title", "custom_data", "focal_point", "upload_id"].every(
     (key) => _lodash2.default.has(rawDatoValue, key)
   );
 }
+function _isVideo(rawDatoValue) {
+  return _lodash2.default.isObject(rawDatoValue) && [
+    "url",
+    "title",
+    "width",
+    "height",
+    "provider",
+    "provider_uid",
+    "thumbnail_url"
+  ].every((key) => _lodash2.default.has(rawDatoValue, key));
+}
 
 // src/cli/loaders/dato/index.ts
 function createDatoLoader(configFilePath) {
@@ -3300,13 +3514,20 @@ function createDatoLoader(configFilePath) {
     return composeLoaders(
       createDatoApiLoader(
         datoConfig,
-        (updatedConfig) => fs10.default.writeFileSync(configFilePath, _json52.default.stringify(updatedConfig, null, 2))
+        (updatedConfig) => fs10.default.writeFileSync(
+          configFilePath,
+          _json52.default.stringify(updatedConfig, null, 2)
+        )
       ),
       createDatoFilterLoader(),
       createDatoExtractLoader()
     );
   } catch (error) {
-    throw new Error([`Failed to parse DatoCMS config file.`, `Error: ${error.message}`].join("\n\n"));
+    throw new Error(
+      [`Failed to parse DatoCMS config file.`, `Error: ${error.message}`].join(
+        "\n\n"
+      )
+    );
   }
 }
 
@@ -3318,7 +3539,7 @@ function createVttLoader() {
       if (!input2) {
         return "";
       }
-      const vtt = _optionalChain([_nodewebvtt2.default, 'access', _166 => _166.parse, 'call', _167 => _167(input2), 'optionalAccess', _168 => _168.cues]);
+      const vtt = _optionalChain([_nodewebvtt2.default, 'access', _173 => _173.parse, 'call', _174 => _174(input2), 'optionalAccess', _175 => _175.cues]);
       if (Object.keys(vtt).length === 0) {
         return {};
       } else {
@@ -3372,7 +3593,7 @@ function variableExtractLoader(params) {
         for (let i = 0; i < matches.length; i++) {
           const match2 = matches[i];
           const currentValue = result[key].value;
-          const newValue = _optionalChain([currentValue, 'optionalAccess', _169 => _169.replace, 'call', _170 => _170(match2, `{variable:${i}}`)]);
+          const newValue = _optionalChain([currentValue, 'optionalAccess', _176 => _176.replace, 'call', _177 => _177(match2, `{variable:${i}}`)]);
           result[key].value = newValue;
           result[key].variables[i] = match2;
         }
@@ -3386,7 +3607,7 @@ function variableExtractLoader(params) {
         for (let i = 0; i < valueObj.variables.length; i++) {
           const variable = valueObj.variables[i];
           const currentValue = result[key];
-          const newValue = _optionalChain([currentValue, 'optionalAccess', _171 => _171.replace, 'call', _172 => _172(`{variable:${i}}`, variable)]);
+          const newValue = _optionalChain([currentValue, 'optionalAccess', _178 => _178.replace, 'call', _179 => _179(`{variable:${i}}`, variable)]);
           result[key] = newValue;
         }
       }
@@ -3455,7 +3676,9 @@ function formatPlutilStyle(jsonData, existingJson) {
     }
     if (Array.isArray(data)) {
       if (data.length === 0) return "[]";
-      const items2 = data.map((item) => `${nextIndent}${format(item, level + 1)}`);
+      const items2 = data.map(
+        (item) => `${nextIndent}${format(item, level + 1)}`
+      );
       return `[
 ${items2.join(",\n")}
 ${currentIndent}]`;
@@ -3475,7 +3698,10 @@ ${currentIndent}}`;
     });
     const items = sortedKeys.map((key) => {
       const value = data[key];
-      return `${nextIndent}${JSON.stringify(key)} : ${format(value, level + 1)}`;
+      return `${nextIndent}${JSON.stringify(key)} : ${format(
+        value,
+        level + 1
+      )}`;
     });
     return `{
 ${items.join(",\n")}
@@ -3548,11 +3774,23 @@ function toPhpArray(data, shortSyntax = true, indentLevel = 1) {
   const arrayEnd = shortSyntax ? "]" : ")";
   if (Array.isArray(data)) {
     return `${arrayStart}
-${data.map((value) => `${indent(indentLevel)}${toPhpArray(value, shortSyntax, indentLevel + 1)}`).join(",\n")}
+${data.map(
+      (value) => `${indent(indentLevel)}${toPhpArray(
+        value,
+        shortSyntax,
+        indentLevel + 1
+      )}`
+    ).join(",\n")}
 ${indent(indentLevel - 1)}${arrayEnd}`;
   }
   const output = `${arrayStart}
-${Object.entries(data).map(([key, value]) => `${indent(indentLevel)}'${key}' => ${toPhpArray(value, shortSyntax, indentLevel + 1)}`).join(",\n")}
+${Object.entries(data).map(
+    ([key, value]) => `${indent(indentLevel)}'${key}' => ${toPhpArray(
+      value,
+      shortSyntax,
+      indentLevel + 1
+    )}`
+  ).join(",\n")}
 ${indent(indentLevel - 1)}${arrayEnd}`;
   return output;
 }
@@ -3569,7 +3807,7 @@ function createVueJsonLoader() {
   return createLoader({
     pull: async (locale, input2, ctx) => {
       const parsed = parseVueFile(input2);
-      return _nullishCoalesce(_optionalChain([parsed, 'optionalAccess', _173 => _173.i18n, 'optionalAccess', _174 => _174[locale]]), () => ( {}));
+      return _nullishCoalesce(_optionalChain([parsed, 'optionalAccess', _180 => _180.i18n, 'optionalAccess', _181 => _181[locale]]), () => ( {}));
     },
     push: async (locale, data, originalInput) => {
       const parsed = parseVueFile(_nullishCoalesce(originalInput, () => ( "")));
@@ -3578,7 +3816,11 @@ function createVueJsonLoader() {
       }
       parsed.i18n[locale] = data;
       return `${parsed.before}<i18n>
-${JSON.stringify(parsed.i18n, null, 2)}
+${JSON.stringify(
+        parsed.i18n,
+        null,
+        2
+      )}
 </i18n>${parsed.after}`;
     }
   });
@@ -3750,7 +3992,7 @@ function updateStringsInObjectExpression(objectExpression, data) {
   objectExpression.properties.forEach((prop) => {
     if (!t.isObjectProperty(prop)) return;
     const key = getPropertyKey(prop);
-    const incomingVal = _optionalChain([data, 'optionalAccess', _175 => _175[key]]);
+    const incomingVal = _optionalChain([data, 'optionalAccess', _182 => _182[key]]);
     if (incomingVal === void 0) {
       return;
     }
@@ -3786,7 +4028,7 @@ function updateStringsInArrayExpression(arrayExpression, incoming) {
   let modified = false;
   arrayExpression.elements.forEach((element, index) => {
     if (!element) return;
-    const incomingVal = _optionalChain([incoming, 'optionalAccess', _176 => _176[index]]);
+    const incomingVal = _optionalChain([incoming, 'optionalAccess', _183 => _183[index]]);
     if (incomingVal === void 0) return;
     if (t.isStringLiteral(element) && typeof incomingVal === "string") {
       if (element.value !== incomingVal) {
@@ -3844,42 +4086,48 @@ function createInjectLocaleLoader(injectLocaleKeys) {
       if (!injectLocaleKeys) {
         return data;
       }
-      const omitKeys = injectLocaleKeys.filter((key) => {
-        return _lodash2.default.get(data, key) === locale;
-      });
+      const omitKeys = _getKeysWithLocales(data, injectLocaleKeys, locale);
       const result = _lodash2.default.omit(data, omitKeys);
       return result;
     },
     async push(locale, data, originalInput, originalLocale) {
-      if (!injectLocaleKeys) {
+      if (!injectLocaleKeys || !originalInput) {
         return data;
       }
-      const mergedData = _lodash2.default.merge({}, originalInput, data);
-      injectLocaleKeys.forEach((key) => {
-        if (_lodash2.default.get(mergedData, key) === originalLocale) {
-          _lodash2.default.set(mergedData, key, locale);
-        }
+      const localeKeys = _getKeysWithLocales(
+        originalInput,
+        injectLocaleKeys,
+        originalLocale
+      );
+      localeKeys.forEach((key) => {
+        _lodash2.default.set(data, key, locale);
       });
-      return mergedData;
+      return data;
     }
   });
 }
+function _getKeysWithLocales(data, injectLocaleKeys, locale) {
+  return injectLocaleKeys.filter((key) => {
+    return _lodash2.default.get(data, key) === locale;
+  });
+}
 
 // src/cli/loaders/locked-keys.ts
 
-function createLockedKeysLoader(lockedKeys, isCacheRestore = false) {
+function createLockedKeysLoader(lockedKeys) {
   return createLoader({
-    pull: async (locale, data) => _lodash2.default.chain(data).pickBy((value, key) => !lockedKeys.some((lockedKey) => key.startsWith(lockedKey))).value(),
+    pull: async (locale, data) => {
+      return _lodash2.default.pickBy(data, (value, key) => !_isLockedKey(key, lockedKeys));
+    },
     push: async (locale, data, originalInput) => {
-      const lockedSubObject = _lodash2.default.chain(originalInput).pickBy((value, key) => lockedKeys.some((lockedKey) => key.startsWith(lockedKey))).value();
-      if (isCacheRestore) {
-        return _lodash2.default.merge({}, data, lockedSubObject);
-      } else {
-        return _lodash2.default.merge({}, originalInput, data, lockedSubObject);
-      }
+      const lockedSubObject = _lodash2.default.chain(originalInput).pickBy((value, key) => _isLockedKey(key, lockedKeys)).value();
+      return _lodash2.default.merge({}, data, lockedSubObject);
     }
   });
 }
+function _isLockedKey(key, lockedKeys) {
+  return lockedKeys.some((lockedKey) => key.startsWith(lockedKey));
+}
 
 // src/cli/loaders/mdx2/frontmatter-split.ts
 
@@ -4062,7 +4310,7 @@ function createMdxSectionsSplit2Loader() {
       const content = _lodash2.default.chain(data.sections).values().join("\n\n").value();
       const result = {
         frontmatter: data.frontmatter,
-        codePlaceholders: _optionalChain([pullInput, 'optionalAccess', _177 => _177.codePlaceholders]) || {},
+        codePlaceholders: _optionalChain([pullInput, 'optionalAccess', _184 => _184.codePlaceholders]) || {},
         content
       };
       return result;
@@ -4109,9 +4357,14 @@ function createMdxLockedPatternsLoader(defaultPatterns) {
       if (!pullInput) {
         return data;
       }
-      const { lockedPlaceholders } = extractLockedPatterns(pullInput, patterns);
+      const { lockedPlaceholders } = extractLockedPatterns(
+        pullInput,
+        patterns
+      );
       let result = data;
-      for (const [placeholder, original] of Object.entries(lockedPlaceholders)) {
+      for (const [placeholder, original] of Object.entries(
+        lockedPlaceholders
+      )) {
         result = result.replaceAll(placeholder, original);
       }
       return result;
@@ -4205,7 +4458,10 @@ function parseEjsForTranslation(input2) {
           if (trimmedContent) {
             const key = `text_${counter++}`;
             translatable[key] = trimmedContent;
-            template += textPart.content.replace(trimmedContent, `__LINGO_PLACEHOLDER_${key}__`);
+            template += textPart.content.replace(
+              trimmedContent,
+              `__LINGO_PLACEHOLDER_${key}__`
+            );
           } else {
             template += textPart.content;
           }
@@ -4235,7 +4491,9 @@ function createEjsLoader() {
         const parseResult = parseEjsForTranslation(input2);
         return parseResult.translatable;
       } catch (error) {
-        console.warn("Warning: Could not parse EJS template, treating as plain text");
+        console.warn(
+          "Warning: Could not parse EJS template, treating as plain text"
+        );
         return { content: input2.trim() };
       }
     },
@@ -4246,15 +4504,53 @@ function createEjsLoader() {
       try {
         const parseResult = parseEjsForTranslation(originalInput);
         const mergedTranslatable = { ...parseResult.translatable, ...data };
-        return reconstructEjsWithTranslation(parseResult.content, mergedTranslatable);
+        return reconstructEjsWithTranslation(
+          parseResult.content,
+          mergedTranslatable
+        );
       } catch (error) {
-        console.warn("Warning: Could not reconstruct EJS template, returning translated data");
+        console.warn(
+          "Warning: Could not reconstruct EJS template, returning translated data"
+        );
         return Object.values(data).join("\n");
       }
     }
   });
 }
 
+// src/cli/loaders/ensure-key-order.ts
+
+function createEnsureKeyOrderLoader() {
+  return createLoader({
+    pull: async (_locale, input2) => {
+      return input2;
+    },
+    push: async (_locale, data, originalInput) => {
+      if (!originalInput || !data) {
+        return data;
+      }
+      return reorderKeys(data, originalInput);
+    }
+  });
+}
+function reorderKeys(data, originalInput) {
+  if (!_lodash2.default.isObject(data) || _lodash2.default.isArray(data) || _lodash2.default.isDate(data)) {
+    return data;
+  }
+  const orderedData = {};
+  const originalKeys = Object.keys(originalInput);
+  const dataKeys = new Set(Object.keys(data));
+  for (const key of originalKeys) {
+    if (dataKeys.has(key)) {
+      if (data[key]) {
+        orderedData[key] = reorderKeys(data[key], originalInput[key]);
+      }
+      dataKeys.delete(key);
+    }
+  }
+  return orderedData;
+}
+
 // src/cli/loaders/index.ts
 function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys, lockedPatterns, ignoredKeys) {
   switch (bucketType) {
@@ -4264,23 +4560,19 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createAndroidLoader(),
+        createEnsureKeyOrderLoader(),
         createFlatLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "csv":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createCsvLoader(),
+        createEnsureKeyOrderLoader(),
         createFlatLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "html":
       return composeLoaders(
@@ -4288,34 +4580,26 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
         createPrettierLoader({ parser: "html", bucketPathPattern }),
         createHtmlLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "ejs":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createEjsLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "json":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createPrettierLoader({ parser: "json", bucketPathPattern }),
         createJsonLoader(),
+        createEnsureKeyOrderLoader(),
         createInjectLocaleLoader(options.injectLocale),
         createFlatLoader(),
-        createLockedKeysLoader(lockedKeys || [], options.isCacheRestore),
+        createLockedKeysLoader(lockedKeys || []),
         createSyncLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "markdown":
       return composeLoaders(
@@ -4323,10 +4607,7 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
         createPrettierLoader({ parser: "markdown", bucketPathPattern }),
         createMarkdownLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "mdx":
       return composeLoaders(
@@ -4341,55 +4622,43 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
         createMdxSectionsSplit2Loader(),
         createLocalizableMdxDocumentLoader(),
         createFlatLoader(),
-        createLockedKeysLoader(lockedKeys || [], options.isCacheRestore),
+        createEnsureKeyOrderLoader(),
+        createLockedKeysLoader(lockedKeys || []),
         createSyncLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "po":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createPoLoader(),
         createFlatLoader(),
+        createEnsureKeyOrderLoader(),
         createSyncLoader(),
         createVariableLoader({ type: "python" }),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "properties":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createPropertiesLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "xcode-strings":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createXcodeStringsLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "xcode-stringsdict":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createXcodeStringsdictLoader(),
         createFlatLoader(),
+        createEnsureKeyOrderLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "xcode-xcstrings":
       return composeLoaders(
@@ -4398,12 +4667,10 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
         createJsonLoader(),
         createXcodeXcstringsLoader(options.defaultLocale),
         createFlatLoader(),
+        createEnsureKeyOrderLoader(),
         createSyncLoader(),
         createVariableLoader({ type: "ieee" }),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "yaml":
       return composeLoaders(
@@ -4411,12 +4678,10 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
         createPrettierLoader({ parser: "yaml", bucketPathPattern }),
         createYamlLoader(),
         createFlatLoader(),
-        createLockedKeysLoader(lockedKeys || [], options.isCacheRestore),
+        createEnsureKeyOrderLoader(),
+        createLockedKeysLoader(lockedKeys || []),
         createSyncLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "yaml-root-key":
       return composeLoaders(
@@ -4425,76 +4690,60 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
         createYamlLoader(),
         createRootKeyLoader(true),
         createFlatLoader(),
+        createEnsureKeyOrderLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "flutter":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createPrettierLoader({ parser: "json", bucketPathPattern }),
         createJsonLoader(),
+        createEnsureKeyOrderLoader(),
         createFlutterLoader(),
         createFlatLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "xliff":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createXliffLoader(),
         createFlatLoader(),
+        createEnsureKeyOrderLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "xml":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createXmlLoader(),
         createFlatLoader(),
+        createEnsureKeyOrderLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "srt":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createSrtLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "dato":
       return composeLoaders(
         createDatoLoader(bucketPathPattern),
         createSyncLoader(),
         createFlatLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createEnsureKeyOrderLoader(),
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "vtt":
       return composeLoaders(
         createTextFileLoader(bucketPathPattern),
         createVttLoader(),
         createSyncLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "php":
       return composeLoaders(
@@ -4502,10 +4751,8 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
         createPhpLoader(),
         createSyncLoader(),
         createFlatLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createEnsureKeyOrderLoader(),
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "vue-json":
       return composeLoaders(
@@ -4513,10 +4760,8 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
         createVueJsonLoader(),
         createSyncLoader(),
         createFlatLoader(),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createEnsureKeyOrderLoader(),
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
     case "typescript":
       return composeLoaders(
@@ -4524,13 +4769,11 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
         createPrettierLoader({ parser: "typescript", bucketPathPattern }),
         createTypescriptLoader(),
         createFlatLoader(),
+        createEnsureKeyOrderLoader(),
         createSyncLoader(),
-        createLockedKeysLoader(lockedKeys || [], options.isCacheRestore),
+        createLockedKeysLoader(lockedKeys || []),
         createIgnoredKeysLoader(ignoredKeys || []),
-        createUnlocalizableLoader(
-          options.isCacheRestore,
-          options.returnUnlocalizedKeys
-        )
+        createUnlocalizableLoader(options.returnUnlocalizedKeys)
       );
   }
 }
@@ -4636,7 +4879,7 @@ function createBasicTranslator(model, systemPrompt) {
       ]
     });
     const result = JSON.parse(response.text);
-    return _optionalChain([result, 'optionalAccess', _178 => _178.data]) || {};
+    return _optionalChain([result, 'optionalAccess', _185 => _185.data]) || {};
   }
 }
 function extractPayloadChunks(payload) {
@@ -4679,6 +4922,7 @@ var _openai = require('@ai-sdk/openai');
 var _anthropic = require('@ai-sdk/anthropic');
 var _google = require('@ai-sdk/google');
 var _aisdkprovider = require('@openrouter/ai-sdk-provider');
+var _mistral = require('@ai-sdk/mistral');
 var _ollamaaiprovider = require('ollama-ai-provider');
 function createProcessor(provider, params) {
   if (!provider) {
@@ -4696,7 +4940,11 @@ function getPureModelProvider(provider) {
 
   To fix this issue:
   1. ${envVar ? `Set ${_chalk2.default.dim(envVar)} in your environment variables` : "Set the environment variable for your provider (if required)"}, or
-  2. Remove the ${_chalk2.default.italic("provider")} node from your i18n.json configuration to switch to ${_chalk2.default.hex(colors.green)("Lingo.dev")}
+  2. Remove the ${_chalk2.default.italic(
+    "provider"
+  )} node from your i18n.json configuration to switch to ${_chalk2.default.hex(
+    colors.green
+  )("Lingo.dev")}
 
   ${_chalk2.default.hex(colors.blue)("Docs: https://lingo.dev/go/docs")}
 `;
@@ -4705,11 +4953,15 @@ function getPureModelProvider(provider) {
 
   To fix this issue:
   1. Switch to one of the supported providers, or
-  2. Remove the ${_chalk2.default.italic("provider")} node from your i18n.json configuration to switch to ${_chalk2.default.hex(colors.green)("Lingo.dev")}
+  2. Remove the ${_chalk2.default.italic(
+    "provider"
+  )} node from your i18n.json configuration to switch to ${_chalk2.default.hex(
+    colors.green
+  )("Lingo.dev")}
 
   ${_chalk2.default.hex(colors.blue)("Docs: https://lingo.dev/go/docs")}
   `;
-  switch (_optionalChain([provider, 'optionalAccess', _179 => _179.id])) {
+  switch (_optionalChain([provider, 'optionalAccess', _186 => _186.id])) {
     case "openai": {
       if (!process.env.OPENAI_API_KEY) {
         throw new Error(
@@ -4755,8 +5007,19 @@ function getPureModelProvider(provider) {
     case "ollama": {
       return _ollamaaiprovider.createOllama.call(void 0, )(provider.model);
     }
+    case "mistral": {
+      if (!process.env.MISTRAL_API_KEY) {
+        throw new Error(
+          createMissingKeyErrorMessage("Mistral", "MISTRAL_API_KEY")
+        );
+      }
+      return _mistral.createMistral.call(void 0, {
+        apiKey: process.env.MISTRAL_API_KEY,
+        baseURL: provider.baseUrl
+      })(provider.model);
+    }
     default: {
-      throw new Error(createUnsupportedProviderErrorMessage(_optionalChain([provider, 'optionalAccess', _180 => _180.id])));
+      throw new Error(createUnsupportedProviderErrorMessage(_optionalChain([provider, 'optionalAccess', _187 => _187.id])));
     }
   }
 }
@@ -4864,11 +5127,17 @@ function createDeltaProcessor(fileKey) {
       return checkIfFileExists(lockfilePath);
     },
     async calculateDelta(params) {
-      let added = _lodash2.default.difference(Object.keys(params.sourceData), Object.keys(params.targetData));
-      let removed = _lodash2.default.difference(Object.keys(params.targetData), Object.keys(params.sourceData));
-      const updated = _lodash2.default.filter(Object.keys(params.sourceData), (key) => {
-        return md5(params.sourceData[key]) !== params.checksums[key] && params.checksums[key];
-      });
+      let added = _lodash2.default.difference(
+        Object.keys(params.sourceData),
+        Object.keys(params.targetData)
+      );
+      let removed = _lodash2.default.difference(
+        Object.keys(params.targetData),
+        Object.keys(params.sourceData)
+      );
+      const updated = Object.keys(params.sourceData).filter(
+        (key) => md5(params.sourceData[key]) !== params.checksums[key] && params.checksums[key]
+      );
       const renamed = [];
       for (const addedKey of added) {
         const addedHash = md5(params.sourceData[addedKey]);
@@ -4879,9 +5148,18 @@ function createDeltaProcessor(fileKey) {
           }
         }
       }
-      added = added.filter((key) => !renamed.some(([oldKey, newKey]) => newKey === key));
-      removed = removed.filter((key) => !renamed.some(([oldKey, newKey]) => oldKey === key));
-      const hasChanges = [added.length > 0, removed.length > 0, updated.length > 0, renamed.length > 0].some((v) => v);
+      added = added.filter(
+        (key) => !renamed.some(([oldKey, newKey]) => newKey === key)
+      );
+      removed = removed.filter(
+        (key) => !renamed.some(([oldKey, newKey]) => oldKey === key)
+      );
+      const hasChanges = [
+        added.length > 0,
+        removed.length > 0,
+        updated.length > 0,
+        renamed.length > 0
+      ].some((v) => v);
       return {
         added,
         removed,
@@ -4981,7 +5259,7 @@ var i18n_default = new (0, _interactivecommander.Command)().command("i18n").desc
     validateParams(i18nConfig, flags);
     ora.succeed("Localization configuration is valid");
     ora.start("Connecting to Lingo.dev Localization Engine...");
-    const isByokMode = !!_optionalChain([i18nConfig, 'optionalAccess', _181 => _181.provider]);
+    const isByokMode = !!_optionalChain([i18nConfig, 'optionalAccess', _188 => _188.provider]);
     if (isByokMode) {
       authId = null;
       ora.succeed("Using external provider (BYOK mode)");
@@ -4995,16 +5273,16 @@ var i18n_default = new (0, _interactivecommander.Command)().command("i18n").desc
       flags
     });
     let buckets = getBuckets(i18nConfig);
-    if (_optionalChain([flags, 'access', _182 => _182.bucket, 'optionalAccess', _183 => _183.length])) {
+    if (_optionalChain([flags, 'access', _189 => _189.bucket, 'optionalAccess', _190 => _190.length])) {
       buckets = buckets.filter(
         (bucket) => flags.bucket.includes(bucket.type)
       );
     }
     ora.succeed("Buckets retrieved");
-    if (_optionalChain([flags, 'access', _184 => _184.file, 'optionalAccess', _185 => _185.length])) {
+    if (_optionalChain([flags, 'access', _191 => _191.file, 'optionalAccess', _192 => _192.length])) {
       buckets = buckets.map((bucket) => {
         const paths = bucket.paths.filter(
-          (path17) => flags.file.find((file) => _optionalChain([path17, 'access', _186 => _186.pathPattern, 'optionalAccess', _187 => _187.includes, 'call', _188 => _188(file)]))
+          (path17) => flags.file.find((file) => _optionalChain([path17, 'access', _193 => _193.pathPattern, 'optionalAccess', _194 => _194.includes, 'call', _195 => _195(file)]))
         );
         return { ...bucket, paths };
       }).filter((bucket) => bucket.paths.length > 0);
@@ -5023,7 +5301,7 @@ var i18n_default = new (0, _interactivecommander.Command)().command("i18n").desc
         });
       }
     }
-    const targetLocales = _optionalChain([flags, 'access', _189 => _189.locale, 'optionalAccess', _190 => _190.length]) ? flags.locale : i18nConfig.locale.targets;
+    const targetLocales = _optionalChain([flags, 'access', _196 => _196.locale, 'optionalAccess', _197 => _197.length]) ? flags.locale : i18nConfig.locale.targets;
     ora.start("Setting up localization cache...");
     const checkLockfileProcessor = createDeltaProcessor("");
     const lockfileExists = await checkLockfileProcessor.checkIfLockExists();
@@ -5039,7 +5317,6 @@ var i18n_default = new (0, _interactivecommander.Command)().command("i18n").desc
             bucket.type,
             bucketPath.pathPattern,
             {
-              isCacheRestore: false,
               defaultLocale: sourceLocale,
               injectLocale: bucket.injectLocale
             },
@@ -5074,7 +5351,6 @@ var i18n_default = new (0, _interactivecommander.Command)().command("i18n").desc
             bucket.type,
             bucketPath.pathPattern,
             {
-              isCacheRestore: false,
               defaultLocale: sourceLocale,
               returnUnlocalizedKeys: true,
               injectLocale: bucket.injectLocale
@@ -5160,7 +5436,6 @@ var i18n_default = new (0, _interactivecommander.Command)().command("i18n").desc
             bucket.type,
             bucketPath.pathPattern,
             {
-              isCacheRestore: false,
               defaultLocale: sourceLocale,
               injectLocale: bucket.injectLocale
             },
@@ -5197,7 +5472,7 @@ var i18n_default = new (0, _interactivecommander.Command)().command("i18n").desc
               if (flags.key) {
                 processableData = _lodash2.default.pickBy(
                   processableData,
-                  (_33, key) => key === flags.key
+                  (_34, key) => key === flags.key
                 );
               }
               if (flags.verbose) {
@@ -5367,12 +5642,12 @@ function validateParams(i18nConfig, flags) {
       message: "No buckets found in i18n.json. Please add at least one bucket containing i18n content.",
       docUrl: "bucketNotFound"
     });
-  } else if (_optionalChain([flags, 'access', _191 => _191.locale, 'optionalAccess', _192 => _192.some, 'call', _193 => _193((locale) => !i18nConfig.locale.targets.includes(locale))])) {
+  } else if (_optionalChain([flags, 'access', _198 => _198.locale, 'optionalAccess', _199 => _199.some, 'call', _200 => _200((locale) => !i18nConfig.locale.targets.includes(locale))])) {
     throw new CLIError({
       message: `One or more specified locales do not exist in i18n.json locale.targets. Please add them to the list and try again.`,
       docUrl: "localeTargetNotFound"
     });
-  } else if (_optionalChain([flags, 'access', _194 => _194.bucket, 'optionalAccess', _195 => _195.some, 'call', _196 => _196(
+  } else if (_optionalChain([flags, 'access', _201 => _201.bucket, 'optionalAccess', _202 => _202.some, 'call', _203 => _203(
     (bucket) => !i18nConfig.buckets[bucket]
   )])) {
     throw new CLIError({
@@ -5387,7 +5662,9 @@ async function reviewChanges(args) {
   if (currentStr === proposedStr && !args.force) {
     console.log(
       `
-${_chalk2.default.blue(args.pathPattern)} (${_chalk2.default.yellow(args.targetLocale)}): ${_chalk2.default.gray("No changes to review")}`
+${_chalk2.default.blue(args.pathPattern)} (${_chalk2.default.yellow(
+        args.targetLocale
+      )}): ${_chalk2.default.gray("No changes to review")}`
     );
     return args.proposedData;
   }
@@ -5408,7 +5685,9 @@ ${_chalk2.default.blue(args.pathPattern)} (${_chalk2.default.yellow(args.targetL
   }).join("\n");
   console.log(
     `
-Reviewing changes for ${_chalk2.default.blue(args.pathPattern)} (${_chalk2.default.yellow(args.targetLocale)}):`
+Reviewing changes for ${_chalk2.default.blue(args.pathPattern)} (${_chalk2.default.yellow(
+      args.targetLocale
+    )}):`
   );
   console.log(coloredDiff);
   const { action } = await _inquirer2.default.prompt([
@@ -5521,8 +5800,15 @@ function createLockfileHelper() {
     registerPartialSourceData: (pathPattern, partialSourceData) => {
       const lockfile = _loadLockfile();
       const sectionKey = _objecthash.MD5.call(void 0, pathPattern);
-      const sectionChecksums = _lodash2.default.mapValues(partialSourceData, (value) => _objecthash.MD5.call(void 0, value));
-      lockfile.checksums[sectionKey] = _lodash2.default.merge({}, _nullishCoalesce(lockfile.checksums[sectionKey], () => ( {})), sectionChecksums);
+      const sectionChecksums = _lodash2.default.mapValues(
+        partialSourceData,
+        (value) => _objecthash.MD5.call(void 0, value)
+      );
+      lockfile.checksums[sectionKey] = _lodash2.default.merge(
+        {},
+        _nullishCoalesce(lockfile.checksums[sectionKey], () => ( {})),
+        sectionChecksums
+      );
       _saveLockfile(lockfile);
     },
     extractUpdatedData: (pathPattern, sourceData) => {
@@ -5530,7 +5816,10 @@ function createLockfileHelper() {
       const sectionKey = _objecthash.MD5.call(void 0, pathPattern);
       const currentChecksums = _lodash2.default.mapValues(sourceData, (value) => _objecthash.MD5.call(void 0, value));
       const savedChecksums = lockfile.checksums[sectionKey] || {};
-      const updatedData = _lodash2.default.pickBy(sourceData, (value, key) => savedChecksums[key] !== currentChecksums[key]);
+      const updatedData = _lodash2.default.pickBy(
+        sourceData,
+        (value, key) => savedChecksums[key] !== currentChecksums[key]
+      );
       return updatedData;
     }
   };
@@ -5574,20 +5863,31 @@ var lockfile_default = new (0, _interactivecommander.Command)().command("lockfil
   const ora = _ora2.default.call(void 0, );
   const lockfileHelper = createLockfileHelper();
   if (lockfileHelper.isLockfileExists() && !flags.force) {
-    ora.warn(`Lockfile won't be created because it already exists. Use --force to overwrite.`);
+    ora.warn(
+      `Lockfile won't be created because it already exists. Use --force to overwrite.`
+    );
   } else {
     const i18nConfig = getConfig();
     const buckets = getBuckets(i18nConfig);
     for (const bucket of buckets) {
       for (const bucketConfig of bucket.paths) {
-        const sourceLocale = __spec.resolveOverriddenLocale.call(void 0, i18nConfig.locale.source, bucketConfig.delimiter);
-        const bucketLoader = createBucketLoader(bucket.type, bucketConfig.pathPattern, {
-          isCacheRestore: false,
-          defaultLocale: sourceLocale
-        });
+        const sourceLocale = __spec.resolveOverriddenLocale.call(void 0, 
+          i18nConfig.locale.source,
+          bucketConfig.delimiter
+        );
+        const bucketLoader = createBucketLoader(
+          bucket.type,
+          bucketConfig.pathPattern,
+          {
+            defaultLocale: sourceLocale
+          }
+        );
         bucketLoader.setDefaultLocale(sourceLocale);
         const sourceData = await bucketLoader.pull(sourceLocale);
-        lockfileHelper.registerSourceData(bucketConfig.pathPattern, sourceData);
+        lockfileHelper.registerSourceData(
+          bucketConfig.pathPattern,
+          sourceData
+        );
       }
     }
     ora.succeed("Lockfile created");
@@ -5602,7 +5902,9 @@ var flagsSchema = _zod2.default.object({
 
 
 
-var cleanup_default = new (0, _interactivecommander.Command)().command("cleanup").description("Remove keys from target files that do not exist in the source file").helpOption("-h, --help", "Show help").option("--locale <locale>", "Specific locale to cleanup").option("--bucket <bucket>", "Specific bucket to cleanup").option("--dry-run", "Show what would be removed without making changes").option(
+var cleanup_default = new (0, _interactivecommander.Command)().command("cleanup").description(
+  "Remove keys from target files that do not exist in the source file"
+).helpOption("-h, --help", "Show help").option("--locale <locale>", "Specific locale to cleanup").option("--bucket <bucket>", "Specific bucket to cleanup").option("--dry-run", "Show what would be removed without making changes").option(
   "--verbose",
   "Show detailed output including:\n  - List of keys that would be removed.\n  - Processing steps."
 ).action(async function(options) {
@@ -5615,24 +5917,37 @@ var cleanup_default = new (0, _interactivecommander.Command)().command("cleanup"
     ora.succeed("Configuration loaded");
     let buckets = getBuckets(i18nConfig);
     if (options.bucket) {
-      buckets = buckets.filter((bucket) => bucket.type === options.bucket);
+      buckets = buckets.filter(
+        (bucket) => bucket.type === options.bucket
+      );
     }
     const targetLocales = options.locale ? [options.locale] : i18nConfig.locale.targets;
     for (const bucket of buckets) {
       console.log();
       ora.info(`Processing bucket: ${bucket.type}`);
       for (const bucketConfig of bucket.paths) {
-        const sourceLocale = __spec.resolveOverriddenLocale.call(void 0, i18nConfig.locale.source, bucketConfig.delimiter);
-        const bucketOra = _ora2.default.call(void 0, { indent: 2 }).info(`Processing path: ${bucketConfig.pathPattern}`);
-        const bucketLoader = createBucketLoader(bucket.type, bucketConfig.pathPattern, {
-          isCacheRestore: false,
-          defaultLocale: sourceLocale
-        });
+        const sourceLocale = __spec.resolveOverriddenLocale.call(void 0, 
+          i18nConfig.locale.source,
+          bucketConfig.delimiter
+        );
+        const bucketOra = _ora2.default.call(void 0, { indent: 2 }).info(
+          `Processing path: ${bucketConfig.pathPattern}`
+        );
+        const bucketLoader = createBucketLoader(
+          bucket.type,
+          bucketConfig.pathPattern,
+          {
+            defaultLocale: sourceLocale
+          }
+        );
         bucketLoader.setDefaultLocale(sourceLocale);
         const sourceData = await bucketLoader.pull(sourceLocale);
         const sourceKeys = Object.keys(sourceData);
         for (const _targetLocale of targetLocales) {
-          const targetLocale = __spec.resolveOverriddenLocale.call(void 0, _targetLocale, bucketConfig.delimiter);
+          const targetLocale = __spec.resolveOverriddenLocale.call(void 0, 
+            _targetLocale,
+            bucketConfig.delimiter
+          );
           try {
             const targetData = await bucketLoader.pull(targetLocale);
             const targetKeys = Object.keys(targetData);
@@ -5642,17 +5957,29 @@ var cleanup_default = new (0, _interactivecommander.Command)().command("cleanup"
               continue;
             }
             if (options.verbose) {
-              bucketOra.info(`[${targetLocale}] Keys to remove: ${JSON.stringify(keysToRemove, null, 2)}`);
+              bucketOra.info(
+                `[${targetLocale}] Keys to remove: ${JSON.stringify(
+                  keysToRemove,
+                  null,
+                  2
+                )}`
+              );
             }
             if (!options.dryRun) {
               const cleanedData = _lodash2.default.pick(targetData, sourceKeys);
               await bucketLoader.push(targetLocale, cleanedData);
-              bucketOra.succeed(`[${targetLocale}] Removed ${keysToRemove.length} keys`);
+              bucketOra.succeed(
+                `[${targetLocale}] Removed ${keysToRemove.length} keys`
+              );
             } else {
-              bucketOra.succeed(`[${targetLocale}] Would remove ${keysToRemove.length} keys (dry run)`);
+              bucketOra.succeed(
+                `[${targetLocale}] Would remove ${keysToRemove.length} keys (dry run)`
+              );
             }
           } catch (error) {
-            bucketOra.fail(`[${targetLocale}] Failed to cleanup: ${error.message}`);
+            bucketOra.fail(
+              `[${targetLocale}] Failed to cleanup: ${error.message}`
+            );
             results.push({
               step: `Cleanup ${bucket.type}/${bucketConfig} for ${targetLocale}`,
               status: "Failed",
@@ -5700,7 +6027,7 @@ var _stdiojs = require('@modelcontextprotocol/sdk/server/stdio.js');
 var _mcpjs = require('@modelcontextprotocol/sdk/server/mcp.js');
 
 
-var mcp_default = new (0, _interactivecommander.Command)().command("mcp").description("Use Lingo.dev model context provider with your AI agent").helpOption("-h, --help", "Show help").action(async (_33, program) => {
+var mcp_default = new (0, _interactivecommander.Command)().command("mcp").description("Use Lingo.dev model context provider with your AI agent").helpOption("-h, --help", "Show help").action(async (_34, program) => {
   const apiKey = program.args[0];
   const settings = getSettings(apiKey);
   if (!settings.auth.apiKey) {
@@ -5802,7 +6129,9 @@ function createLingoDotDevLocalizer(explicitApiKey) {
   if (!auth) {
     throw new Error(
       _dedent2.default`
-        You're trying to use ${_chalk2.default.hex(colors.green)("Lingo.dev")} provider, however, you are not authenticated.
+        You're trying to use ${_chalk2.default.hex(colors.green)(
+        "Lingo.dev"
+      )} provider, however, you are not authenticated.
 
         To fix this issue:
         1. Run ${_chalk2.default.dim("lingo.dev login")} to authenticate, or
@@ -5822,7 +6151,7 @@ function createLingoDotDevLocalizer(explicitApiKey) {
         const response = await engine.whoami();
         return {
           authenticated: !!response,
-          username: _optionalChain([response, 'optionalAccess', _197 => _197.email])
+          username: _optionalChain([response, 'optionalAccess', _204 => _204.email])
         };
       } catch (e2) {
         return { authenticated: false };
@@ -5859,6 +6188,7 @@ function createLingoDotDevLocalizer(explicitApiKey) {
 
 
 
+
 function createExplicitLocalizer(provider) {
   switch (provider.id) {
     default:
@@ -5868,7 +6198,11 @@ function createExplicitLocalizer(provider) {
 
           To fix this issue:
           1. Switch to one of the supported providers, or
-          2. Remove the ${_chalk2.default.italic("provider")} node from your i18n.json configuration to switch to ${_chalk2.default.hex(colors.green)("Lingo.dev")}
+          2. Remove the ${_chalk2.default.italic(
+          "provider"
+        )} node from your i18n.json configuration to switch to ${_chalk2.default.hex(
+          colors.green
+        )("Lingo.dev")}
 
           ${_chalk2.default.hex(colors.blue)("Docs: https://lingo.dev/go/docs")}
         `
@@ -5912,19 +6246,35 @@ function createExplicitLocalizer(provider) {
         prompt: provider.prompt,
         skipAuth: true
       });
+    case "mistral":
+      return createAiSdkLocalizer({
+        factory: (params) => _mistral.createMistral.call(void 0, params).languageModel(provider.model),
+        id: provider.id,
+        prompt: provider.prompt,
+        apiKeyName: "MISTRAL_API_KEY",
+        baseUrl: provider.baseUrl
+      });
   }
 }
 function createAiSdkLocalizer(params) {
   const skipAuth = params.skipAuth === true;
-  const apiKey = process.env[_nullishCoalesce(_optionalChain([params, 'optionalAccess', _198 => _198.apiKeyName]), () => ( ""))];
+  const apiKey = process.env[_nullishCoalesce(_optionalChain([params, 'optionalAccess', _205 => _205.apiKeyName]), () => ( ""))];
   if (!skipAuth && !apiKey || !params.apiKeyName) {
     throw new Error(
       _dedent2.default`
-        You're trying to use raw ${_chalk2.default.dim(params.id)} API for translation. ${params.apiKeyName ? `However, ${_chalk2.default.dim(params.apiKeyName)} environment variable is not set.` : "However, that provider is unavailable."}
+        You're trying to use raw ${_chalk2.default.dim(params.id)} API for translation. ${params.apiKeyName ? `However, ${_chalk2.default.dim(
+        params.apiKeyName
+      )} environment variable is not set.` : "However, that provider is unavailable."}
 
         To fix this issue:
-        1. ${params.apiKeyName ? `Set ${_chalk2.default.dim(params.apiKeyName)} in your environment variables` : "Set the environment variable for your provider (if required)"}, or
-        2. Remove the ${_chalk2.default.italic("provider")} node from your i18n.json configuration to switch to ${_chalk2.default.hex(colors.green)("Lingo.dev")}
+        1. ${params.apiKeyName ? `Set ${_chalk2.default.dim(
+        params.apiKeyName
+      )} in your environment variables` : "Set the environment variable for your provider (if required)"}, or
+        2. Remove the ${_chalk2.default.italic(
+        "provider"
+      )} node from your i18n.json configuration to switch to ${_chalk2.default.hex(
+        colors.green
+      )("Lingo.dev")}
 
         ${_chalk2.default.hex(colors.blue)("Docs: https://lingo.dev/go/docs")}
       `
@@ -6033,8 +6383,8 @@ async function setup(input2) {
             throw new Error(
               "No buckets found in i18n.json. Please add at least one bucket containing i18n content."
             );
-          } else if (_optionalChain([ctx, 'access', _199 => _199.flags, 'access', _200 => _200.bucket, 'optionalAccess', _201 => _201.some, 'call', _202 => _202(
-            (bucket) => !_optionalChain([ctx, 'access', _203 => _203.config, 'optionalAccess', _204 => _204.buckets, 'access', _205 => _205[bucket]])
+          } else if (_optionalChain([ctx, 'access', _206 => _206.flags, 'access', _207 => _207.bucket, 'optionalAccess', _208 => _208.some, 'call', _209 => _209(
+            (bucket) => !_optionalChain([ctx, 'access', _210 => _210.config, 'optionalAccess', _211 => _211.buckets, 'access', _212 => _212[bucket]])
           )])) {
             throw new Error(
               `One or more specified buckets do not exist in i18n.json. Please add them to the list first and try again.`
@@ -6047,7 +6397,7 @@ async function setup(input2) {
         title: "Selecting localization provider",
         task: async (ctx, task) => {
           ctx.localizer = createLocalizer(
-            _optionalChain([ctx, 'access', _206 => _206.config, 'optionalAccess', _207 => _207.provider]),
+            _optionalChain([ctx, 'access', _213 => _213.config, 'optionalAccess', _214 => _214.provider]),
             ctx.flags.apiKey
           );
           if (!ctx.localizer) {
@@ -6064,10 +6414,14 @@ async function setup(input2) {
           const authStatus = await ctx.localizer.checkAuth();
           if (!authStatus.authenticated) {
             throw new Error(
-              `Failed to authenticate with ${_chalk2.default.hex(colors.yellow)(ctx.localizer.id)} provider. Please check your API key and try again.`
+              `Failed to authenticate with ${_chalk2.default.hex(colors.yellow)(
+                ctx.localizer.id
+              )} provider. Please check your API key and try again.`
             );
           }
-          task.title = `Authenticated as ${_chalk2.default.hex(colors.yellow)(authStatus.username)}`;
+          task.title = `Authenticated as ${_chalk2.default.hex(colors.yellow)(
+            authStatus.username
+          )}`;
         }
       },
       {
@@ -6128,14 +6482,22 @@ async function plan(input2) {
         title: "Locating content buckets",
         task: async (ctx, task) => {
           const bucketCount = buckets.length;
-          const bucketFilter = input2.flags.bucket ? ` ${_chalk2.default.dim(`(filtered by: ${_chalk2.default.hex(colors.yellow)(input2.flags.bucket.join(", "))})`)}` : "";
-          task.title = `Found ${_chalk2.default.hex(colors.yellow)(bucketCount.toString())} bucket(s)${bucketFilter}`;
+          const bucketFilter = input2.flags.bucket ? ` ${_chalk2.default.dim(
+            `(filtered by: ${_chalk2.default.hex(colors.yellow)(
+              input2.flags.bucket.join(", ")
+            )})`
+          )}` : "";
+          task.title = `Found ${_chalk2.default.hex(colors.yellow)(
+            bucketCount.toString()
+          )} bucket(s)${bucketFilter}`;
         }
       },
       {
         title: "Detecting locales",
         task: async (ctx, task) => {
-          task.title = `Found ${_chalk2.default.hex(colors.yellow)(_targetLocales.length.toString())} target locale(s)`;
+          task.title = `Found ${_chalk2.default.hex(colors.yellow)(
+            _targetLocales.length.toString()
+          )} target locale(s)`;
         }
       },
       {
@@ -6154,8 +6516,14 @@ async function plan(input2) {
               patterns.push(bucketPath.pathPattern);
             }
           }
-          const fileFilter = input2.flags.file ? ` ${_chalk2.default.dim(`(filtered by: ${_chalk2.default.hex(colors.yellow)(input2.flags.file.join(", "))})`)}` : "";
-          task.title = `Found ${_chalk2.default.hex(colors.yellow)(patterns.length.toString())} path pattern(s)${fileFilter}`;
+          const fileFilter = input2.flags.file ? ` ${_chalk2.default.dim(
+            `(filtered by: ${_chalk2.default.hex(colors.yellow)(
+              input2.flags.file.join(", ")
+            )})`
+          )}` : "";
+          task.title = `Found ${_chalk2.default.hex(colors.yellow)(
+            patterns.length.toString()
+          )} path pattern(s)${fileFilter}`;
         }
       },
       {
@@ -6193,7 +6561,9 @@ async function plan(input2) {
               }
             }
           }
-          task.title = `Prepared ${_chalk2.default.hex(colors.green)(ctx.tasks.length.toString())} translation task(s)`;
+          task.title = `Prepared ${_chalk2.default.hex(colors.green)(
+            ctx.tasks.length.toString()
+          )} translation task(s)`;
         }
       }
     ],
@@ -6647,7 +7017,7 @@ var AST = class _AST {
     const ret = this.type === null ? this.#parts.slice().map((p) => typeof p === "string" ? p : p.toJSON()) : [this.type, ...this.#parts.map((p) => p.toJSON())];
     if (this.isStart() && !this.type)
       ret.unshift([]);
-    if (this.isEnd() && (this === this.#root || this.#root.#filledNegs && _optionalChain([this, 'access', _208 => _208.#parent, 'optionalAccess', _209 => _209.type]) === "!")) {
+    if (this.isEnd() && (this === this.#root || this.#root.#filledNegs && _optionalChain([this, 'access', _215 => _215.#parent, 'optionalAccess', _216 => _216.type]) === "!")) {
       ret.push({});
     }
     return ret;
@@ -6655,7 +7025,7 @@ var AST = class _AST {
   isStart() {
     if (this.#root === this)
       return true;
-    if (!_optionalChain([this, 'access', _210 => _210.#parent, 'optionalAccess', _211 => _211.isStart, 'call', _212 => _212()]))
+    if (!_optionalChain([this, 'access', _217 => _217.#parent, 'optionalAccess', _218 => _218.isStart, 'call', _219 => _219()]))
       return false;
     if (this.#parentIndex === 0)
       return true;
@@ -6671,12 +7041,12 @@ var AST = class _AST {
   isEnd() {
     if (this.#root === this)
       return true;
-    if (_optionalChain([this, 'access', _213 => _213.#parent, 'optionalAccess', _214 => _214.type]) === "!")
+    if (_optionalChain([this, 'access', _220 => _220.#parent, 'optionalAccess', _221 => _221.type]) === "!")
       return true;
-    if (!_optionalChain([this, 'access', _215 => _215.#parent, 'optionalAccess', _216 => _216.isEnd, 'call', _217 => _217()]))
+    if (!_optionalChain([this, 'access', _222 => _222.#parent, 'optionalAccess', _223 => _223.isEnd, 'call', _224 => _224()]))
       return false;
     if (!this.type)
-      return _optionalChain([this, 'access', _218 => _218.#parent, 'optionalAccess', _219 => _219.isEnd, 'call', _220 => _220()]);
+      return _optionalChain([this, 'access', _225 => _225.#parent, 'optionalAccess', _226 => _226.isEnd, 'call', _227 => _227()]);
     const pl = this.#parent ? this.#parent.#parts.length : 0;
     return this.#parentIndex === pl - 1;
   }
@@ -6898,7 +7268,7 @@ var AST = class _AST {
     if (!this.type) {
       const noEmpty = this.isStart() && this.isEnd();
       const src = this.#parts.map((p) => {
-        const [re, _33, hasMagic, uflag] = typeof p === "string" ? _AST.#parseGlob(p, this.#hasMagic, noEmpty) : p.toRegExpSource(allowDot);
+        const [re, _34, hasMagic, uflag] = typeof p === "string" ? _AST.#parseGlob(p, this.#hasMagic, noEmpty) : p.toRegExpSource(allowDot);
         this.#hasMagic = this.#hasMagic || hasMagic;
         this.#uflag = this.#uflag || uflag;
         return re;
@@ -6921,7 +7291,7 @@ var AST = class _AST {
         }
       }
       let end = "";
-      if (this.isEnd() && this.#root.#filledNegs && _optionalChain([this, 'access', _221 => _221.#parent, 'optionalAccess', _222 => _222.type]) === "!") {
+      if (this.isEnd() && this.#root.#filledNegs && _optionalChain([this, 'access', _228 => _228.#parent, 'optionalAccess', _229 => _229.type]) === "!") {
         end = "(?:$|\\/)";
       }
       const final2 = start2 + src + end;
@@ -6971,7 +7341,7 @@ var AST = class _AST {
       if (typeof p === "string") {
         throw new Error("string type in extglob ast??");
       }
-      const [re, _33, _hasMagic, uflag] = p.toRegExpSource(dot);
+      const [re, _34, _hasMagic, uflag] = p.toRegExpSource(dot);
       this.#uflag = this.#uflag || uflag;
       return re;
     }).filter((p) => !(this.isStart() && this.isEnd()) || !!p).join("|");
@@ -7216,7 +7586,7 @@ var Minimatch = class {
     }
     return false;
   }
-  debug(..._33) {
+  debug(..._34) {
   }
   make() {
     const pattern = this.pattern;
@@ -7238,7 +7608,7 @@ var Minimatch = class {
     const rawGlobParts = this.globSet.map((s) => this.slashSplit(s));
     this.globParts = this.preprocess(rawGlobParts);
     this.debug(this.pattern, this.globParts);
-    let set = this.globParts.map((s, _33, __) => {
+    let set = this.globParts.map((s, _34, __) => {
       if (this.isWindows && this.windowsNoMagicRoot) {
         const isUNC = s[0] === "" && s[1] === "" && (s[2] === "?" || !globMagic.test(s[2])) && !globMagic.test(s[3]);
         const isDrive = /^[a-z]:/i.test(s[0]);
@@ -7761,11 +8131,15 @@ async function execute(input2) {
       {
         title: "Initializing localization engine",
         task: async (ctx, task) => {
-          task.title = `Localization engine ${_chalk2.default.hex(colors.green)("ready")} (${ctx.localizer.id})`;
+          task.title = `Localization engine ${_chalk2.default.hex(colors.green)(
+            "ready"
+          )} (${ctx.localizer.id})`;
         }
       },
       {
-        title: `Processing localization tasks ${_chalk2.default.dim(`(tasks: ${input2.tasks.length}, concurrency: ${effectiveConcurrency})`)}`,
+        title: `Processing localization tasks ${_chalk2.default.dim(
+          `(tasks: ${input2.tasks.length}, concurrency: ${effectiveConcurrency})`
+        )}`,
         task: (ctx, task) => {
           if (input2.tasks.length < 1) {
             task.title = `Skipping, nothing to localize.`;
@@ -7778,7 +8152,7 @@ async function execute(input2) {
           const workerTasks = [];
           for (let i = 0; i < workersCount; i++) {
             const assignedTasks = ctx.tasks.filter(
-              (_33, idx) => idx % workersCount === i
+              (_34, idx) => idx % workersCount === i
             );
             workerTasks.push(
               createWorkerTask({
@@ -7814,11 +8188,11 @@ function createWorkerStatusMessage(args) {
     "[locale]",
     args.assignedTask.targetLocale
   );
-  return `[${_chalk2.default.hex(colors.yellow)(`${args.percentage}%`)}] Processing: ${_chalk2.default.dim(
-    displayPath
-  )} (${_chalk2.default.hex(colors.yellow)(args.assignedTask.sourceLocale)} -> ${_chalk2.default.hex(
-    colors.yellow
-  )(args.assignedTask.targetLocale)})`;
+  return `[${_chalk2.default.hex(colors.yellow)(
+    `${args.percentage}%`
+  )}] Processing: ${_chalk2.default.dim(displayPath)} (${_chalk2.default.hex(colors.yellow)(
+    args.assignedTask.sourceLocale
+  )} -> ${_chalk2.default.hex(colors.yellow)(args.assignedTask.targetLocale)})`;
 }
 function createExecutionProgressMessage(ctx) {
   const succeededTasksCount = countTasks(
@@ -7833,7 +8207,9 @@ function createExecutionProgressMessage(ctx) {
     ctx,
     (_t, result) => result.status === "skipped"
   );
-  return `Processed ${_chalk2.default.green(succeededTasksCount)}/${ctx.tasks.length}, Failed ${_chalk2.default.red(failedTasksCount)}, Skipped ${_chalk2.default.dim(skippedTasksCount)}`;
+  return `Processed ${_chalk2.default.green(succeededTasksCount)}/${ctx.tasks.length}, Failed ${_chalk2.default.red(failedTasksCount)}, Skipped ${_chalk2.default.dim(
+    skippedTasksCount
+  )}`;
 }
 function createLoaderForTask(assignedTask) {
   const bucketLoader = createBucketLoader(
@@ -7841,7 +8217,6 @@ function createLoaderForTask(assignedTask) {
     assignedTask.bucketPathPattern,
     {
       defaultLocale: assignedTask.sourceLocale,
-      isCacheRestore: false,
       injectLocale: assignedTask.injectLocale
     },
     assignedTask.lockedKeys,
@@ -7880,7 +8255,7 @@ function createWorkerTask(args) {
             const processableData = _lodash2.default.chain(sourceData).entries().filter(
               ([key, value]) => delta.added.includes(key) || delta.updated.includes(key) || !!args.ctx.flags.force
             ).filter(
-              ([key]) => !assignedTask.onlyKeys.length || _optionalChain([assignedTask, 'access', _223 => _223.onlyKeys, 'optionalAccess', _224 => _224.some, 'call', _225 => _225(
+              ([key]) => !assignedTask.onlyKeys.length || _optionalChain([assignedTask, 'access', _230 => _230.onlyKeys, 'optionalAccess', _231 => _231.some, 'call', _232 => _232(
                 (pattern) => minimatch(key, pattern)
               )])
             ).fromPairs().value();
@@ -7895,33 +8270,47 @@ function createWorkerTask(args) {
                 targetData,
                 processableData
               },
-              (progress) => {
+              async (progress, _sourceChunk, processedChunk) => {
+                await args.ioLimiter(async () => {
+                  await bucketLoader.pull(assignedTask.sourceLocale);
+                  const latestTargetData = await bucketLoader.pull(
+                    assignedTask.targetLocale
+                  );
+                  const _partialData = _lodash2.default.merge(
+                    {},
+                    latestTargetData,
+                    processedChunk
+                  );
+                  const finalChunkTargetData = processRenamedKeys(
+                    delta,
+                    _partialData
+                  );
+                  await bucketLoader.push(
+                    assignedTask.targetLocale,
+                    finalChunkTargetData
+                  );
+                });
                 subTask.title = createWorkerStatusMessage({
                   assignedTask,
                   percentage: progress
                 });
               }
             );
-            let finalTargetData = _lodash2.default.merge(
+            const finalTargetData = _lodash2.default.merge(
               {},
               sourceData,
               targetData,
               processedTargetData
             );
-            finalTargetData = _lodash2.default.chain(finalTargetData).entries().map(([key, value]) => {
-              const renaming = delta.renamed.find(
-                ([oldKey]) => oldKey === key
-              );
-              if (!renaming) {
-                return [key, value];
-              }
-              return [renaming[1], value];
-            }).fromPairs().value();
+            const finalRenamedTargetData = processRenamedKeys(
+              delta,
+              finalTargetData
+            );
             await args.ioLimiter(async () => {
               await bucketLoader.pull(assignedTask.sourceLocale);
               await bucketLoader.push(
                 assignedTask.targetLocale,
-                finalTargetData
+                finalRenamedTargetData
               );
               const checksums2 = await deltaProcessor.createChecksums(sourceData);
               await deltaProcessor.saveChecksums(checksums2);
@@ -7945,6 +8334,15 @@ function countTasks(ctx, predicate) {
     ([task, result]) => predicate(task, result)
   ).length;
 }
+function processRenamedKeys(delta, targetData) {
+  return _lodash2.default.chain(targetData).entries().map(([key, value]) => {
+    const renaming = delta.renamed.find(([oldKey]) => oldKey === key);
+    if (!renaming) {
+      return [key, value];
+    }
+    return [renaming[1], value];
+  }).fromPairs().value();
+}
 
 // src/cli/cmd/run/_types.ts
 
@@ -7969,13 +8367,13 @@ var flagsSchema2 = _zod.z.object({
 
 // src/cli/cmd/run/_utils.ts
 async function determineAuthId(ctx) {
-  const isByokMode = !!_optionalChain([ctx, 'access', _226 => _226.config, 'optionalAccess', _227 => _227.provider]);
+  const isByokMode = !!_optionalChain([ctx, 'access', _233 => _233.config, 'optionalAccess', _234 => _234.provider]);
   if (isByokMode) {
     return null;
   } else {
     try {
-      const authStatus = await _optionalChain([ctx, 'access', _228 => _228.localizer, 'optionalAccess', _229 => _229.checkAuth, 'call', _230 => _230()]);
-      return _optionalChain([authStatus, 'optionalAccess', _231 => _231.username]) || null;
+      const authStatus = await _optionalChain([ctx, 'access', _235 => _235.localizer, 'optionalAccess', _236 => _236.checkAuth, 'call', _237 => _237()]);
+      return _optionalChain([authStatus, 'optionalAccess', _238 => _238.username]) || null;
     } catch (e3) {
       return null;
     }
@@ -8075,7 +8473,9 @@ var InBranchFlow = class extends IntegrationFlow {
       _child_process.execSync.call(void 0, `git add .`, { stdio: "inherit" });
       _child_process.execSync.call(void 0, `git status --porcelain`, { stdio: "inherit" });
       _child_process.execSync.call(void 0, 
-        `git commit -m ${escapeShellArg(this.platformKit.config.commitMessage)} --no-verify`,
+        `git commit -m ${escapeShellArg(
+          this.platformKit.config.commitMessage
+        )} --no-verify`,
         {
           stdio: "inherit"
         }
@@ -8123,7 +8523,7 @@ var InBranchFlow = class extends IntegrationFlow {
     _child_process.execSync.call(void 0, `git config --global safe.directory ${process.cwd()}`);
     _child_process.execSync.call(void 0, `git config user.name "${gitConfig.userName}"`);
     _child_process.execSync.call(void 0, `git config user.email "${gitConfig.userEmail}"`);
-    _optionalChain([this, 'access', _232 => _232.platformKit, 'optionalAccess', _233 => _233.gitConfig, 'call', _234 => _234()]);
+    _optionalChain([this, 'access', _239 => _239.platformKit, 'optionalAccess', _240 => _240.gitConfig, 'call', _241 => _241()]);
     _child_process.execSync.call(void 0, `git fetch origin ${baseBranchName}`, { stdio: "inherit" });
     _child_process.execSync.call(void 0, `git checkout ${baseBranchName} --`, { stdio: "inherit" });
     if (!processOwnCommits) {
@@ -8155,7 +8555,7 @@ var InBranchFlow = class extends IntegrationFlow {
 // src/cli/cmd/ci/flows/pull-request.ts
 var PullRequestFlow = class extends InBranchFlow {
   async preRun() {
-    const canContinue = await _optionalChain([super.preRun.bind(this), 'optionalCall', _235 => _235()]);
+    const canContinue = await _optionalChain([super.preRun.bind(this), 'optionalCall', _242 => _242()]);
     if (!canContinue) {
       return false;
     }
@@ -8198,7 +8598,9 @@ var PullRequestFlow = class extends InBranchFlow {
     this.ora.start("Checking if PR already exists");
     const pullRequestNumber = await this.ensureFreshPr(this.i18nBranchName);
     this.ora.succeed(
-      `Pull request ready: ${this.platformKit.buildPullRequestUrl(pullRequestNumber)}`
+      `Pull request ready: ${this.platformKit.buildPullRequestUrl(
+        pullRequestNumber
+      )}`
     );
   }
   calculatePrBranchName() {
@@ -8368,11 +8770,17 @@ var PlatformKit = class {
   get config() {
     const env = _zod2.default.object({
       LINGODOTDEV_API_KEY: _zod2.default.string(),
-      LINGODOTDEV_PULL_REQUEST: _zod2.default.preprocess((val) => val === "true" || val === true, _zod2.default.boolean()),
+      LINGODOTDEV_PULL_REQUEST: _zod2.default.preprocess(
+        (val) => val === "true" || val === true,
+        _zod2.default.boolean()
+      ),
       LINGODOTDEV_COMMIT_MESSAGE: _zod2.default.string().optional(),
       LINGODOTDEV_PULL_REQUEST_TITLE: _zod2.default.string().optional(),
       LINGODOTDEV_WORKING_DIRECTORY: _zod2.default.string().optional(),
-      LINGODOTDEV_PROCESS_OWN_COMMITS: _zod2.default.preprocess((val) => val === "true" || val === true, _zod2.default.boolean()).optional()
+      LINGODOTDEV_PROCESS_OWN_COMMITS: _zod2.default.preprocess(
+        (val) => val === "true" || val === true,
+        _zod2.default.boolean()
+      ).optional()
     }).parse(process.env);
     return {
       replexicaApiKey: env.LINGODOTDEV_API_KEY,
@@ -8410,10 +8818,10 @@ var BitbucketPlatformKit = class extends PlatformKit {
       repo_slug: this.platformConfig.repositoryName,
       state: "OPEN"
     }).then(({ data: { values } }) => {
-      return _optionalChain([values, 'optionalAccess', _236 => _236.find, 'call', _237 => _237(
-        ({ source, destination }) => _optionalChain([source, 'optionalAccess', _238 => _238.branch, 'optionalAccess', _239 => _239.name]) === branch && _optionalChain([destination, 'optionalAccess', _240 => _240.branch, 'optionalAccess', _241 => _241.name]) === this.platformConfig.baseBranchName
+      return _optionalChain([values, 'optionalAccess', _243 => _243.find, 'call', _244 => _244(
+        ({ source, destination }) => _optionalChain([source, 'optionalAccess', _245 => _245.branch, 'optionalAccess', _246 => _246.name]) === branch && _optionalChain([destination, 'optionalAccess', _247 => _247.branch, 'optionalAccess', _248 => _248.name]) === this.platformConfig.baseBranchName
       )]);
-    }).then((pr) => _optionalChain([pr, 'optionalAccess', _242 => _242.id]));
+    }).then((pr) => _optionalChain([pr, 'optionalAccess', _249 => _249.id]));
   }
   async closePullRequest({ pullRequestNumber }) {
     await this.bb.repositories.declinePullRequest({
@@ -8509,7 +8917,7 @@ var GitHubPlatformKit = class extends PlatformKit {
       repo: this.platformConfig.repositoryName,
       base: this.platformConfig.baseBranchName,
       state: "open"
-    }).then(({ data }) => data[0]).then((pr) => _optionalChain([pr, 'optionalAccess', _243 => _243.number]));
+    }).then(({ data }) => data[0]).then((pr) => _optionalChain([pr, 'optionalAccess', _250 => _250.number]));
   }
   async closePullRequest({ pullRequestNumber }) {
     await this.octokit.rest.pulls.update({
@@ -8636,7 +9044,7 @@ var GitlabPlatformKit = class extends PlatformKit {
       sourceBranch: branch,
       state: "opened"
     });
-    return _optionalChain([mergeRequests, 'access', _244 => _244[0], 'optionalAccess', _245 => _245.iid]);
+    return _optionalChain([mergeRequests, 'access', _251 => _251[0], 'optionalAccess', _252 => _252.iid]);
   }
   async closePullRequest({
     pullRequestNumber
@@ -8726,7 +9134,7 @@ var ci_default = new (0, _interactivecommander.Command)().command("ci").descript
   }
   const env = {
     LINGODOTDEV_API_KEY: settings.auth.apiKey,
-    LINGODOTDEV_PULL_REQUEST: _optionalChain([options, 'access', _246 => _246.pullRequest, 'optionalAccess', _247 => _247.toString, 'call', _248 => _248()]) || "false",
+    LINGODOTDEV_PULL_REQUEST: _optionalChain([options, 'access', _253 => _253.pullRequest, 'optionalAccess', _254 => _254.toString, 'call', _255 => _255()]) || "false",
     ...options.commitMessage && {
       LINGODOTDEV_COMMIT_MESSAGE: options.commitMessage
     },
@@ -8746,7 +9154,7 @@ var ci_default = new (0, _interactivecommander.Command)().command("ci").descript
   const { isPullRequestMode } = platformKit.config;
   ora.info(`Pull request mode: ${isPullRequestMode ? "on" : "off"}`);
   const flow = isPullRequestMode ? new PullRequestFlow(ora, platformKit) : new InBranchFlow(ora, platformKit);
-  const canRun = await _optionalChain([flow, 'access', _249 => _249.preRun, 'optionalCall', _250 => _250()]);
+  const canRun = await _optionalChain([flow, 'access', _256 => _256.preRun, 'optionalCall', _257 => _257()]);
   if (canRun === false) {
     return;
   }
@@ -8756,7 +9164,7 @@ var ci_default = new (0, _interactivecommander.Command)().command("ci").descript
   if (!hasChanges) {
     return;
   }
-  await _optionalChain([flow, 'access', _251 => _251.postRun, 'optionalCall', _252 => _252()]);
+  await _optionalChain([flow, 'access', _258 => _258.postRun, 'optionalCall', _259 => _259()]);
 });
 function parseBooleanArg(val) {
   if (val === true) return true;
@@ -8772,11 +9180,29 @@ function parseBooleanArg(val) {
 
 
 
+
+
+
+
 var _clitable3 = require('cli-table3'); var _clitable32 = _interopRequireDefault(_clitable3);
-var status_default = new (0, _interactivecommander.Command)().command("status").description("Show the status of the localization process").helpOption("-h, --help", "Show help").option("--locale <locale>", "Locale to process", (val, prev) => prev ? [...prev, val] : [val]).option("--bucket <bucket>", "Bucket to process", (val, prev) => prev ? [...prev, val] : [val]).option(
+var status_default = new (0, _interactivecommander.Command)().command("status").description("Show the status of the localization process").helpOption("-h, --help", "Show help").option(
+  "--locale <locale>",
+  "Locale to process",
+  (val, prev) => prev ? [...prev, val] : [val]
+).option(
+  "--bucket <bucket>",
+  "Bucket to process",
+  (val, prev) => prev ? [...prev, val] : [val]
+).option(
   "--file [files...]",
   "File to process. Process only a specific path, may contain asterisk * to match multiple files."
-).option("--force", "Ignore lockfile and process all keys, useful for estimating full re-translation").option("--verbose", "Show detailed output including key-level word counts").option("--api-key <api-key>", "Explicitly set the API key to use, override the default API key from settings").action(async function(options) {
+).option(
+  "--force",
+  "Ignore lockfile and process all keys, useful for estimating full re-translation"
+).option("--verbose", "Show detailed output including key-level word counts").option(
+  "--api-key <api-key>",
+  "Explicitly set the API key to use, override the default API key from settings"
+).action(async function(options) {
   const ora = _ora2.default.call(void 0, );
   const flags = parseFlags2(options);
   let authId = null;
@@ -8807,17 +9233,23 @@ var status_default = new (0, _interactivecommander.Command)().command("status").
       flags
     });
     let buckets = getBuckets(i18nConfig);
-    if (_optionalChain([flags, 'access', _253 => _253.bucket, 'optionalAccess', _254 => _254.length])) {
-      buckets = buckets.filter((bucket) => flags.bucket.includes(bucket.type));
+    if (_optionalChain([flags, 'access', _260 => _260.bucket, 'optionalAccess', _261 => _261.length])) {
+      buckets = buckets.filter(
+        (bucket) => flags.bucket.includes(bucket.type)
+      );
     }
     ora.succeed("Buckets retrieved");
-    if (_optionalChain([flags, 'access', _255 => _255.file, 'optionalAccess', _256 => _256.length])) {
+    if (_optionalChain([flags, 'access', _262 => _262.file, 'optionalAccess', _263 => _263.length])) {
       buckets = buckets.map((bucket) => {
-        const paths = bucket.paths.filter((path17) => flags.file.find((file) => _optionalChain([path17, 'access', _257 => _257.pathPattern, 'optionalAccess', _258 => _258.match, 'call', _259 => _259(file)])));
+        const paths = bucket.paths.filter(
+          (path17) => flags.file.find((file) => _optionalChain([path17, 'access', _264 => _264.pathPattern, 'optionalAccess', _265 => _265.match, 'call', _266 => _266(file)]))
+        );
         return { ...bucket, paths };
       }).filter((bucket) => bucket.paths.length > 0);
       if (buckets.length === 0) {
-        ora.fail("No buckets found. All buckets were filtered out by --file option.");
+        ora.fail(
+          "No buckets found. All buckets were filtered out by --file option."
+        );
         process.exit(1);
       } else {
         ora.info(`\x1B[36mProcessing only filtered buckets:\x1B[0m`);
@@ -8829,7 +9261,7 @@ var status_default = new (0, _interactivecommander.Command)().command("status").
         });
       }
     }
-    const targetLocales = _optionalChain([flags, 'access', _260 => _260.locale, 'optionalAccess', _261 => _261.length]) ? flags.locale : i18nConfig.locale.targets;
+    const targetLocales = _optionalChain([flags, 'access', _267 => _267.locale, 'optionalAccess', _268 => _268.length]) ? flags.locale : i18nConfig.locale.targets;
     let totalSourceKeyCount = 0;
     let uniqueKeysToTranslate = 0;
     let totalExistingTranslations = 0;
@@ -8850,13 +9282,17 @@ var status_default = new (0, _interactivecommander.Command)().command("status").
         console.log();
         ora.info(`Analyzing bucket: ${bucket.type}`);
         for (const bucketPath of bucket.paths) {
-          const bucketOra = _ora2.default.call(void 0, { indent: 2 }).info(`Analyzing path: ${bucketPath.pathPattern}`);
-          const sourceLocale = __spec.resolveOverriddenLocale.call(void 0, i18nConfig.locale.source, bucketPath.delimiter);
+          const bucketOra = _ora2.default.call(void 0, { indent: 2 }).info(
+            `Analyzing path: ${bucketPath.pathPattern}`
+          );
+          const sourceLocale = __spec.resolveOverriddenLocale.call(void 0, 
+            i18nConfig.locale.source,
+            bucketPath.delimiter
+          );
           const bucketLoader = createBucketLoader(
             bucket.type,
             bucketPath.pathPattern,
             {
-              isCacheRestore: false,
               defaultLocale: sourceLocale,
               injectLocale: bucket.injectLocale
             },
@@ -8895,8 +9331,13 @@ var status_default = new (0, _interactivecommander.Command)().command("status").
           }
           fileStats[filePath].wordCount = sourceWordCount;
           for (const _targetLocale of targetLocales) {
-            const targetLocale = __spec.resolveOverriddenLocale.call(void 0, _targetLocale, bucketPath.delimiter);
-            bucketOra.start(`[${sourceLocale} -> ${targetLocale}] Analyzing translation status...`);
+            const targetLocale = __spec.resolveOverriddenLocale.call(void 0, 
+              _targetLocale,
+              bucketPath.delimiter
+            );
+            bucketOra.start(
+              `[${sourceLocale} -> ${targetLocale}] Analyzing translation status...`
+            );
             let targetData = {};
             let fileExists = true;
             try {
@@ -8912,13 +9353,20 @@ var status_default = new (0, _interactivecommander.Command)().command("status").
               fileStats[filePath].languageStats[_targetLocale].words = sourceWordCount;
               languageStats[_targetLocale].missing += sourceKeys.length;
               languageStats[_targetLocale].words += sourceWordCount;
-              totalWordCount.set(_targetLocale, (totalWordCount.get(_targetLocale) || 0) + sourceWordCount);
+              totalWordCount.set(
+                _targetLocale,
+                (totalWordCount.get(_targetLocale) || 0) + sourceWordCount
+              );
               bucketOra.succeed(
-                `[${sourceLocale} -> ${targetLocale}] ${_chalk2.default.red(`0% complete`)} (0/${sourceKeys.length} keys) - file not found`
+                `[${sourceLocale} -> ${targetLocale}] ${_chalk2.default.red(
+                  `0% complete`
+                )} (0/${sourceKeys.length} keys) - file not found`
               );
               continue;
             }
-            const deltaProcessor = createDeltaProcessor(bucketPath.pathPattern);
+            const deltaProcessor = createDeltaProcessor(
+              bucketPath.pathPattern
+            );
             const checksums = await deltaProcessor.loadChecksums();
             const delta = await deltaProcessor.calculateDelta({
               sourceData,
@@ -8927,7 +9375,9 @@ var status_default = new (0, _interactivecommander.Command)().command("status").
             });
             const missingKeys = delta.added;
             const updatedKeys = delta.updated;
-            const completeKeys = sourceKeys.filter((key) => !missingKeys.includes(key) && !updatedKeys.includes(key));
+            const completeKeys = sourceKeys.filter(
+              (key) => !missingKeys.includes(key) && !updatedKeys.includes(key)
+            );
             let wordsToTranslate = 0;
             const keysToProcess = flags.force ? sourceKeys : [...missingKeys, ...updatedKeys];
             for (const key of keysToProcess) {
@@ -8945,25 +9395,39 @@ var status_default = new (0, _interactivecommander.Command)().command("status").
             languageStats[_targetLocale].updated += updatedKeys.length;
             languageStats[_targetLocale].complete += completeKeys.length;
             languageStats[_targetLocale].words += wordsToTranslate;
-            totalWordCount.set(_targetLocale, (totalWordCount.get(_targetLocale) || 0) + wordsToTranslate);
+            totalWordCount.set(
+              _targetLocale,
+              (totalWordCount.get(_targetLocale) || 0) + wordsToTranslate
+            );
             const totalKeysInFile = sourceKeys.length;
             const completionPercent = (completeKeys.length / totalKeysInFile * 100).toFixed(1);
             if (missingKeys.length === 0 && updatedKeys.length === 0) {
               bucketOra.succeed(
-                `[${sourceLocale} -> ${targetLocale}] ${_chalk2.default.green(`100% complete`)} (${completeKeys.length}/${totalKeysInFile} keys)`
+                `[${sourceLocale} -> ${targetLocale}] ${_chalk2.default.green(
+                  `100% complete`
+                )} (${completeKeys.length}/${totalKeysInFile} keys)`
               );
             } else {
               const message = `[${sourceLocale} -> ${targetLocale}] ${parseFloat(completionPercent) > 50 ? _chalk2.default.yellow(`${completionPercent}% complete`) : _chalk2.default.red(`${completionPercent}% complete`)} (${completeKeys.length}/${totalKeysInFile} keys)`;
               bucketOra.succeed(message);
               if (flags.verbose) {
                 if (missingKeys.length > 0) {
-                  console.log(`    ${_chalk2.default.red(`Missing:`)} ${missingKeys.length} keys, ~${wordsToTranslate} words`);
                   console.log(
-                    `    ${_chalk2.default.dim(`Example missing: ${missingKeys.slice(0, 2).join(", ")}${missingKeys.length > 2 ? "..." : ""}`)}`
+                    `    ${_chalk2.default.red(`Missing:`)} ${missingKeys.length} keys, ~${wordsToTranslate} words`
+                  );
+                  console.log(
+                    `    ${_chalk2.default.red(`Missing:`)} ${missingKeys.length} keys, ~${wordsToTranslate} words`
+                  );
+                  console.log(
+                    `    ${_chalk2.default.dim(
+                      `Example missing: ${missingKeys.slice(0, 2).join(", ")}${missingKeys.length > 2 ? "..." : ""}`
+                    )}`
                   );
                 }
                 if (updatedKeys.length > 0) {
-                  console.log(`    ${_chalk2.default.yellow(`Updated:`)} ${updatedKeys.length} keys that changed in source`);
+                  console.log(
+                    `    ${_chalk2.default.yellow(`Updated:`)} ${updatedKeys.length} keys that changed in source`
+                  );
                 }
               }
             }
@@ -8973,9 +9437,12 @@ var status_default = new (0, _interactivecommander.Command)().command("status").
         ora.fail(`Failed to analyze bucket ${bucket.type}: ${error.message}`);
       }
     }
-    const totalKeysNeedingTranslation = Object.values(languageStats).reduce((sum, stats) => {
-      return sum + stats.missing + stats.updated;
-    }, 0);
+    const totalKeysNeedingTranslation = Object.values(languageStats).reduce(
+      (sum, stats) => {
+        return sum + stats.missing + stats.updated;
+      },
+      0
+    );
     const totalCompletedKeys = totalSourceKeyCount - totalKeysNeedingTranslation / targetLocales.length;
     console.log();
     ora.succeed(_chalk2.default.green(`Localization status completed.`));
@@ -8985,12 +9452,26 @@ var status_default = new (0, _interactivecommander.Command)().command("status").
     console.log(_chalk2.default.bold.cyan(`\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D`));
     console.log(_chalk2.default.bold(`
 \u{1F4DD} SOURCE CONTENT:`));
-    console.log(`\u2022 Source language: ${_chalk2.default.green(i18nConfig.locale.source)}`);
-    console.log(`\u2022 Source keys: ${_chalk2.default.yellow(totalSourceKeyCount.toString())} keys across all files`);
+    console.log(
+      `\u2022 Source language: ${_chalk2.default.green(i18nConfig.locale.source)}`
+    );
+    console.log(
+      `\u2022 Source keys: ${_chalk2.default.yellow(
+        totalSourceKeyCount.toString()
+      )} keys across all files`
+    );
     console.log(_chalk2.default.bold(`
 \u{1F310} LANGUAGE BY LANGUAGE BREAKDOWN:`));
     const table = new (0, _clitable32.default)({
-      head: ["Language", "Status", "Complete", "Missing", "Updated", "Total Keys", "Words to Translate"],
+      head: [
+        "Language",
+        "Status",
+        "Complete",
+        "Missing",
+        "Updated",
+        "Total Keys",
+        "Words to Translate"
+      ],
       style: {
         head: ["white"],
         // White color for headers
@@ -9039,15 +9520,21 @@ var status_default = new (0, _interactivecommander.Command)().command("status").
     console.log(_chalk2.default.bold(`
 \u{1F4CA} USAGE ESTIMATE:`));
     console.log(
-      `\u2022 WORDS TO BE CONSUMED: ~${_chalk2.default.yellow.bold(totalWordsToTranslate.toLocaleString())} words across all languages`
+      `\u2022 WORDS TO BE CONSUMED: ~${_chalk2.default.yellow.bold(
+        totalWordsToTranslate.toLocaleString()
+      )} words across all languages`
+    );
+    console.log(
+      `  (Words are counted from source language for keys that need translation in target languages)`
     );
-    console.log(`  (Words are counted from source language for keys that need translation in target languages)`);
     if (targetLocales.length > 1) {
       console.log(`\u2022 Per-language breakdown:`);
       for (const locale of targetLocales) {
         const words = totalWordCount.get(locale) || 0;
         const percent = (words / totalWordsToTranslate * 100).toFixed(1);
-        console.log(`  - ${locale}: ~${words.toLocaleString()} words (${percent}% of total)`);
+        console.log(
+          `  - ${locale}: ~${words.toLocaleString()} words (${percent}% of total)`
+        );
       }
     }
     if (flags.confirm && Object.keys(fileStats).length > 0) {
@@ -9057,7 +9544,9 @@ var status_default = new (0, _interactivecommander.Command)().command("status").
         if (stats.sourceKeys === 0) return;
         console.log(_chalk2.default.bold(`
 \u2022 ${path17}:`));
-        console.log(`  ${stats.sourceKeys} source keys, ~${stats.wordCount.toLocaleString()} source words`);
+        console.log(
+          `  ${stats.sourceKeys} source keys, ~${stats.wordCount.toLocaleString()} source words`
+        );
         const fileTable = new (0, _clitable32.default)({
           head: ["Language", "Status", "Details"],
           style: {
@@ -9084,8 +9573,10 @@ var status_default = new (0, _interactivecommander.Command)().command("status").
           let details = "";
           if (langStats.missing > 0 || langStats.updated > 0) {
             const parts = [];
-            if (langStats.missing > 0) parts.push(`${langStats.missing} missing`);
-            if (langStats.updated > 0) parts.push(`${langStats.updated} changed`);
+            if (langStats.missing > 0)
+              parts.push(`${langStats.missing} missing`);
+            if (langStats.updated > 0)
+              parts.push(`${langStats.updated} changed`);
             details = `${parts.join(", ")}, ~${langStats.words} words`;
           } else {
             details = "All keys translated";
@@ -9098,7 +9589,9 @@ var status_default = new (0, _interactivecommander.Command)().command("status").
     const completeLanguages = targetLocales.filter(
       (locale) => languageStats[locale].missing === 0 && languageStats[locale].updated === 0
     );
-    const missingLanguages = targetLocales.filter((locale) => languageStats[locale].complete === 0);
+    const missingLanguages = targetLocales.filter(
+      (locale) => languageStats[locale].complete === 0
+    );
     console.log(_chalk2.default.bold.green(`
 \u{1F4A1} OPTIMIZATION TIPS:`));
     if (missingLanguages.length > 0) {
@@ -9113,7 +9606,9 @@ var status_default = new (0, _interactivecommander.Command)().command("status").
     }
     if (targetLocales.length > 1) {
       console.log(`\u2022 Translating one language at a time reduces complexity`);
-      console.log(`\u2022 Try 'lingo.dev@latest i18n --locale ${targetLocales[0]}' to process just one language`);
+      console.log(
+        `\u2022 Try 'lingo.dev@latest i18n --locale ${targetLocales[0]}' to process just one language`
+      );
     }
     trackEvent(authId || "status", "cmd.status.success", {
       i18nConfig,
@@ -9170,12 +9665,14 @@ function validateParams2(i18nConfig, flags) {
       message: "No buckets found in i18n.json. Please add at least one bucket containing i18n content.",
       docUrl: "bucketNotFound"
     });
-  } else if (_optionalChain([flags, 'access', _262 => _262.locale, 'optionalAccess', _263 => _263.some, 'call', _264 => _264((locale) => !i18nConfig.locale.targets.includes(locale))])) {
+  } else if (_optionalChain([flags, 'access', _269 => _269.locale, 'optionalAccess', _270 => _270.some, 'call', _271 => _271((locale) => !i18nConfig.locale.targets.includes(locale))])) {
     throw new CLIError({
       message: `One or more specified locales do not exist in i18n.json locale.targets. Please add them to the list and try again.`,
       docUrl: "localeTargetNotFound"
     });
-  } else if (_optionalChain([flags, 'access', _265 => _265.bucket, 'optionalAccess', _266 => _266.some, 'call', _267 => _267((bucket) => !i18nConfig.buckets[bucket])])) {
+  } else if (_optionalChain([flags, 'access', _272 => _272.bucket, 'optionalAccess', _273 => _273.some, 'call', _274 => _274(
+    (bucket) => !i18nConfig.buckets[bucket]
+  )])) {
     throw new CLIError({
       message: `One or more specified buckets do not exist in i18n.json. Please add them to the list and try again.`,
       docUrl: "bucketNotFound"
@@ -9220,7 +9717,9 @@ var may_the_fourth_default = new (0, _interactivecommander.Command)().command("m
   });
   await renderSpacer2();
   console.log(
-    `${_chalk2.default.hex(colors2.green)("We hope you enjoyed it! :)")} ${_chalk2.default.hex(colors2.blue)("May the Fourth be with you! \u{1F680}")}`
+    `${_chalk2.default.hex(colors2.green)("We hope you enjoyed it! :)")} ${_chalk2.default.hex(
+      colors2.blue
+    )("May the Fourth be with you! \u{1F680}")}`
   );
   await renderSpacer2();
   console.log(_chalk2.default.dim(`---`));
@@ -9246,7 +9745,9 @@ async function renderBanner2() {
 }
 async function renderHero2() {
   console.log(
-    `\u26A1\uFE0F ${_chalk2.default.hex(colors2.green)("Lingo.dev")} - open-source, AI-powered i18n CLI for web & mobile localization.`
+    `\u26A1\uFE0F ${_chalk2.default.hex(colors2.green)(
+      "Lingo.dev"
+    )} - open-source, AI-powered i18n CLI for web & mobile localization.`
   );
   console.log(" ");
   console.log(
@@ -9258,7 +9759,7 @@ async function renderHero2() {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.100.0",
+  version: "0.101.0",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {
@@ -9372,6 +9873,7 @@ var package_default = {
   dependencies: {
     "@ai-sdk/anthropic": "^1.2.11",
     "@ai-sdk/google": "^1.2.19",
+    "@ai-sdk/mistral": "^1.2.8",
     "@ai-sdk/openai": "^1.3.22",
     "@babel/generator": "^7.27.1",
     "@babel/parser": "^7.27.1",
@@ -9488,6 +9990,167 @@ var package_default = {
   packageManager: "pnpm@9.12.3"
 };
 
+// src/cli/cmd/purge.ts
+
+
+
+
+var purge_default = new (0, _interactivecommander.Command)().command("purge").description(
+  "Remove translations for given --bucket, --file, --key, --locale"
+).helpOption("-h, --help", "Show help").option(
+  "--bucket <bucket>",
+  "Bucket to process",
+  (val, prev) => prev ? [...prev, val] : [val]
+).option(
+  "--file [files...]",
+  "File(s) to process. Only process files that match the given glob pattern(s)."
+).option(
+  "--key <key>",
+  "Key to remove. Remove all translation keys matching the given glob pattern."
+).option(
+  "--locale <locale>",
+  "Locale to process",
+  (val, prev) => prev ? [...prev, val] : [val]
+).option(
+  "--yes-really",
+  "Skip interactive confirmation and delete without asking."
+).action(async function(options) {
+  const ora = _ora2.default.call(void 0, );
+  try {
+    ora.start("Loading configuration...");
+    const i18nConfig = getConfig();
+    if (!i18nConfig) {
+      throw new Error("i18n.json not found. Please run `lingo.dev init`.");
+    }
+    ora.succeed("Configuration loaded");
+    let buckets = getBuckets(i18nConfig);
+    if (options.bucket && options.bucket.length) {
+      buckets = buckets.filter(
+        (bucket) => options.bucket.includes(bucket.type)
+      );
+    }
+    if (options.file && options.file.length) {
+      buckets = buckets.map((bucket) => {
+        const paths = bucket.paths.filter(
+          (bucketPath) => _optionalChain([options, 'access', _275 => _275.file, 'optionalAccess', _276 => _276.some, 'call', _277 => _277((f) => bucketPath.pathPattern.includes(f))])
+        );
+        return { ...bucket, paths };
+      }).filter((bucket) => bucket.paths.length > 0);
+      if (buckets.length === 0) {
+        ora.fail("All files were filtered out by --file option.");
+        process.exit(1);
+      }
+    }
+    const sourceLocale = i18nConfig.locale.source;
+    const targetLocales = options.locale && options.locale.length ? options.locale : i18nConfig.locale.targets;
+    let removedAny = false;
+    for (const bucket of buckets) {
+      console.log();
+      ora.info(`Processing bucket: ${bucket.type}`);
+      for (const bucketPath of bucket.paths) {
+        for (const _targetLocale of targetLocales) {
+          const targetLocale = __spec.resolveOverriddenLocale.call(void 0, 
+            _targetLocale,
+            bucketPath.delimiter
+          );
+          const bucketOra = _ora2.default.call(void 0, { indent: 2 }).start(
+            `Processing path: ${bucketPath.pathPattern} [${targetLocale}]`
+          );
+          try {
+            const bucketLoader = createBucketLoader(
+              bucket.type,
+              bucketPath.pathPattern,
+              {
+                defaultLocale: sourceLocale,
+                injectLocale: bucket.injectLocale
+              },
+              bucket.lockedKeys,
+              bucket.lockedPatterns,
+              bucket.ignoredKeys
+            );
+            await bucketLoader.init();
+            bucketLoader.setDefaultLocale(sourceLocale);
+            await bucketLoader.pull(sourceLocale);
+            let targetData = await bucketLoader.pull(targetLocale);
+            if (!targetData || Object.keys(targetData).length === 0) {
+              bucketOra.info(
+                `No translations found for ${bucketPath.pathPattern} [${targetLocale}]`
+              );
+              continue;
+            }
+            let newData = { ...targetData };
+            let keysToRemove = [];
+            if (options.key) {
+              keysToRemove = Object.keys(newData).filter(
+                (k) => minimatch(k, options.key)
+              );
+            } else {
+              keysToRemove = Object.keys(newData);
+            }
+            if (keysToRemove.length > 0) {
+              if (options.key) {
+                bucketOra.info(
+                  `About to delete ${keysToRemove.length} key(s) matching '${options.key}' from ${bucketPath.pathPattern} [${targetLocale}]:
+  ${keysToRemove.slice(0, 10).join(", ")}${keysToRemove.length > 10 ? ", ..." : ""}`
+                );
+              } else {
+                bucketOra.info(
+                  `About to delete all (${keysToRemove.length}) keys from ${bucketPath.pathPattern} [${targetLocale}]`
+                );
+              }
+              if (!options.yesReally) {
+                bucketOra.warn(
+                  "This is a destructive operation. If you are sure, type 'y' to continue. (Use --yes-really to skip this check.)"
+                );
+                const confirmed = await _prompts.confirm.call(void 0, {
+                  message: `Delete these keys from ${bucketPath.pathPattern} [${targetLocale}]?`,
+                  default: false
+                });
+                if (!confirmed) {
+                  bucketOra.info("Skipped by user.");
+                  continue;
+                }
+              }
+              for (const key of keysToRemove) {
+                delete newData[key];
+              }
+              removedAny = true;
+              await bucketLoader.push(targetLocale, newData);
+              if (options.key) {
+                bucketOra.succeed(
+                  `Removed ${keysToRemove.length} key(s) matching '${options.key}' from ${bucketPath.pathPattern} [${targetLocale}]`
+                );
+              } else {
+                bucketOra.succeed(
+                  `Removed all keys (${keysToRemove.length}) from ${bucketPath.pathPattern} [${targetLocale}]`
+                );
+              }
+            } else if (options.key) {
+              bucketOra.info(
+                `No keys matching '${options.key}' found in ${bucketPath.pathPattern} [${targetLocale}]`
+              );
+            } else {
+              bucketOra.info("No keys to remove.");
+            }
+          } catch (error) {
+            const err = error;
+            bucketOra.fail(`Failed: ${err.message}`);
+          }
+        }
+      }
+    }
+    if (!removedAny) {
+      ora.info("No keys were removed.");
+    } else {
+      ora.succeed("Purge completed.");
+    }
+  } catch (error) {
+    const err = error;
+    ora.fail(err.message);
+    process.exit(1);
+  }
+});
+
 // src/cli/index.ts
 _dotenv2.default.config();
 var cli_default = new (0, _interactivecommander.InteractiveCommand)().name("lingo.dev").description("Lingo.dev CLI").helpOption("-h, --help", "Show help").addHelpText(
@@ -9505,7 +10168,7 @@ ${_gradientstring.vice.call(void 0,
 
 Star the the repo :) https://github.com/LingoDotDev/lingo.dev
 `
-).version(`v${package_default.version}`, "-v, --version", "Show version").addCommand(init_default).interactive("-y, --no-interactive", "Disable interactive mode").addCommand(i18n_default).addCommand(auth_default).addCommand(login_default).addCommand(logout_default).addCommand(show_default).addCommand(config_default2).addCommand(lockfile_default).addCommand(cleanup_default).addCommand(mcp_default).addCommand(ci_default).addCommand(status_default).addCommand(may_the_fourth_default, { hidden: true }).addCommand(run_default, { hidden: true }).exitOverride((err) => {
+).version(`v${package_default.version}`, "-v, --version", "Show version").addCommand(init_default).interactive("-y, --no-interactive", "Disable interactive mode").addCommand(i18n_default).addCommand(auth_default).addCommand(login_default).addCommand(logout_default).addCommand(show_default).addCommand(config_default2).addCommand(lockfile_default).addCommand(cleanup_default).addCommand(mcp_default).addCommand(ci_default).addCommand(status_default).addCommand(may_the_fourth_default, { hidden: true }).addCommand(run_default).addCommand(purge_default).exitOverride((err) => {
   if (err.code === "commander.helpDisplayed" || err.code === "commander.version" || err.code === "commander.help") {
     process.exit(0);
   }