@wix/himalaya-cli 0.1242.0 → 0.1244.0

package/dist/cli.mjs

@@ -4053,7 +4053,8 @@ __export(paths_exports, {
   storeConfigPath: () => storeConfigPath,
   storeDir: () => storeDir,
   tvosProjectYml: () => tvosProjectYml,
-  watchosProjectYml: () => watchosProjectYml
+  watchosProjectYml: () => watchosProjectYml,
+  watchosStoreSpec: () => watchosStoreSpec
 });
 import { existsSync as existsSync6, readdirSync as readdirSync4 } from "node:fs";
 import { dirname as dirname6, join as join10, resolve as resolve7 } from "node:path";
@@ -4116,6 +4117,9 @@ function androidTvManifestPath(app) {
 function iosStoreSpec(app) {
   return join10(appDir(app), "ios", "project.store.yml");
 }
+function watchosStoreSpec(app) {
+  return join10(appDir(app), "watchos", "project.store.yml");
+}
 function androidGradle(app) {
   const androidDir = join10(appDir(app), "android");
   const preferred = join10(androidDir, `${app}-app`, "build.gradle.kts");
@@ -6757,6 +6761,31 @@ function tonalElevationAlpha(level) {
   if (typeof level !== "number" || !Number.isFinite(level)) return 0;
   return TONAL_ELEVATION_ALPHA[Math.min(5, Math.max(0, Math.round(level)))];
 }
+function resolveButtonTokens(tokens2, size, style) {
+  const button = own(own(tokens2, "controls"), "button");
+  const sizeKey = size === "sm" || size === "lg" ? size : "md";
+  const s2 = own(button, sizeKey);
+  const v2 = own(own(button, "variants"), style || "primary");
+  const out2 = {};
+  const set = (k2, val) => {
+    if (val !== void 0) out2[k2] = val;
+  };
+  set("height", nonNegative(own(s2, "height")));
+  set("paddingH", nonNegative(own(s2, "paddingH")));
+  set("paddingV", nonNegative(own(s2, "paddingV")));
+  set("text", nonEmpty(own(s2, "text")));
+  set("icon", nonNegative(own(s2, "icon")));
+  set("radius", nonNegative(own(v2, "radius")) ?? nonNegative(own(s2, "radius")));
+  set("fill", nonEmpty(own(v2, "fill")));
+  set("label", nonEmpty(own(v2, "label")));
+  set("border", nonEmpty(own(v2, "border")));
+  set("borderWidth", nonNegative(own(v2, "borderWidth")));
+  return out2;
+}
+function buttonHitSlop(visibleHeight) {
+  if (typeof visibleHeight !== "number" || !Number.isFinite(visibleHeight)) return 0;
+  return Math.max(0, (BUTTON_MIN_HIT_TARGET - visibleHeight) / 2);
+}
 function buildTokenRegistry(tokens2) {
   return {
     colors: new Set(Object.keys(tokens2.colors ?? {})),
@@ -6824,12 +6853,16 @@ function walk(node, registry, path2, out2) {
     walk(value, registry, `${path2}.${key2}`, out2);
   }
 }
-var SYSTEM_FONT_FAMILY, TONAL_ELEVATION_ALPHA, COLOR_TOKEN_PROPS, TYPOGRAPHY_TOKEN_PROPS;
+var SYSTEM_FONT_FAMILY, TONAL_ELEVATION_ALPHA, BUTTON_MIN_HIT_TARGET, nonNegative, nonEmpty, own, COLOR_TOKEN_PROPS, TYPOGRAPHY_TOKEN_PROPS;
 var init_tokens = __esm({
   "../../core/ts/src/tokens.ts"() {
     "use strict";
     SYSTEM_FONT_FAMILY = "$system";
     TONAL_ELEVATION_ALPHA = [0, 0.05, 0.08, 0.11, 0.12, 0.14];
+    BUTTON_MIN_HIT_TARGET = 44;
+    nonNegative = (v2) => typeof v2 === "number" && Number.isFinite(v2) && v2 >= 0 ? v2 : void 0;
+    nonEmpty = (v2) => typeof v2 === "string" && v2 !== "" ? v2 : void 0;
+    own = (o2, k2) => o2 && typeof o2 === "object" && Object.prototype.hasOwnProperty.call(o2, k2) ? o2[k2] : void 0;
     COLOR_TOKEN_PROPS = {
       Badge: ["token"],
       Card: ["background"],
@@ -8112,7 +8145,7 @@ function isDynamicValue(v2) {
 function isActionEnvelope(v2) {
   return !!v2 && typeof v2 === "object" && !Array.isArray(v2) && typeof v2.actionId === "string";
 }
-function own(bag, key2) {
+function own2(bag, key2) {
   return Object.prototype.hasOwnProperty.call(bag, key2) ? bag[key2] : void 0;
 }
 function atExposureOf(node) {
@@ -8136,17 +8169,17 @@ function hasPropHandler(node) {
   const body = bag(node.body);
   const bags = [bag(body.props), bag(node.props), node];
   return bags.some((b2) => PROP_HANDLER_KEYS.some((k2) => {
-    const v2 = own(b2, k2);
+    const v2 = own2(b2, k2);
     return !!v2 && typeof v2 === "object" && !Array.isArray(v2);
   }));
 }
 function ownName(n2) {
   for (const k2 of ACCESSIBLE_NAME_KEYS) {
-    const v2 = own(n2, k2);
+    const v2 = own2(n2, k2);
     if (typeof v2 === "string" && v2.trim() !== "" || isDynamicValue(v2)) return true;
   }
   for (const k2 of CONTENT_ARM_KEYS) {
-    const v2 = own(n2, k2);
+    const v2 = own2(n2, k2);
     if (v2 !== void 0 && v2 !== null) return true;
   }
   return false;
@@ -8214,7 +8247,7 @@ function accessibleNameGaps(descriptor, options = {}) {
       if (exposure !== "decorative") {
         const tappable = isInteractive(n2) || propHandlers && hasPropHandler(n2);
         const type = componentTypeOf(n2);
-        const row = type ? own(A11Y_CONTRACT, type) : void 0;
+        const row = type ? own2(A11Y_CONTRACT, type) : void 0;
         const contractual = !interactiveOnly && row?.name === "required";
         if ((tappable || contractual) && !hasAccessibleName(n2)) {
           out2.push({
@@ -9799,7 +9832,7 @@ function serviceFieldDeclared(state, path2) {
 function ellipsis(value, max) {
   return value.length <= max ? value : `${value.slice(0, max)}\u2026`;
 }
-function own2(table, key2) {
+function own3(table, key2) {
   return Object.prototype.hasOwnProperty.call(table, key2) ? table[key2] : void 0;
 }
 function isOpaqueAuthorJson(key2, value, atRoot) {
@@ -9844,7 +9877,7 @@ function nativeRequiredFindings(descriptor) {
       value.forEach((v2, i2) => checkNested(v2, of2, `${path2}[${i2}]`, from));
       return;
     }
-    const rule = own2(NATIVE_NESTED_CLASSES, cls);
+    const rule = own3(NATIVE_NESTED_CLASSES, cls);
     if (!rule) return;
     if (Array.isArray(value) || !value || typeof value !== "object") {
       reportKind(cls, value, path2, from);
@@ -9852,17 +9885,17 @@ function nativeRequiredFindings(descriptor) {
     }
     const bag = value;
     for (const name of rule.required) {
-      if (own2(bag, name) !== void 0 && bag[name] !== null) continue;
+      if (own3(bag, name) !== void 0 && bag[name] !== null) continue;
       out2.push({
         path: `${path2}.${name}`,
         message: `${cls}.${name} is REQUIRED by the native decoder but is missing \u2014 native decode rejects it ("Field '${name}' is required for type with serial name 'io.himalaya.core.${cls}', but it was missing") and drops the WHOLE screen from the seed, while web renders it fine (reached from ${from})`
       });
     }
     for (const [name, sub] of Object.entries(rule.nested)) {
-      const inner = own2(bag, name);
+      const inner = own3(bag, name);
       if (inner !== void 0 && inner !== null) checkNested(inner, sub, `${path2}.${name}`, from);
     }
-    if (cls === "Action") checkActionParams(own2(bag, "params"), `${path2}.params`, from);
+    if (cls === "Action") checkActionParams(own3(bag, "params"), `${path2}.params`, from);
   };
   const checkActionParams = (params, path2, from) => {
     if (params === void 0 || params === null) return;
@@ -9895,22 +9928,22 @@ function nativeRequiredFindings(descriptor) {
       const props = body.props;
       const bag = props && typeof props === "object" && !Array.isArray(props) ? props : {};
       const base = at2 ? `${at2}.body.props` : "body.props";
-      for (const name of own2(NATIVE_REQUIRED_PROPS, type) ?? []) {
-        if (own2(bag, name) !== void 0 && bag[name] !== null) continue;
+      for (const name of own3(NATIVE_REQUIRED_PROPS, type) ?? []) {
+        if (own3(bag, name) !== void 0 && bag[name] !== null) continue;
         const hint = type === "Button" && name === "title" && bag.iconOnly === true ? " \u2014 `iconOnly` HIDES the label, it does not make it optional; keep a title (it is also the accessibility label)" : "";
         out2.push({
           path: `${base}.${name}`,
           message: `${type}.${name} is REQUIRED by the native decoder but is missing \u2014 native decode rejects it ("Field '${name}' is required for type with serial name 'io.himalaya.core.${type}Props', but it was missing") and drops the WHOLE screen from the seed, while web renders it fine${hint}`
         });
       }
-      for (const [prop, cls] of Object.entries(own2(NATIVE_NESTED_PROPS, type) ?? {})) {
-        const value = own2(bag, prop);
+      for (const [prop, cls] of Object.entries(own3(NATIVE_NESTED_PROPS, type) ?? {})) {
+        const value = own3(bag, prop);
         if (value === void 0 || value === null) continue;
         checkNested(value, cls, `${base}.${prop}`, `${type}.${prop}`);
       }
     }
     if (body && typeof body === "object" && typeof body.type === "string" && typeof body.package === "string") {
-      const modifiers = own2(record2, "modifiers");
+      const modifiers = own3(record2, "modifiers");
       if (modifiers !== void 0 && modifiers !== null) {
         checkNested(modifiers, NATIVE_MODIFIERS_CLASS, at2 ? `${at2}.modifiers` : "modifiers", "modifiers");
       }
@@ -9924,7 +9957,7 @@ function nativeRequiredFindings(descriptor) {
   if (descriptor && typeof descriptor === "object" && !Array.isArray(descriptor)) {
     const root = descriptor;
     for (const [field, cls] of Object.entries(NATIVE_DESCRIPTOR_NESTED)) {
-      const value = own2(root, field);
+      const value = own3(root, field);
       if (value === void 0 || value === null) continue;
       checkNested(value, cls, field, `${NATIVE_DESCRIPTOR_CLASS}.${field}`);
     }
@@ -9954,14 +9987,14 @@ function componentPropFindings(descriptor) {
     const body = record2.body;
     if (typeof body?.package === "string" && CORE_PACKAGES.has(body.package) && typeof body.type === "string") {
       const type = body.type;
-      const declared = own2(KNOWN_PROPS, type);
+      const declared = own3(KNOWN_PROPS, type);
       const props = body.props;
       if (declared && props && typeof props === "object" && !Array.isArray(props)) {
         const bag = props;
         const base = at2 ? `${at2}.body.props` : "body.props";
         for (const name of Object.keys(bag)) {
           const path2 = `${base}.${name}`;
-          const kind = own2(declared, name);
+          const kind = own3(declared, name);
           if (kind === void 0) {
             if (LEGACY_UNSCORED_KEYS.has(`${type}.${name}`)) continue;
             const hint = MODIFIER_KEYS.has(name) ? ` \u2014 \`${name}\` is a MODIFIER, not a prop: move it out of \`props\` and into the node's \`modifiers\` bag (\`{ id, body, modifiers: { ${name}: \u2026 } }\`)` : "";
@@ -9977,7 +10010,7 @@ function componentPropFindings(descriptor) {
           if (kind === "any") continue;
           if (typeof value === "string" && BINDING_SIGIL_RE.test(value)) {
             if (kind === "string") continue;
-            const twin = own2(declared, `${name}Path`) !== void 0 ? `${name}Path` : void 0;
+            const twin = own3(declared, `${name}Path`) !== void 0 ? `${name}Path` : void 0;
             const inArray = IN_ARRAY_BINDING_PROPS.has(`${type}.${name}`) && value.startsWith(SERVICE_SIGIL);
             out2.push({
               path: path2,
@@ -10000,10 +10033,10 @@ function componentPropFindings(descriptor) {
             });
             continue;
           }
-          if (own2(NATIVE_PROP_ENUMS, name) !== void 0) continue;
+          if (own3(NATIVE_PROP_ENUMS, name) !== void 0) continue;
           const actual = wireKind(value);
           if (actual === kind) {
-            if (kind === "number" && typeof value === "number" && !Number.isInteger(value) && own2(INTEGER_PROPS, type)?.includes(name)) {
+            if (kind === "number" && typeof value === "number" && !Number.isInteger(value) && own3(INTEGER_PROPS, type)?.includes(name)) {
               out2.push({
                 path: path2,
                 kind: "decode",
@@ -10021,13 +10054,13 @@ function componentPropFindings(descriptor) {
       }
     }
     if (body && typeof body === "object" && typeof body.type === "string" && typeof body.package === "string") {
-      const modifiers = own2(record2, "modifiers");
+      const modifiers = own3(record2, "modifiers");
       if (modifiers && typeof modifiers === "object" && !Array.isArray(modifiers)) {
         const schemaOwnsUnknownKeys = SCHEMA_SCORED_NODES.has(at2);
         const bag = modifiers;
         for (const key2 of Object.keys(bag)) {
           if (MODIFIER_KEYS.has(key2)) {
-            const spec = own2(MODIFIER_KINDS, key2);
+            const spec = own3(MODIFIER_KINDS, key2);
             const value = bag[key2];
             if (!spec || value === void 0 || value === null) continue;
             const where = at2 ? `${at2}.modifiers.${key2}` : `modifiers.${key2}`;
@@ -10815,7 +10848,7 @@ function validateScreenDescriptor(screenId, descriptor, opts = {}) {
       if (isOpaqueAuthorJson(k2, val, at2 === "")) continue;
       if (k2 === "params" && typeof node.actionId === "string") continue;
       const here = at2 ? `${at2}.${k2}` : k2;
-      const allowed2 = own2(NATIVE_PROP_ENUMS, k2);
+      const allowed2 = own3(NATIVE_PROP_ENUMS, k2);
       if (typeof val === "string" && enums.has(k2) && DYNAMIC_PLACEHOLDER.test(val)) {
         issues.push({
           severity: "error",
@@ -13691,6 +13724,47 @@ function tokenColorIssues(dir, tokensPathOverride) {
       checkElevations(layer, `idiom.${overlay}.`, /* @__PURE__ */ new Set([...baseShadows, ...shadowNames(layer)]));
     }
   }
+  const groupNames = (layer, group) => {
+    const g2 = layer?.[group];
+    return new Set(g2 !== null && typeof g2 === "object" && !Array.isArray(g2) ? Object.keys(g2) : []);
+  };
+  const checkControlButton = (layer, where, typo, cols) => {
+    const controlButton = layer?.controls?.button;
+    if (controlButton === void 0 || controlButton === null || typeof controlButton !== "object" || Array.isArray(controlButton)) return;
+    const btn = controlButton;
+    for (const size of ["sm", "md", "lg"]) {
+      const text8 = btn[size]?.text;
+      if (text8 === void 0 || typeof text8 === "string" && typo.has(text8)) continue;
+      error(
+        `${tokensPath}: ${where}controls.button.${size}.text is ${JSON.stringify(text8)}, which names no \`typography\` token \u2014 every renderer would keep the built-in Button label. Name one that exists.`
+      );
+    }
+    const variants = btn.variants;
+    if (variants !== null && typeof variants === "object" && !Array.isArray(variants)) {
+      for (const [style, v2] of Object.entries(variants)) {
+        for (const field of ["fill", "label", "border"]) {
+          const value = v2?.[field];
+          if (value === void 0 || typeof value === "string" && (isCanonicalHex(value) || cols.has(value))) continue;
+          error(
+            `${tokensPath}: ${where}controls.button.variants.${style}.${field} is ${JSON.stringify(value)}, which is neither a \`colors\` token nor a #RRGGBB(AA) literal \u2014 every renderer would keep the built-in colour.`
+          );
+        }
+      }
+    }
+  };
+  const baseTypo = groupNames(raw, "typography");
+  const baseCols = groupNames(raw, "colors");
+  checkControlButton(raw, "", baseTypo, baseCols);
+  if (idiom !== null && typeof idiom === "object" && !Array.isArray(idiom)) {
+    for (const [overlay, layer] of Object.entries(idiom)) {
+      checkControlButton(
+        layer,
+        `idiom.${overlay}.`,
+        /* @__PURE__ */ new Set([...baseTypo, ...groupNames(layer, "typography")]),
+        /* @__PURE__ */ new Set([...baseCols, ...groupNames(layer, "colors")])
+      );
+    }
+  }
   const colors = raw.colors;
   if (colors === void 0) return issues;
   if (colors === null || typeof colors !== "object" || Array.isArray(colors)) {
@@ -15506,15 +15580,15 @@ function hexToRgb2(hex2) {
 }
 function rgba(color, alpha2) {
   let h2 = color.trim().replace(/^#/, "");
-  let own3 = 1;
+  let own4 = 1;
   if (/^[\da-f]{4}$/i.test(h2) || /^[\da-f]{8}$/i.test(h2)) {
     const a2 = h2.length === 4 ? h2[3] + h2[3] : h2.slice(6, 8);
-    own3 = parseInt(a2, 16) / 255;
+    own4 = parseInt(a2, 16) / 255;
     h2 = h2.length === 4 ? h2.slice(0, 3) : h2.slice(0, 6);
   }
   const rgb = hexToRgb2(`#${h2}`);
   if (!rgb) return color;
-  const composed2 = own3 === 1 ? clamp(alpha2) : Math.round(clamp(alpha2) * own3 * 1e3) / 1e3;
+  const composed2 = own4 === 1 ? clamp(alpha2) : Math.round(clamp(alpha2) * own4 * 1e3) / 1e3;
   return `rgba(${rgb[0]}, ${rgb[1]}, ${rgb[2]}, ${composed2})`;
 }
 function normalizeSpring(spring, durationMs) {
@@ -15875,8 +15949,8 @@ var init_tokens2 = __esm({
 // ../font-bake/web-fallback.ts
 function webRenderedFallback(family) {
   const stack = fontStack(family);
-  const own3 = `"${family}", `;
-  const tail = stack.startsWith(own3) ? stack.slice(own3.length) : stack;
+  const own4 = `"${family}", `;
+  const tail = stack.startsWith(own4) ? stack.slice(own4.length) : stack;
   return tail.split(",")[0].trim().replace(/^"(.*)"$/, "$1");
 }
 var init_web_fallback = __esm({
@@ -17632,9 +17706,9 @@ function isKnownCapability(id) {
 function needsNativeBuild(id) {
   const req = CAPABILITY_NATIVE[catalogKey(id)];
   if (!req) return false;
-  const nonEmpty = (v2) => Array.isArray(v2) ? v2.length > 0 : v2 != null && typeof v2 === "object" ? Object.keys(v2).length > 0 : false;
+  const nonEmpty2 = (v2) => Array.isArray(v2) ? v2.length > 0 : v2 != null && typeof v2 === "object" ? Object.keys(v2).length > 0 : false;
   const { ios, android } = req;
-  return nonEmpty(ios?.usageStrings) || nonEmpty(ios?.infoPlist) || nonEmpty(ios?.entitlements) || nonEmpty(ios?.spmProducts) || nonEmpty(android?.permissions) || nonEmpty(android?.features) || nonEmpty(android?.services) || nonEmpty(android?.foregroundServiceTypes) || nonEmpty(android?.gradleDeps);
+  return nonEmpty2(ios?.usageStrings) || nonEmpty2(ios?.infoPlist) || nonEmpty2(ios?.entitlements) || nonEmpty2(ios?.spmProducts) || nonEmpty2(android?.permissions) || nonEmpty2(android?.features) || nonEmpty2(android?.services) || nonEmpty2(android?.foregroundServiceTypes) || nonEmpty2(android?.gradleDeps);
 }
 function capabilitiesUsedBy(bundleJs) {
   const out2 = /* @__PURE__ */ new Set();
@@ -18687,15 +18761,15 @@ function renderDistCapabilitiesXml(bake, indent) {
     `${indent}<meta-data android:name="${ANDROID_DIST_CAPABILITIES_META}" android:value="${bake.added.join(",")}" />`
   ];
 }
-function resolveDistBake(app, own3, extra) {
-  const ownSet = new Set(own3);
+function resolveDistBake(app, own4, extra) {
+  const ownSet = new Set(own4);
   const extraKeys = [...new Set(extra.map(catalogKey))].filter((id) => !ownSet.has(id)).sort();
   const refused2 = extraKeys.map((id) => [id, distAddRefusal(id)]).filter(([, r2]) => r2 !== null);
   if (refused2.length) {
     throw new Error(`${app}: a dist build cannot add ${refused2.map(([id, r2]) => `${id} (${r2})`).join("; ")}`);
   }
-  const build3 = buildSet([...own3, ...extraKeys]);
-  const ownExpanded = expandCapabilities(own3);
+  const build3 = buildSet([...own4, ...extraKeys]);
+  const ownExpanded = expandCapabilities(own4);
   const added = [...expandCapabilities(extraKeys)].filter((id) => !ownExpanded.has(id) && distAddRefusal(id) === null).sort();
   return { build: build3, added };
 }
@@ -21735,8 +21809,8 @@ function rewriteNav(nav, removed, homeId) {
       return p2;
     };
     const tabFor = (screenId) => {
-      const own3 = remainingRoots.find((t2) => t2.screenId === screenId);
-      return typeof own3?.id === "string" ? own3.id : void 0;
+      const own4 = remainingRoots.find((t2) => t2.screenId === screenId);
+      return typeof own4?.id === "string" ? own4.id : void 0;
     };
     const homeTab = tabFor(homeId) ?? (typeof remainingRoots[0]?.id === "string" ? remainingRoots[0].id : "");
     const finalTab = /* @__PURE__ */ new Map();
@@ -21871,8 +21945,8 @@ function planTrim(src, keepIds, links) {
     if (!linksOf(r2).some((l2) => removedTarget(l2.to))) continue;
     const block = structuredClone(r2.block);
     const isDead = (entry) => {
-      const own3 = tapTarget(entry);
-      const to2 = own3 && removedTarget(own3) ? own3 : rowTemplateTarget(entry, removedTarget);
+      const own4 = tapTarget(entry);
+      const to2 = own4 && removedTarget(own4) ? own4 : rowTemplateTarget(entry, removedTarget);
       if (!to2) return false;
       dropped.push({ screen: r2.label, node: entryLabel(entry), to: to2 });
       return true;
@@ -24064,12 +24138,12 @@ function clampRule(rule, denyPrefixes, maxTTL) {
     ttl: Math.min(rule.ttl, maxTTL)
   };
 }
-function shadows(own3, dflt) {
-  const methodCovers = own3.method === null || own3.method.toUpperCase() === (dflt.method ?? "").toUpperCase();
-  return methodCovers && dflt.pathPrefix.startsWith(own3.pathPrefix);
+function shadows(own4, dflt) {
+  const methodCovers = own4.method === null || own4.method.toUpperCase() === (dflt.method ?? "").toUpperCase();
+  return methodCovers && dflt.pathPrefix.startsWith(own4.pathPrefix);
 }
 function resolveWixCachePolicy(appName2, declared) {
-  const own3 = (declared?.rules ?? []).map((r2) => ({
+  const own4 = (declared?.rules ?? []).map((r2) => ({
     method: r2.method ?? null,
     pathPrefix: r2.pathPrefix,
     cacheable: r2.cacheable,
@@ -24078,7 +24152,7 @@ function resolveWixCachePolicy(appName2, declared) {
     tag: r2.tag ?? null
   }));
   const legacy = CACHE_OVERRIDES[appName2] ?? [];
-  const appLevel = [...own3, ...legacy];
+  const appLevel = [...own4, ...legacy];
   const defaults = declared?.platformDefaults === false ? [] : PLATFORM_DEFAULT_WIX_CACHE_RULES.filter((d2) => !appLevel.some((a2) => shadows(a2, d2)));
   const denies = [
     ...[...PLATFORM_DENY_PREFIXES, ...PERSONAL_DATA_PREFIXES].map((pathPrefix) => ({ method: null, pathPrefix, cacheable: false, ttl: 0, swr: 0, tag: null })),
@@ -25674,6 +25748,7 @@ function shouldRevealError(args) {
 var EMAIL_RE, URL_HOST_RE, INTEGER_RE, NUMBER_RE;
 var init_validation = __esm({
   "../../core/ts/src/validation.ts"() {
+    "use strict";
     EMAIL_RE = /^[A-Za-z0-9._%+-]+@[A-Za-z0-9-]+(\.[A-Za-z0-9-]+)*\.[A-Za-z]{2,}$/;
     URL_HOST_RE = /^[A-Za-z0-9-]+(\.[A-Za-z0-9-]+)*(:[0-9]+)?$/;
     INTEGER_RE = /^[+-]?[0-9]+$/;
@@ -26333,6 +26408,7 @@ function validateWorkerSubtree(raw, slotId, policy, actionCatalog) {
 var WORKER_SUBTREE_CEILINGS, ID_PART, ACTION_ID;
 var init_worker_subtree = __esm({
   "../../core/ts/src/worker-subtree.ts"() {
+    "use strict";
     init_worker_subtree_safe_types_generated();
     WORKER_SUBTREE_CEILINGS = Object.freeze({
       maxEncodedBytes: 65536,
@@ -28784,8 +28860,8 @@ var init_src4 = __esm({
 // ../../core/dev-server/src/descriptor-postprocess.ts
 function applyTopBarDefault(descriptor, config) {
   const fallback = config?.navigation?.topBarDefault;
-  const own3 = descriptor?.topBar;
-  if (!fallback || own3) return descriptor;
+  const own4 = descriptor?.topBar;
+  if (!fallback || own4) return descriptor;
   return { ...descriptor, topBar: fallback };
 }
 function attachAssignments(descriptor, definitions2, ctx, overrides) {
@@ -31380,13 +31456,13 @@ function parsePaddingShorthand(v2) {
 }
 function addIntrinsicPadding(style, modPad) {
   if (!style) return void 0;
-  const own3 = parsePaddingShorthand(style.padding);
-  if (!own3) return void 0;
+  const own4 = parsePaddingShorthand(style.padding);
+  if (!own4) return void 0;
   const sides = [
-    ["paddingTop", own3.top],
-    ["paddingBottom", own3.bottom],
-    ["paddingLeft", own3.left],
-    ["paddingRight", own3.right]
+    ["paddingTop", own4.top],
+    ["paddingBottom", own4.bottom],
+    ["paddingLeft", own4.left],
+    ["paddingRight", own4.right]
   ];
   let out2;
   for (const [key2, ownPx] of sides) {
@@ -32966,8 +33042,8 @@ function RichContentEditorView({ props, ctx, wrap, nodeId, renderChild, ...dom }
   const root = { position: "relative", display: "flex", flexDirection: "column", width: "100%", ...fill ? { flex: "1 1 auto" } : {}, minHeight, ...wrap };
   if (!live3) {
     const { paddingTop: _t2, paddingBottom: _b, paddingLeft: _l2, paddingRight: _r2, ...rootNoSides } = root;
-    const own3 = { ...rootNoSides, border: `1px solid ${C2("border", "#e3e3e3")}`, borderRadius: 8, padding: 12, boxSizing: "border-box" };
-    return /* @__PURE__ */ jsx4("div", { ...dom, style: addIntrinsicPadding(own3, wrap) ?? own3, children: /* @__PURE__ */ jsx4("span", { style: { color: C2("textSecondary", "#636B78") }, children: placeholder2 || "Rich text editor" }) });
+    const own4 = { ...rootNoSides, border: `1px solid ${C2("border", "#e3e3e3")}`, borderRadius: 8, padding: 12, boxSizing: "border-box" };
+    return /* @__PURE__ */ jsx4("div", { ...dom, style: addIntrinsicPadding(own4, wrap) ?? own4, children: /* @__PURE__ */ jsx4("span", { style: { color: C2("textSecondary", "#636B78") }, children: placeholder2 || "Rich text editor" }) });
   }
   if (status === "unavailable") {
     return /* @__PURE__ */ jsx4("div", { ...dom, style: root, children: /* @__PURE__ */ jsx4("div", { "data-component-id": `${id}/fallback`, children: props.fallback ? renderChild(props.fallback) : /* @__PURE__ */ jsx4("p", { style: { margin: 0, color: C2("textSecondary", "#636B78") }, children: "Editor unavailable" }) }) });
@@ -33809,8 +33885,8 @@ function pushModalLayer(el2, opts = {}) {
   sync();
   return {
     isTop: () => {
-      const own3 = layer.el();
-      return own3 != null && own3.isConnected && topLayerOver(own3) === layer;
+      const own4 = layer.el();
+      return own4 != null && own4.isConnected && topLayerOver(own4) === layer;
     },
     release: () => {
       const i2 = layers.indexOf(layer);
@@ -116368,18 +116444,18 @@ function editA11yParts(node, edit) {
     return changed ? out2 : node;
   }
   if (!React8.isValidElement(node) || typeof node.type !== "string") return node;
-  const own3 = node.props;
-  if (own3["data-component-id"] != null) return node;
-  const part = own3[A11Y_PART];
-  const kids3 = own3.children;
+  const own4 = node.props;
+  if (own4["data-component-id"] != null) return node;
+  const part = own4[A11Y_PART];
+  const kids3 = own4.children;
   const nextKids = kids3 == null ? kids3 : editA11yParts(kids3, edit);
   if (typeof part !== "string" && nextKids === kids3) return node;
-  return cloneWithKids(node, typeof part === "string" ? { ...edit(part, own3), [A11Y_PART]: void 0 } : {}, nextKids);
+  return cloneWithKids(node, typeof part === "string" ? { ...edit(part, own4), [A11Y_PART]: void 0 } : {}, nextKids);
 }
 function a11yPartEdit(routed, authoredName, onNode, focus) {
-  return (part, own3) => {
+  return (part, own4) => {
     if (part === "derived-name") return authoredName ? {} : { "aria-hidden": "true" };
-    const focusable = typeof own3.tabIndex === "number" && own3.tabIndex >= 0;
+    const focusable = typeof own4.tabIndex === "number" && own4.tabIndex >= 0;
     if (part === "focus") {
       if (!focus || !focusable) return {};
       focus.onRouted();
@@ -116392,10 +116468,10 @@ function a11yPartEdit(routed, authoredName, onNode, focus) {
       Object.assign(patch, focus.carried);
       focus.onRouted();
     }
-    if (typeof routed["aria-describedby"] === "string" && typeof own3["aria-describedby"] === "string") {
-      patch["aria-describedby"] = `${own3["aria-describedby"]} ${routed["aria-describedby"]}`;
+    if (typeof routed["aria-describedby"] === "string" && typeof own4["aria-describedby"] === "string") {
+      patch["aria-describedby"] = `${own4["aria-describedby"]} ${routed["aria-describedby"]}`;
     }
-    if ("role" in routed && routed.role !== own3.role) {
+    if ("role" in routed && routed.role !== own4.role) {
       if (!(typeof routed.role === "string" && RANGE_ROLES.has(routed.role))) {
         patch["aria-valuenow"] = void 0;
         patch["aria-valuemin"] = void 0;
@@ -116447,8 +116523,8 @@ function nameFromOwnContent(root) {
         const t2 = child.textContent?.trim();
         if (t2) parts.push(t2);
       } else if (child.nodeType === 1 && !child.matches(NAME_SKIP_SELECTOR)) {
-        const own3 = child.getAttribute("aria-label")?.trim() || (child.tagName === "IMG" ? child.getAttribute("alt")?.trim() : void 0);
-        if (own3) parts.push(own3);
+        const own4 = child.getAttribute("aria-label")?.trim() || (child.tagName === "IMG" ? child.getAttribute("alt")?.trim() : void 0);
+        if (own4) parts.push(own4);
         else walk2(child);
       }
     }
@@ -118275,6 +118351,7 @@ var init_renderNode = __esm({
     init_helpers();
     init_bindings2();
     init_bindings();
+    init_tokens();
     init_message_format();
     init_validation();
     init_formBag();
@@ -120401,22 +120478,30 @@ var init_renderNode = __esm({
       const buttonStyle = props.style ?? "primary";
       const destructive = buttonStyle === "destructive";
       const primary = buttonStyle === "primary" || destructive;
-      const outlined = buttonStyle === "secondary";
-      const accent = destructive ? C2("danger", "#E62214") : C2("accentPrimary", "#116DFF");
+      const bt2 = resolveButtonTokens(ctx.tokens, props.size, buttonStyle);
+      const borderWidth = bt2.borderWidth ?? (buttonStyle === "secondary" ? 1 : 0);
+      const outlined = borderWidth > 0;
+      const builtInFill = !primary ? "transparent" : destructive ? C2("danger", "#E62214") : C2("accentPrimary", "#116DFF");
+      const accent = bt2.fill != null ? C2(bt2.fill, builtInFill) : builtInFill;
+      const filled = primary || bt2.fill != null;
       const boundDisabled = useResolvedScalar(props.disabledPath, ctx);
       const disabled = props.disabled === true || props.loading === true || hiddenBool(boundDisabled);
       const onClick = ctx.onAction && props.action && !disabled ? (e2) => {
         e2?.stopPropagation?.();
         ctx.onAction(resolveItemDeep2(props.action, ctx));
       } : void 0;
-      const fg = primary ? C2("textOnAccent", "#fff") : accentTextColor(ctx);
-      const pillRadius = props.cornerRadius != null ? props.cornerRadius : ctx.radius("pill", 24);
-      const vPad = props.iconOnly ? 11 : props.size === "sm" ? 8 : props.size === "lg" ? 16 : 13;
+      const builtInFg = primary ? C2("textOnAccent", "#fff") : accentTextColor(ctx);
+      const fg = bt2.label != null ? C2(bt2.label, builtInFg) : builtInFg;
+      const outlineColor = bt2.border != null ? C2(bt2.border, fg) : fg;
+      const pillRadius = props.cornerRadius != null ? props.cornerRadius : bt2.radius ?? ctx.radius("pill", 24);
+      const vPad = props.iconOnly ? 11 : bt2.paddingV ?? (props.size === "sm" ? 8 : props.size === "lg" ? 16 : 13);
       const hPadBase = props.iconOnly ? 11 : props.size === "sm" ? 13 : props.size === "lg" ? 22 : 16;
-      const hPad = props.iconOnly ? 11 : Math.min(Math.max(hPadBase, pillRadius), vPad + 8);
+      const hPad = props.iconOnly ? 11 : bt2.paddingH ?? Math.min(Math.max(hPadBase, pillRadius), vPad + 8);
       const pad3 = `${vPad}px ${hPad}px`;
-      const f2 = ctx.font("bodyEmphasis");
-      const glyph = props.size === "sm" ? 14 : props.size === "lg" ? 18 : 16;
+      const f2 = ctx.font(bt2.text ?? "bodyEmphasis");
+      const glyph = bt2.icon ?? (props.size === "sm" ? 14 : props.size === "lg" ? 18 : 16);
+      const visibleMin = props.iconOnly ? 44 : props.minHeight ?? bt2.height ?? 44;
+      const slop = props.iconOnly ? 0 : buttonHitSlop(Math.max(visibleMin, 2 * vPad + Math.max(f2.size * (f2.line ?? 1.25), glyph)));
       const ic = (name) => /* @__PURE__ */ jsx9("span", { style: { display: "inline-grid", placeItems: "center", width: glyph, height: glyph }, children: iconSvg(name, { size: glyph, color: fg }) });
       const iconLabel = typeof resolvedLeadingIcon === "string" && resolvedLeadingIcon ? resolvedLeadingIcon.replace(/[_-]+/g, " ").replace(/\b\w/g, (c2) => c2.toUpperCase()) : "";
       const hasTitle = typeof resolvedTitle === "string" && resolvedTitle.length > 0 || typeof resolvedTitle === "number";
@@ -120466,19 +120551,24 @@ var init_renderNode = __esm({
             width: props.fullWidth ? "100%" : void 0,
             flex: rowStretch ? "1 1 0" : void 0,
             minWidth: props.iconOnly ? 44 : props.fullWidth ? void 0 : 64,
-            minHeight: 44,
+            minHeight: visibleMin + 2 * slop,
             ...props.iconOnly ? {} : { whiteSpace: "nowrap", overflow: "hidden", textOverflow: "ellipsis" },
             alignItems: "center",
             justifyContent: "center",
             gap: 8,
             padding: pad3,
-            borderRadius: props.iconOnly ? "50%" : pillRadius,
+            // With a hit band the outer box is `slop` taller at each end; an elliptical radius keeps
+            // the VISIBLE (padding-box) corner at `pillRadius`.
+            borderRadius: props.iconOnly ? "50%" : slop > 0 ? `${pillRadius}px / ${pillRadius + slop}px` : pillRadius,
             fontFamily: fontStack(f2.family, ctx.idiom),
             fontWeight: f2.weight,
             fontSize: f2.remSize,
-            background: primary ? accent : "transparent",
+            // An authored `text` token paints its own line height too — the one the hit area estimates with.
+            ...bt2.text != null && f2.line != null ? { lineHeight: f2.line } : {},
+            ...bt2.text != null && f2.letterSpacing != null ? { letterSpacing: f2.letterSpacing } : {},
+            background: filled ? accent : "transparent",
             color: fg,
-            border: outlined ? `1px solid ${fg}` : "none",
+            ...slop > 0 ? { border: "none", borderTop: `${slop}px solid transparent`, borderBottom: `${slop}px solid transparent`, backgroundClip: "padding-box", marginTop: -slop, marginBottom: -slop, ...outlined ? { boxShadow: `inset 0 0 0 ${borderWidth}px ${outlineColor}` } : {} } : { border: outlined ? `${borderWidth}px solid ${outlineColor}` : "none" },
             cursor: disabled ? "default" : "pointer",
             opacity: disabled ? 0.55 : 1,
             boxSizing: "border-box",
@@ -122303,10 +122393,10 @@ var init_renderNode = __esm({
     focusRoots = /* @__PURE__ */ new WeakMap();
     A11yHintDescription = ({ hint, idBase, children, ...forwarded }) => {
       const descId = `${idBase ?? "hm"}__hint${React8.useId()}`;
-      const own3 = children.props;
+      const own4 = children.props;
       const next = { ...forwarded };
-      if (forwarded.style) next.style = { ...own3.style ?? {}, ...forwarded.style };
-      next["aria-describedby"] = [own3["aria-describedby"], descId].filter(Boolean).join(" ");
+      if (forwarded.style) next.style = { ...own4.style ?? {}, ...forwarded.style };
+      next["aria-describedby"] = [own4["aria-describedby"], descId].filter(Boolean).join(" ");
       return /* @__PURE__ */ jsxs6(Fragment4, { children: [
         React8.cloneElement(children, next),
         /* @__PURE__ */ jsx9("span", { id: descId, hidden: true, "data-hm-a11y-hint": "", children: hint })
@@ -141583,15 +141673,15 @@ function assembleLedger(r2, options = {}) {
         remedy: SOURCEMAP_REMEDY[c2.sourcemap]
       });
     }
-    const own3 = (c2.uncoveredFunctions ?? []).filter((f2) => f2.source?.startsWith("tier5-src/") || f2.source?.startsWith("core/dev-server/tier5-bundles-src/"));
-    if (!own3.length) continue;
-    const named = own3.slice(0, 6).map((f2) => `${f2.name} (${f2.source})`).join(", ");
-    const more = own3.length > 6 ? ` +${own3.length - 6} more` : "";
+    const own4 = (c2.uncoveredFunctions ?? []).filter((f2) => f2.source?.startsWith("tier5-src/") || f2.source?.startsWith("core/dev-server/tier5-bundles-src/"));
+    if (!own4.length) continue;
+    const named = own4.slice(0, 6).map((f2) => `${f2.name} (${f2.source})`).join(", ");
+    const more = own4.length > 6 ? ` +${own4.length - 6} more` : "";
     out2.push({
       key: `code-uncovered|${c2.screen}`,
       kind: "code-uncovered",
       screen: c2.screen,
-      gap: `${own3.length} worker function${own3.length === 1 ? "" : "s"} never executed on any axis: ${named}${more}`,
+      gap: `${own4.length} worker function${own4.length === 1 ? "" : "s"} never executed on any axis: ${named}${more}`,
       remedy: "usually an error/edge branch \u2014 give the crawl data that reaches it (a net-mocks rule, cms seed rows, or a nav edge with the right input), or verify the path on a preview"
     });
   }
@@ -143651,23 +143741,23 @@ var init_preview_assets_generated = __esm({
   "../../packages/serve/src/preview-assets.generated.ts"() {
     init_preview_assets_format();
     PREVIEW_ASSET_MANIFEST = [
-      { key: "assets/index-BZS8K4zM.js", contentType: "application/javascript; charset=utf-8", offset: 8, length: 1192364, sha256: "50d2524148ee0aedb74e5e6a548f269eb75b4a289f7a1de101de410c01e60bf5" },
-      { key: "assets/pdf.worker.min-BmVo14Nb.mjs", contentType: "application/octet-stream", offset: 1192372, length: 1317034, sha256: "a33cfe728c584fdba4fcc1fd54bcdc2f9f2f13889ddbb5b2bd1d0f8cbe49b84e" },
-      { key: "assets/pdfDocument-PXxklXbm.js", contentType: "application/javascript; charset=utf-8", offset: 2509406, length: 489166, sha256: "6df079a4bd8eaa2ed5abfb4af8154f2a4c0b8283fb26e1ef2f1964c2d7b6d1ac" },
-      { key: "fonts/Roboto-LICENSE.txt", contentType: "application/octet-stream", offset: 2998572, length: 4610, sha256: "994062dd7af4186a739de55dd9e151c63b6301f8e2cbafc608d35c2e87da0cd2" },
-      { key: "fonts/Roboto-Variable.ttf", contentType: "font/ttf", offset: 3003182, length: 488584, sha256: "d7598e12c5dbef095ff8272cfc55da0250bd07fbdecbac8a530b9b277872a134" },
-      { key: "fonts/WixMadeforDisplay-Bold.ttf", contentType: "font/ttf", offset: 3491766, length: 90924, sha256: "ec4c7d63772d980d6e147b2df6215fd2737e4b04cebe0cf7e11dc695fb63cdcf" },
-      { key: "fonts/WixMadeforDisplay-ExtraBold.ttf", contentType: "font/ttf", offset: 3582690, length: 90984, sha256: "bf4c16a2774edd38a921edf3099469866cd74c094fd596f3fa4e81f54a04dfaa" },
-      { key: "fonts/WixMadeforDisplay-Medium.ttf", contentType: "font/ttf", offset: 3673674, length: 90980, sha256: "368faca44fb9f7207e4af784e94750b1ee59c1098b8689e0f4a918926f244fb5" },
-      { key: "fonts/WixMadeforDisplay-Regular.ttf", contentType: "font/ttf", offset: 3764654, length: 90872, sha256: "97ed8f1a6772abe26e3d8af5cecfc4b02faa94497d585b0398b5053b739a70c1" },
-      { key: "fonts/WixMadeforDisplay-SemiBold.ttf", contentType: "font/ttf", offset: 3855526, length: 90980, sha256: "642feab8a48ddf6c7a89d7c2a7c0edfa0e6e773f671287e460e222703563191e" },
-      { key: "fonts/WixMadeforText-Bold.ttf", contentType: "font/ttf", offset: 3946506, length: 108636, sha256: "37c179b4fefb63ea9637322b84583a2df53aa226c150294eea1675c14b1b8e29" },
-      { key: "fonts/WixMadeforText-ExtraBold.ttf", contentType: "font/ttf", offset: 4055142, length: 109084, sha256: "62e2fe4718129f36ecdb0ae4de385bd6b81ecc876146447167c6c140fad699a9" },
-      { key: "fonts/WixMadeforText-Medium.ttf", contentType: "font/ttf", offset: 4164226, length: 109048, sha256: "4ecf270136af928612c76fe4ebade91d8156975e5ea4c0cf9225501dd1788e02" },
-      { key: "fonts/WixMadeforText-Regular.ttf", contentType: "font/ttf", offset: 4273274, length: 107700, sha256: "dee56f09fd3efc127c1ea95557edc74110c1460a46287da36e0af25efd341ef5" },
-      { key: "fonts/WixMadeforText-SemiBold.ttf", contentType: "font/ttf", offset: 4380974, length: 88108, sha256: "dced97a77624bc5f8b1ae65850360908297f4588e09feb6f22792d29dc7e765b" },
-      { key: "index.html", contentType: "text/html; charset=utf-8", offset: 4469082, length: 4947, sha256: "ec96c9af3b4b5bf3113b3ef80c4a6f16b77f40e28903dd20813ce866207e145d" },
-      { key: "t5-frame.html", contentType: "text/html; charset=utf-8", offset: 4474029, length: 17344, sha256: "d057298d75e7373e5e2c4d11b7d1bcbea88e03af555ba63d97641c78509c58e4" }
+      { key: "assets/index-CPLD_SKV.js", contentType: "application/javascript; charset=utf-8", offset: 8, length: 1193794, sha256: "4b6a6e4c6cc9a5bbb9683436c0569281ecc1b23885c6684f42b8e50de02d7d1c" },
+      { key: "assets/pdf.worker.min-BmVo14Nb.mjs", contentType: "application/octet-stream", offset: 1193802, length: 1317034, sha256: "a33cfe728c584fdba4fcc1fd54bcdc2f9f2f13889ddbb5b2bd1d0f8cbe49b84e" },
+      { key: "assets/pdfDocument-DLmlpdLS.js", contentType: "application/javascript; charset=utf-8", offset: 2510836, length: 489166, sha256: "c583b748cbc814a27789ca1bcc8fd812a3c7a9cbc9428fea612f3d321d357fa9" },
+      { key: "fonts/Roboto-LICENSE.txt", contentType: "application/octet-stream", offset: 3000002, length: 4610, sha256: "994062dd7af4186a739de55dd9e151c63b6301f8e2cbafc608d35c2e87da0cd2" },
+      { key: "fonts/Roboto-Variable.ttf", contentType: "font/ttf", offset: 3004612, length: 488584, sha256: "d7598e12c5dbef095ff8272cfc55da0250bd07fbdecbac8a530b9b277872a134" },
+      { key: "fonts/WixMadeforDisplay-Bold.ttf", contentType: "font/ttf", offset: 3493196, length: 90924, sha256: "ec4c7d63772d980d6e147b2df6215fd2737e4b04cebe0cf7e11dc695fb63cdcf" },
+      { key: "fonts/WixMadeforDisplay-ExtraBold.ttf", contentType: "font/ttf", offset: 3584120, length: 90984, sha256: "bf4c16a2774edd38a921edf3099469866cd74c094fd596f3fa4e81f54a04dfaa" },
+      { key: "fonts/WixMadeforDisplay-Medium.ttf", contentType: "font/ttf", offset: 3675104, length: 90980, sha256: "368faca44fb9f7207e4af784e94750b1ee59c1098b8689e0f4a918926f244fb5" },
+      { key: "fonts/WixMadeforDisplay-Regular.ttf", contentType: "font/ttf", offset: 3766084, length: 90872, sha256: "97ed8f1a6772abe26e3d8af5cecfc4b02faa94497d585b0398b5053b739a70c1" },
+      { key: "fonts/WixMadeforDisplay-SemiBold.ttf", contentType: "font/ttf", offset: 3856956, length: 90980, sha256: "642feab8a48ddf6c7a89d7c2a7c0edfa0e6e773f671287e460e222703563191e" },
+      { key: "fonts/WixMadeforText-Bold.ttf", contentType: "font/ttf", offset: 3947936, length: 108636, sha256: "37c179b4fefb63ea9637322b84583a2df53aa226c150294eea1675c14b1b8e29" },
+      { key: "fonts/WixMadeforText-ExtraBold.ttf", contentType: "font/ttf", offset: 4056572, length: 109084, sha256: "62e2fe4718129f36ecdb0ae4de385bd6b81ecc876146447167c6c140fad699a9" },
+      { key: "fonts/WixMadeforText-Medium.ttf", contentType: "font/ttf", offset: 4165656, length: 109048, sha256: "4ecf270136af928612c76fe4ebade91d8156975e5ea4c0cf9225501dd1788e02" },
+      { key: "fonts/WixMadeforText-Regular.ttf", contentType: "font/ttf", offset: 4274704, length: 107700, sha256: "dee56f09fd3efc127c1ea95557edc74110c1460a46287da36e0af25efd341ef5" },
+      { key: "fonts/WixMadeforText-SemiBold.ttf", contentType: "font/ttf", offset: 4382404, length: 88108, sha256: "dced97a77624bc5f8b1ae65850360908297f4588e09feb6f22792d29dc7e765b" },
+      { key: "index.html", contentType: "text/html; charset=utf-8", offset: 4470512, length: 4947, sha256: "58e2242ae4a75ea666a13847f575df0455bbc0928a080c861804294ecb72f83f" },
+      { key: "t5-frame.html", contentType: "text/html; charset=utf-8", offset: 4475459, length: 17344, sha256: "d057298d75e7373e5e2c4d11b7d1bcbea88e03af555ba63d97641c78509c58e4" }
     ];
   }
 });
@@ -144114,6 +144204,138 @@ var init_git = __esm({
   }
 });
 
+// ../store-release/version.ts
+var version_exports = {};
+__export(version_exports, {
+  bumpVersion: () => bumpVersion,
+  readAndroidVersion: () => readAndroidVersion,
+  readAndroidVersionName: () => readAndroidVersionName,
+  readIosMarketingVersion: () => readIosMarketingVersion,
+  readIosVersion: () => readIosVersion,
+  readIosVersionStrings: () => readIosVersionStrings,
+  setAndroidVersion: () => setAndroidVersion,
+  setIosVersion: () => setIosVersion,
+  stampIosVersionStrings: () => stampIosVersionStrings
+});
+import { readFileSync as readFileSync76, writeFileSync as writeFileSync26 } from "node:fs";
+function readIosVersion(projectYml) {
+  const marketing = matchScalar(projectYml, "CFBundleShortVersionString");
+  const build3 = matchScalar(projectYml, "CFBundleVersion");
+  if (marketing === null || build3 === null) {
+    throw new Error("project.yml is missing CFBundleShortVersionString / CFBundleVersion");
+  }
+  return { marketing, build: Number(build3) };
+}
+function setIosVersion(projectYml, v2) {
+  let out2 = replaceScalar(projectYml, "CFBundleShortVersionString", v2.marketing);
+  out2 = replaceScalar(out2, "CFBundleVersion", String(v2.build));
+  out2 = out2.replace(
+    /(^[ \t]*# >>> himalaya:live-activity:target[^\n]*\n)([\s\S]*?)(^[ \t]*# <<< himalaya:live-activity:target[^\n]*$)/m,
+    (_match, start, body, end) => {
+      if (!body.trim()) return start + body + end;
+      return start + replaceScalar(replaceScalar(body, "CFBundleShortVersionString", v2.marketing), "CFBundleVersion", String(v2.build)) + end;
+    }
+  );
+  return out2;
+}
+function readIosVersionStrings(projectYml) {
+  const marketing = matchScalar(projectYml, "CFBundleShortVersionString");
+  const build3 = matchScalar(projectYml, "CFBundleVersion");
+  if (marketing === null || build3 === null) {
+    throw new Error("project.yml is missing CFBundleShortVersionString / CFBundleVersion");
+  }
+  return { marketing, build: build3 };
+}
+function stampIosVersionStrings(projectYml, v2) {
+  return replaceScalar(replaceScalar(projectYml, "CFBundleShortVersionString", v2.marketing), "CFBundleVersion", v2.build);
+}
+function readIosMarketingVersion(projectYml) {
+  return matchScalar(projectYml, "CFBundleShortVersionString");
+}
+function scalarRe(key2) {
+  return new RegExp(`^(\\s*${key2}:\\s*)("?)([^"\\n#]*?)("?)(\\s*(?:#.*)?)$`, "m");
+}
+function matchScalar(content, key2) {
+  const m2 = scalarRe(key2).exec(content);
+  return m2 ? m2[3].trim() : null;
+}
+function replaceScalar(content, key2, value) {
+  const re2 = scalarRe(key2);
+  if (!re2.test(content)) throw new Error(`could not locate \`${key2}:\` in project.yml`);
+  return content.replace(re2, (_full, pre, openQ, _oldVal, _closeQ, tail) => {
+    const q2 = openQ ? '"' : "";
+    return `${pre}${q2}${value}${q2}${tail}`;
+  });
+}
+function readAndroidVersion(gradle) {
+  const name = /(\bversionName\s*=\s*")([^"]*)(")/.exec(gradle);
+  const code = /(\bversionCode\s*=\s*)(\d+)/.exec(gradle);
+  if (!name || !code) throw new Error("build.gradle.kts is missing versionName / versionCode");
+  return { marketing: name[2], build: Number(code[2]) };
+}
+function readAndroidVersionName(gradle) {
+  const name = /(\bversionName\s*=\s*")([^"]*)(")/.exec(gradle);
+  return name ? name[2] : null;
+}
+function setAndroidVersion(gradle, v2) {
+  if (!/\bversionName\s*=\s*"/.test(gradle) || !/\bversionCode\s*=\s*\d+/.test(gradle)) {
+    throw new Error("build.gradle.kts is missing versionName / versionCode");
+  }
+  return gradle.replace(/(\bversionName\s*=\s*")[^"]*(")/, `$1${v2.marketing}$2`).replace(/(\bversionCode\s*=\s*)\d+/, `$1${v2.build}`);
+}
+function bumpVersion(app, opts) {
+  const iosPath = iosProjectYml(app);
+  const gradlePath = androidGradle(app);
+  const iosYml = readFileSync76(iosPath, "utf8");
+  const gradle = readFileSync76(gradlePath, "utf8");
+  const current = readIosVersion(iosYml);
+  const next = {
+    marketing: opts.marketing ?? current.marketing,
+    build: opts.build === "increment" || opts.build === void 0 ? current.build + (opts.build === "increment" ? 1 : 0) : opts.build
+  };
+  writeFileSync26(iosPath, setIosVersion(iosYml, next));
+  writeFileSync26(gradlePath, setAndroidVersion(gradle, next));
+  return next;
+}
+var init_version = __esm({
+  "../store-release/version.ts"() {
+    init_paths2();
+  }
+});
+
+// ../store-release/store-spec.ts
+function detectBundleId(projectYml) {
+  const m2 = /^\s*bundleId:\s*(\S+)\s*$/m.exec(projectYml);
+  if (!m2) throw new Error("project.yml has no `bundleId:` on the application target");
+  return m2[1];
+}
+function defaultProdBundleId(devBundleId) {
+  return devBundleId.replace(/\.dev$/, "");
+}
+function referencedWatchProject(projectYml) {
+  if (!/^projectReferences:/m.test(projectYml)) return void 0;
+  const m2 = /^projectReferences:\n {2}Watch:\n {4}path:\s*\.\.\/watchos\/(\S+)\.xcodeproj\s*$/m.exec(projectYml);
+  if (!m2) {
+    throw new Error(
+      "store-spec: this iOS project references an xcodegen project other than the generated companion watch app (`projectReferences: Watch: path: ../watchos/<Name>.xcodeproj`) \u2014 only that one is supported"
+    );
+  }
+  return { name: m2[1] };
+}
+function storeWatchBundleId(prodIosBundleId) {
+  return `${prodIosBundleId}.watchkitapp`;
+}
+function storeSigningBundleIds(projectYml, toBundleId) {
+  const prod = toBundleId ?? defaultProdBundleId(detectBundleId(projectYml));
+  return referencedWatchProject(projectYml) ? [prod, storeWatchBundleId(prod)] : [prod];
+}
+var init_store_spec = __esm({
+  "../store-release/store-spec.ts"() {
+    init_paths2();
+    init_version();
+  }
+});
+
 // ../store-release/preflight.ts
 var preflight_exports = {};
 __export(preflight_exports, {
@@ -144123,7 +144345,7 @@ __export(preflight_exports, {
   parseStoreConfig: () => parseStoreConfig,
   requireEnv: () => requireEnv
 });
-import { existsSync as existsSync65, readFileSync as readFileSync76 } from "node:fs";
+import { existsSync as existsSync65, readFileSync as readFileSync77 } from "node:fs";
 import { isAbsolute as isAbsolute6, relative as relative13, resolve as resolve50 } from "node:path";
 function isInsideRepo(p2) {
   const rel = relative13(REPO_ROOT3, resolve50(p2));
@@ -144183,7 +144405,7 @@ function loadStoreConfig(app) {
   if (!existsSync65(p2)) {
     throw new Error(`No store config at ${p2}. Create apps/${app}/store/store.config.yaml first (see /setup-store-signing).`);
   }
-  return parseStoreConfig(readFileSync76(p2, "utf8"));
+  return parseStoreConfig(readFileSync77(p2, "utf8"));
 }
 var init_preflight = __esm({
   "../store-release/preflight.ts"() {
@@ -144192,7 +144414,7 @@ var init_preflight = __esm({
 });
 
 // ../store-release/register-bundle.ts
-import { readFileSync as readFileSync77 } from "node:fs";
+import { readFileSync as readFileSync78 } from "node:fs";
 import { createPrivateKey as createPrivateKey2, sign } from "node:crypto";
 function b64url2(b2) {
   return Buffer.from(b2).toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
@@ -144210,7 +144432,7 @@ function bundleIdBody(identifier, name, platform = "IOS") {
 async function registerBundleId(opts) {
   const env = requireEnv(["ASC_KEY_ID", "ASC_ISSUER_ID", "ASC_KEY_PATH"]);
   assertCredentialOutsideRepo("ASC_KEY_PATH", env.ASC_KEY_PATH);
-  const jwt = ascJwt(env.ASC_KEY_ID, env.ASC_ISSUER_ID, readFileSync77(env.ASC_KEY_PATH, "utf8"), Math.floor(Date.now() / 1e3));
+  const jwt = ascJwt(env.ASC_KEY_ID, env.ASC_ISSUER_ID, readFileSync78(env.ASC_KEY_PATH, "utf8"), Math.floor(Date.now() / 1e3));
   const res = await fetch(`${ASC_API}/v1/bundleIds`, {
     method: "POST",
     headers: { Authorization: `Bearer ${jwt}`, "Content-Type": "application/json" },
@@ -144240,13 +144462,16 @@ async function main() {
   }
   const ni2 = rest.indexOf("--name");
   const name = ni2 >= 0 ? rest[ni2 + 1] : cfg.app ?? app;
-  const r2 = await registerBundleId({ identifier, name });
-  console.log(`bundle id ${identifier}: ${r2.status}${r2.id ? ` (${r2.id})` : ""}`);
+  for (const id of storeSigningBundleIds(readFileSync78(iosProjectYml(app), "utf8"), identifier)) {
+    const r2 = await registerBundleId({ identifier: id, name: id === identifier ? name : `${name} Watch` });
+    console.log(`bundle id ${id}: ${r2.status}${r2.id ? ` (${r2.id})` : ""}`);
+  }
 }
 var ASC_API;
 var init_register_bundle = __esm({
   "../store-release/register-bundle.ts"() {
     init_paths2();
+    init_store_spec();
     init_preflight();
     ASC_API = "https://api.appstoreconnect.apple.com";
     if (runningAsScript("store-release/register-bundle.ts")) {
@@ -145642,7 +145867,7 @@ __export(credential_profile_exports, {
   profilePath: () => profilePath,
   resolveStoreCredentials: () => resolveStoreCredentials
 });
-import { existsSync as existsSync66, readFileSync as readFileSync78 } from "node:fs";
+import { existsSync as existsSync66, readFileSync as readFileSync79 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
 import { join as join66 } from "node:path";
 function credentialsDir(home = homedir5()) {
@@ -145685,7 +145910,7 @@ function resolveStoreCredentials(opts) {
   const { app, cfg } = opts;
   const env = opts.env ?? process.env;
   const home = opts.home ?? homedir5();
-  const read = opts.readProfile ?? ((p2) => readFileSync78(p2, "utf8"));
+  const read = opts.readProfile ?? ((p2) => readFileSync79(p2, "utf8"));
   const exists = opts.profileExists ?? existsSync66;
   const ios = cfg.ios ?? {};
   const flagName = opts.profileFlag?.trim();
@@ -145752,7 +145977,7 @@ var init_credential_profile = __esm({
 
 // ../store-release/iap-credentials.ts
 import { createHash as createHash32 } from "node:crypto";
-import { existsSync as existsSync67, readFileSync as readFileSync79, realpathSync as realpathSync10 } from "node:fs";
+import { existsSync as existsSync67, readFileSync as readFileSync80, realpathSync as realpathSync10 } from "node:fs";
 import { homedir as homedir6 } from "node:os";
 function accountFingerprint(keyId, issuerId) {
   return `sha256:${createHash32("sha256").update(`${issuerId}:${keyId}`).digest("hex").slice(0, 16)}`;
@@ -145786,7 +146011,7 @@ function canonicalKeyPath(path2, profile, realpath) {
 function resolveIapCredentials(options) {
   const { target } = options;
   const home = options.home ?? homedir6();
-  const readFile3 = options.readFile ?? ((p2) => readFileSync79(p2, "utf8"));
+  const readFile3 = options.readFile ?? ((p2) => readFileSync80(p2, "utf8"));
   const realpath = options.realpath ?? realpathSync10;
   const profile = requireExplicitProfile(options.profileFlag, target);
   const creds = resolveStoreCredentials({
@@ -146045,8 +146270,8 @@ function scrubBook(value) {
 }
 function assertNoSecrets(serialized) {
   const hits = secretFindings([{ path: "book.json", bytes: Buffer.from(serialized) }]);
-  const own3 = TOKEN_PATTERNS.find((re2) => new RegExp(re2.source, re2.flags.replace("g", "")).test(serialized));
-  if (hits.length || own3) {
+  const own4 = TOKEN_PATTERNS.find((re2) => new RegExp(re2.source, re2.flags.replace("g", "")).test(serialized));
+  if (hits.length || own4) {
     throw new Error(`refusing to write the app book: it still contains ${hits[0]?.reason ?? "a token-shaped string"} after redaction`);
   }
 }
@@ -146243,7 +146468,7 @@ __export(store_iap_exports, {
   runStoreIap: () => runStoreIap
 });
 import { randomUUID as randomUUID5 } from "node:crypto";
-import { appendFileSync as appendFileSync2, mkdirSync as mkdirSync32, readFileSync as readFileSync80, rmSync as rmSync16, writeFileSync as writeFileSync26 } from "node:fs";
+import { appendFileSync as appendFileSync2, mkdirSync as mkdirSync32, readFileSync as readFileSync81, rmSync as rmSync16, writeFileSync as writeFileSync27 } from "node:fs";
 import { homedir as homedir7, hostname } from "node:os";
 import { join as join67 } from "node:path";
 function scrubDeep(value, scrub) {
@@ -146571,7 +146796,7 @@ function fileJournal(path2) {
 }
 function readLockSummary(path2) {
   try {
-    const { pid, host, at: at2 } = JSON.parse(readFileSync80(path2, "utf8"));
+    const { pid, host, at: at2 } = JSON.parse(readFileSync81(path2, "utf8"));
     return `pid ${pid} on ${host} since ${at2}`;
   } catch {
     return "unreadable lock";
@@ -146581,7 +146806,7 @@ function acquireApplyLock(dir, appleAppId) {
   const path2 = join67(dir, "apply.lock");
   const stamp = JSON.stringify({ pid: process.pid, host: hostname(), at: (/* @__PURE__ */ new Date()).toISOString(), token: randomUUID5() });
   try {
-    writeFileSync26(path2, stamp, { flag: "wx", mode: 384 });
+    writeFileSync27(path2, stamp, { flag: "wx", mode: 384 });
   } catch (e2) {
     if (e2.code !== "EEXIST") throw e2;
     throw new Error(
@@ -146591,7 +146816,7 @@ function acquireApplyLock(dir, appleAppId) {
   return () => {
     let current = "";
     try {
-      current = readFileSync80(path2, "utf8");
+      current = readFileSync81(path2, "utf8");
     } catch {
       return;
     }
@@ -146615,7 +146840,7 @@ async function confirmOnTerminal(question) {
 }
 function defaultStoreIapDeps() {
   return {
-    readFile: (path2) => readFileSync80(path2, "utf8"),
+    readFile: (path2) => readFileSync81(path2, "utf8"),
     writeFileAtomic,
     resolveCredentials: ({ profileFlag, target }) => resolveIapCredentials({ profileFlag, target }),
     createApi: (key2) => createIapApi(createAscClient({ key: key2 })),
@@ -147078,7 +147303,7 @@ __export(preflight_app_exports, {
   preflightApp: () => preflightApp,
   profileAccount: () => profileAccount
 });
-import { readFileSync as readFileSync81, existsSync as existsSync68, readdirSync as readdirSync31, statSync as statSync18 } from "node:fs";
+import { readFileSync as readFileSync82, existsSync as existsSync68, readdirSync as readdirSync31, statSync as statSync18 } from "node:fs";
 import { createHash as createHash34 } from "node:crypto";
 import { join as join68 } from "node:path";
 function analyze(projectYml, storeConfig, icon, account) {
@@ -147144,8 +147369,8 @@ function profileAccount(app, storeConfig, opts = {}) {
   }
 }
 async function preflightApp(app, opts = {}) {
-  const projectYml = existsSync68(iosProjectYml(app)) ? readFileSync81(iosProjectYml(app), "utf8") : "";
-  const storeConfig = existsSync68(storeConfigPath(app)) ? readFileSync81(storeConfigPath(app), "utf8") : "";
+  const projectYml = existsSync68(iosProjectYml(app)) ? readFileSync82(iosProjectYml(app), "utf8") : "";
+  const storeConfig = existsSync68(storeConfigPath(app)) ? readFileSync82(storeConfigPath(app), "utf8") : "";
   if (!storeConfig) return [{ level: "error", message: `no apps/${app}/store/store.config.yaml \u2014 run /setup-store-signing first.` }];
   const findings = analyze(
     projectYml,
@@ -147304,7 +147529,7 @@ function playListingAssets(app, locale = "en-US") {
     for (const name of names) {
       const p2 = join68(dir, name);
       try {
-        if (statSync18(p2).isFile()) return { name, bytes: readFileSync81(p2) };
+        if (statSync18(p2).isFile()) return { name, bytes: readFileSync82(p2) };
       } catch {
       }
     }
@@ -147344,7 +147569,7 @@ function listScreenshots(app, locale = "en-US") {
   const flat = join68(storeDir(app), "screenshots", locale);
   if (existsSync68(flat)) {
     for (const png of readdirSync31(flat).filter((n2) => n2.endsWith(".png"))) {
-      const sz = pngSize(readFileSync81(join68(flat, png)));
+      const sz = pngSize(readFileSync82(join68(flat, png)));
       if (sz) out2.push({ name: png, w: sz.w, h: sz.h });
     }
   }
@@ -147354,7 +147579,7 @@ function listScreenshots(app, locale = "en-US") {
       const d2 = join68(legacy, deviceDir);
       if (!statSync18(d2).isDirectory()) continue;
       for (const png of readdirSync31(d2).filter((n2) => n2.endsWith(".png"))) {
-        const sz = pngSize(readFileSync81(join68(d2, png)));
+        const sz = pngSize(readFileSync82(join68(d2, png)));
         if (sz) out2.push({ name: `${deviceDir}/${png}`, w: sz.w, h: sz.h });
       }
     }
@@ -147368,7 +147593,7 @@ function placeholderHashes2() {
     const p2 = join68(templateIos, target, "Assets.xcassets", "AppIcon.appiconset", "icon_1024.png");
     try {
       if (!statSync18(p2).isFile()) continue;
-      return [LEGACY_PLACEHOLDER_SHA2562, createHash34("sha256").update(readFileSync81(p2)).digest("hex")];
+      return [LEGACY_PLACEHOLDER_SHA2562, createHash34("sha256").update(readFileSync82(p2)).digest("hex")];
     } catch {
     }
   }
@@ -147404,7 +147629,7 @@ async function appIconState(iosDir) {
     const p2 = join68(iosDir, target, "Assets.xcassets", "AppIcon.appiconset", "icon_1024.png");
     try {
       if (!statSync18(p2).isFile()) continue;
-      const bytes2 = readFileSync81(p2);
+      const bytes2 = readFileSync82(p2);
       const hash = createHash34("sha256").update(bytes2).digest("hex");
       const pixels = await pixelIssues(bytes2);
       return {
@@ -147465,92 +147690,6 @@ var init_preflight_app = __esm({
   }
 });
 
-// ../store-release/version.ts
-var version_exports = {};
-__export(version_exports, {
-  bumpVersion: () => bumpVersion,
-  readAndroidVersion: () => readAndroidVersion,
-  readAndroidVersionName: () => readAndroidVersionName,
-  readIosMarketingVersion: () => readIosMarketingVersion,
-  readIosVersion: () => readIosVersion,
-  setAndroidVersion: () => setAndroidVersion,
-  setIosVersion: () => setIosVersion
-});
-import { readFileSync as readFileSync82, writeFileSync as writeFileSync27 } from "node:fs";
-function readIosVersion(projectYml) {
-  const marketing = matchScalar(projectYml, "CFBundleShortVersionString");
-  const build3 = matchScalar(projectYml, "CFBundleVersion");
-  if (marketing === null || build3 === null) {
-    throw new Error("project.yml is missing CFBundleShortVersionString / CFBundleVersion");
-  }
-  return { marketing, build: Number(build3) };
-}
-function setIosVersion(projectYml, v2) {
-  let out2 = replaceScalar(projectYml, "CFBundleShortVersionString", v2.marketing);
-  out2 = replaceScalar(out2, "CFBundleVersion", String(v2.build));
-  out2 = out2.replace(
-    /(^[ \t]*# >>> himalaya:live-activity:target[^\n]*\n)([\s\S]*?)(^[ \t]*# <<< himalaya:live-activity:target[^\n]*$)/m,
-    (_match, start, body, end) => {
-      if (!body.trim()) return start + body + end;
-      return start + replaceScalar(replaceScalar(body, "CFBundleShortVersionString", v2.marketing), "CFBundleVersion", String(v2.build)) + end;
-    }
-  );
-  return out2;
-}
-function readIosMarketingVersion(projectYml) {
-  return matchScalar(projectYml, "CFBundleShortVersionString");
-}
-function scalarRe(key2) {
-  return new RegExp(`^(\\s*${key2}:\\s*)("?)([^"\\n#]*?)("?)(\\s*(?:#.*)?)$`, "m");
-}
-function matchScalar(content, key2) {
-  const m2 = scalarRe(key2).exec(content);
-  return m2 ? m2[3].trim() : null;
-}
-function replaceScalar(content, key2, value) {
-  const re2 = scalarRe(key2);
-  if (!re2.test(content)) throw new Error(`could not locate \`${key2}:\` in project.yml`);
-  return content.replace(re2, (_full, pre, openQ, _oldVal, _closeQ, tail) => {
-    const q2 = openQ ? '"' : "";
-    return `${pre}${q2}${value}${q2}${tail}`;
-  });
-}
-function readAndroidVersion(gradle) {
-  const name = /(\bversionName\s*=\s*")([^"]*)(")/.exec(gradle);
-  const code = /(\bversionCode\s*=\s*)(\d+)/.exec(gradle);
-  if (!name || !code) throw new Error("build.gradle.kts is missing versionName / versionCode");
-  return { marketing: name[2], build: Number(code[2]) };
-}
-function readAndroidVersionName(gradle) {
-  const name = /(\bversionName\s*=\s*")([^"]*)(")/.exec(gradle);
-  return name ? name[2] : null;
-}
-function setAndroidVersion(gradle, v2) {
-  if (!/\bversionName\s*=\s*"/.test(gradle) || !/\bversionCode\s*=\s*\d+/.test(gradle)) {
-    throw new Error("build.gradle.kts is missing versionName / versionCode");
-  }
-  return gradle.replace(/(\bversionName\s*=\s*")[^"]*(")/, `$1${v2.marketing}$2`).replace(/(\bversionCode\s*=\s*)\d+/, `$1${v2.build}`);
-}
-function bumpVersion(app, opts) {
-  const iosPath = iosProjectYml(app);
-  const gradlePath = androidGradle(app);
-  const iosYml = readFileSync82(iosPath, "utf8");
-  const gradle = readFileSync82(gradlePath, "utf8");
-  const current = readIosVersion(iosYml);
-  const next = {
-    marketing: opts.marketing ?? current.marketing,
-    build: opts.build === "increment" || opts.build === void 0 ? current.build + (opts.build === "increment" ? 1 : 0) : opts.build
-  };
-  writeFileSync27(iosPath, setIosVersion(iosYml, next));
-  writeFileSync27(gradlePath, setAndroidVersion(gradle, next));
-  return next;
-}
-var init_version = __esm({
-  "../store-release/version.ts"() {
-    init_paths2();
-  }
-});
-
 // ../store-release/asc-status.ts
 var asc_status_exports = {};
 __export(asc_status_exports, {
@@ -151706,9 +151845,9 @@ function routesFromBundle(js2) {
   const code = codeMask(js2);
   for (const m2 of js2.matchAll(/\bpath\s*:\s*["'`](\/[A-Za-z0-9_\-/:.*]*|\*)["'`]/g)) {
     if (!code[m2.index]) continue;
-    const own3 = enclosingObject(js2, m2.index, code);
+    const own4 = enclosingObject(js2, m2.index, code);
     const before = js2.slice(Math.max(0, m2.index - 80), m2.index);
-    if (!(own3 && ROUTE_KEY.test(own3)) && !NAV_LABEL_BEFORE.test(before)) continue;
+    if (!(own4 && ROUTE_KEY.test(own4)) && !NAV_LABEL_BEFORE.test(before)) continue;
     out2.add(m2[1]);
     if (out2.size >= MAX_ROUTES) break;
   }
@@ -157022,8 +157161,8 @@ function catalogTypography(overlay, template) {
   return { typography, notes };
 }
 function staticFaqFor(overlay, overlayPath) {
-  const own3 = overlay.faq;
-  if (own3 !== void 0) return deriveStaticFaq(own3);
+  const own4 = overlay.faq;
+  if (own4 !== void 0) return deriveStaticFaq(own4);
   const bookPath = join74(dirname39(resolve54(overlayPath)), "book.json");
   if (!existsSync71(bookPath)) return void 0;
   try {
@@ -164682,8 +164821,8 @@ ${doNow.map((l2) => `  ${l2}`).join("\n")}`);
             const dir = contentDir(flags);
             try {
               const spec = keepFromSpec2(dir, str9(flags["from-spec"]) ?? join75(dir, "SPEC.md"));
-              const own3 = typeof keep === "string" ? keep.split(",").map((k2) => k2.trim()).filter(Boolean) : [];
-              keep = [.../* @__PURE__ */ new Set([...spec.keep, ...own3])].join(",");
+              const own4 = typeof keep === "string" ? keep.split(",").map((k2) => k2.trim()).filter(Boolean) : [];
+              keep = [.../* @__PURE__ */ new Set([...spec.keep, ...own4])].join(",");
               fromSpec = { fromSpec: {
                 keep: spec.keep,
                 specOnly: spec.specOnly,
@@ -168773,10 +168912,10 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             const dir = contentDir(flags);
             if (!existsSync74(join75(dir, "himalaya.content.json"))) return;
             const { lastDistFromJob: lastDistFromJob2, writeLastDist: writeLastDist2 } = await Promise.resolve().then(() => (init_capabilities(), capabilities_exports));
-            const own3 = await appId(dir);
+            const own4 = await appId(dir);
             for (const job of jobs2) {
               const rec = lastDistFromJob2(job);
-              if (!rec || rec.app !== own3) continue;
+              if (!rec || rec.app !== own4) continue;
               await writeLastDist2(dir, rec);
             }
           } catch {