lingo.dev 0.116.2 → 0.116.4

package/build/cli.cjs

@@ -26,17 +26,17 @@ function getSettings(explicitApiKey) {
   _envVarsInfo();
   return {
     auth: {
-      apiKey: explicitApiKey || env.LINGODOTDEV_API_KEY || _optionalChain([systemFile, 'access', _37 => _37.auth, 'optionalAccess', _38 => _38.apiKey]) || defaults2.auth.apiKey,
-      apiUrl: env.LINGODOTDEV_API_URL || _optionalChain([systemFile, 'access', _39 => _39.auth, 'optionalAccess', _40 => _40.apiUrl]) || defaults2.auth.apiUrl,
-      webUrl: env.LINGODOTDEV_WEB_URL || _optionalChain([systemFile, 'access', _41 => _41.auth, 'optionalAccess', _42 => _42.webUrl]) || defaults2.auth.webUrl
+      apiKey: explicitApiKey || env.LINGODOTDEV_API_KEY || _optionalChain([systemFile, 'access', _38 => _38.auth, 'optionalAccess', _39 => _39.apiKey]) || defaults2.auth.apiKey,
+      apiUrl: env.LINGODOTDEV_API_URL || _optionalChain([systemFile, 'access', _40 => _40.auth, 'optionalAccess', _41 => _41.apiUrl]) || defaults2.auth.apiUrl,
+      webUrl: env.LINGODOTDEV_WEB_URL || _optionalChain([systemFile, 'access', _42 => _42.auth, 'optionalAccess', _43 => _43.webUrl]) || defaults2.auth.webUrl
     },
     llm: {
-      openaiApiKey: env.OPENAI_API_KEY || _optionalChain([systemFile, 'access', _43 => _43.llm, 'optionalAccess', _44 => _44.openaiApiKey]),
-      anthropicApiKey: env.ANTHROPIC_API_KEY || _optionalChain([systemFile, 'access', _45 => _45.llm, 'optionalAccess', _46 => _46.anthropicApiKey]),
-      groqApiKey: env.GROQ_API_KEY || _optionalChain([systemFile, 'access', _47 => _47.llm, 'optionalAccess', _48 => _48.groqApiKey]),
-      googleApiKey: env.GOOGLE_API_KEY || _optionalChain([systemFile, 'access', _49 => _49.llm, 'optionalAccess', _50 => _50.googleApiKey]),
-      openrouterApiKey: env.OPENROUTER_API_KEY || _optionalChain([systemFile, 'access', _51 => _51.llm, 'optionalAccess', _52 => _52.openrouterApiKey]),
-      mistralApiKey: env.MISTRAL_API_KEY || _optionalChain([systemFile, 'access', _53 => _53.llm, 'optionalAccess', _54 => _54.mistralApiKey])
+      openaiApiKey: env.OPENAI_API_KEY || _optionalChain([systemFile, 'access', _44 => _44.llm, 'optionalAccess', _45 => _45.openaiApiKey]),
+      anthropicApiKey: env.ANTHROPIC_API_KEY || _optionalChain([systemFile, 'access', _46 => _46.llm, 'optionalAccess', _47 => _47.anthropicApiKey]),
+      groqApiKey: env.GROQ_API_KEY || _optionalChain([systemFile, 'access', _48 => _48.llm, 'optionalAccess', _49 => _49.groqApiKey]),
+      googleApiKey: env.GOOGLE_API_KEY || _optionalChain([systemFile, 'access', _50 => _50.llm, 'optionalAccess', _51 => _51.googleApiKey]),
+      openrouterApiKey: env.OPENROUTER_API_KEY || _optionalChain([systemFile, 'access', _52 => _52.llm, 'optionalAccess', _53 => _53.openrouterApiKey]),
+      mistralApiKey: env.MISTRAL_API_KEY || _optionalChain([systemFile, 'access', _54 => _54.llm, 'optionalAccess', _55 => _55.mistralApiKey])
     }
   };
 }
@@ -145,43 +145,43 @@ Please use LINGODOTDEV_API_KEY instead.
 function _envVarsInfo() {
   const env = _loadEnv();
   const systemFile = _loadSystemFile();
-  if (env.LINGODOTDEV_API_KEY && _optionalChain([systemFile, 'access', _55 => _55.auth, 'optionalAccess', _56 => _56.apiKey])) {
+  if (env.LINGODOTDEV_API_KEY && _optionalChain([systemFile, 'access', _56 => _56.auth, 'optionalAccess', _57 => _57.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', _57 => _57.llm, 'optionalAccess', _58 => _58.openaiApiKey])) {
+  if (env.OPENAI_API_KEY && _optionalChain([systemFile, 'access', _58 => _58.llm, 'optionalAccess', _59 => _59.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', _59 => _59.llm, 'optionalAccess', _60 => _60.anthropicApiKey])) {
+  if (env.ANTHROPIC_API_KEY && _optionalChain([systemFile, 'access', _60 => _60.llm, 'optionalAccess', _61 => _61.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', _61 => _61.llm, 'optionalAccess', _62 => _62.groqApiKey])) {
+  if (env.GROQ_API_KEY && _optionalChain([systemFile, 'access', _62 => _62.llm, 'optionalAccess', _63 => _63.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', _63 => _63.llm, 'optionalAccess', _64 => _64.googleApiKey])) {
+  if (env.GOOGLE_API_KEY && _optionalChain([systemFile, 'access', _64 => _64.llm, 'optionalAccess', _65 => _65.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', _65 => _65.llm, 'optionalAccess', _66 => _66.openrouterApiKey])) {
+  if (env.OPENROUTER_API_KEY && _optionalChain([systemFile, 'access', _66 => _66.llm, 'optionalAccess', _67 => _67.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', _67 => _67.llm, 'optionalAccess', _68 => _68.mistralApiKey])) {
+  if (env.MISTRAL_API_KEY && _optionalChain([systemFile, 'access', _68 => _68.llm, 'optionalAccess', _69 => _69.mistralApiKey])) {
     console.info(
       "\x1B[36m%s\x1B[0m",
       `\u2139\uFE0F  Using MISTRAL_API_KEY env var instead of key from user config`
@@ -264,10 +264,10 @@ var LocalizationError = (_class5 = class extends Error {
   constructor(message, context) {
     super(message);_class5.prototype.__init5.call(this);;
     this.name = "LocalizationError";
-    this.bucket = _optionalChain([context, 'optionalAccess', _69 => _69.bucket]);
-    this.sourceLocale = _optionalChain([context, 'optionalAccess', _70 => _70.sourceLocale]);
-    this.targetLocale = _optionalChain([context, 'optionalAccess', _71 => _71.targetLocale]);
-    this.pathPattern = _optionalChain([context, 'optionalAccess', _72 => _72.pathPattern]);
+    this.bucket = _optionalChain([context, 'optionalAccess', _70 => _70.bucket]);
+    this.sourceLocale = _optionalChain([context, 'optionalAccess', _71 => _71.sourceLocale]);
+    this.targetLocale = _optionalChain([context, 'optionalAccess', _72 => _72.targetLocale]);
+    this.pathPattern = _optionalChain([context, 'optionalAccess', _73 => _73.pathPattern]);
   }
 }, _class5);
 var BucketProcessingError = (_class6 = class extends Error {
@@ -403,7 +403,7 @@ function createAuthenticator(params) {
         });
         if (res.ok) {
           const payload = await res.json();
-          if (!_optionalChain([payload, 'optionalAccess', _73 => _73.email])) {
+          if (!_optionalChain([payload, 'optionalAccess', _74 => _74.email])) {
             return null;
           }
           return {
@@ -598,7 +598,7 @@ async function renderSummary(results) {
   if (succeededResults.length > 0) {
     console.log(_chalk2.default.hex(colors.green)("\n[Processed Files]"));
     for (const result of succeededResults) {
-      const displayPath = _optionalChain([result, 'access', _74 => _74.pathPattern, 'optionalAccess', _75 => _75.replace, 'call', _76 => _76("[locale]", result.targetLocale)]) || "unknown";
+      const displayPath = _optionalChain([result, 'access', _75 => _75.pathPattern, 'optionalAccess', _76 => _76.replace, 'call', _77 => _77("[locale]", result.targetLocale)]) || "unknown";
       console.log(
         `  \u2713 ${_chalk2.default.dim(displayPath)} ${_chalk2.default.hex(colors.yellow)(`(${result.sourceLocale} \u2192 ${result.targetLocale})`)}`
       );
@@ -607,7 +607,7 @@ async function renderSummary(results) {
   if (skippedResults.length > 0) {
     console.log(_chalk2.default.hex(colors.blue)("\n[Cached Files]"));
     for (const result of skippedResults) {
-      const displayPath = _optionalChain([result, 'access', _77 => _77.pathPattern, 'optionalAccess', _78 => _78.replace, 'call', _79 => _79("[locale]", result.targetLocale)]) || "unknown";
+      const displayPath = _optionalChain([result, 'access', _78 => _78.pathPattern, 'optionalAccess', _79 => _79.replace, 'call', _80 => _80("[locale]", result.targetLocale)]) || "unknown";
       console.log(
         `  \u26A1 ${_chalk2.default.dim(displayPath)} ${_chalk2.default.hex(colors.yellow)(`(${result.sourceLocale} \u2192 ${result.targetLocale})`)}`
       );
@@ -616,12 +616,12 @@ async function renderSummary(results) {
   if (failedResults.length > 0) {
     console.log(_chalk2.default.hex(colors.orange)("\n[Failed Files]"));
     for (const result of failedResults) {
-      const displayPath = _optionalChain([result, 'access', _80 => _80.pathPattern, 'optionalAccess', _81 => _81.replace, 'call', _82 => _82("[locale]", result.targetLocale)]) || "unknown";
+      const displayPath = _optionalChain([result, 'access', _81 => _81.pathPattern, 'optionalAccess', _82 => _82.replace, 'call', _83 => _83("[locale]", result.targetLocale)]) || "unknown";
       console.log(
         `  \u274C ${_chalk2.default.dim(displayPath)} ${_chalk2.default.hex(colors.yellow)(`(${result.sourceLocale} \u2192 ${result.targetLocale})`)}`
       );
       console.log(
-        `     ${_chalk2.default.hex(colors.white)(String(_optionalChain([result, 'access', _83 => _83.error, 'optionalAccess', _84 => _84.message]) || "Unknown error"))}`
+        `     ${_chalk2.default.hex(colors.white)(String(_optionalChain([result, 'access', _84 => _84.error, 'optionalAccess', _85 => _85.message]) || "Unknown error"))}`
       );
     }
   }
@@ -1267,7 +1267,7 @@ 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', _85 => _85.email])}`);
+          _ora2.default.call(void 0, ).succeed(`Authenticated as ${_optionalChain([auth2, 'optionalAccess', _86 => _86.email])}`);
         } else {
           _ora2.default.call(void 0, ).fail("Authentication failed.");
         }
@@ -1357,7 +1357,7 @@ function getBuckets(i18nConfig) {
       const includeItems = bucketEntry.include.map(
         (item) => resolveBucketItem(item)
       );
-      const excludeItems = _optionalChain([bucketEntry, 'access', _86 => _86.exclude, 'optionalAccess', _87 => _87.map, 'call', _88 => _88(
+      const excludeItems = _optionalChain([bucketEntry, 'access', _87 => _87.exclude, 'optionalAccess', _88 => _88.map, 'call', _89 => _89(
         (item) => resolveBucketItem(item)
       )]);
       const config = {
@@ -1395,7 +1395,7 @@ function extractPathPatterns(sourceLocale, include, exclude) {
       delimiter: pattern.delimiter
     }))
   );
-  const excludedPatterns = _optionalChain([exclude, 'optionalAccess', _89 => _89.flatMap, 'call', _90 => _90(
+  const excludedPatterns = _optionalChain([exclude, 'optionalAccess', _90 => _90.flatMap, 'call', _91 => _91(
     (pattern) => expandPlaceholderedGlob(
       pattern.path,
       __spec.resolveOverriddenLocale.call(void 0, sourceLocale, pattern.delimiter)
@@ -1561,12 +1561,12 @@ function composeLoaders(...loaders) {
   return {
     init: async () => {
       for (const loader of loaders) {
-        await _optionalChain([loader, 'access', _91 => _91.init, 'optionalCall', _92 => _92()]);
+        await _optionalChain([loader, 'access', _92 => _92.init, 'optionalCall', _93 => _93()]);
       }
     },
     setDefaultLocale(locale) {
       for (const loader of loaders) {
-        _optionalChain([loader, 'access', _93 => _93.setDefaultLocale, 'optionalCall', _94 => _94(locale)]);
+        _optionalChain([loader, 'access', _94 => _94.setDefaultLocale, 'optionalCall', _95 => _95(locale)]);
       }
       return this;
     },
@@ -1587,7 +1587,7 @@ function composeLoaders(...loaders) {
     pullHints: async (originalInput) => {
       let result = originalInput;
       for (let i = 0; i < loaders.length; i++) {
-        const subResult = await _optionalChain([loaders, 'access', _95 => _95[i], 'access', _96 => _96.pullHints, 'optionalCall', _97 => _97(result)]);
+        const subResult = await _optionalChain([loaders, 'access', _96 => _96[i], 'access', _97 => _97.pullHints, 'optionalCall', _98 => _98(result)]);
         if (subResult) {
           result = subResult;
         }
@@ -1609,7 +1609,7 @@ function createLoader(lDefinition) {
       if (state.initCtx) {
         return state.initCtx;
       }
-      state.initCtx = await _optionalChain([lDefinition, 'access', _98 => _98.init, 'optionalCall', _99 => _99()]);
+      state.initCtx = await _optionalChain([lDefinition, 'access', _99 => _99.init, 'optionalCall', _100 => _100()]);
       return state.initCtx;
     },
     setDefaultLocale(locale) {
@@ -1619,8 +1619,8 @@ function createLoader(lDefinition) {
       state.defaultLocale = locale;
       return this;
     },
-    async pullHints() {
-      return _optionalChain([lDefinition, 'access', _100 => _100.pullHints, 'optionalCall', _101 => _101(state.originalInput)]);
+    async pullHints(originalInput) {
+      return _optionalChain([lDefinition, 'access', _101 => _101.pullHints, 'optionalCall', _102 => _102(originalInput || state.originalInput)]);
     },
     async pull(locale, input2) {
       if (!state.defaultLocale) {
@@ -1906,7 +1906,7 @@ function createDenormalizeLoader(options) {
       const preservedObjects = {};
       const nonPreservedInput = {};
       for (const [key, value] of Object.entries(inputDenormalized)) {
-        if (_optionalChain([options, 'optionalAccess', _102 => _102.shouldPreserveObject, 'optionalCall', _103 => _103(value)])) {
+        if (_optionalChain([options, 'optionalAccess', _103 => _103.shouldPreserveObject, 'optionalCall', _104 => _104(value)])) {
           preservedObjects[key] = value;
         } else {
           nonPreservedInput[key] = value;
@@ -1939,7 +1939,7 @@ function createNormalizeLoader() {
       return normalized;
     },
     push: async (locale, data, originalInput) => {
-      const keysMap = _nullishCoalesce(_optionalChain([originalInput, 'optionalAccess', _104 => _104.keysMap]), () => ( {}));
+      const keysMap = _nullishCoalesce(_optionalChain([originalInput, 'optionalAccess', _105 => _105.keysMap]), () => ( {}));
       const input2 = mapDenormalizedKeys(data, keysMap);
       const denormalized = _flat.unflatten.call(void 0, input2, {
         delimiter: "/",
@@ -2040,7 +2040,7 @@ function createTextFileLoader(pathPattern) {
       const trimmedResult = result.trim();
       return trimmedResult;
     },
-    async push(locale, data, _36, originalLocale) {
+    async push(locale, data, _37, originalLocale) {
       const draftPath = pathPattern.replaceAll("[locale]", locale);
       const finalPath = path14.default.resolve(draftPath);
       const dirPath = path14.default.dirname(finalPath);
@@ -2073,8 +2073,8 @@ async function getTrailingNewLine(pathPattern, locale, originalLocale) {
   if (!templateData) {
     templateData = await readFileForLocale(pathPattern, originalLocale);
   }
-  if (_optionalChain([templateData, 'optionalAccess', _105 => _105.match, 'call', _106 => _106(/[\r\n]$/)])) {
-    const ending = _optionalChain([templateData, 'optionalAccess', _107 => _107.includes, 'call', _108 => _108("\r\n")]) ? "\r\n" : _optionalChain([templateData, 'optionalAccess', _109 => _109.includes, 'call', _110 => _110("\r")]) ? "\r" : "\n";
+  if (_optionalChain([templateData, 'optionalAccess', _106 => _106.match, 'call', _107 => _107(/[\r\n]$/)])) {
+    const ending = _optionalChain([templateData, 'optionalAccess', _108 => _108.includes, 'call', _109 => _109("\r\n")]) ? "\r\n" : _optionalChain([templateData, 'optionalAccess', _110 => _110.includes, 'call', _111 => _111("\r")]) ? "\r" : "\n";
     return ending;
   }
   return "";
@@ -2268,7 +2268,7 @@ async function parseAndroidDocument(input2) {
   const resourceNodes = [];
   let metaIndex = 0;
   for (const child of resourcesNode.$$) {
-    const elementName = _optionalChain([child, 'optionalAccess', _111 => _111["#name"]]);
+    const elementName = _optionalChain([child, 'optionalAccess', _112 => _112["#name"]]);
     if (!isResourceElementName(elementName)) {
       continue;
     }
@@ -2276,11 +2276,11 @@ async function parseAndroidDocument(input2) {
     if (!meta || meta.type !== elementName) {
       continue;
     }
-    const name = _nullishCoalesce(_optionalChain([child, 'optionalAccess', _112 => _112.$, 'optionalAccess', _113 => _113.name]), () => ( meta.name));
+    const name = _nullishCoalesce(_optionalChain([child, 'optionalAccess', _113 => _113.$, 'optionalAccess', _114 => _114.name]), () => ( meta.name));
     if (!name) {
       continue;
     }
-    const translatable = (_nullishCoalesce(_optionalChain([child, 'optionalAccess', _114 => _114.$, 'optionalAccess', _115 => _115.translatable]), () => ( ""))).toLowerCase() !== "false";
+    const translatable = (_nullishCoalesce(_optionalChain([child, 'optionalAccess', _115 => _115.$, 'optionalAccess', _116 => _116.translatable]), () => ( ""))).toLowerCase() !== "false";
     switch (meta.type) {
       case "string": {
         resourceNodes.push({
@@ -2293,7 +2293,7 @@ async function parseAndroidDocument(input2) {
         break;
       }
       case "string-array": {
-        const itemNodes = _nullishCoalesce(_optionalChain([child, 'optionalAccess', _116 => _116.item]), () => ( []));
+        const itemNodes = _nullishCoalesce(_optionalChain([child, 'optionalAccess', _117 => _117.item]), () => ( []));
         const items = [];
         const templateItems = meta.items;
         for (let i = 0; i < Math.max(itemNodes.length, templateItems.length); i++) {
@@ -2317,7 +2317,7 @@ async function parseAndroidDocument(input2) {
         break;
       }
       case "plurals": {
-        const itemNodes = _nullishCoalesce(_optionalChain([child, 'optionalAccess', _117 => _117.item]), () => ( []));
+        const itemNodes = _nullishCoalesce(_optionalChain([child, 'optionalAccess', _118 => _118.item]), () => ( []));
         const templateItems = meta.items;
         const items = [];
         for (const templateItem of templateItems) {
@@ -2326,7 +2326,7 @@ async function parseAndroidDocument(input2) {
             continue;
           }
           const nodeItem = itemNodes.find(
-            (item) => _optionalChain([item, 'optionalAccess', _118 => _118.$, 'optionalAccess', _119 => _119.quantity]) === quantity
+            (item) => _optionalChain([item, 'optionalAccess', _119 => _119.$, 'optionalAccess', _120 => _120.quantity]) === quantity
           );
           if (!nodeItem) {
             continue;
@@ -2607,7 +2607,7 @@ function cloneResourceNode(resource) {
       const nodeClone = deepClone(resource.node);
       const itemNodes = _nullishCoalesce(nodeClone.item, () => ( []));
       const items = itemNodes.map((itemNode, index) => {
-        const templateMeta = _nullishCoalesce(_nullishCoalesce(_optionalChain([resource, 'access', _120 => _120.items, 'access', _121 => _121[index], 'optionalAccess', _122 => _122.meta]), () => ( _optionalChain([resource, 'access', _123 => _123.items, 'access', _124 => _124[resource.items.length - 1], 'optionalAccess', _125 => _125.meta]))), () => ( makeTextMeta([])));
+        const templateMeta = _nullishCoalesce(_nullishCoalesce(_optionalChain([resource, 'access', _121 => _121.items, 'access', _122 => _122[index], 'optionalAccess', _123 => _123.meta]), () => ( _optionalChain([resource, 'access', _124 => _124.items, 'access', _125 => _125[resource.items.length - 1], 'optionalAccess', _126 => _126.meta]))), () => ( makeTextMeta([])));
         return {
           node: itemNode,
           meta: cloneTextMeta(templateMeta)
@@ -2627,7 +2627,7 @@ function cloneResourceNode(resource) {
       const items = [];
       for (const templateItem of resource.items) {
         const cloneNode = itemNodes.find(
-          (item) => _optionalChain([item, 'optionalAccess', _126 => _126.$, 'optionalAccess', _127 => _127.quantity]) === templateItem.quantity
+          (item) => _optionalChain([item, 'optionalAccess', _127 => _127.$, 'optionalAccess', _128 => _128.quantity]) === templateItem.quantity
         );
         if (!cloneNode) {
           continue;
@@ -2883,8 +2883,8 @@ function cloneDocumentStructure(document) {
       resourceNodes.map((r) => resourceLookupKey(r.type, r.name))
     );
     let filtered = resourcesClone.$$.filter((child) => {
-      const elementName = _optionalChain([child, 'optionalAccess', _128 => _128["#name"]]);
-      const name = _optionalChain([child, 'optionalAccess', _129 => _129.$, 'optionalAccess', _130 => _130.name]);
+      const elementName = _optionalChain([child, 'optionalAccess', _129 => _129["#name"]]);
+      const name = _optionalChain([child, 'optionalAccess', _130 => _130.$, 'optionalAccess', _131 => _131.name]);
       if (!isResourceElementName(elementName) || !name) {
         return true;
       }
@@ -2893,7 +2893,7 @@ function cloneDocumentStructure(document) {
     const cleaned = [];
     let lastWasWhitespace = false;
     for (const child of filtered) {
-      const isWhitespace = _optionalChain([child, 'optionalAccess', _131 => _131["#name"]]) === "__text__" && (!child._ || child._.trim() === "");
+      const isWhitespace = _optionalChain([child, 'optionalAccess', _132 => _132["#name"]]) === "__text__" && (!child._ || child._.trim() === "");
       if (isWhitespace) {
         if (!lastWasWhitespace) {
           cleaned.push(child);
@@ -2915,8 +2915,8 @@ function buildResourceLookup(resources) {
   const lookup = /* @__PURE__ */ new Map();
   const children = Array.isArray(resources.$$) ? resources.$$ : [];
   for (const child of children) {
-    const type = _optionalChain([child, 'optionalAccess', _132 => _132["#name"]]);
-    const name = _optionalChain([child, 'optionalAccess', _133 => _133.$, 'optionalAccess', _134 => _134.name]);
+    const type = _optionalChain([child, 'optionalAccess', _133 => _133["#name"]]);
+    const name = _optionalChain([child, 'optionalAccess', _134 => _134.$, 'optionalAccess', _135 => _135.name]);
     if (!type || !name || !isResourceElementName(type)) {
       continue;
     }
@@ -2945,7 +2945,7 @@ function cloneResourceNodeFromLookup(resource, lookup) {
     }
     case "string-array": {
       const childItems = (Array.isArray(node.$$) ? node.$$ : []).filter(
-        (child) => _optionalChain([child, 'optionalAccess', _135 => _135["#name"]]) === "item"
+        (child) => _optionalChain([child, 'optionalAccess', _136 => _136["#name"]]) === "item"
       );
       node.item = childItems;
       if (childItems.length < resource.items.length) {
@@ -2974,12 +2974,12 @@ function cloneResourceNodeFromLookup(resource, lookup) {
     }
     case "plurals": {
       const childItems = (Array.isArray(node.$$) ? node.$$ : []).filter(
-        (child) => _optionalChain([child, 'optionalAccess', _136 => _136["#name"]]) === "item"
+        (child) => _optionalChain([child, 'optionalAccess', _137 => _137["#name"]]) === "item"
       );
       node.item = childItems;
       const itemMap = /* @__PURE__ */ new Map();
       for (const item of childItems) {
-        if (_optionalChain([item, 'optionalAccess', _137 => _137.$, 'optionalAccess', _138 => _138.quantity])) {
+        if (_optionalChain([item, 'optionalAccess', _138 => _138.$, 'optionalAccess', _139 => _139.quantity])) {
           itemMap.set(item.$.quantity, item);
         }
       }
@@ -3269,7 +3269,7 @@ var _sync3 = require('csv-stringify/sync');
 
 function detectKeyColumnName(csvString) {
   const row = _sync.parse.call(void 0, csvString)[0];
-  const firstColumn = _optionalChain([row, 'optionalAccess', _139 => _139[0], 'optionalAccess', _140 => _140.trim, 'call', _141 => _141()]);
+  const firstColumn = _optionalChain([row, 'optionalAccess', _140 => _140[0], 'optionalAccess', _141 => _141.trim, 'call', _142 => _142()]);
   return firstColumn || "KEY";
 }
 function createCsvLoader() {
@@ -3371,7 +3371,7 @@ function createHtmlLoader() {
             break;
           }
           const siblings = Array.from(parent.childNodes).filter(
-            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _142 => _142.textContent, 'optionalAccess', _143 => _143.trim, 'call', _144 => _144()])
+            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _143 => _143.textContent, 'optionalAccess', _144 => _144.trim, 'call', _145 => _145()])
           );
           const index = siblings.indexOf(current);
           if (index !== -1) {
@@ -3407,15 +3407,15 @@ function createHtmlLoader() {
             }
           });
           Array.from(element.childNodes).filter(
-            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _145 => _145.textContent, 'optionalAccess', _146 => _146.trim, 'call', _147 => _147()])
+            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _146 => _146.textContent, 'optionalAccess', _147 => _147.trim, 'call', _148 => _148()])
           ).forEach(processNode);
         }
       };
       Array.from(document.head.childNodes).filter(
-        (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _148 => _148.textContent, 'optionalAccess', _149 => _149.trim, 'call', _150 => _150()])
+        (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _149 => _149.textContent, 'optionalAccess', _150 => _150.trim, 'call', _151 => _151()])
       ).forEach(processNode);
       Array.from(document.body.childNodes).filter(
-        (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _151 => _151.textContent, 'optionalAccess', _152 => _152.trim, 'call', _153 => _153()])
+        (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _152 => _152.textContent, 'optionalAccess', _153 => _153.trim, 'call', _154 => _154()])
       ).forEach(processNode);
       return result;
     },
@@ -3440,7 +3440,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', _154 => _154.textContent, 'optionalAccess', _155 => _155.trim, 'call', _156 => _156()])
+            (n) => n.nodeType === 1 || n.nodeType === 3 && _optionalChain([n, 'access', _155 => _155.textContent, 'optionalAccess', _156 => _156.trim, 'call', _157 => _157()])
           );
           if (index >= siblings.length) {
             if (i === indices.length - 1) {
@@ -3491,7 +3491,7 @@ function createMarkdownLoader() {
           yaml: yamlEngine
         }
       });
-      const sections = content.split(SECTION_REGEX).map((section) => _nullishCoalesce(_optionalChain([section, 'optionalAccess', _157 => _157.trim, 'call', _158 => _158()]), () => ( ""))).filter(Boolean);
+      const sections = content.split(SECTION_REGEX).map((section) => _nullishCoalesce(_optionalChain([section, 'optionalAccess', _158 => _158.trim, 'call', _159 => _159()]), () => ( ""))).filter(Boolean);
       return {
         ...Object.fromEntries(
           sections.map((section, index) => [`${MD_SECTION_PREFIX}${index}`, section]).filter(([, section]) => Boolean(section))
@@ -3510,7 +3510,7 @@ function createMarkdownLoader() {
       );
       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', _159 => _159.trim, 'call', _160 => _160()]), () => ( ""))).filter(Boolean).join("\n\n");
+      ).map(([, value]) => _nullishCoalesce(_optionalChain([value, 'optionalAccess', _160 => _160.trim, 'call', _161 => _161()]), () => ( ""))).filter(Boolean).join("\n\n");
       if (Object.keys(frontmatter).length > 0) {
         content = `
 ${content}`;
@@ -3535,7 +3535,7 @@ function createMarkdocLoader() {
       const result = {};
       const counters = {};
       traverseAndExtract(ast, "", result, counters);
-      if (_optionalChain([ast, 'access', _161 => _161.attributes, 'optionalAccess', _162 => _162.frontmatter])) {
+      if (_optionalChain([ast, 'access', _162 => _162.attributes, 'optionalAccess', _163 => _163.frontmatter])) {
         const frontmatter = _yaml2.default.parse(ast.attributes.frontmatter);
         Object.entries(frontmatter).forEach(([key, value]) => {
           if (typeof value === "string") {
@@ -3581,7 +3581,7 @@ function traverseAndExtract(node, path19, result, counters, parentType) {
   if (nodeSemanticType && !["text", "strong", "em", "inline", "link"].includes(nodeSemanticType)) {
     semanticType = nodeSemanticType;
   }
-  if (node.type === "text" && _optionalChain([node, 'access', _163 => _163.attributes, 'optionalAccess', _164 => _164.content])) {
+  if (node.type === "text" && _optionalChain([node, 'access', _164 => _164.attributes, 'optionalAccess', _165 => _165.content])) {
     const content = node.attributes.content;
     if (typeof content === "string" && content.trim()) {
       if (semanticType) {
@@ -3608,7 +3608,7 @@ function buildPathMap(node, path19, counters, pathMap, parentType) {
   if (nodeSemanticType && !["text", "strong", "em", "inline", "link"].includes(nodeSemanticType)) {
     semanticType = nodeSemanticType;
   }
-  if (node.type === "text" && _optionalChain([node, 'access', _165 => _165.attributes, 'optionalAccess', _166 => _166.content])) {
+  if (node.type === "text" && _optionalChain([node, 'access', _166 => _166.attributes, 'optionalAccess', _167 => _167.content])) {
     const content = node.attributes.content;
     if (typeof content === "string" && content.trim()) {
       if (semanticType) {
@@ -3631,7 +3631,7 @@ function applyTranslations(node, path19, data, pathMap) {
   if (!node || typeof node !== "object") {
     return;
   }
-  if (node.type === "text" && _optionalChain([node, 'access', _167 => _167.attributes, 'optionalAccess', _168 => _168.content])) {
+  if (node.type === "text" && _optionalChain([node, 'access', _168 => _168.attributes, 'optionalAccess', _169 => _169.content])) {
     const content = node.attributes.content;
     if (typeof content === "string") {
       const contentPath = path19 ? `${path19}/attributes/content` : "attributes/content";
@@ -3670,7 +3670,7 @@ function createPropertiesLoader() {
       return result;
     },
     async push(locale, payload) {
-      const result = Object.entries(payload).filter(([_36, value]) => value != null).map(([key, value]) => `${key}=${value}`).join("\n");
+      const result = Object.entries(payload).filter(([_37, value]) => value != null).map(([key, value]) => `${key}=${value}`).join("\n");
       return result;
     }
   });
@@ -3681,7 +3681,7 @@ function isSkippableLine(line) {
 function parsePropertyLine(line) {
   const [key, ...valueParts] = line.split("=");
   return {
-    key: _optionalChain([key, 'optionalAccess', _169 => _169.trim, 'call', _170 => _170()]) || "",
+    key: _optionalChain([key, 'optionalAccess', _170 => _170.trim, 'call', _171 => _171()]) || "",
     value: valueParts.join("=").trim()
   };
 }
@@ -3973,7 +3973,7 @@ var Parser = class {
     }
   }
   expect(type) {
-    if (_optionalChain([this, 'access', _171 => _171.current, 'call', _172 => _172(), 'optionalAccess', _173 => _173.type]) === type) {
+    if (_optionalChain([this, 'access', _172 => _172.current, 'call', _173 => _173(), 'optionalAccess', _174 => _174.type]) === type) {
       this.advance();
       return true;
     }
@@ -3992,7 +3992,7 @@ function createXcodeStringsLoader() {
       return result;
     },
     async push(locale, payload) {
-      const lines = Object.entries(payload).filter(([_36, value]) => value != null).map(([key, value]) => {
+      const lines = Object.entries(payload).filter(([_37, value]) => value != null).map(([key, value]) => {
         const escapedValue = escapeString(value);
         return `"${key}" = "${escapedValue}";`;
       });
@@ -4050,7 +4050,7 @@ function createXcodeXcstringsLoader(defaultLocale) {
         if (rootTranslationEntity.shouldTranslate === false) {
           continue;
         }
-        const langTranslationEntity = _optionalChain([rootTranslationEntity, 'optionalAccess', _174 => _174.localizations, 'optionalAccess', _175 => _175[locale]]);
+        const langTranslationEntity = _optionalChain([rootTranslationEntity, 'optionalAccess', _175 => _175.localizations, 'optionalAccess', _176 => _176[locale]]);
         if (langTranslationEntity) {
           if ("stringUnit" in langTranslationEntity) {
             resultData[translationKey] = langTranslationEntity.stringUnit.value;
@@ -4064,7 +4064,7 @@ function createXcodeXcstringsLoader(defaultLocale) {
               resultData[translationKey] = {};
               const pluralForms = langTranslationEntity.variations.plural;
               for (const form in pluralForms) {
-                if (_optionalChain([pluralForms, 'access', _176 => _176[form], 'optionalAccess', _177 => _177.stringUnit, 'optionalAccess', _178 => _178.value])) {
+                if (_optionalChain([pluralForms, 'access', _177 => _177[form], 'optionalAccess', _178 => _178.stringUnit, 'optionalAccess', _179 => _179.value])) {
                   resultData[translationKey][form] = pluralForms[form].stringUnit.value;
                 }
               }
@@ -4090,7 +4090,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', _179 => _179.strings, 'optionalAccess', _180 => _180[key], 'optionalAccess', _181 => _181.extractionState]),
+            extractionState: _optionalChain([originalInput, 'optionalAccess', _180 => _180.strings, 'optionalAccess', _181 => _181[key], 'optionalAccess', _182 => _182.extractionState]),
             localizations: {
               [locale]: {
                 stringUnit: {
@@ -4105,7 +4105,7 @@ function createXcodeXcstringsLoader(defaultLocale) {
           }
         } else if (Array.isArray(value)) {
           langDataToMerge.strings[key] = {
-            extractionState: _optionalChain([originalInput, 'optionalAccess', _182 => _182.strings, 'optionalAccess', _183 => _183[key], 'optionalAccess', _184 => _184.extractionState]),
+            extractionState: _optionalChain([originalInput, 'optionalAccess', _183 => _183.strings, 'optionalAccess', _184 => _184[key], 'optionalAccess', _185 => _185.extractionState]),
             localizations: {
               [locale]: {
                 stringSet: {
@@ -4163,7 +4163,7 @@ function createXcodeXcstringsLoader(defaultLocale) {
           for (const [locale, localization] of Object.entries(
             entity.localizations
           )) {
-            if (_optionalChain([localization, 'access', _185 => _185.variations, 'optionalAccess', _186 => _186.plural])) {
+            if (_optionalChain([localization, 'access', _186 => _186.variations, 'optionalAccess', _187 => _187.plural])) {
               const pluralForms = localization.variations.plural;
               for (const form in pluralForms) {
                 const pluralKey = `${translationKey}/${form}`;
@@ -4183,225 +4183,53 @@ function _removeLocale(input2, locale) {
   const { strings } = input2;
   const newStrings = _lodash2.default.cloneDeep(strings);
   for (const [key, value] of Object.entries(newStrings)) {
-    if (_optionalChain([value, 'access', _187 => _187.localizations, 'optionalAccess', _188 => _188[locale]])) {
+    if (_optionalChain([value, 'access', _188 => _188.localizations, 'optionalAccess', _189 => _189[locale]])) {
       delete value.localizations[locale];
     }
   }
   return { ...input2, strings: newStrings };
 }
 
-// src/cli/loaders/xcode-xcstrings-icu.ts
-var ICU_TYPE_MARKER = Symbol.for("@lingo.dev/icu-plural-object");
-var CLDR_PLURAL_CATEGORIES = /* @__PURE__ */ new Set([
-  "zero",
-  "one",
-  "two",
-  "few",
-  "many",
-  "other"
-]);
-function isICUPluralObject(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
-    return false;
-  }
-  if (ICU_TYPE_MARKER in value) {
-    return true;
-  }
-  if (!("icu" in value) || typeof value.icu !== "string") {
-    return false;
-  }
-  const icuPluralPattern = /^\{[\w]+,\s*plural,\s*.+\}$/;
-  if (!icuPluralPattern.test(value.icu)) {
-    return false;
-  }
-  if (value._meta !== void 0) {
-    if (typeof value._meta !== "object" || !value._meta.variables || typeof value._meta.variables !== "object") {
-      return false;
-    }
-    for (const [varName, varMeta] of Object.entries(value._meta.variables)) {
-      if (!varMeta || typeof varMeta !== "object" || typeof varMeta.format !== "string" || varMeta.role !== "plural" && varMeta.role !== "other") {
-        return false;
-      }
-    }
-  }
-  return true;
-}
-function isPluralFormsObject(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
-    return false;
-  }
-  const keys = Object.keys(value);
-  if (keys.length === 0) {
-    return false;
-  }
-  const allKeysAreCldr = keys.every((key) => CLDR_PLURAL_CATEGORIES.has(key));
-  if (!allKeysAreCldr) {
-    return false;
-  }
-  const allValuesAreStrings = keys.every(
-    (key) => typeof value[key] === "string"
-  );
-  if (!allValuesAreStrings) {
-    return false;
-  }
-  if (!("other" in value)) {
-    return false;
-  }
-  return true;
-}
+// src/cli/loaders/xcode-xcstrings-v2.ts
+
 function getRequiredPluralCategories(locale) {
   try {
     const pluralRules = new Intl.PluralRules(locale);
     const categories = pluralRules.resolvedOptions().pluralCategories;
     if (!categories || categories.length === 0) {
-      throw new Error(`No plural categories found for locale: ${locale}`);
+      return ["other"];
     }
     return categories;
   } catch (error) {
-    console.warn(
-      `[xcode-xcstrings-icu] Failed to resolve plural categories for locale "${locale}". Using fallback ["one", "other"]. Error: ${error instanceof Error ? error.message : String(error)}`
-    );
-    return ["one", "other"];
+    return ["other"];
   }
 }
-var CLDR_CATEGORY_TO_NUMBER = {
-  zero: 0,
-  one: 1,
-  two: 2
-};
-var NUMBER_TO_CLDR_CATEGORY = {
-  0: "zero",
-  1: "one",
-  2: "two"
-};
-function xcstringsToPluralWithMeta(pluralForms, sourceLocale = "en") {
-  if (!pluralForms || Object.keys(pluralForms).length === 0) {
-    throw new Error("pluralForms cannot be empty");
-  }
-  const requiredCategories = getRequiredPluralCategories(sourceLocale);
-  const variables = {};
-  const formatRegex = /(%(?:(\d+)\$)?(?:[+-])?(?:\d+)?(?:\.(\d+))?([lhqLzjt]*)([diuoxXfFeEgGaAcspn@]))/g;
-  let maxMatches = [];
-  let maxMatchText = "";
-  for (const [form, text] of Object.entries(pluralForms)) {
-    if (typeof text !== "string") {
-      console.warn(
-        `Warning: Plural form "${form}" has non-string value:`,
-        text
-      );
-      continue;
-    }
-    const matches = [...text.matchAll(formatRegex)];
-    if (matches.length > maxMatches.length) {
-      maxMatches = matches;
-      maxMatchText = text;
-    }
-  }
-  let lastNumericIndex = -1;
-  maxMatches.forEach((match2, idx) => {
-    const specifier = match2[5];
-    if (/[diuoxXfFeE]/.test(specifier)) {
-      lastNumericIndex = idx;
+function isValidPluralForm(form, locale) {
+  if (form.startsWith("=")) return true;
+  const requiredCategories = getRequiredPluralCategories(locale);
+  return requiredCategories.includes(form);
+}
+function buildIcuPluralString(forms, sourceLocale) {
+  const requiredCategories = new Set(getRequiredPluralCategories(sourceLocale));
+  const parts = Object.entries(forms).map(([form, text]) => {
+    let normalizedForm = form;
+    if (!requiredCategories.has(form)) {
+      if (form === "zero") normalizedForm = "=0";
+      else if (form === "one") normalizedForm = "=1";
+      else if (form === "two") normalizedForm = "=2";
     }
+    return `${normalizedForm} {${text}}`;
   });
-  let nonPluralCounter = 0;
-  maxMatches.forEach((match2, idx) => {
-    const fullFormat = match2[1];
-    const position = match2[2];
-    const precision = match2[3];
-    const lengthMod = match2[4];
-    const specifier = match2[5];
-    const isPluralVar = idx === lastNumericIndex;
-    const varName = isPluralVar ? "count" : `var${nonPluralCounter++}`;
-    variables[varName] = {
-      format: fullFormat,
-      role: isPluralVar ? "plural" : "other"
-    };
-  });
-  const variableKeys = Object.keys(variables);
-  const icuForms = Object.entries(pluralForms).filter(([form, text]) => {
-    if (typeof text !== "string") {
-      return false;
-    }
-    return true;
-  }).map(([form, text]) => {
-    let processed = text;
-    let vIdx = 0;
-    processed = processed.replace(formatRegex, () => {
-      if (vIdx >= variableKeys.length) {
-        vIdx++;
-        return "#";
-      }
-      const varName = variableKeys[vIdx];
-      const varMeta = variables[varName];
-      vIdx++;
-      if (varMeta.role === "plural") {
-        return "#";
-      } else {
-        return `{${varName}}`;
-      }
-    });
-    const isRequired = requiredCategories.includes(form);
-    const formKey = !isRequired && form in CLDR_CATEGORY_TO_NUMBER ? `=${CLDR_CATEGORY_TO_NUMBER[form]}` : form;
-    return `${formKey} {${processed}}`;
-  }).join(" ");
-  const pluralVarName = Object.keys(variables).find((name) => variables[name].role === "plural") || "count";
-  const icu = `{${pluralVarName}, plural, ${icuForms}}`;
-  const result = {
-    icu,
-    _meta: Object.keys(variables).length > 0 ? { variables } : void 0,
-    [ICU_TYPE_MARKER]: true
-    // Add type marker for robust detection
-  };
-  return result;
+  return `{count, plural, ${parts.join(" ")}}`;
 }
-function pluralWithMetaToXcstrings(data) {
-  if (!data.icu) {
-    throw new Error("ICU string is required");
-  }
-  const ast = parseICU(data.icu);
-  if (!ast || ast.length === 0) {
-    throw new Error("Invalid ICU format");
-  }
-  const pluralNode = ast.find((node) => node.type === "plural");
-  if (!pluralNode) {
-    throw new Error("No plural found in ICU format");
+function parseIcuPluralString(icuString, locale) {
+  const pluralMatch = icuString.match(/\{[\w]+,\s*plural,\s*(.+)\}$/);
+  if (!pluralMatch) {
+    throw new Error(`Invalid ICU plural format: ${icuString}`);
   }
+  const formsText = pluralMatch[1];
   const forms = {};
-  for (const [form, option] of Object.entries(pluralNode.options)) {
-    let text = "";
-    const optionValue = option.value;
-    for (const element of optionValue) {
-      if (element.type === "literal") {
-        text += element.value;
-      } else if (element.type === "pound") {
-        const pluralVar = Object.entries(_optionalChain([data, 'access', _189 => _189._meta, 'optionalAccess', _190 => _190.variables]) || {}).find(
-          ([_36, meta]) => meta.role === "plural"
-        );
-        text += _optionalChain([pluralVar, 'optionalAccess', _191 => _191[1], 'access', _192 => _192.format]) || "%lld";
-      } else if (element.type === "argument") {
-        const varName = element.value;
-        const varMeta = _optionalChain([data, 'access', _193 => _193._meta, 'optionalAccess', _194 => _194.variables, 'optionalAccess', _195 => _195[varName]]);
-        text += _optionalChain([varMeta, 'optionalAccess', _196 => _196.format]) || "%@";
-      }
-    }
-    let xcstringsFormName = form;
-    if (form.startsWith("=")) {
-      const numValue = parseInt(form.substring(1), 10);
-      xcstringsFormName = NUMBER_TO_CLDR_CATEGORY[numValue] || form;
-    }
-    forms[xcstringsFormName] = text;
-  }
-  return forms;
-}
-function parseICU(icu) {
-  const match2 = icu.match(/\{(\w+),\s*plural,\s*(.+)\}$/);
-  if (!match2) {
-    throw new Error("Invalid ICU plural format");
-  }
-  const varName = match2[1];
-  const formsText = match2[2];
-  const options = {};
+  const exactMatches = /* @__PURE__ */ new Set();
   let i = 0;
   while (i < formsText.length) {
     while (i < formsText.length && /\s/.test(formsText[i])) {
@@ -4423,6 +4251,16 @@ function parseICU(icu) {
       }
     }
     if (!formName) break;
+    if (formName === "=0") {
+      formName = "zero";
+      exactMatches.add("zero");
+    } else if (formName === "=1") {
+      formName = "one";
+      exactMatches.add("one");
+    } else if (formName === "=2") {
+      formName = "two";
+      exactMatches.add("two");
+    }
     while (i < formsText.length && /\s/.test(formsText[i])) {
       i++;
     }
@@ -4447,119 +4285,204 @@ function parseICU(icu) {
       i++;
     }
     if (braceCount !== 0) {
-      const preview = formsText.substring(
-        Math.max(0, i - 50),
-        Math.min(formsText.length, i + 50)
-      );
       throw new Error(
-        `Unclosed brace for form '${formName}' in ICU MessageFormat.
-Expected ${braceCount} more closing brace(s).
-Context: ...${preview}...
-Full ICU: {${varName}, plural, ${formsText}}`
+        `Unclosed brace for form '${formName}' in ICU: ${icuString}`
       );
     }
-    const elements = parseFormText(formText);
-    options[formName] = {
-      value: elements
-    };
+    forms[formName] = formText;
   }
-  return [
-    {
-      type: "plural",
-      value: varName,
-      options
+  const filteredForms = {};
+  for (const [form, text] of Object.entries(forms)) {
+    if (exactMatches.has(form) || isValidPluralForm(form, locale)) {
+      filteredForms[form] = text;
     }
-  ];
-}
-function parseFormText(text) {
-  const elements = [];
-  let currentText = "";
-  let i = 0;
-  while (i < text.length) {
-    if (text[i] === "#") {
-      if (currentText) {
-        elements.push({ type: "literal", value: currentText });
-        currentText = "";
-      }
-      elements.push({ type: "pound" });
-      i++;
-    } else if (text[i] === "{") {
-      if (currentText) {
-        elements.push({ type: "literal", value: currentText });
-        currentText = "";
-      }
-      let braceCount = 1;
-      let j = i + 1;
-      while (j < text.length && braceCount > 0) {
-        if (text[j] === "{") {
-          braceCount++;
-        } else if (text[j] === "}") {
-          braceCount--;
-        }
-        j++;
-      }
-      if (braceCount !== 0) {
-        throw new Error("Unclosed variable reference");
-      }
-      const varName = text.slice(i + 1, j - 1);
-      elements.push({ type: "argument", value: varName });
-      i = j;
-    } else {
-      currentText += text[i];
-      i++;
-    }
-  }
-  if (currentText) {
-    elements.push({ type: "literal", value: currentText });
   }
-  return elements;
+  return filteredForms;
 }
-
-// src/cli/loaders/xcode-xcstrings-v2-loader.ts
-function createXcodeXcstringsV2Loader(defaultLocale = "en") {
+function isIcuPluralString(value) {
+  return typeof value === "string" && /^\{[\w]+,\s*plural,\s*.+\}$/.test(value);
+}
+function createXcodeXcstringsV2Loader(defaultLocale) {
   return createLoader({
-    async pull(locale, input2) {
-      const result = {};
-      for (const [key, value] of Object.entries(input2)) {
-        if (isPluralFormsObject(value)) {
-          try {
-            result[key] = xcstringsToPluralWithMeta(value, locale);
-          } catch (error) {
-            console.error(
-              `
-[xcode-xcstrings-icu] Failed to convert plural forms for key "${key}":`,
-              `
-Error: ${error instanceof Error ? error.message : String(error)}`,
-              `
-Locale: ${locale}
-`
-            );
-            result[key] = value;
+    async pull(locale, input2, initCtx) {
+      const resultData = {};
+      const isSourceLanguage = locale === defaultLocale;
+      for (const [translationKey, _translationEntity] of Object.entries(
+        input2.strings
+      )) {
+        const rootTranslationEntity = _translationEntity;
+        if (rootTranslationEntity.shouldTranslate === false) {
+          continue;
+        }
+        const langTranslationEntity = _optionalChain([rootTranslationEntity, 'optionalAccess', _190 => _190.localizations, 'optionalAccess', _191 => _191[locale]]);
+        if (langTranslationEntity) {
+          if (!resultData[translationKey]) {
+            resultData[translationKey] = {};
           }
-        } else {
-          result[key] = value;
+          if ("stringUnit" in langTranslationEntity) {
+            resultData[translationKey].stringUnit = langTranslationEntity.stringUnit.value;
+            if ("substitutions" in langTranslationEntity) {
+              resultData[translationKey].substitutions = {};
+              for (const [subName, subData] of Object.entries(
+                langTranslationEntity.substitutions
+              )) {
+                const pluralForms = _optionalChain([subData, 'access', _192 => _192.variations, 'optionalAccess', _193 => _193.plural]);
+                if (pluralForms) {
+                  const forms = {};
+                  for (const [form, formData] of Object.entries(pluralForms)) {
+                    forms[form] = formData.stringUnit.value;
+                  }
+                  const icuString = buildIcuPluralString(forms, locale);
+                  resultData[translationKey].substitutions[subName] = {
+                    variations: {
+                      plural: icuString
+                    }
+                  };
+                }
+              }
+            }
+          } else if ("stringSet" in langTranslationEntity) {
+            const values = langTranslationEntity.stringSet.values;
+            if (Array.isArray(values) && values.length > 0) {
+              resultData[translationKey].stringSet = values;
+            }
+          } else if ("variations" in langTranslationEntity) {
+            if ("plural" in langTranslationEntity.variations) {
+              const pluralForms = langTranslationEntity.variations.plural;
+              const forms = {};
+              for (const [form, formData] of Object.entries(pluralForms)) {
+                if (_optionalChain([formData, 'optionalAccess', _194 => _194.stringUnit, 'optionalAccess', _195 => _195.value])) {
+                  forms[form] = formData.stringUnit.value;
+                }
+              }
+              const icuString = buildIcuPluralString(forms, locale);
+              resultData[translationKey].variations = {
+                plural: icuString
+              };
+            }
+          }
+        } else if (isSourceLanguage) {
+          if (!resultData[translationKey]) {
+            resultData[translationKey] = {};
+          }
+          resultData[translationKey].stringUnit = translationKey;
         }
       }
-      return result;
+      return resultData;
     },
-    async push(locale, payload) {
-      const result = {};
-      for (const [key, value] of Object.entries(payload)) {
-        if (isICUPluralObject(value)) {
-          try {
-            const pluralForms = pluralWithMetaToXcstrings(value);
-            result[key] = pluralForms;
-          } catch (error) {
-            throw new Error(
-              `Failed to write plural translation for key "${key}" (locale: ${locale}).
+    async push(locale, payload, originalInput) {
+      const langDataToMerge = {};
+      langDataToMerge.strings = {};
+      const input2 = _lodash2.default.cloneDeep(originalInput) || {
+        sourceLanguage: locale,
+        strings: {}
+      };
+      for (const [baseKey, keyData] of Object.entries(payload)) {
+        if (!keyData || typeof keyData !== "object") {
+          continue;
+        }
+        const hasDoNotTranslateFlag = originalInput && originalInput.strings && originalInput.strings[baseKey] && originalInput.strings[baseKey].shouldTranslate === false;
+        const localizationData = {};
+        if ("stringUnit" in keyData) {
+          localizationData.stringUnit = {
+            state: "translated",
+            value: keyData.stringUnit
+          };
+        }
+        if ("substitutions" in keyData && keyData.substitutions) {
+          const subs = {};
+          for (const [subName, subData] of Object.entries(
+            keyData.substitutions
+          )) {
+            const pluralValue = _optionalChain([subData, 'optionalAccess', _196 => _196.variations, 'optionalAccess', _197 => _197.plural]);
+            if (pluralValue && isIcuPluralString(pluralValue)) {
+              try {
+                const pluralForms = parseIcuPluralString(pluralValue, locale);
+                const pluralOut = {};
+                for (const [form, text] of Object.entries(pluralForms)) {
+                  pluralOut[form] = {
+                    stringUnit: {
+                      state: "translated",
+                      value: text
+                    }
+                  };
+                }
+                const sourceLocale = _optionalChain([originalInput, 'optionalAccess', _198 => _198.sourceLanguage]) || "en";
+                const origFormatSpec = _optionalChain([originalInput, 'optionalAccess', _199 => _199.strings, 'optionalAccess', _200 => _200[baseKey], 'optionalAccess', _201 => _201.localizations, 'optionalAccess', _202 => _202[sourceLocale], 'optionalAccess', _203 => _203.substitutions, 'optionalAccess', _204 => _204[subName], 'optionalAccess', _205 => _205.formatSpecifier]) || subName;
+                subs[subName] = {
+                  formatSpecifier: origFormatSpec,
+                  variations: {
+                    plural: pluralOut
+                  }
+                };
+              } catch (error) {
+                throw new Error(
+                  `Failed to write substitution plural translation for key "${baseKey}/substitutions/${subName}" (locale: ${locale}).
 ${error instanceof Error ? error.message : String(error)}`
-            );
+                );
+              }
+            }
+          }
+          if (Object.keys(subs).length > 0) {
+            localizationData.substitutions = subs;
+          }
+        }
+        if ("stringSet" in keyData && Array.isArray(keyData.stringSet)) {
+          localizationData.stringSet = {
+            state: "translated",
+            values: keyData.stringSet
+          };
+        }
+        if ("variations" in keyData && _optionalChain([keyData, 'access', _206 => _206.variations, 'optionalAccess', _207 => _207.plural])) {
+          const pluralValue = keyData.variations.plural;
+          if (isIcuPluralString(pluralValue)) {
+            try {
+              const pluralForms = parseIcuPluralString(pluralValue, locale);
+              const pluralOut = {};
+              for (const [form, text] of Object.entries(pluralForms)) {
+                pluralOut[form] = {
+                  stringUnit: {
+                    state: "translated",
+                    value: text
+                  }
+                };
+              }
+              localizationData.variations = {
+                plural: pluralOut
+              };
+            } catch (error) {
+              throw new Error(
+                `Failed to write plural translation for key "${baseKey}" (locale: ${locale}).
+${error instanceof Error ? error.message : String(error)}`
+              );
+            }
+          }
+        }
+        if (Object.keys(localizationData).length > 0) {
+          langDataToMerge.strings[baseKey] = {
+            extractionState: _optionalChain([originalInput, 'optionalAccess', _208 => _208.strings, 'optionalAccess', _209 => _209[baseKey], 'optionalAccess', _210 => _210.extractionState]),
+            localizations: {
+              [locale]: localizationData
+            }
+          };
+          if (hasDoNotTranslateFlag) {
+            langDataToMerge.strings[baseKey].shouldTranslate = false;
           }
-        } else {
-          result[key] = value;
         }
       }
-      return result;
+      return _lodash2.default.merge(input2, langDataToMerge);
+    },
+    async pullHints(input2) {
+      const hints = {};
+      for (const [translationKey, _translationEntity] of Object.entries(
+        input2.strings || {}
+      )) {
+        const rootTranslationEntity = _translationEntity;
+        if (rootTranslationEntity.comment && typeof rootTranslationEntity.comment === "string") {
+          hints[translationKey] = { hint: rootTranslationEntity.comment };
+        }
+      }
+      return hints;
     }
   });
 }
@@ -4574,12 +4497,12 @@ function createUnlocalizableLoader(returnUnlocalizedKeys = false) {
       const unlocalizableKeys = _getUnlocalizableKeys(input2);
       const result = _lodash2.default.omitBy(
         input2,
-        (_36, key) => unlocalizableKeys.includes(key)
+        (_37, key) => unlocalizableKeys.includes(key)
       );
       if (returnUnlocalizedKeys) {
         result.unlocalizable = _lodash2.default.omitBy(
           input2,
-          (_36, key) => !unlocalizableKeys.includes(key)
+          (_37, key) => !unlocalizableKeys.includes(key)
         );
       }
       return result;
@@ -4589,7 +4512,7 @@ function createUnlocalizableLoader(returnUnlocalizedKeys = false) {
       const result = _lodash2.default.merge(
         {},
         data,
-        _lodash2.default.omitBy(originalInput, (_36, key) => !unlocalizableKeys.includes(key))
+        _lodash2.default.omitBy(originalInput, (_37, key) => !unlocalizableKeys.includes(key))
       );
       return result;
     }
@@ -4620,7 +4543,7 @@ function _getUnlocalizableKeys(input2) {
       }
     }
     return false;
-  }).map(([key, _36]) => key);
+  }).map(([key, _37]) => key);
 }
 
 // src/cli/loaders/formatters/prettier.ts
@@ -4760,8 +4683,8 @@ async function formatDataWithBiome(data, filePath, options) {
     });
     return formatted.content;
   } catch (error) {
-    const errorMessage = error instanceof Error ? error.message || _optionalChain([error, 'access', _197 => _197.stackTrace, 'optionalAccess', _198 => _198.toString, 'call', _199 => _199(), 'access', _200 => _200.split, 'call', _201 => _201("\n"), 'access', _202 => _202[0]]) : "";
-    if (_optionalChain([errorMessage, 'optionalAccess', _203 => _203.includes, 'call', _204 => _204("does not exist in the workspace")])) {
+    const errorMessage = error instanceof Error ? error.message || _optionalChain([error, 'access', _211 => _211.stackTrace, 'optionalAccess', _212 => _212.toString, 'call', _213 => _213(), 'access', _214 => _214.split, 'call', _215 => _215("\n"), 'access', _216 => _216[0]]) : "";
+    if (_optionalChain([errorMessage, 'optionalAccess', _217 => _217.includes, 'call', _218 => _218("does not exist in the workspace")])) {
     } else {
       console.log(`\u26A0\uFE0F  Biome skipped ${path14.default.basename(filePath)}`);
       if (errorMessage) {
@@ -4808,7 +4731,7 @@ function createPoDataLoader(params) {
         Object.entries(entries).forEach(([msgid, entry]) => {
           if (msgid && entry.msgid) {
             const context = entry.msgctxt || "";
-            const fullEntry = _optionalChain([parsedPo, 'access', _205 => _205.translations, 'access', _206 => _206[context], 'optionalAccess', _207 => _207[msgid]]);
+            const fullEntry = _optionalChain([parsedPo, 'access', _219 => _219.translations, 'access', _220 => _220[context], 'optionalAccess', _221 => _221[msgid]]);
             if (fullEntry) {
               result[msgid] = fullEntry;
             }
@@ -4818,8 +4741,8 @@ function createPoDataLoader(params) {
       return result;
     },
     async push(locale, data, originalInput, originalLocale, pullInput) {
-      const currentSections = _optionalChain([pullInput, 'optionalAccess', _208 => _208.split, 'call', _209 => _209("\n\n"), 'access', _210 => _210.filter, 'call', _211 => _211(Boolean)]) || [];
-      const originalSections = _optionalChain([originalInput, 'optionalAccess', _212 => _212.split, 'call', _213 => _213("\n\n"), 'access', _214 => _214.filter, 'call', _215 => _215(Boolean)]) || [];
+      const currentSections = _optionalChain([pullInput, 'optionalAccess', _222 => _222.split, 'call', _223 => _223("\n\n"), 'access', _224 => _224.filter, 'call', _225 => _225(Boolean)]) || [];
+      const originalSections = _optionalChain([originalInput, 'optionalAccess', _226 => _226.split, 'call', _227 => _227("\n\n"), 'access', _228 => _228.filter, 'call', _229 => _229(Boolean)]) || [];
       const result = originalSections.map((section) => {
         const sectionPo = _gettextparser2.default.po.parse(section);
         if (Object.keys(sectionPo.translations).length === 0) {
@@ -4888,8 +4811,8 @@ function createPoContentLoader() {
         {
           ...entry,
           msgstr: [
-            _optionalChain([data, 'access', _216 => _216[entry.msgid], 'optionalAccess', _217 => _217.singular]),
-            _optionalChain([data, 'access', _218 => _218[entry.msgid], 'optionalAccess', _219 => _219.plural]) || null
+            _optionalChain([data, 'access', _230 => _230[entry.msgid], 'optionalAccess', _231 => _231.singular]),
+            _optionalChain([data, 'access', _232 => _232[entry.msgid], 'optionalAccess', _233 => _233.plural]) || null
           ].filter(Boolean)
         }
       ]).fromPairs().value();
@@ -5011,7 +4934,7 @@ function pullV1(xliffElement, locale, originalLocale) {
     let key = getTransUnitKey(unit);
     if (!key) return;
     if (seenKeys.has(key)) {
-      const id = _optionalChain([unit, 'access', _220 => _220.getAttribute, 'call', _221 => _221("id"), 'optionalAccess', _222 => _222.trim, 'call', _223 => _223()]);
+      const id = _optionalChain([unit, 'access', _234 => _234.getAttribute, 'call', _235 => _235("id"), 'optionalAccess', _236 => _236.trim, 'call', _237 => _237()]);
       if (id) {
         key = `${key}#${id}`;
       } else {
@@ -5059,7 +4982,7 @@ function pushV1(dom, xliffElement, locale, translations, originalLocale, origina
     let key = getTransUnitKey(unit);
     if (!key) return;
     if (seenKeys.has(key)) {
-      const id = _optionalChain([unit, 'access', _224 => _224.getAttribute, 'call', _225 => _225("id"), 'optionalAccess', _226 => _226.trim, 'call', _227 => _227()]);
+      const id = _optionalChain([unit, 'access', _238 => _238.getAttribute, 'call', _239 => _239("id"), 'optionalAccess', _240 => _240.trim, 'call', _241 => _241()]);
       if (id) {
         key = `${key}#${id}`;
       } else {
@@ -5101,7 +5024,7 @@ function pushV1(dom, xliffElement, locale, translations, originalLocale, origina
   const translationKeys = new Set(Object.keys(translations));
   existingUnits.forEach((unit, key) => {
     if (!translationKeys.has(key)) {
-      _optionalChain([unit, 'access', _228 => _228.parentNode, 'optionalAccess', _229 => _229.removeChild, 'call', _230 => _230(unit)]);
+      _optionalChain([unit, 'access', _242 => _242.parentNode, 'optionalAccess', _243 => _243.removeChild, 'call', _244 => _244(unit)]);
     }
   });
   return serializeWithDeclaration(
@@ -5144,18 +5067,18 @@ function traverseUnitsV2(container, fileId, currentPath, result) {
   Array.from(container.children).forEach((child) => {
     const tagName = child.tagName;
     if (tagName === "unit") {
-      const unitId = _optionalChain([child, 'access', _231 => _231.getAttribute, 'call', _232 => _232("id"), 'optionalAccess', _233 => _233.trim, 'call', _234 => _234()]);
+      const unitId = _optionalChain([child, 'access', _245 => _245.getAttribute, 'call', _246 => _246("id"), 'optionalAccess', _247 => _247.trim, 'call', _248 => _248()]);
       if (!unitId) return;
       const key = `resources/${fileId}/${currentPath}${unitId}/source`;
       const segment = child.querySelector("segment");
-      const source = _optionalChain([segment, 'optionalAccess', _235 => _235.querySelector, 'call', _236 => _236("source")]);
+      const source = _optionalChain([segment, 'optionalAccess', _249 => _249.querySelector, 'call', _250 => _250("source")]);
       if (source) {
         result[key] = extractTextContent(source);
       } else {
         result[key] = unitId;
       }
     } else if (tagName === "group") {
-      const groupId = _optionalChain([child, 'access', _237 => _237.getAttribute, 'call', _238 => _238("id"), 'optionalAccess', _239 => _239.trim, 'call', _240 => _240()]);
+      const groupId = _optionalChain([child, 'access', _251 => _251.getAttribute, 'call', _252 => _252("id"), 'optionalAccess', _253 => _253.trim, 'call', _254 => _254()]);
       const newPath = groupId ? `${currentPath}${groupId}/groupUnits/` : currentPath;
       traverseUnitsV2(child, fileId, newPath, result);
     }
@@ -5191,12 +5114,12 @@ function indexUnitsV2(container, fileId, currentPath, index) {
   Array.from(container.children).forEach((child) => {
     const tagName = child.tagName;
     if (tagName === "unit") {
-      const unitId = _optionalChain([child, 'access', _241 => _241.getAttribute, 'call', _242 => _242("id"), 'optionalAccess', _243 => _243.trim, 'call', _244 => _244()]);
+      const unitId = _optionalChain([child, 'access', _255 => _255.getAttribute, 'call', _256 => _256("id"), 'optionalAccess', _257 => _257.trim, 'call', _258 => _258()]);
       if (!unitId) return;
       const key = `resources/${fileId}/${currentPath}${unitId}/source`;
       index.set(key, child);
     } else if (tagName === "group") {
-      const groupId = _optionalChain([child, 'access', _245 => _245.getAttribute, 'call', _246 => _246("id"), 'optionalAccess', _247 => _247.trim, 'call', _248 => _248()]);
+      const groupId = _optionalChain([child, 'access', _259 => _259.getAttribute, 'call', _260 => _260("id"), 'optionalAccess', _261 => _261.trim, 'call', _262 => _262()]);
       const newPath = groupId ? `${currentPath}${groupId}/groupUnits/` : currentPath;
       indexUnitsV2(child, fileId, newPath, index);
     }
@@ -5217,9 +5140,9 @@ function updateUnitV2(unit, value) {
   setTextContent(source, value);
 }
 function getTransUnitKey(transUnit) {
-  const resname = _optionalChain([transUnit, 'access', _249 => _249.getAttribute, 'call', _250 => _250("resname"), 'optionalAccess', _251 => _251.trim, 'call', _252 => _252()]);
+  const resname = _optionalChain([transUnit, 'access', _263 => _263.getAttribute, 'call', _264 => _264("resname"), 'optionalAccess', _265 => _265.trim, 'call', _266 => _266()]);
   if (resname) return resname;
-  const id = _optionalChain([transUnit, 'access', _253 => _253.getAttribute, 'call', _254 => _254("id"), 'optionalAccess', _255 => _255.trim, 'call', _256 => _256()]);
+  const id = _optionalChain([transUnit, 'access', _267 => _267.getAttribute, 'call', _268 => _268("id"), 'optionalAccess', _269 => _269.trim, 'call', _270 => _270()]);
   if (id) return id;
   const sourceElement = transUnit.querySelector("source");
   if (sourceElement) {
@@ -5276,7 +5199,7 @@ function formatXml(xml) {
     if (cdataNode) {
       return `${indent2}${openTag}<![CDATA[${cdataNode.nodeValue}]]></${tagName}>`;
     }
-    const textContent = _optionalChain([element, 'access', _257 => _257.textContent, 'optionalAccess', _258 => _258.trim, 'call', _259 => _259()]) || "";
+    const textContent = _optionalChain([element, 'access', _271 => _271.textContent, 'optionalAccess', _272 => _272.trim, 'call', _273 => _273()]) || "";
     const hasOnlyText = element.childNodes.length === 1 && element.childNodes[0].nodeType === 3;
     if (hasOnlyText && textContent) {
       return `${indent2}${openTag}${textContent}</${tagName}>`;
@@ -5569,7 +5492,7 @@ function createDatoClient(params) {
           ids: !records.length ? void 0 : records.join(",")
         }
       }).catch(
-        (error) => Promise.reject(_optionalChain([error, 'optionalAccess', _260 => _260.response, 'optionalAccess', _261 => _261.body, 'optionalAccess', _262 => _262.data, 'optionalAccess', _263 => _263[0]]) || error)
+        (error) => Promise.reject(_optionalChain([error, 'optionalAccess', _274 => _274.response, 'optionalAccess', _275 => _275.body, 'optionalAccess', _276 => _276.data, 'optionalAccess', _277 => _277[0]]) || error)
       );
     },
     findRecordsForModel: async (modelId, records) => {
@@ -5580,10 +5503,10 @@ function createDatoClient(params) {
           filter: {
             type: modelId,
             only_valid: "true",
-            ids: !_optionalChain([records, 'optionalAccess', _264 => _264.length]) ? void 0 : records.join(",")
+            ids: !_optionalChain([records, 'optionalAccess', _278 => _278.length]) ? void 0 : records.join(",")
           }
         }).catch(
-          (error) => Promise.reject(_optionalChain([error, 'optionalAccess', _265 => _265.response, 'optionalAccess', _266 => _266.body, 'optionalAccess', _267 => _267.data, 'optionalAccess', _268 => _268[0]]) || error)
+          (error) => Promise.reject(_optionalChain([error, 'optionalAccess', _279 => _279.response, 'optionalAccess', _280 => _280.body, 'optionalAccess', _281 => _281.data, 'optionalAccess', _282 => _282[0]]) || error)
         );
         return result;
       } catch (_error) {
@@ -5599,10 +5522,10 @@ function createDatoClient(params) {
     updateRecord: async (id, payload) => {
       try {
         await dato.items.update(id, payload).catch(
-          (error) => Promise.reject(_optionalChain([error, 'optionalAccess', _269 => _269.response, 'optionalAccess', _270 => _270.body, 'optionalAccess', _271 => _271.data, 'optionalAccess', _272 => _272[0]]) || error)
+          (error) => Promise.reject(_optionalChain([error, 'optionalAccess', _283 => _283.response, 'optionalAccess', _284 => _284.body, 'optionalAccess', _285 => _285.data, 'optionalAccess', _286 => _286[0]]) || error)
         );
       } catch (_error) {
-        if (_optionalChain([_error, 'optionalAccess', _273 => _273.attributes, 'optionalAccess', _274 => _274.details, 'optionalAccess', _275 => _275.message])) {
+        if (_optionalChain([_error, 'optionalAccess', _287 => _287.attributes, 'optionalAccess', _288 => _288.details, 'optionalAccess', _289 => _289.message])) {
           throw new Error(
             [
               `${_error.attributes.details.message}`,
@@ -5624,10 +5547,10 @@ function createDatoClient(params) {
     enableFieldLocalization: async (args) => {
       try {
         await dato.fields.update(`${args.modelId}::${args.fieldId}`, { localized: true }).catch(
-          (error) => Promise.reject(_optionalChain([error, 'optionalAccess', _276 => _276.response, 'optionalAccess', _277 => _277.body, 'optionalAccess', _278 => _278.data, 'optionalAccess', _279 => _279[0]]) || error)
+          (error) => Promise.reject(_optionalChain([error, 'optionalAccess', _290 => _290.response, 'optionalAccess', _291 => _291.body, 'optionalAccess', _292 => _292.data, 'optionalAccess', _293 => _293[0]]) || error)
         );
       } catch (_error) {
-        if (_optionalChain([_error, 'optionalAccess', _280 => _280.attributes, 'optionalAccess', _281 => _281.code]) === "NOT_FOUND") {
+        if (_optionalChain([_error, 'optionalAccess', _294 => _294.attributes, 'optionalAccess', _295 => _295.code]) === "NOT_FOUND") {
           throw new Error(
             [
               `Field "${args.fieldId}" not found in model "${args.modelId}".`,
@@ -5635,7 +5558,7 @@ function createDatoClient(params) {
             ].join("\n\n")
           );
         }
-        if (_optionalChain([_error, 'optionalAccess', _282 => _282.attributes, 'optionalAccess', _283 => _283.details, 'optionalAccess', _284 => _284.message])) {
+        if (_optionalChain([_error, 'optionalAccess', _296 => _296.attributes, 'optionalAccess', _297 => _297.details, 'optionalAccess', _298 => _298.message])) {
           throw new Error(
             [
               `${_error.attributes.details.message}`,
@@ -5713,7 +5636,7 @@ function createDatoApiLoader(config, onConfigUpdate) {
           const records = await dato.findRecordsForModel(modelId);
           const recordChoices = createRecordChoices(
             records,
-            _optionalChain([config, 'access', _285 => _285.models, 'access', _286 => _286[modelId], 'optionalAccess', _287 => _287.records]) || [],
+            _optionalChain([config, 'access', _299 => _299.models, 'access', _300 => _300[modelId], 'optionalAccess', _301 => _301.records]) || [],
             project
           );
           const selectedRecords = await promptRecordSelection(
@@ -5732,14 +5655,14 @@ function createDatoApiLoader(config, onConfigUpdate) {
     },
     async pull(locale, input2, initCtx) {
       const result = {};
-      for (const modelId of _lodash2.default.keys(_optionalChain([initCtx, 'optionalAccess', _288 => _288.models]) || {})) {
-        let records = _optionalChain([initCtx, 'optionalAccess', _289 => _289.models, 'access', _290 => _290[modelId], 'access', _291 => _291.records]) || [];
+      for (const modelId of _lodash2.default.keys(_optionalChain([initCtx, 'optionalAccess', _302 => _302.models]) || {})) {
+        let records = _optionalChain([initCtx, 'optionalAccess', _303 => _303.models, 'access', _304 => _304[modelId], 'access', _305 => _305.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', _292 => _292.models, 'optionalAccess', _293 => _293[modelId], 'optionalAccess', _294 => _294.fields]) || [],
+            fields: _optionalChain([initCtx, 'optionalAccess', _306 => _306.models, 'optionalAccess', _307 => _307[modelId], 'optionalAccess', _308 => _308.fields]) || [],
             records
           };
         }
@@ -5802,7 +5725,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', _295 => _295.includes, 'call', _296 => _296(record.id)])
+    checked: _optionalChain([selectedIds, 'optionalAccess', _309 => _309.includes, 'call', _310 => _310(record.id)])
   }));
 }
 async function promptRecordSelection(modelName, choices) {
@@ -6121,7 +6044,7 @@ function createVttLoader() {
       if (!input2) {
         return "";
       }
-      const vtt = _optionalChain([_nodewebvtt2.default, 'access', _297 => _297.parse, 'call', _298 => _298(input2), 'optionalAccess', _299 => _299.cues]);
+      const vtt = _optionalChain([_nodewebvtt2.default, 'access', _311 => _311.parse, 'call', _312 => _312(input2), 'optionalAccess', _313 => _313.cues]);
       if (Object.keys(vtt).length === 0) {
         return {};
       } else {
@@ -6167,15 +6090,6 @@ function variableExtractLoader(params) {
       const inputValues = _lodash2.default.omitBy(input2, _lodash2.default.isEmpty);
       for (const [key, value] of Object.entries(inputValues)) {
         const originalValue = originalInput[key];
-        if (isICUPluralObject(originalValue)) {
-          const icuValue = isICUPluralObject(value) ? { icu: value.icu } : value;
-          result[key] = {
-            value: icuValue,
-            variables: []
-            // Metadata stored separately, not in variables
-          };
-          continue;
-        }
         const matches = originalValue.match(specifierPattern) || [];
         result[key] = result[key] || {
           value,
@@ -6184,7 +6098,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', _300 => _300.replace, 'call', _301 => _301(match2, `{variable:${i}}`)]);
+          const newValue = _optionalChain([currentValue, 'optionalAccess', _314 => _314.replace, 'call', _315 => _315(match2, `{variable:${i}}`)]);
           result[key].value = newValue;
           result[key].variables[i] = match2;
         }
@@ -6195,19 +6109,14 @@ function variableExtractLoader(params) {
       const result = {};
       for (const [key, valueObj] of Object.entries(data)) {
         result[key] = valueObj.value;
-        const resultValue = result[key];
-        if (isICUPluralObject(resultValue)) {
-          const originalValue = _optionalChain([originalInput, 'optionalAccess', _302 => _302[key]]);
-          if (isICUPluralObject(originalValue) && originalValue._meta) {
-            resultValue._meta = originalValue._meta;
-            resultValue[Symbol.for("@lingo.dev/icu-plural-object")] = true;
-          }
-        }
         for (let i = 0; i < valueObj.variables.length; i++) {
           const variable = valueObj.variables[i];
           const currentValue = result[key];
           if (typeof currentValue === "string") {
-            const newValue = _optionalChain([currentValue, 'optionalAccess', _303 => _303.replace, 'call', _304 => _304(`{variable:${i}}`, variable)]);
+            const newValue = _optionalChain([currentValue, 'optionalAccess', _316 => _316.replaceAll, 'call', _317 => _317(
+              `{variable:${i}}`,
+              variable
+            )]);
             result[key] = newValue;
           }
         }
@@ -6408,7 +6317,7 @@ function createVueJsonLoader() {
   return createLoader({
     pull: async (locale, input2, ctx) => {
       const parsed = parseVueFile(input2);
-      return _nullishCoalesce(_optionalChain([parsed, 'optionalAccess', _305 => _305.i18n, 'optionalAccess', _306 => _306[locale]]), () => ( {}));
+      return _nullishCoalesce(_optionalChain([parsed, 'optionalAccess', _318 => _318.i18n, 'optionalAccess', _319 => _319[locale]]), () => ( {}));
     },
     push: async (locale, data, originalInput) => {
       const parsed = parseVueFile(_nullishCoalesce(originalInput, () => ( "")));
@@ -6593,7 +6502,7 @@ function updateStringsInObjectExpression(objectExpression, data) {
   objectExpression.properties.forEach((prop) => {
     if (!t.isObjectProperty(prop)) return;
     const key = getPropertyKey(prop);
-    const incomingVal = _optionalChain([data, 'optionalAccess', _307 => _307[key]]);
+    const incomingVal = _optionalChain([data, 'optionalAccess', _320 => _320[key]]);
     if (incomingVal === void 0) {
       return;
     }
@@ -6629,7 +6538,7 @@ function updateStringsInArrayExpression(arrayExpression, incoming) {
   let modified = false;
   arrayExpression.elements.forEach((element, index) => {
     if (!element) return;
-    const incomingVal = _optionalChain([incoming, 'optionalAccess', _308 => _308[index]]);
+    const incomingVal = _optionalChain([incoming, 'optionalAccess', _321 => _321[index]]);
     if (incomingVal === void 0) return;
     if (t.isStringLiteral(element) && typeof incomingVal === "string") {
       if (element.value !== incomingVal) {
@@ -7120,7 +7029,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', _309 => _309.#parent, 'optionalAccess', _310 => _310.type]) === "!")) {
+    if (this.isEnd() && (this === this.#root || this.#root.#filledNegs && _optionalChain([this, 'access', _322 => _322.#parent, 'optionalAccess', _323 => _323.type]) === "!")) {
       ret.push({});
     }
     return ret;
@@ -7128,7 +7037,7 @@ var AST = class _AST {
   isStart() {
     if (this.#root === this)
       return true;
-    if (!_optionalChain([this, 'access', _311 => _311.#parent, 'optionalAccess', _312 => _312.isStart, 'call', _313 => _313()]))
+    if (!_optionalChain([this, 'access', _324 => _324.#parent, 'optionalAccess', _325 => _325.isStart, 'call', _326 => _326()]))
       return false;
     if (this.#parentIndex === 0)
       return true;
@@ -7144,12 +7053,12 @@ var AST = class _AST {
   isEnd() {
     if (this.#root === this)
       return true;
-    if (_optionalChain([this, 'access', _314 => _314.#parent, 'optionalAccess', _315 => _315.type]) === "!")
+    if (_optionalChain([this, 'access', _327 => _327.#parent, 'optionalAccess', _328 => _328.type]) === "!")
       return true;
-    if (!_optionalChain([this, 'access', _316 => _316.#parent, 'optionalAccess', _317 => _317.isEnd, 'call', _318 => _318()]))
+    if (!_optionalChain([this, 'access', _329 => _329.#parent, 'optionalAccess', _330 => _330.isEnd, 'call', _331 => _331()]))
       return false;
     if (!this.type)
-      return _optionalChain([this, 'access', _319 => _319.#parent, 'optionalAccess', _320 => _320.isEnd, 'call', _321 => _321()]);
+      return _optionalChain([this, 'access', _332 => _332.#parent, 'optionalAccess', _333 => _333.isEnd, 'call', _334 => _334()]);
     const pl = this.#parent ? this.#parent.#parts.length : 0;
     return this.#parentIndex === pl - 1;
   }
@@ -7371,7 +7280,7 @@ var AST = class _AST {
     if (!this.type) {
       const noEmpty = this.isStart() && this.isEnd();
       const src = this.#parts.map((p) => {
-        const [re, _36, hasMagic, uflag] = typeof p === "string" ? _AST.#parseGlob(p, this.#hasMagic, noEmpty) : p.toRegExpSource(allowDot);
+        const [re, _37, 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;
@@ -7394,7 +7303,7 @@ var AST = class _AST {
         }
       }
       let end = "";
-      if (this.isEnd() && this.#root.#filledNegs && _optionalChain([this, 'access', _322 => _322.#parent, 'optionalAccess', _323 => _323.type]) === "!") {
+      if (this.isEnd() && this.#root.#filledNegs && _optionalChain([this, 'access', _335 => _335.#parent, 'optionalAccess', _336 => _336.type]) === "!") {
         end = "(?:$|\\/)";
       }
       const final2 = start2 + src + end;
@@ -7444,7 +7353,7 @@ var AST = class _AST {
       if (typeof p === "string") {
         throw new Error("string type in extglob ast??");
       }
-      const [re, _36, _hasMagic, uflag] = p.toRegExpSource(dot);
+      const [re, _37, _hasMagic, uflag] = p.toRegExpSource(dot);
       this.#uflag = this.#uflag || uflag;
       return re;
     }).filter((p) => !(this.isStart() && this.isEnd()) || !!p).join("|");
@@ -7689,7 +7598,7 @@ var Minimatch = class {
     }
     return false;
   }
-  debug(..._36) {
+  debug(..._37) {
   }
   make() {
     const pattern = this.pattern;
@@ -7711,7 +7620,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, _36, __) => {
+    let set = this.globParts.map((s, _37, __) => {
       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]);
@@ -8484,7 +8393,7 @@ function createMdxSectionsSplit2Loader() {
       const content = _lodash2.default.chain(data.sections).values().join("\n\n").value();
       const result = {
         frontmatter: data.frontmatter,
-        codePlaceholders: _optionalChain([pullInput, 'optionalAccess', _324 => _324.codePlaceholders]) || {},
+        codePlaceholders: _optionalChain([pullInput, 'optionalAccess', _337 => _337.codePlaceholders]) || {},
         content
       };
       return result;
@@ -8749,7 +8658,7 @@ function createTxtLoader() {
       const sortedEntries = Object.entries(payload).sort(
         ([a], [b]) => parseInt(a) - parseInt(b)
       );
-      return sortedEntries.map(([_36, value]) => value).join("\n");
+      return sortedEntries.map(([_37, value]) => value).join("\n");
     }
   });
 }
@@ -9040,9 +8949,8 @@ function createBucketLoader(bucketType, bucketPathPattern, options, lockedKeys,
         createPlutilJsonTextLoader(),
         createLockedPatternsLoader(lockedPatterns),
         createJsonLoader(),
-        createXcodeXcstringsLoader(options.defaultLocale),
         createXcodeXcstringsV2Loader(options.defaultLocale),
-        createFlatLoader({ shouldPreserveObject: isICUPluralObject }),
+        createFlatLoader(),
         createEnsureKeyOrderLoader(),
         createLockedKeysLoader(lockedKeys || []),
         createIgnoredKeysLoader(ignoredKeys || []),
@@ -9585,7 +9493,7 @@ function createBasicTranslator(model, systemPrompt, settings = {}) {
       ]
     });
     const result = JSON.parse(response.text);
-    return _optionalChain([result, 'optionalAccess', _325 => _325.data]) || {};
+    return _optionalChain([result, 'optionalAccess', _338 => _338.data]) || {};
   }
 }
 function extractPayloadChunks(payload) {
@@ -9668,7 +9576,7 @@ function getPureModelProvider(provider) {
 
   ${_chalk2.default.hex(colors.blue)("Docs: https://lingo.dev/go/docs")}
   `;
-  switch (_optionalChain([provider, 'optionalAccess', _326 => _326.id])) {
+  switch (_optionalChain([provider, 'optionalAccess', _339 => _339.id])) {
     case "openai": {
       if (!process.env.OPENAI_API_KEY) {
         throw new Error(
@@ -9726,7 +9634,7 @@ function getPureModelProvider(provider) {
       })(provider.model);
     }
     default: {
-      throw new Error(createUnsupportedProviderErrorMessage(_optionalChain([provider, 'optionalAccess', _327 => _327.id])));
+      throw new Error(createUnsupportedProviderErrorMessage(_optionalChain([provider, 'optionalAccess', _340 => _340.id])));
     }
   }
 }
@@ -10012,7 +9920,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', _328 => _328.provider]);
+    const isByokMode = !!_optionalChain([i18nConfig, 'optionalAccess', _341 => _341.provider]);
     if (isByokMode) {
       authId = null;
       ora.succeed("Using external provider (BYOK mode)");
@@ -10026,16 +9934,16 @@ var i18n_default = new (0, _interactivecommander.Command)().command("i18n").desc
       flags
     });
     let buckets = getBuckets(i18nConfig);
-    if (_optionalChain([flags, 'access', _329 => _329.bucket, 'optionalAccess', _330 => _330.length])) {
+    if (_optionalChain([flags, 'access', _342 => _342.bucket, 'optionalAccess', _343 => _343.length])) {
       buckets = buckets.filter(
         (bucket) => flags.bucket.includes(bucket.type)
       );
     }
     ora.succeed("Buckets retrieved");
-    if (_optionalChain([flags, 'access', _331 => _331.file, 'optionalAccess', _332 => _332.length])) {
+    if (_optionalChain([flags, 'access', _344 => _344.file, 'optionalAccess', _345 => _345.length])) {
       buckets = buckets.map((bucket) => {
         const paths = bucket.paths.filter(
-          (path19) => flags.file.find((file) => _optionalChain([path19, 'access', _333 => _333.pathPattern, 'optionalAccess', _334 => _334.includes, 'call', _335 => _335(file)]))
+          (path19) => flags.file.find((file) => _optionalChain([path19, 'access', _346 => _346.pathPattern, 'optionalAccess', _347 => _347.includes, 'call', _348 => _348(file)]))
         );
         return { ...bucket, paths };
       }).filter((bucket) => bucket.paths.length > 0);
@@ -10056,7 +9964,7 @@ var i18n_default = new (0, _interactivecommander.Command)().command("i18n").desc
         });
       }
     }
-    const targetLocales = _optionalChain([flags, 'access', _336 => _336.locale, 'optionalAccess', _337 => _337.length]) ? flags.locale : i18nConfig.locale.targets;
+    const targetLocales = _optionalChain([flags, 'access', _349 => _349.locale, 'optionalAccess', _350 => _350.length]) ? flags.locale : i18nConfig.locale.targets;
     ora.start("Setting up localization cache...");
     const checkLockfileProcessor = createDeltaProcessor("");
     const lockfileExists = await checkLockfileProcessor.checkIfLockExists();
@@ -10233,7 +10141,7 @@ var i18n_default = new (0, _interactivecommander.Command)().command("i18n").desc
               if (flags.key) {
                 processableData = _lodash2.default.pickBy(
                   processableData,
-                  (_36, key) => key === flags.key
+                  (_37, key) => key === flags.key
                 );
               }
               if (flags.verbose) {
@@ -10298,11 +10206,8 @@ var i18n_default = new (0, _interactivecommander.Command)().command("i18n").desc
               }
               const finalDiffSize = _lodash2.default.chain(finalTargetData).omitBy((value, key) => {
                 const targetValue = targetData[key];
-                if (isICUPluralObject(value) && isICUPluralObject(targetValue)) {
-                  return _lodash2.default.isEqual(
-                    { icu: value.icu, _meta: value._meta },
-                    { icu: targetValue.icu, _meta: targetValue._meta }
-                  );
+                if (typeof value === "object" && value !== null) {
+                  return _lodash2.default.isEqual(value, targetValue);
                 }
                 return value === targetValue;
               }).size().value();
@@ -10344,7 +10249,7 @@ var i18n_default = new (0, _interactivecommander.Command)().command("i18n").desc
           }
           const deltaProcessor = createDeltaProcessor(bucketPath.pathPattern);
           const checksums = await deltaProcessor.createChecksums(sourceData);
-          if (!_optionalChain([flags, 'access', _338 => _338.locale, 'optionalAccess', _339 => _339.length])) {
+          if (!_optionalChain([flags, 'access', _351 => _351.locale, 'optionalAccess', _352 => _352.length])) {
             await deltaProcessor.saveChecksums(checksums);
           }
         }
@@ -10468,12 +10373,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', _340 => _340.locale, 'optionalAccess', _341 => _341.some, 'call', _342 => _342((locale) => !i18nConfig.locale.targets.includes(locale))])) {
+  } else if (_optionalChain([flags, 'access', _353 => _353.locale, 'optionalAccess', _354 => _354.some, 'call', _355 => _355((locale) => !i18nConfig.locale.targets.includes(locale))])) {
     throw new ValidationError({
       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', _343 => _343.bucket, 'optionalAccess', _344 => _344.some, 'call', _345 => _345(
+  } else if (_optionalChain([flags, 'access', _356 => _356.bucket, 'optionalAccess', _357 => _357.some, 'call', _358 => _358(
     (bucket) => !i18nConfig.buckets[bucket]
   )])) {
     throw new ValidationError({
@@ -10877,7 +10782,7 @@ var _mcpjs = require('@modelcontextprotocol/sdk/server/mcp.js');
 
 var mcp_default = new (0, _interactivecommander.Command)().command("mcp").description(
   "Start a Model Context Protocol (MCP) server for AI assistant integration"
-).helpOption("-h, --help", "Show help").action(async (_36, program) => {
+).helpOption("-h, --help", "Show help").action(async (_37, program) => {
   const apiKey = program.args[0];
   const settings = getSettings(apiKey);
   if (!settings.auth.apiKey) {
@@ -11007,7 +10912,7 @@ function createLingoDotDevLocalizer(explicitApiKey) {
         const response = await engine.whoami();
         return {
           authenticated: !!response,
-          username: _optionalChain([response, 'optionalAccess', _346 => _346.email])
+          username: _optionalChain([response, 'optionalAccess', _359 => _359.email])
         };
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -11123,7 +11028,7 @@ function createExplicitLocalizer(provider) {
 }
 function createAiSdkLocalizer(params) {
   const skipAuth = params.skipAuth === true;
-  const apiKey = process.env[_nullishCoalesce(_optionalChain([params, 'optionalAccess', _347 => _347.apiKeyName]), () => ( ""))];
+  const apiKey = process.env[_nullishCoalesce(_optionalChain([params, 'optionalAccess', _360 => _360.apiKeyName]), () => ( ""))];
   if (!skipAuth && !apiKey || !params.apiKeyName) {
     throw new Error(
       _dedent2.default`
@@ -11257,8 +11162,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', _348 => _348.flags, 'access', _349 => _349.bucket, 'optionalAccess', _350 => _350.some, 'call', _351 => _351(
-            (bucket) => !_optionalChain([ctx, 'access', _352 => _352.config, 'optionalAccess', _353 => _353.buckets, 'access', _354 => _354[bucket]])
+          } else if (_optionalChain([ctx, 'access', _361 => _361.flags, 'access', _362 => _362.bucket, 'optionalAccess', _363 => _363.some, 'call', _364 => _364(
+            (bucket) => !_optionalChain([ctx, 'access', _365 => _365.config, 'optionalAccess', _366 => _366.buckets, 'access', _367 => _367[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.`
@@ -11271,7 +11176,7 @@ async function setup(input2) {
         title: "Selecting localization provider",
         task: async (ctx, task) => {
           ctx.localizer = createLocalizer(
-            _optionalChain([ctx, 'access', _355 => _355.config, 'optionalAccess', _356 => _356.provider]),
+            _optionalChain([ctx, 'access', _368 => _368.config, 'optionalAccess', _369 => _369.provider]),
             ctx.flags.apiKey
           );
           if (!ctx.localizer) {
@@ -11284,7 +11189,7 @@ async function setup(input2) {
       },
       {
         title: "Checking authentication",
-        enabled: (ctx) => _optionalChain([ctx, 'access', _357 => _357.localizer, 'optionalAccess', _358 => _358.id]) === "Lingo.dev",
+        enabled: (ctx) => _optionalChain([ctx, 'access', _370 => _370.localizer, 'optionalAccess', _371 => _371.id]) === "Lingo.dev",
         task: async (ctx, task) => {
           const authStatus = await ctx.localizer.checkAuth();
           if (!authStatus.authenticated) {
@@ -11297,7 +11202,7 @@ async function setup(input2) {
       },
       {
         title: "Validating configuration",
-        enabled: (ctx) => _optionalChain([ctx, 'access', _359 => _359.localizer, 'optionalAccess', _360 => _360.id]) !== "Lingo.dev",
+        enabled: (ctx) => _optionalChain([ctx, 'access', _372 => _372.localizer, 'optionalAccess', _373 => _373.id]) !== "Lingo.dev",
         task: async (ctx, task) => {
           const validationStatus = await ctx.localizer.validateSettings();
           if (!validationStatus.valid) {
@@ -11515,7 +11420,7 @@ async function execute(input2) {
           const workerTasks = [];
           for (let i = 0; i < workersCount; i++) {
             const assignedTasks = ctx.tasks.filter(
-              (_36, idx) => idx % workersCount === i
+              (_37, idx) => idx % workersCount === i
             );
             workerTasks.push(
               createWorkerTask({
@@ -11628,7 +11533,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', _361 => _361.onlyKeys, 'optionalAccess', _362 => _362.some, 'call', _363 => _363(
+              ([key]) => !assignedTask.onlyKeys.length || _optionalChain([assignedTask, 'access', _374 => _374.onlyKeys, 'optionalAccess', _375 => _375.some, 'call', _376 => _376(
                 (pattern) => minimatch(key, pattern)
               )])
             ).fromPairs().value();
@@ -11696,7 +11601,7 @@ function createWorkerTask(args) {
                 finalRenamedTargetData
               );
               const checksums = await deltaProcessor.createChecksums(sourceData);
-              if (!_optionalChain([args, 'access', _364 => _364.ctx, 'access', _365 => _365.flags, 'access', _366 => _366.targetLocale, 'optionalAccess', _367 => _367.length])) {
+              if (!_optionalChain([args, 'access', _377 => _377.ctx, 'access', _378 => _378.flags, 'access', _379 => _379.targetLocale, 'optionalAccess', _380 => _380.length])) {
                 await deltaProcessor.saveChecksums(checksums);
               }
             });
@@ -11901,10 +11806,10 @@ var flagsSchema2 = _zod.z.object({
 async function frozen(input2) {
   console.log(_chalk2.default.hex(colors.orange)("[Frozen]"));
   let buckets = getBuckets(input2.config);
-  if (_optionalChain([input2, 'access', _368 => _368.flags, 'access', _369 => _369.bucket, 'optionalAccess', _370 => _370.length])) {
+  if (_optionalChain([input2, 'access', _381 => _381.flags, 'access', _382 => _382.bucket, 'optionalAccess', _383 => _383.length])) {
     buckets = buckets.filter((b) => input2.flags.bucket.includes(b.type));
   }
-  if (_optionalChain([input2, 'access', _371 => _371.flags, 'access', _372 => _372.file, 'optionalAccess', _373 => _373.length])) {
+  if (_optionalChain([input2, 'access', _384 => _384.flags, 'access', _385 => _385.file, 'optionalAccess', _386 => _386.length])) {
     buckets = buckets.map((bucket) => {
       const paths = bucket.paths.filter(
         (p) => input2.flags.file.some(
@@ -12041,13 +11946,13 @@ async function frozen(input2) {
 
 // src/cli/cmd/run/_utils.ts
 async function determineAuthId(ctx) {
-  const isByokMode = !!_optionalChain([ctx, 'access', _374 => _374.config, 'optionalAccess', _375 => _375.provider]);
+  const isByokMode = !!_optionalChain([ctx, 'access', _387 => _387.config, 'optionalAccess', _388 => _388.provider]);
   if (isByokMode) {
     return null;
   } else {
     try {
-      const authStatus = await _optionalChain([ctx, 'access', _376 => _376.localizer, 'optionalAccess', _377 => _377.checkAuth, 'call', _378 => _378()]);
-      return _optionalChain([authStatus, 'optionalAccess', _379 => _379.username]) || null;
+      const authStatus = await _optionalChain([ctx, 'access', _389 => _389.localizer, 'optionalAccess', _390 => _390.checkAuth, 'call', _391 => _391()]);
+      return _optionalChain([authStatus, 'optionalAccess', _392 => _392.username]) || null;
     } catch (e3) {
       return null;
     }
@@ -12245,7 +12150,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', _380 => _380.platformKit, 'optionalAccess', _381 => _381.gitConfig, 'call', _382 => _382()]);
+    _optionalChain([this, 'access', _393 => _393.platformKit, 'optionalAccess', _394 => _394.gitConfig, 'call', _395 => _395()]);
     _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) {
@@ -12277,7 +12182,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', _383 => _383()]);
+    const canContinue = await _optionalChain([super.preRun.bind(this), 'optionalCall', _396 => _396()]);
     if (!canContinue) {
       return false;
     }
@@ -12544,10 +12449,10 @@ var BitbucketPlatformKit = class extends PlatformKit {
       repo_slug: this.platformConfig.repositoryName,
       state: "OPEN"
     }).then(({ data: { values } }) => {
-      return _optionalChain([values, 'optionalAccess', _384 => _384.find, 'call', _385 => _385(
-        ({ source, destination }) => _optionalChain([source, 'optionalAccess', _386 => _386.branch, 'optionalAccess', _387 => _387.name]) === branch && _optionalChain([destination, 'optionalAccess', _388 => _388.branch, 'optionalAccess', _389 => _389.name]) === this.platformConfig.baseBranchName
+      return _optionalChain([values, 'optionalAccess', _397 => _397.find, 'call', _398 => _398(
+        ({ source, destination }) => _optionalChain([source, 'optionalAccess', _399 => _399.branch, 'optionalAccess', _400 => _400.name]) === branch && _optionalChain([destination, 'optionalAccess', _401 => _401.branch, 'optionalAccess', _402 => _402.name]) === this.platformConfig.baseBranchName
       )]);
-    }).then((pr) => _optionalChain([pr, 'optionalAccess', _390 => _390.id]));
+    }).then((pr) => _optionalChain([pr, 'optionalAccess', _403 => _403.id]));
   }
   async closePullRequest({ pullRequestNumber }) {
     await this.bb.repositories.declinePullRequest({
@@ -12643,7 +12548,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', _391 => _391.number]));
+    }).then(({ data }) => data[0]).then((pr) => _optionalChain([pr, 'optionalAccess', _404 => _404.number]));
   }
   async closePullRequest({ pullRequestNumber }) {
     await this.octokit.rest.pulls.update({
@@ -12770,7 +12675,7 @@ var GitlabPlatformKit = class extends PlatformKit {
       sourceBranch: branch,
       state: "opened"
     });
-    return _optionalChain([mergeRequests, 'access', _392 => _392[0], 'optionalAccess', _393 => _393.iid]);
+    return _optionalChain([mergeRequests, 'access', _405 => _405[0], 'optionalAccess', _406 => _406.iid]);
   }
   async closePullRequest({
     pullRequestNumber
@@ -12882,7 +12787,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', _394 => _394.pullRequest, 'optionalAccess', _395 => _395.toString, 'call', _396 => _396()]) || "false",
+    LINGODOTDEV_PULL_REQUEST: _optionalChain([options, 'access', _407 => _407.pullRequest, 'optionalAccess', _408 => _408.toString, 'call', _409 => _409()]) || "false",
     ...options.commitMessage && {
       LINGODOTDEV_COMMIT_MESSAGE: options.commitMessage
     },
@@ -12908,7 +12813,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', _397 => _397.preRun, 'optionalCall', _398 => _398()]);
+  const canRun = await _optionalChain([flow, 'access', _410 => _410.preRun, 'optionalCall', _411 => _411()]);
   if (canRun === false) {
     return;
   }
@@ -12918,7 +12823,7 @@ var ci_default = new (0, _interactivecommander.Command)().command("ci").descript
   if (!hasChanges) {
     return;
   }
-  await _optionalChain([flow, 'access', _399 => _399.postRun, 'optionalCall', _400 => _400()]);
+  await _optionalChain([flow, 'access', _412 => _412.postRun, 'optionalCall', _413 => _413()]);
 });
 function parseBooleanArg(val) {
   if (val === true) return true;
@@ -12955,8 +12860,8 @@ function exitGracefully(elapsedMs = 0) {
   }
 }
 function checkForPendingOperations() {
-  const activeHandles = _optionalChain([process, 'access', _401 => _401._getActiveHandles, 'optionalCall', _402 => _402()]) || [];
-  const activeRequests = _optionalChain([process, 'access', _403 => _403._getActiveRequests, 'optionalCall', _404 => _404()]) || [];
+  const activeHandles = _optionalChain([process, 'access', _414 => _414._getActiveHandles, 'optionalCall', _415 => _415()]) || [];
+  const activeRequests = _optionalChain([process, 'access', _416 => _416._getActiveRequests, 'optionalCall', _417 => _417()]) || [];
   const nonStandardHandles = activeHandles.filter((handle) => {
     if (handle === process.stdin || handle === process.stdout || handle === process.stderr) {
       return false;
@@ -13025,17 +12930,17 @@ var status_default = new (0, _interactivecommander.Command)().command("status").
       flags
     });
     let buckets = getBuckets(i18nConfig);
-    if (_optionalChain([flags, 'access', _405 => _405.bucket, 'optionalAccess', _406 => _406.length])) {
+    if (_optionalChain([flags, 'access', _418 => _418.bucket, 'optionalAccess', _419 => _419.length])) {
       buckets = buckets.filter(
         (bucket) => flags.bucket.includes(bucket.type)
       );
     }
     ora.succeed("Buckets retrieved");
-    if (_optionalChain([flags, 'access', _407 => _407.file, 'optionalAccess', _408 => _408.length])) {
+    if (_optionalChain([flags, 'access', _420 => _420.file, 'optionalAccess', _421 => _421.length])) {
       buckets = buckets.map((bucket) => {
         const paths = bucket.paths.filter(
           (path19) => flags.file.find(
-            (file) => _optionalChain([path19, 'access', _409 => _409.pathPattern, 'optionalAccess', _410 => _410.includes, 'call', _411 => _411(file)]) || _optionalChain([path19, 'access', _412 => _412.pathPattern, 'optionalAccess', _413 => _413.match, 'call', _414 => _414(file)]) || minimatch(path19.pathPattern, file)
+            (file) => _optionalChain([path19, 'access', _422 => _422.pathPattern, 'optionalAccess', _423 => _423.includes, 'call', _424 => _424(file)]) || _optionalChain([path19, 'access', _425 => _425.pathPattern, 'optionalAccess', _426 => _426.match, 'call', _427 => _427(file)]) || minimatch(path19.pathPattern, file)
           )
         );
         return { ...bucket, paths };
@@ -13055,7 +12960,7 @@ var status_default = new (0, _interactivecommander.Command)().command("status").
         });
       }
     }
-    const targetLocales = _optionalChain([flags, 'access', _415 => _415.locale, 'optionalAccess', _416 => _416.length]) ? flags.locale : i18nConfig.locale.targets;
+    const targetLocales = _optionalChain([flags, 'access', _428 => _428.locale, 'optionalAccess', _429 => _429.length]) ? flags.locale : i18nConfig.locale.targets;
     let totalSourceKeyCount = 0;
     let uniqueKeysToTranslate = 0;
     let totalExistingTranslations = 0;
@@ -13463,12 +13368,12 @@ 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', _417 => _417.locale, 'optionalAccess', _418 => _418.some, 'call', _419 => _419((locale) => !i18nConfig.locale.targets.includes(locale))])) {
+  } else if (_optionalChain([flags, 'access', _430 => _430.locale, 'optionalAccess', _431 => _431.some, 'call', _432 => _432((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', _420 => _420.bucket, 'optionalAccess', _421 => _421.some, 'call', _422 => _422(
+  } else if (_optionalChain([flags, 'access', _433 => _433.bucket, 'optionalAccess', _434 => _434.some, 'call', _435 => _435(
     (bucket) => !i18nConfig.buckets[bucket]
   )])) {
     throw new CLIError({
@@ -13560,7 +13465,7 @@ async function renderHero2() {
 // package.json
 var package_default = {
   name: "lingo.dev",
-  version: "0.116.2",
+  version: "0.116.4",
   description: "Lingo.dev CLI",
   private: false,
   publishConfig: {
@@ -13852,7 +13757,7 @@ var purge_default = new (0, _interactivecommander.Command)().command("purge").de
     if (options.file && options.file.length) {
       buckets = buckets.map((bucket) => {
         const paths = bucket.paths.filter(
-          (bucketPath) => _optionalChain([options, 'access', _423 => _423.file, 'optionalAccess', _424 => _424.some, 'call', _425 => _425((f) => bucketPath.pathPattern.includes(f))])
+          (bucketPath) => _optionalChain([options, 'access', _436 => _436.file, 'optionalAccess', _437 => _437.some, 'call', _438 => _438((f) => bucketPath.pathPattern.includes(f))])
         );
         return { ...bucket, paths };
       }).filter((bucket) => bucket.paths.length > 0);