@wix/himalaya-cli 0.1453.0 → 0.1454.0

package/dist/cli.mjs

@@ -3923,7 +3923,7 @@ async function browserLogin(opts) {
   const log = opts.log ?? (() => {
   });
   const timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS;
-  return await new Promise((resolve66, reject) => {
+  return await new Promise((resolve67, reject) => {
     let settled = false;
     let loginUrl = "";
     const server = createServer();
@@ -3989,7 +3989,7 @@ async function browserLogin(opts) {
         res.writeHead(200, { "content-type": "text/html; charset=utf-8", "cache-control": "no-store", connection: "close" }).end(closePage(opts.doneTitle ?? "Signed in to himi"));
         const extra = {};
         for (const [k2, v2] of params) if (k2 !== "token" && k2 !== "state") extra[k2] = v2;
-        finish2(() => resolve66({ token, loginUrl, extra }));
+        finish2(() => resolve67({ token, loginUrl, extra }));
       });
     });
     server.on("error", (err) => finish2(() => reject(err)));
@@ -4101,7 +4101,7 @@ async function mintToken(args, label3, cacheKey, spawnImpl) {
     tokenCache.set(cacheKey, fromEnv);
     return fromEnv;
   }
-  const token = await new Promise((resolve66, reject) => {
+  const token = await new Promise((resolve67, reject) => {
     let child;
     try {
       child = spawnImpl("wix", [...args]);
@@ -4130,12 +4130,12 @@ async function mintToken(args, label3, cacheKey, spawnImpl) {
     child.stdout?.on("data", (d2) => {
       out2 += String(d2);
       const m2 = out2.match(TOKEN_RE);
-      if (m2) done(() => resolve66(m2[0]));
+      if (m2) done(() => resolve67(m2[0]));
     });
     child.stderr?.on("data", (d2) => {
       out2 += String(d2);
       const m2 = out2.match(TOKEN_RE);
-      if (m2) done(() => resolve66(m2[0]));
+      if (m2) done(() => resolve67(m2[0]));
     });
     child.on("error", (e2) => done(() => reject(new Error(mintHelp(label3, e2.message)))));
     child.on("exit", (code) => done(() => reject(new Error(
@@ -5058,8 +5058,8 @@ function tsExtResolvePlugin() {
     setup(b2) {
       b2.onResolve({ filter: /\.js$/ }, (args) => {
         if (args.kind === "entry-point" || !args.path.startsWith(".")) return void 0;
-        const ts10 = resolve8(args.resolveDir, args.path.replace(/\.js$/, ".ts"));
-        return existsSync8(ts10) ? { path: ts10 } : void 0;
+        const ts11 = resolve8(args.resolveDir, args.path.replace(/\.js$/, ".ts"));
+        return existsSync8(ts11) ? { path: ts11 } : void 0;
       });
     }
   };
@@ -5804,7 +5804,7 @@ function bundleFor(file2) {
   const match = /^tier5-src\/([^/]+)\//.exec(file2);
   return match?.[1] ?? "_shared";
 }
-function toIssue(ts10, contentDir2, diagnostic) {
+function toIssue(ts11, contentDir2, diagnostic) {
   const file2 = diagnostic.file ? relativeFile(contentDir2, diagnostic.file.fileName) : void 0;
   const position = diagnostic.file && diagnostic.start !== void 0 ? diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start) : void 0;
   return {
@@ -5812,13 +5812,13 @@ function toIssue(ts10, contentDir2, diagnostic) {
     ...file2 ? { file: file2 } : {},
     ...position ? { line: position.line + 1, column: position.character + 1 } : {},
     code: `TS${diagnostic.code}`,
-    message: ts10.flattenDiagnosticMessageText(diagnostic.messageText, "\n")
+    message: ts11.flattenDiagnosticMessageText(diagnostic.messageText, "\n")
   };
 }
-function confinedHost(ts10, contentDir2, options) {
+function confinedHost(ts11, contentDir2, options) {
   if (!buildConfinementRequired()) return void 0;
-  const host = ts10.createCompilerHost(options);
-  const libDir = resolve10(ts10.getDefaultLibFilePath(options), "..");
+  const host = ts11.createCompilerHost(options);
+  const libDir = resolve10(ts11.getDefaultLibFilePath(options), "..");
   const allows = confinementMatcher(contentDir2, [libDir]);
   const getSourceFile = host.getSourceFile.bind(host);
   const readFile3 = host.readFile.bind(host);
@@ -5847,7 +5847,7 @@ function confinedHost(ts10, contentDir2, options) {
 }
 async function typecheckContentWorkers(contentDir2, options) {
   if (!existsSync9(resolve10(contentDir2, "tier5-src"))) return [];
-  const ts10 = await compiler2();
+  const ts11 = await compiler2();
   const config = {
     compilerOptions: {
       ...CONTENT_WORKER_COMPILER_OPTIONS,
@@ -5856,18 +5856,18 @@ async function typecheckContentWorkers(contentDir2, options) {
       // The deployed authoring runtime stages TypeScript 6, which requires an explicit
       // acknowledgement for this compatibility `baseUrl`; the repository's TypeScript 5 lane
       // rejects that 6.0 value, so keep it specific to the compiler that needs it.
-      ...Number.parseInt(ts10.versionMajorMinor, 10) >= 6 ? { ignoreDeprecations: "6.0" } : {}
+      ...Number.parseInt(ts11.versionMajorMinor, 10) >= 6 ? { ignoreDeprecations: "6.0" } : {}
     },
     include: ["tier5-src/*/index.ts", "tier5-src/_shared/**/*.ts"]
   };
-  const parsed = ts10.parseJsonConfigFileContent(config, ts10.sys, contentDir2);
+  const parsed = ts11.parseJsonConfigFileContent(config, ts11.sys, contentDir2);
   if (parsed.fileNames.length === 0) return [];
-  const program = ts10.createProgram({
+  const program = ts11.createProgram({
     rootNames: parsed.fileNames,
     options: parsed.options,
-    host: confinedHost(ts10, contentDir2, parsed.options)
+    host: confinedHost(ts11, contentDir2, parsed.options)
   });
-  return [...parsed.errors, ...ts10.getPreEmitDiagnostics(program)].filter((diagnostic) => diagnostic.category === ts10.DiagnosticCategory.Error && belongsToContentWorkers(contentDir2, diagnostic)).map((diagnostic) => toIssue(ts10, contentDir2, diagnostic));
+  return [...parsed.errors, ...ts11.getPreEmitDiagnostics(program)].filter((diagnostic) => diagnostic.category === ts11.DiagnosticCategory.Error && belongsToContentWorkers(contentDir2, diagnostic)).map((diagnostic) => toIssue(ts11, contentDir2, diagnostic));
 }
 var compilerPromise;
 var init_tier5_typecheck = __esm({
@@ -6186,15 +6186,15 @@ function analyzeController(source, file2, profile, diagnostics) {
     error(declaration ?? sf2, "Default-export defineController({ initialState, handlers }).");
     return;
   }
-  const object6 = declaration.expression.arguments[0];
-  if (!object6 || !ts2.isObjectLiteralExpression(object6)) {
+  const object7 = declaration.expression.arguments[0];
+  if (!object7 || !ts2.isObjectLiteralExpression(object7)) {
     error(declaration, "Controller definition must be an object literal.");
     return;
   }
-  const props = new Map(object6.properties.map((p2) => [p2.name?.getText(sf2).replace(/^["']|["']$/g, ""), p2]));
+  const props = new Map(object7.properties.map((p2) => [p2.name?.getText(sf2).replace(/^["']|["']$/g, ""), p2]));
   const state = props.get("initialState"), handlers = props.get("handlers");
   if (!state || !ts2.isPropertyAssignment(state) || !handlers || !ts2.isPropertyAssignment(handlers) || !ts2.isObjectLiteralExpression(handlers.initializer)) {
-    error(object6, "initialState and handlers must be object literals.");
+    error(object7, "initialState and handlers must be object literals.");
     return;
   }
   function literal(n2) {
@@ -6932,12 +6932,12 @@ import * as cheerio2 from "cheerio";
 import Ajv from "ajv";
 import { createHash as createHash6 } from "node:crypto";
 function validator(schema) {
-  let validate4 = validators.get(schema);
-  if (!validate4) {
-    validate4 = ajv.compile({ ...schema, $defs: catalog.schema.$defs });
-    validators.set(schema, validate4);
+  let validate5 = validators.get(schema);
+  if (!validate5) {
+    validate5 = ajv.compile({ ...schema, $defs: catalog.schema.$defs });
+    validators.set(schema, validate5);
   }
-  return validate4;
+  return validate5;
 }
 function compileV2(html, profile, options) {
   const diagnostics = [], sourceMap2 = {}, dependencies = [options.file];
@@ -7007,7 +7007,7 @@ function compileV2(html, profile, options) {
   });
   for (const rule of rules) {
     const type = rule.declarations.display === "grid" || rule.declarations["grid-template-columns"] ? "Grid" : "VStack";
-    translateStyle(rule.declarations, profile, type, {}, {}, (message, hint, property) => diagnostics.push({ code: "HHP-CSS-VALUE", severity: "error", ...rule.locations[property ?? ""] ?? { file: rule.file, line: rule.line, column: 1 }, message, ...hint ? { hint } : {} }));
+    translateStyle(rule.declarations, profile, type, {}, {}, (message, hint, property2) => diagnostics.push({ code: "HHP-CSS-VALUE", severity: "error", ...rule.locations[property2 ?? ""] ?? { file: rule.file, line: rule.line, column: 1 }, message, ...hint ? { hint } : {} }));
   }
   rules.sort((a2, b2) => a2.specificity - b2.specificity);
   const tags = new Map(Object.entries(profile.components).map(([name, spec]) => [spec.tag, name]));
@@ -7060,8 +7060,8 @@ function compileV2(html, profile, options) {
     for (const child of Object.values(record2)) structured(el2, child);
   }
   function checkValue(el2, field, value, name) {
-    const validate4 = validator(field.schema);
-    if (!validate4(value)) error(el2, "HHP-PROP-VALUE", `${name}: ${ajv.errorsText(validate4.errors)}.`);
+    const validate5 = validator(field.schema);
+    if (!validate5(value)) error(el2, "HHP-PROP-VALUE", `${name}: ${ajv.errorsText(validate5.errors)}.`);
     if (!profile.surfaces.every((s2) => field.surfaces.includes(s2))) error(el2, "HHP-FIELD-SURFACE", `${name} is unsupported on an enabled surface.`);
   }
   const statePath = (raw) => raw.startsWith(`${serviceName}.`) ? raw.slice(serviceName.length + 1) : raw;
@@ -7121,7 +7121,7 @@ function compileV2(html, profile, options) {
     }
     if (style.display && !["main", "div", "header", "footer", "nav", "himi-v-stack", "himi-h-stack", "himi-grid"].includes(tag))
       error(el2, "HHP-CSS-COMPONENT", "display layout rules require a stack or grid container.");
-    type = translateStyle(style, profile, type, props, mods, (message, hint, property) => diagnostics.push({ code: "HHP-CSS-VALUE", severity: "error", ...styleLocations[property ?? ""] ?? loc(el2), message, ...hint ? { hint } : {} }));
+    type = translateStyle(style, profile, type, props, mods, (message, hint, property2) => diagnostics.push({ code: "HHP-CSS-VALUE", severity: "error", ...styleLocations[property2 ?? ""] ?? loc(el2), message, ...hint ? { hint } : {} }));
     const spec = Object.hasOwn(profile.components, type) ? profile.components[type] : void 0;
     let id = attrs["data-id"] ?? attrs.id ?? `hhp.${screenId}.${treePath}`;
     if (row && !id.includes("$item.")) id += ".$item.id";
@@ -7330,7 +7330,7 @@ function compileV2(html, profile, options) {
     }
     for (const rule of matching.filter((r2) => r2.breakpoint)) {
       const responsiveProps = {};
-      translateStyle(rule.declarations, profile, type, responsiveProps, {}, (message, hint, property) => diagnostics.push({ code: "HHP-CSS-VALUE", severity: "error", ...rule.locations[property ?? ""] ?? { file: rule.file, line: rule.line, column: 1 }, message, ...hint ? { hint } : {} }));
+      translateStyle(rule.declarations, profile, type, responsiveProps, {}, (message, hint, property2) => diagnostics.push({ code: "HHP-CSS-VALUE", severity: "error", ...rule.locations[property2 ?? ""] ?? { file: rule.file, line: rule.line, column: 1 }, message, ...hint ? { hint } : {} }));
       if (type !== "Grid") error(el2, "HHP-CSS-RESPONSIVE", "Container column overrides require a Grid.");
     }
     for (const breakpoint of [600, 840]) {
@@ -7411,8 +7411,8 @@ function compileV2(html, profile, options) {
       if (!cases.length || new Set(cases.map((entry) => entry.id)).size !== cases.length || !cases.some((entry) => entry.id === props.defaultCase)) error(el2, "HHP-COMPOSITION-POLICY", "FragmentSlot requires unique cases and a matching defaultCase.");
     }
     if (spec.propsSchema) {
-      const validate4 = validator(spec.propsSchema);
-      if (!validate4(props)) error(el2, "HHP-PROP-SHAPE", `${type}: ${ajv.errorsText(validate4.errors)}.`);
+      const validate5 = validator(spec.propsSchema);
+      if (!validate5(props)) error(el2, "HHP-PROP-SHAPE", `${type}: ${ajv.errorsText(validate5.errors)}.`);
     }
     for (const required3 of spec.required) if (!Object.hasOwn(props, required3)) error(el2, "HHP-PROP-REQUIRED", `${type} requires ${required3}.`);
     for (const [name, value] of Object.entries(props)) {
@@ -8261,9 +8261,9 @@ function scanWidgetPayload(node, family, path2, bindings, disallowed, timeRefs,
   }
 }
 function validateWidget(snapshot2) {
-  const validate4 = compileWidgetSchema();
-  const schemaOk = validate4(snapshot2);
-  const schemaErrors = schemaOk ? [] : validate4.errors ?? [];
+  const validate5 = compileWidgetSchema();
+  const schemaOk = validate5(snapshot2);
+  const schemaErrors = schemaOk ? [] : validate5.errors ?? [];
   const bindingViolations = [];
   const disallowedComponents = [];
   const timeRefViolations = [];
@@ -10026,16 +10026,16 @@ var init_src = __esm({
 });
 
 // ../../core/dev-server/src/media-value.ts
-function isMediaValueProperty(property) {
-  const normalized = property.toLowerCase();
-  return MEDIA_NAMED_PROPERTY.test(property) || normalized === "url" || normalized === "src" || normalized === "source" || MEDIA_LOCATION_SUFFIX.test(property);
+function isMediaValueProperty(property2) {
+  const normalized = property2.toLowerCase();
+  return MEDIA_NAMED_PROPERTY.test(property2) || normalized === "url" || normalized === "src" || normalized === "source" || MEDIA_LOCATION_SUFFIX.test(property2);
 }
-function isComponentMediaValueProperty(componentType, property) {
-  return isMediaValueProperty(property) || componentType === "Image" && property === "asset";
+function isComponentMediaValueProperty(componentType, property2) {
+  return isMediaValueProperty(property2) || componentType === "Image" && property2 === "asset";
 }
-function isMediaLocationProperty(property) {
-  const normalized = property.toLowerCase();
-  return normalized === "url" || normalized === "src" || normalized === "source" || MEDIA_LOCATION_SUFFIX.test(property) || MEDIA_NAMED_PROPERTY.test(property) && MEDIA_PATH_SUFFIX.test(property);
+function isMediaLocationProperty(property2) {
+  const normalized = property2.toLowerCase();
+  return normalized === "url" || normalized === "src" || normalized === "source" || MEDIA_LOCATION_SUFFIX.test(property2) || MEDIA_NAMED_PROPERTY.test(property2) && MEDIA_PATH_SUFFIX.test(property2);
 }
 function unresolvedWixMediaReference(value, allowBareId = false) {
   if (typeof value !== "string") return null;
@@ -26816,10 +26816,10 @@ var init_preview = __esm({
         }
       },
       kill: (pid, signal) => process.kill(pid, signal),
-      portFree: (port) => new Promise((resolve66) => {
+      portFree: (port) => new Promise((resolve67) => {
         const s2 = createServer2();
-        s2.once("error", () => resolve66(false));
-        s2.listen(port, "127.0.0.1", () => s2.close(() => resolve66(true)));
+        s2.once("error", () => resolve67(false));
+        s2.listen(port, "127.0.0.1", () => s2.close(() => resolve67(true)));
       }),
       sleep: (ms2) => new Promise((r2) => setTimeout(r2, ms2)),
       servingIdentity: async (origin) => {
@@ -28747,23 +28747,23 @@ async function runTemplateTrim(req, deps) {
       }
     }
   };
-  const base = (validate5) => ({
+  const base = (validate6) => ({
     dryRun: false,
     ...plan.report,
-    validate: validate5 ? { counts: validate5.counts ?? null, ...validate5.tail ? { tail: validate5.tail } : {} } : null
+    validate: validate6 ? { counts: validate6.counts ?? null, ...validate6.tail ? { tail: validate6.tail } : {} } : null
   });
-  const abort = (error, cause, validate5) => {
+  const abort = (error, cause, validate6) => {
     const message = cause?.message ?? String(cause);
     try {
       restore();
     } catch (e2) {
       return {
         code: 1,
-        result: { ok: false, error: `${error} (${message}), and restoring the originals failed too (${e2.message})`, rolledBack: false, backup: backupRel, hint: `the originals are in ${backupRel} \u2014 copy dev/index.ts, config.ts and tier5-src/* back by hand`, ...base(validate5) }
+        result: { ok: false, error: `${error} (${message}), and restoring the originals failed too (${e2.message})`, rolledBack: false, backup: backupRel, hint: `the originals are in ${backupRel} \u2014 copy dev/index.ts, config.ts and tier5-src/* back by hand`, ...base(validate6) }
       };
     }
     dropBackup();
-    return { code: 1, result: { ok: false, error: `${error} (${message}); every file was restored`, rolledBack: true, ...base(validate5) } };
+    return { code: 1, result: { ok: false, error: `${error} (${message}); every file was restored`, rolledBack: true, ...base(validate6) } };
   };
   try {
     mkdirSync19(join40(backup, "dev"), { recursive: true });
@@ -28779,24 +28779,24 @@ async function runTemplateTrim(req, deps) {
     return abort("the trim failed while writing", e2);
   }
   let failure;
-  let validate4;
+  let validate5;
   try {
     const written = parseApp(readFileSync39(devPath, "utf8"), readFileSync39(configPath, "utf8"));
     const leftovers = leftoverNavRefs(written.nav.value, plan.removedIds);
     if (leftovers.length) failure = { error: "navigation still names screens this trim removed", leftovers };
     else {
-      validate4 = await deps.validate(dir);
-      if (validate4.code !== 0) failure = { error: "himi validate --strict failed on the trimmed app" };
+      validate5 = await deps.validate(dir);
+      if (validate5.code !== 0) failure = { error: "himi validate --strict failed on the trimmed app" };
     }
   } catch (e2) {
-    return abort("the trim could not be checked", e2, validate4);
+    return abort("the trim could not be checked", e2, validate5);
   }
   let compared;
-  if (failure && validate4 && validate4.code !== 0 && comparable(validate4)) {
+  if (failure && validate5 && validate5.code !== 0 && comparable(validate5)) {
     try {
       restore();
     } catch (e2) {
-      return abort(String(failure.error), e2, validate4);
+      return abort(String(failure.error), e2, validate5);
     }
     let original;
     try {
@@ -28804,14 +28804,14 @@ async function runTemplateTrim(req, deps) {
     } catch {
     }
     if (original && comparable(original)) {
-      compared = compareErrors(validate4.errors ?? [], original.code === 0 ? [] : original.errors ?? []);
+      compared = compareErrors(validate5.errors ?? [], original.code === 0 ? [] : original.errors ?? []);
     }
     const clean2 = compared !== void 0 && compared.introduced.length === 0;
     if (clean2 || req.force) {
       try {
         apply();
       } catch (e2) {
-        return abort("the trim failed while re-applying it after validating the untrimmed app", e2, validate4);
+        return abort("the trim failed while re-applying it after validating the untrimmed app", e2, validate5);
       }
     }
     if (clean2) failure = void 0;
@@ -28831,7 +28831,7 @@ async function runTemplateTrim(req, deps) {
       code: 0,
       result: {
         ok: true,
-        ...base(validate4),
+        ...base(validate5),
         ...preExisting.length ? {
           preExistingErrors: preExisting,
           note: `trimmed; ${plural(preExisting.length, "error")} ${preExisting.length === 1 ? "was" : "were"} already present before trim: ${summarize2(preExisting)}`
@@ -28842,18 +28842,18 @@ async function runTemplateTrim(req, deps) {
   if (req.force) {
     return {
       code: 1,
-      result: { ok: false, ...failure, rolledBack: false, forcedKeep: true, backup: backupRel, hint: `--force kept the trimmed tree; the originals are in ${backupRel}`, ...base(validate4) }
+      result: { ok: false, ...failure, rolledBack: false, forcedKeep: true, backup: backupRel, hint: `--force kept the trimmed tree; the originals are in ${backupRel}`, ...base(validate5) }
     };
   }
   try {
     restore();
   } catch (e2) {
-    return abort(String(failure.error), e2, validate4);
+    return abort(String(failure.error), e2, validate5);
   }
   dropBackup();
   return {
     code: 1,
-    result: { ok: false, ...failure, rolledBack: true, hint: "nothing changed \u2014 fix what validate reports (or keep more screens) and trim again, or pass --force to keep the trimmed tree anyway", ...base(validate4) }
+    result: { ok: false, ...failure, rolledBack: true, hint: "nothing changed \u2014 fix what validate reports (or keep more screens) and trim again, or pass --force to keep the trimmed tree anyway", ...base(validate5) }
   };
 }
 function comparable(v2) {
@@ -31066,7 +31066,7 @@ async function injectRequest(listener, request) {
   req.headers.host ??= url.host;
   if (body && body.length > 0) req.push(body);
   req.push(null);
-  return await new Promise((resolve66, reject) => {
+  return await new Promise((resolve67, reject) => {
     const streamed = () => {
       queueMicrotask(() => {
         req.emit("close");
@@ -31082,7 +31082,7 @@ async function injectRequest(listener, request) {
         else headers2.set(name, value);
       }
       const bodyless = out2.status === 204 || out2.status === 304 || request.method === "HEAD";
-      resolve66(new Response(bodyless ? null : out2.body, { status: out2.status, headers: headers2 }));
+      resolve67(new Response(bodyless ? null : out2.body, { status: out2.status, headers: headers2 }));
     }, streamed);
     res.on("inject-error", reject);
     try {
@@ -37412,12 +37412,12 @@ function finalizeRecording(key3, rec) {
   if (rec.finalize) return rec.finalize;
   rec.finalize = (async () => {
     clearTimeout(rec.autoStop);
-    await new Promise((resolve66) => {
+    await new Promise((resolve67) => {
       let done = false;
       const finish2 = () => {
         if (!done) {
           done = true;
-          resolve66();
+          resolve67();
         }
       };
       rec.child.once("close", finish2);
@@ -37528,7 +37528,7 @@ var init_preview2 = __esm({
     DEVICE_LIST_TIMEOUT_MS = 5e3;
     defaultRunner2 = {
       capture(cmd, args, timeoutMs = DEFAULT_CAPTURE_TIMEOUT_MS) {
-        return new Promise((resolve66, reject) => {
+        return new Promise((resolve67, reject) => {
           const child = spawn4(cmd, args, { stdio: ["ignore", "pipe", "pipe"] });
           const out2 = [];
           const err = [];
@@ -37550,7 +37550,7 @@ var init_preview2 = __esm({
           child.stderr.on("data", (b2) => err.push(b2));
           child.on("error", (e2) => settle(reject, e2));
           child.on("close", (code) => {
-            if (code === 0) settle(resolve66, Buffer.concat(out2));
+            if (code === 0) settle(resolve67, Buffer.concat(out2));
             else settle(reject, new Error(`${cmd} exited ${code}: ${Buffer.concat(err).toString("utf8")}`));
           });
         });
@@ -39905,12 +39905,12 @@ function createRicosHostSession(o2) {
     flush() {
       if (!state.ready || state.unavailable || disposed) return Promise.resolve(null);
       const requestId2 = newId();
-      return new Promise((resolve66) => {
+      return new Promise((resolve67) => {
         const timer = t2.setTimeout(() => {
           flushes.delete(requestId2);
-          resolve66(null);
+          resolve67(null);
         }, flushMs);
-        flushes.set(requestId2, { resolve: resolve66, timer });
+        flushes.set(requestId2, { resolve: resolve67, timer });
         o2.send({ v: 1, type: "requestContent", requestId: requestId2 });
       });
     },
@@ -39969,7 +39969,7 @@ async function runRicosImageUpload(o2) {
   };
   session.insertMediaPlaceholder(requestId2);
   try {
-    const entry = await new Promise((resolve66) => {
+    const entry = await new Promise((resolve67) => {
       let done = false;
       let unsub = () => {
       };
@@ -39978,7 +39978,7 @@ async function runRicosImageUpload(o2) {
         done = true;
         t2.clearTimeout(timer);
         queueMicrotask(() => unsub());
-        resolve66(v2);
+        resolve67(v2);
       };
       const timer = t2.setTimeout(() => finish2(null), o2.timeoutMs ?? RICOS_UPLOAD_TIMEOUT_MS);
       unsub = deps.subscribe(`${svc}.uploads.${requestId2}`, (v2) => {
@@ -40500,10 +40500,10 @@ async function runMediaFieldUpload(o2) {
   }, o2.timeoutMs ?? MEDIA_FIELD_UPLOAD_TIMEOUT_MS);
   const bounded2 = (p2) => {
     if (expired) return Promise.reject(new Deadline());
-    return new Promise((resolve66, reject) => {
+    return new Promise((resolve67, reject) => {
       const stop = () => reject(new Deadline());
       onExpire.push(stop);
-      p2.then(resolve66, reject).finally(() => {
+      p2.then(resolve67, reject).finally(() => {
         onExpire = onExpire.filter((f2) => f2 !== stop);
       });
     });
@@ -40526,7 +40526,7 @@ async function runMediaFieldUpload(o2) {
     const before = deps.value(urlPath);
     let uploadUrl;
     try {
-      uploadUrl = await bounded2(new Promise((resolve66, reject) => {
+      uploadUrl = await bounded2(new Promise((resolve67, reject) => {
         let done = false;
         let unsub = () => {
         };
@@ -40534,7 +40534,7 @@ async function runMediaFieldUpload(o2) {
           if (done || typeof v2 !== "string" || v2 === "" || v2 === before) return;
           done = true;
           queueMicrotask(() => unsub());
-          resolve66(v2);
+          resolve67(v2);
         });
         onExpire.push(() => {
           if (!done) {
@@ -40549,7 +40549,7 @@ async function runMediaFieldUpload(o2) {
             if (typeof now === "string" && now !== "" && now !== before) {
               done = true;
               queueMicrotask(() => unsub());
-              resolve66(now);
+              resolve67(now);
               return;
             }
           }
@@ -42703,7 +42703,7 @@ async function fetchData(url, type = "text") {
     }
     return response.text();
   }
-  return new Promise((resolve66, reject) => {
+  return new Promise((resolve67, reject) => {
     const request = new XMLHttpRequest();
     request.open("GET", url, true);
     request.responseType = type === "bytes" ? "arraybuffer" : type;
@@ -42714,14 +42714,14 @@ async function fetchData(url, type = "text") {
       if (request.status === 200 || request.status === 0) {
         switch (type) {
           case "bytes":
-            resolve66(new Uint8Array(request.response));
+            resolve67(new Uint8Array(request.response));
             return;
           case "blob":
           case "json":
-            resolve66(request.response);
+            resolve67(request.response);
             return;
         }
-        resolve66(request.responseText);
+        resolve67(request.responseText);
         return;
       }
       reject(new Error(request.statusText));
@@ -43602,9 +43602,9 @@ function putBinaryImageMask(ctx, imgData) {
 }
 function copyCtxState(sourceCtx, destCtx) {
   const properties = ["strokeStyle", "fillStyle", "fillRule", "globalAlpha", "lineWidth", "lineCap", "lineJoin", "miterLimit", "globalCompositeOperation", "font", "filter"];
-  for (const property of properties) {
-    if (sourceCtx[property] !== void 0) {
-      destCtx[property] = sourceCtx[property];
+  for (const property2 of properties) {
+    if (sourceCtx[property2] !== void 0) {
+      destCtx[property2] = sourceCtx[property2];
     }
   }
   if (sourceCtx.setLineDash !== void 0) {
@@ -44370,7 +44370,7 @@ var init_pdf = __esm({
           if (isCallable(C2) && (!setPrototypeOf || isPrototypeOf(TypedArray, C2))) return C2;
           throw new TypeError2(tryToString(C2) + " is not a typed array constructor");
         };
-        var exportTypedArrayMethod = function(KEY, property, forced, options) {
+        var exportTypedArrayMethod = function(KEY, property2, forced, options) {
           if (!DESCRIPTORS) return;
           if (forced) for (var ARRAY in TypedArrayConstructorsList) {
             var TypedArrayConstructor = globalThis2[ARRAY];
@@ -44378,16 +44378,16 @@ var init_pdf = __esm({
               delete TypedArrayConstructor.prototype[KEY];
             } catch (error) {
               try {
-                TypedArrayConstructor.prototype[KEY] = property;
+                TypedArrayConstructor.prototype[KEY] = property2;
               } catch (error2) {
               }
             }
           }
           if (!TypedArrayPrototype[KEY] || forced) {
-            defineBuiltIn(TypedArrayPrototype, KEY, forced ? property : NATIVE_ARRAY_BUFFER_VIEWS && Int8ArrayPrototype[KEY] || property, options);
+            defineBuiltIn(TypedArrayPrototype, KEY, forced ? property2 : NATIVE_ARRAY_BUFFER_VIEWS && Int8ArrayPrototype[KEY] || property2, options);
           }
         };
-        var exportTypedArrayStaticMethod = function(KEY, property, forced) {
+        var exportTypedArrayStaticMethod = function(KEY, property2, forced) {
           var ARRAY, TypedArrayConstructor;
           if (!DESCRIPTORS) return;
           if (setPrototypeOf) {
@@ -44400,7 +44400,7 @@ var init_pdf = __esm({
             }
             if (!TypedArray[KEY] || forced) {
               try {
-                return defineBuiltIn(TypedArray, KEY, forced ? property : NATIVE_ARRAY_BUFFER_VIEWS && TypedArray[KEY] || property);
+                return defineBuiltIn(TypedArray, KEY, forced ? property2 : NATIVE_ARRAY_BUFFER_VIEWS && TypedArray[KEY] || property2);
               } catch (error) {
               }
             } else return;
@@ -44408,7 +44408,7 @@ var init_pdf = __esm({
           for (ARRAY in TypedArrayConstructorsList) {
             TypedArrayConstructor = globalThis2[ARRAY];
             if (TypedArrayConstructor && (!TypedArrayConstructor[KEY] || forced)) {
-              defineBuiltIn(TypedArrayConstructor, KEY, property);
+              defineBuiltIn(TypedArrayConstructor, KEY, property2);
             }
           }
         };
@@ -44636,11 +44636,11 @@ var init_pdf = __esm({
         var DESCRIPTORS = __webpack_require__3(3724);
         var definePropertyModule = __webpack_require__3(4913);
         var createPropertyDescriptor = __webpack_require__3(6980);
-        module.exports = DESCRIPTORS ? function(object6, key3, value) {
-          return definePropertyModule.f(object6, key3, createPropertyDescriptor(1, value));
-        } : function(object6, key3, value) {
-          object6[key3] = value;
-          return object6;
+        module.exports = DESCRIPTORS ? function(object7, key3, value) {
+          return definePropertyModule.f(object7, key3, createPropertyDescriptor(1, value));
+        } : function(object7, key3, value) {
+          object7[key3] = value;
+          return object7;
         };
       },
       /***/
@@ -44659,9 +44659,9 @@ var init_pdf = __esm({
         var DESCRIPTORS = __webpack_require__3(3724);
         var definePropertyModule = __webpack_require__3(4913);
         var createPropertyDescriptor = __webpack_require__3(6980);
-        module.exports = function(object6, key3, value) {
-          if (DESCRIPTORS) definePropertyModule.f(object6, key3, createPropertyDescriptor(0, value));
-          else object6[key3] = value;
+        module.exports = function(object7, key3, value) {
+          if (DESCRIPTORS) definePropertyModule.f(object7, key3, createPropertyDescriptor(0, value));
+          else object7[key3] = value;
         };
       },
       /***/
@@ -44951,9 +44951,9 @@ var init_pdf = __esm({
       6706(module, __unused_webpack_exports, __webpack_require__3) {
         var uncurryThis = __webpack_require__3(9504);
         var aCallable = __webpack_require__3(9306);
-        module.exports = function(object6, key3, method) {
+        module.exports = function(object7, key3, method) {
           try {
-            return uncurryThis(aCallable(Object.getOwnPropertyDescriptor(object6, key3)[method]));
+            return uncurryThis(aCallable(Object.getOwnPropertyDescriptor(object7, key3)[method]));
           } catch (error) {
           }
         };
@@ -45653,7 +45653,7 @@ var init_pdf = __esm({
         var defineProperty = Object.defineProperty;
         var stringSlice = uncurryThis("".slice);
         var replace = uncurryThis("".replace);
-        var join95 = uncurryThis([].join);
+        var join96 = uncurryThis([].join);
         var CONFIGURABLE_LENGTH = DESCRIPTORS && !fails(function() {
           return defineProperty(function() {
           }, "length", { value: 8 }).length !== 8;
@@ -45680,7 +45680,7 @@ var init_pdf = __esm({
           }
           var state = enforceInternalState(value);
           if (!hasOwn(state, "source")) {
-            state.source = join95(TEMPLATE, typeof name == "string" ? name : "");
+            state.source = join96(TEMPLATE, typeof name == "string" ? name : "");
           }
           return value;
         };
@@ -45725,13 +45725,13 @@ var init_pdf = __esm({
         var aCallable = __webpack_require__3(9306);
         var $TypeError = TypeError;
         var PromiseCapability = function(C2) {
-          var resolve66, reject;
+          var resolve67, reject;
           this.promise = new C2(function($$resolve, $$reject) {
-            if (resolve66 !== void 0 || reject !== void 0) throw new $TypeError("Bad Promise constructor");
-            resolve66 = $$resolve;
+            if (resolve67 !== void 0 || reject !== void 0) throw new $TypeError("Bad Promise constructor");
+            resolve67 = $$resolve;
             reject = $$reject;
           });
-          this.resolve = aCallable(resolve66);
+          this.resolve = aCallable(resolve67);
           this.reject = aCallable(reject);
         };
         module.exports.f = function(C2) {
@@ -45921,13 +45921,13 @@ var init_pdf = __esm({
         var $Object = Object;
         var ObjectPrototype = $Object.prototype;
         module.exports = CORRECT_PROTOTYPE_GETTER ? $Object.getPrototypeOf : function(O2) {
-          var object6 = toObject(O2);
-          if (hasOwn(object6, IE_PROTO)) return object6[IE_PROTO];
-          var constructor = object6.constructor;
-          if (isCallable(constructor) && object6 instanceof constructor) {
+          var object7 = toObject(O2);
+          if (hasOwn(object7, IE_PROTO)) return object7[IE_PROTO];
+          var constructor = object7.constructor;
+          if (isCallable(constructor) && object7 instanceof constructor) {
             return constructor.prototype;
           }
-          return object6 instanceof $Object ? ObjectPrototype : null;
+          return object7 instanceof $Object ? ObjectPrototype : null;
         };
       },
       /***/
@@ -45943,8 +45943,8 @@ var init_pdf = __esm({
         var indexOf = __webpack_require__3(9617).indexOf;
         var hiddenKeys = __webpack_require__3(421);
         var push = uncurryThis([].push);
-        module.exports = function(object6, names2) {
-          var O2 = toIndexedObject(object6);
+        module.exports = function(object7, names2) {
+          var O2 = toIndexedObject(object7);
           var i2 = 0;
           var result = [];
           var key3;
@@ -46099,8 +46099,8 @@ var init_pdf = __esm({
           anObject(C2);
           if (isObject3(x2) && x2.constructor === C2) return x2;
           var promiseCapability = newPromiseCapability.f(C2);
-          var resolve66 = promiseCapability.resolve;
-          resolve66(x2);
+          var resolve67 = promiseCapability.resolve;
+          resolve67(x2);
           return promiseCapability.promise;
         };
       },
@@ -47387,13 +47387,13 @@ var init_pdf = __esm({
           }
           return call(reviver, holder, name, val, context);
         };
-        var internalizeProperty = function(object6, key3, value) {
+        var internalizeProperty = function(object7, key3, value) {
           if (DESCRIPTORS) {
-            var descriptor = getOwnPropertyDescriptor(object6, key3);
+            var descriptor = getOwnPropertyDescriptor(object7, key3);
             if (descriptor && !descriptor.configurable) return;
           }
-          if (value === void 0) delete object6[key3];
-          else createProperty(object6, key3, value);
+          if (value === void 0) delete object7[key3];
+          else createProperty(object7, key3, value);
         };
         var Node2 = function(value, end, source, nodes) {
           this.value = value;
@@ -47438,7 +47438,7 @@ var init_pdf = __esm({
             var source = this.source;
             var i2 = this.index + 1;
             var expectKeypair = false;
-            var object6 = {};
+            var object7 = {};
             var nodes = {};
             var closed = false;
             while (i2 < source.length) {
@@ -47455,7 +47455,7 @@ var init_pdf = __esm({
               i2 = this.skip(IS_WHITESPACE, i2);
               result = this.fork(i2).parse();
               createProperty(nodes, key3, result);
-              createProperty(object6, key3, result.value);
+              createProperty(object7, key3, result.value);
               i2 = this.until([",", "}"], result.end);
               var chr = at2(source, i2);
               if (chr === ",") {
@@ -47468,7 +47468,7 @@ var init_pdf = __esm({
               }
             }
             if (!closed) throw new SyntaxError2("Unterminated object at: " + i2);
-            return this.node(OBJECT, object6, this.index, i2, nodes);
+            return this.node(OBJECT, object7, this.index, i2, nodes);
           },
           array: function() {
             var source = this.source;
@@ -48203,7 +48203,7 @@ var init_pdf = __esm({
         var charAt = uncurryThis("".charAt);
         var Uint8Array2 = globalThis2.Uint8Array;
         var $Array = globalThis2.Array;
-        var join95 = uncurryThis([].join);
+        var join96 = uncurryThis([].join);
         var INCORRECT_BEHAVIOR_OR_DOESNT_EXISTS = !Uint8Array2 || !Uint8Array2.prototype.toBase64 || !(function() {
           try {
             var target = new Uint8Array2();
@@ -48249,7 +48249,7 @@ var init_pdf = __esm({
                 result[written++] = "=";
               }
             }
-            return join95(result, "");
+            return join96(result, "");
           }
         });
       },
@@ -48261,7 +48261,7 @@ var init_pdf = __esm({
         var anUint8Array = __webpack_require__3(4154);
         var notDetached = __webpack_require__3(5169);
         var numberToString2 = uncurryThis(1.1.toString);
-        var join95 = uncurryThis([].join);
+        var join96 = uncurryThis([].join);
         var $Array = Array;
         var Uint8Array2 = globalThis2.Uint8Array;
         var INCORRECT_BEHAVIOR_OR_DOESNT_EXISTS = !Uint8Array2 || !Uint8Array2.prototype.toHex || !(function() {
@@ -48281,7 +48281,7 @@ var init_pdf = __esm({
               var hex2 = numberToString2(this[i2], 16);
               result[i2] = hex2.length === 1 ? "0" + hex2 : hex2;
             }
-            return join95(result, "");
+            return join96(result, "");
           }
         });
       },
@@ -49954,11 +49954,11 @@ var init_pdf = __esm({
             const mustRemoveAspectRatioPromise = _ImageManager._isSVGFittingCanvas;
             const fileReader = new FileReader();
             const imageElement = new Image();
-            const imagePromise = new Promise((resolve66, reject) => {
+            const imagePromise = new Promise((resolve67, reject) => {
               imageElement.onload = () => {
                 data.bitmap = imageElement;
                 data.isSvg = true;
-                resolve66();
+                resolve67();
               };
               fileReader.onload = async () => {
                 const url = data.svgUrl = fileReader.result;
@@ -50644,13 +50644,13 @@ var init_pdf = __esm({
           return;
         }
         const {
-          resolve: resolve66,
+          resolve: resolve67,
           promise
         } = Promise.withResolvers();
         const onEditorsRendered = (evt) => {
           if (evt.pageNumber === pageNumber) {
             this._eventBus.off("editorsrendered", onEditorsRendered);
-            resolve66();
+            resolve67();
           }
         };
         this._eventBus.on("editorsrendered", onEditorsRendered, internalOpt);
@@ -55688,8 +55688,8 @@ var init_pdf = __esm({
           if (this.isSyncFontLoadingSupported) {
             return;
           }
-          await new Promise((resolve66) => {
-            const request = this._queueLoadingCallback(resolve66);
+          await new Promise((resolve67) => {
+            const request = this._queueLoadingCallback(resolve67);
             this._prepareFontLoadEvent(font, request);
           });
         }
@@ -72729,7 +72729,7 @@ fn fs_main(in : VertexOutput) -> @location(0) vec4<f32> {
         input.type = "file";
         input.accept = SupportedImageMimeTypes.join(",");
         const signal = this._uiManager._signal;
-        this.#bitmapPromise = new Promise((resolve66) => {
+        this.#bitmapPromise = new Promise((resolve67) => {
           input.addEventListener("change", async () => {
             if (!input.files || input.files.length === 0) {
               this.remove();
@@ -72744,13 +72744,13 @@ fn fs_main(in : VertexOutput) -> @location(0) vec4<f32> {
               });
               this.#getBitmapFetched(data);
             }
-            resolve66();
+            resolve67();
           }, {
             signal
           });
           input.addEventListener("cancel", () => {
             this.remove();
-            resolve66();
+            resolve67();
           }, {
             signal
           });
@@ -120374,14 +120374,14 @@ var init_pdf_worker_min = __esm({
       }
       get fingerprints() {
         const e2 = "\0".repeat(16);
-        function validate4(t3) {
+        function validate5(t3) {
           return "string" == typeof t3 && 16 === t3.length && t3 !== e2;
         }
         const t2 = this.xref.trailer.get("ID");
         let n2, a2;
-        if (Array.isArray(t2) && validate4(t2[0])) {
+        if (Array.isArray(t2) && validate5(t2[0])) {
           n2 = stringToBytes2(t2[0]);
-          t2[1] !== t2[0] && validate4(t2[1]) && (a2 = stringToBytes2(t2[1]));
+          t2[1] !== t2[0] && validate5(t2[1]) && (a2 = stringToBytes2(t2[1]));
         } else n2 = calculateMD5(this.stream.getByteRange(0, 1024), 0, 1024);
         return shadow2(this, "fingerprints", [n2.toHex(), a2?.toHex() ?? null]);
       }
@@ -128669,13 +128669,13 @@ var init_renderNode = __esm({
       const hasIcon2 = typeof props.icon === "string" ? props.icon.length > 0 : props.icon != null;
       const hasSubtitle = subtitleText.trim().length > 0;
       const label3 = props.actionLabel;
-      const hasAction = props.action != null && typeof label3 === "string" && label3.trim().length > 0;
+      const hasAction2 = props.action != null && typeof label3 === "string" && label3.trim().length > 0;
       const padding = spacingToken(ctx, EMPTY_STATE_SPACING.padding);
       return /* @__PURE__ */ jsxs7("div", { style: { display: "flex", flexDirection: "column", alignItems: "center", textAlign: "center", width: "100%", padding, boxSizing: "border-box", ...wrap }, children: [
         hasIcon2 && /* @__PURE__ */ jsx10("div", { "data-empty-state-part": "icon", "aria-hidden": "true", style: { width: 46, height: 46, borderRadius: 13, background: C2("surfaceTertiary", "#eee"), display: "grid", placeItems: "center", color: C2("textSecondary", "#9aa2ad"), flexShrink: 0 }, children: iconSvg(props.icon, { size: 24 }) }),
         /* @__PURE__ */ jsx10("div", { "data-empty-state-part": "title", style: { ...fontCss(titleFont), color: C2("textPrimary", "#111"), marginTop: hasIcon2 ? spacingToken(ctx, EMPTY_STATE_SPACING.iconGap) : 0, overflowWrap: "anywhere" }, children: txt(props.title, ctx) }),
         hasSubtitle && /* @__PURE__ */ jsx10("div", { "data-empty-state-part": "subtitle", style: { ...fontCss(subtitleFont), color: C2("textSecondary", "#888"), marginTop: spacingToken(ctx, EMPTY_STATE_SPACING.subtitleGap), overflowWrap: "anywhere" }, children: isBinding(props.subtitle) ? subtitleText : txt(props.subtitle, ctx) }),
-        hasAction && /* @__PURE__ */ jsx10("div", { "data-empty-state-part": "action", style: { marginTop: spacingToken(ctx, EMPTY_STATE_SPACING.actionGap), display: "flex", justifyContent: "center" }, children: renderNode({
+        hasAction2 && /* @__PURE__ */ jsx10("div", { "data-empty-state-part": "action", style: { marginTop: spacingToken(ctx, EMPTY_STATE_SPACING.actionGap), display: "flex", justifyContent: "center" }, children: renderNode({
           id: `${nodeId ?? "empty_state"}.action`,
           body: {
             package: "himalaya",
@@ -131533,13 +131533,13 @@ __export(render_descriptor_exports, {
   stabilizePngPage: () => stabilizePngPage,
   withRetry: () => withRetry2
 });
-function a11ySemantics(type, props, modifiers, ancestorHidden, resolve66) {
+function a11ySemantics(type, props, modifiers, ancestorHidden, resolve67) {
   if (!A11Y_MODIFIER_KEYS.some((k2) => modifiers[k2] !== void 0)) return void 0;
   const literal = (v2) => typeof v2 === "string" && v2.trim() !== "" && !isDynamicValue(v2) ? v2 : void 0;
   const spoken = (v2) => {
     const lit = literal(v2);
-    if (lit !== void 0 || !resolve66 || typeof v2 !== "string" || !isDynamicValue(v2)) return lit;
-    const r2 = resolve66(v2);
+    if (lit !== void 0 || !resolve67 || typeof v2 !== "string" || !isDynamicValue(v2)) return lit;
+    const r2 = resolve67(v2);
     if (r2 === v2) return void 0;
     return typeof r2 === "string" && r2.trim() !== "" ? r2 : typeof r2 === "number" ? String(r2) : void 0;
   };
@@ -131553,7 +131553,7 @@ function a11ySemantics(type, props, modifiers, ancestorHidden, resolve66) {
   if (name !== void 0 && exposure === "exposed") out2.name = name;
   const hint = spoken(modifiers.accessibilityHint);
   if (hint !== void 0) out2.hint = hint;
-  const value = spoken(modifiers.accessibilityValue) ?? controlState(role, props, resolve66);
+  const value = spoken(modifiers.accessibilityValue) ?? controlState(role, props, resolve67);
   if (value !== void 0) out2.value = value;
   if (typeof modifiers.headingLevel === "number") out2.headingLevel = modifiers.headingLevel;
   if (exposure !== "exposed") out2.exposure = exposure;
@@ -131574,13 +131574,13 @@ function a11ySemantics(type, props, modifiers, ancestorHidden, resolve66) {
   }
   return out2;
 }
-function controlState(role, props, resolve66) {
+function controlState(role, props, resolve67) {
   if (role !== "toggle" && role !== "checkbox" && role !== "radio") return void 0;
   if (role === "checkbox" && props.indeterminate === true) return "mixed";
   const binding2 = typeof props.valuePath === "string" ? props.valuePath : typeof props.value === "string" && isDynamicValue(props.value) ? props.value : void 0;
   let on4;
   if (binding2 !== void 0) {
-    const v2 = resolve66 ? resolve66(binding2) : void 0;
+    const v2 = resolve67 ? resolve67(binding2) : void 0;
     if (v2 === true || v2 === 1 || v2 === "true" || v2 === "1") on4 = true;
     else if (v2 === false || v2 === 0 || v2 === "false" || v2 === "0") on4 = false;
     else return void 0;
@@ -131916,7 +131916,7 @@ async function stabilizePngPage(page, scheme) {
     const browser = globalThis;
     browser.document.documentElement.style.colorScheme = selected;
     await browser.document.fonts?.ready;
-    await new Promise((resolve66) => browser.requestAnimationFrame(() => browser.requestAnimationFrame(() => resolve66())));
+    await new Promise((resolve67) => browser.requestAnimationFrame(() => browser.requestAnimationFrame(() => resolve67())));
   }, scheme);
 }
 function setPngEgress(start) {
@@ -132093,7 +132093,7 @@ async function resolveEgress(host, port, allow = allowedOrigins) {
   return addrs.every((a2) => isPublicAddress(a2.address)) ? addrs : null;
 }
 function connectFirst(addrs, port, track) {
-  return new Promise((resolve66, reject) => {
+  return new Promise((resolve67, reject) => {
     const tryAt = (i2) => {
       if (i2 >= addrs.length) return reject(new Error("no address answered"));
       const s2 = net.connect({ host: addrs[i2].address, family: addrs[i2].family, port });
@@ -132107,7 +132107,7 @@ function connectFirst(addrs, port, track) {
       s2.once("connect", () => {
         s2.off("error", onFail);
         s2.setTimeout(0);
-        resolve66(s2);
+        resolve67(s2);
       });
     };
     tryAt(0);
@@ -132213,16 +132213,16 @@ async function startEgressProxy() {
     upstream.pipe(socket);
     socket.pipe(upstream);
   });
-  await new Promise((resolve66, reject) => {
+  await new Promise((resolve67, reject) => {
     server.once("error", reject);
-    server.listen(0, "127.0.0.1", () => resolve66());
+    server.listen(0, "127.0.0.1", () => resolve67());
   });
   const { port } = server.address();
   return {
     url: `http://127.0.0.1:${port}`,
     blocked,
-    close: () => new Promise((resolve66) => {
-      server.close(() => resolve66());
+    close: () => new Promise((resolve67) => {
+      server.close(() => resolve67());
       for (const s2 of sockets) s2.destroy();
       server.closeAllConnections?.();
     })
@@ -134795,14 +134795,14 @@ async function pipeWebWixStream(upstream, res, signal, recordStream) {
     const chunk = await reader.read();
     if (chunk.done) break;
     if (chunk.value && !res.write(chunk.value)) {
-      await new Promise((resolve66) => {
+      await new Promise((resolve67) => {
         let settled = false;
         const finish2 = () => {
           if (settled) return;
           settled = true;
           res.off("drain", finish2);
           res.off("close", finish2);
-          resolve66();
+          resolve67();
         };
         if (res.destroyed || !res.writable) finish2();
         else {
@@ -134818,7 +134818,7 @@ async function handleWebWix(req, res, state) {
   const session = webWixSession(req, res, state);
   const auth = resolveWebWixAuth(state.app);
   const path2 = new URL(req.url ?? "", "http://localhost").pathname;
-  const readJson9 = async () => {
+  const readJson10 = async () => {
     const chunks = [];
     for await (const c2 of req) chunks.push(c2);
     const t2 = Buffer.concat(chunks).toString("utf8");
@@ -134835,7 +134835,7 @@ async function handleWebWix(req, res, state) {
     res.end(JSON.stringify(obj4));
   };
   if (path2 === "/v1/__webwix/stream" && req.method === "POST") {
-    const b2 = await readJson9();
+    const b2 = await readJson10();
     const method = String(b2.method ?? "GET").toUpperCase();
     const requestedUrl = String(b2.url ?? "");
     const body = b2.body === void 0 ? void 0 : typeof b2.body === "string" ? b2.body : JSON.stringify(b2.body);
@@ -134890,7 +134890,7 @@ async function handleWebWix(req, res, state) {
       }
       if (match) {
         const mocked = match.rule.response;
-        if (mocked.delayMs) await new Promise((resolve66) => setTimeout(resolve66, mocked.delayMs));
+        if (mocked.delayMs) await new Promise((resolve67) => setTimeout(resolve67, mocked.delayMs));
         const payload = mocked.template ? renderTemplate(mocked.body, match.captures) : mocked.body;
         recordStream("mock", mocked.status, match.rule.id, mocked.headers);
         res.statusCode = mocked.status;
@@ -134984,7 +134984,7 @@ async function handleWebWix(req, res, state) {
     return;
   }
   if (path2 === "/v1/__webwix/login" && req.method === "POST") {
-    const b2 = await readJson9();
+    const b2 = await readJson10();
     try {
       const { memberToken, visitorToken } = await memberDirectLogin(
         auth.clientId,
@@ -135077,7 +135077,7 @@ async function handleWebWix(req, res, state) {
     res.setHeader("cache-control", "no-store");
     const account = session.account;
     if (!account) return reply(401, { error: "webwix_account_signed_out" });
-    const metaSiteId = String((await readJson9()).metaSiteId ?? "").trim();
+    const metaSiteId = String((await readJson10()).metaSiteId ?? "").trim();
     if (!isSafeMsid(metaSiteId)) return reply(400, { error: "webwix_account_bad_site_id" });
     if (sealedAccountRoute) return sealedRefusal(MEMBER_SESSION_URL, "POST");
     try {
@@ -135098,7 +135098,7 @@ async function handleWebWix(req, res, state) {
     if (!accountApp) return reply(404, { error: "webwix_account_unsupported" });
     if (req.method !== "POST") return reply(405, { error: "method_not_allowed" });
     res.setHeader("cache-control", "no-store");
-    const shortId = String((await readJson9()).shortId ?? "").trim();
+    const shortId = String((await readJson10()).shortId ?? "").trim();
     const start = inviteShortLinkUrl(shortId);
     if (!start) return reply(400, { error: "webwix_short_link_bad_id" });
     if (sealedAccountRoute) return sealedRefusal(start, "GET");
@@ -135107,7 +135107,7 @@ async function handleWebWix(req, res, state) {
     return url ? reply(200, { url }) : reply(404, { error: "webwix_short_link_unresolved" });
   }
   if (path2 === "/v1/__webwix/call" && req.method === "POST") {
-    const b2 = await readJson9();
+    const b2 = await readJson10();
     const ownerRung = b2.ownerMsid !== void 0 || b2.checkOwnerSession === true;
     const accountRung = !ownerRung && accountApp && !!session.account;
     const msid = String(b2.ownerMsid ?? "");
@@ -135170,7 +135170,7 @@ async function handleWebWix(req, res, state) {
       }
       if (match) {
         const mocked = match.rule.response;
-        if (mocked.delayMs) await new Promise((resolve66) => setTimeout(resolve66, mocked.delayMs));
+        if (mocked.delayMs) await new Promise((resolve67) => setTimeout(resolve67, mocked.delayMs));
         const responseBody = mocked.template ? renderTemplate(mocked.body, match.captures) : mocked.body;
         record2("mock", mocked.status, responseBody, match.rule.id, mocked.headers);
         return reply(200, { status: mocked.status, body: responseBody ?? "" });
@@ -135300,7 +135300,7 @@ async function handleWebWix(req, res, state) {
     });
   }
   if (path2 === "/v1/__webwix/register" && req.method === "POST") {
-    const b2 = await readJson9();
+    const b2 = await readJson10();
     try {
       const { memberToken, visitorToken } = await memberDirectRegister(
         auth.clientId,
@@ -137017,8 +137017,8 @@ function sha256hex(b2) {
 function stableStringify(value) {
   if (value === null || typeof value !== "object") return JSON.stringify(value);
   if (Array.isArray(value)) return "[" + value.map(stableStringify).join(",") + "]";
-  const object6 = value;
-  return "{" + Object.keys(object6).sort().map((key3) => JSON.stringify(key3) + ":" + stableStringify(object6[key3])).join(",") + "}";
+  const object7 = value;
+  return "{" + Object.keys(object7).sort().map((key3) => JSON.stringify(key3) + ":" + stableStringify(object7[key3])).join(",") + "}";
 }
 function manifestContent(m2) {
   const {
@@ -137508,12 +137508,12 @@ var init_query = __esm({
 });
 
 // ../../core/dev-server/src/crawl-input.ts
-function resolved(v2, resolve66) {
-  if (typeof v2 === "string") return v2.startsWith("$service:") ? resolve66(v2) : v2;
+function resolved(v2, resolve67) {
+  if (typeof v2 === "string") return v2.startsWith("$service:") ? resolve67(v2) : v2;
   if (Array.isArray(v2)) {
     const out2 = v2.flatMap((el2) => {
       if (typeof el2 !== "string" || !el2.startsWith("$service:")) return [el2];
-      const r2 = resolve66(el2);
+      const r2 = resolve67(el2);
       return Array.isArray(r2) ? r2 : [r2];
     });
     return out2;
@@ -137527,9 +137527,9 @@ function hasRowBinding(props) {
     return itemToken(v2) || Array.isArray(v2) && v2.some(itemToken);
   });
 }
-function declaredOptionIds(props, resolve66) {
+function declaredOptionIds(props, resolve67) {
   const literal = props.options ?? props.tabs ?? props.chips;
-  const bound = props.optionsPath !== void 0 ? resolved(props.optionsPath, resolve66) : void 0;
+  const bound = props.optionsPath !== void 0 ? resolved(props.optionsPath, resolve67) : void 0;
   const raw = Array.isArray(bound) ? bound : literal;
   if (!Array.isArray(raw)) return [];
   const out2 = [];
@@ -137572,24 +137572,24 @@ function seedTokens(state, limit = 48) {
   walk2(state, 0);
   return out2;
 }
-function synthesizeInput(control, resolve66, tokens2) {
+function synthesizeInput(control, resolve67, tokens2) {
   const id = `${control.type}.${control.callback}`;
   const row = SYNTHESIZED_CONTROLS[id];
   if (!row) return null;
   const props = control.props;
   if (hasRowBinding(props)) return null;
   if (row.from === "declared-options") {
-    const ids = declaredOptionIds(props, resolve66);
+    const ids = declaredOptionIds(props, resolve67);
     if (!ids.length) return null;
     if (row.encoding === "string-array") {
-      const currentRaw2 = resolved(props.selectedIds, resolve66);
+      const currentRaw2 = resolved(props.selectedIds, resolve67);
       const current3 = (Array.isArray(currentRaw2) ? currentRaw2 : []).filter((x2) => typeof x2 === "string");
       const pick5 = ids.find((o2) => !current3.includes(o2));
       if (pick5 === void 0) return null;
       const value = props.multiSelect === true ? [...current3, pick5] : [pick5];
       return { key: row.key, value, from: row.from, current: current3, control: id };
     }
-    const currentRaw = resolved(props.selectedId, resolve66);
+    const currentRaw = resolved(props.selectedId, resolve67);
     const current2 = typeof currentRaw === "string" ? currentRaw : void 0;
     const pick4 = ids.find((o2) => o2 !== current2);
     if (pick4 === void 0) return null;
@@ -137597,7 +137597,7 @@ function synthesizeInput(control, resolve66, tokens2) {
   }
   if (!acceptsWords(props) || !acceptsWords(control.wrapper ?? {})) return null;
   const binding2 = typeof props.valuePath === "string" ? props.valuePath : typeof props.value === "string" && props.value.startsWith("$service:") ? props.value : void 0;
-  const bound = binding2 === void 0 ? void 0 : resolve66(binding2);
+  const bound = binding2 === void 0 ? void 0 : resolve67(binding2);
   const literal = typeof props.value === "string" && !props.value.startsWith("$") ? props.value : void 0;
   const current = typeof bound === "string" ? bound : typeof bound === "number" ? String(bound) : literal ?? "";
   const max = typeof props.maxLength === "number" && props.maxLength > 0 ? props.maxLength : void 0;
@@ -140672,7 +140672,7 @@ async function liveRenderServices(bundleJs, opts) {
   return loadBundleServicesLive(bundleJs, liveBootOptions(opts, bus));
 }
 async function settleUnawaitedWork() {
-  for (let turn = 0; turn < SETTLE_TURNS; turn++) await new Promise((resolve66) => setTimeout(resolve66, 0));
+  for (let turn = 0; turn < SETTLE_TURNS; turn++) await new Promise((resolve67) => setTimeout(resolve67, 0));
 }
 async function loadAndSettle(bundleJs, options) {
   const w2 = await bootBundleWorker(bundleJs, options);
@@ -142408,9 +142408,9 @@ function stateOf(view) {
     build: b2 && view.live ? { ok: b2.ok, ms: b2.ms, screens: b2.screens, at: b2.at, run: view.live.runId } : null
   };
 }
-function frameFor(state, prev, ts10, v2, key3) {
-  if (key3 || !prev) return { ts: ts10, v: v2, key: true, ...state };
-  const f2 = { ts: ts10, v: v2 };
+function frameFor(state, prev, ts11, v2, key3) {
+  if (key3 || !prev) return { ts: ts11, v: v2, key: true, ...state };
+  const f2 = { ts: ts11, v: v2 };
   if (!same2(state.step, prev.step)) f2.step = state.step;
   if (!same2(state.now, prev.now)) f2.now = state.now;
   const screens = {};
@@ -142790,7 +142790,7 @@ function buildView(dir, memory, now) {
   const runs = testRuns(dir);
   const last = runs[runs.length - 1];
   const prev = runs[runs.length - 2];
-  const validate4 = obj(readJson4(join51(dir, VALIDATE_RECORD)));
+  const validate5 = obj(readJson4(join51(dir, VALIDATE_RECORD)));
   const push = obj(readJson4(join51(dir, PUSH_RECORD)));
   const edges = readJson4(join51(dir, EDGES_RECORD));
   const nav = [];
@@ -142824,7 +142824,7 @@ function buildView(dir, memory, now) {
     screens,
     focus,
     health: {
-      validate: validate4 && typeof validate4.ok === "boolean" ? { ok: validate4.ok, errors: num2(validate4.errors), warnings: num2(validate4.warnings), at: text(validate4.at) ?? now } : null,
+      validate: validate5 && typeof validate5.ok === "boolean" ? { ok: validate5.ok, errors: num2(validate5.errors), warnings: num2(validate5.warnings), at: text(validate5.at) ?? now } : null,
       test: last ? { ok: last.ok, screens: last.screens, actions: last.actions, gaps: last.gaps, prevGaps: prev ? prev.gaps : null, errors: last.errors, at: runTime(last.runId) } : null,
       ux: uxStatuses(dir),
       push: push && text(push.releaseId) && text(push.app) ? { app: text(push.app), releaseId: text(push.releaseId), draft: push.draft !== false, at: text(push.at) ?? now } : null
@@ -148753,21 +148753,21 @@ function compress(arr2, options, matcher, readonlyMatcher) {
   const compressedObj = {};
   for (let i2 = 0; i2 < arr2.length; i2++) {
     const tagObj = arr2[i2];
-    const property = propName2(tagObj);
-    if (property !== void 0 && property !== options.textNodeName) {
+    const property2 = propName2(tagObj);
+    if (property2 !== void 0 && property2 !== options.textNodeName) {
       const rawAttrs = stripAttributePrefix(
         tagObj[":@"] || {},
         options.attributeNamePrefix
       );
-      matcher.push(property, rawAttrs);
+      matcher.push(property2, rawAttrs);
     }
-    if (property === options.textNodeName) {
-      if (text9 === void 0) text9 = tagObj[property];
-      else text9 += "" + tagObj[property];
-    } else if (property === void 0) {
+    if (property2 === options.textNodeName) {
+      if (text9 === void 0) text9 = tagObj[property2];
+      else text9 += "" + tagObj[property2];
+    } else if (property2 === void 0) {
       continue;
-    } else if (tagObj[property]) {
-      let val = compress(tagObj[property], options, matcher, readonlyMatcher);
+    } else if (tagObj[property2]) {
+      let val = compress(tagObj[property2], options, matcher, readonlyMatcher);
       const isLeaf = isLeafTag(val, options);
       if (Object.keys(val).length === 0 && options.alwaysCreateTextNode) {
         val[options.textNodeName] = "";
@@ -148783,20 +148783,20 @@ function compress(arr2, options, matcher, readonlyMatcher) {
       if (tagObj[METADATA_SYMBOL2] !== void 0 && typeof val === "object" && val !== null) {
         val[METADATA_SYMBOL2] = tagObj[METADATA_SYMBOL2];
       }
-      if (compressedObj[property] !== void 0 && Object.prototype.hasOwnProperty.call(compressedObj, property)) {
-        if (!Array.isArray(compressedObj[property])) {
-          compressedObj[property] = [compressedObj[property]];
+      if (compressedObj[property2] !== void 0 && Object.prototype.hasOwnProperty.call(compressedObj, property2)) {
+        if (!Array.isArray(compressedObj[property2])) {
+          compressedObj[property2] = [compressedObj[property2]];
         }
-        compressedObj[property].push(val);
+        compressedObj[property2].push(val);
       } else {
         const jPathOrMatcher = options.jPath ? readonlyMatcher.toString() : readonlyMatcher;
-        if (options.isArray(property, jPathOrMatcher, isLeaf)) {
-          compressedObj[property] = [val];
+        if (options.isArray(property2, jPathOrMatcher, isLeaf)) {
+          compressedObj[property2] = [val];
         } else {
-          compressedObj[property] = val;
+          compressedObj[property2] = val;
         }
       }
-      if (property !== void 0 && property !== options.textNodeName) {
+      if (property2 !== void 0 && property2 !== options.textNodeName) {
         matcher.pop();
       }
     }
@@ -149269,22 +149269,22 @@ function resolveTagName2(name, isAttribute2, options, matcher, xmlVersion) {
   if (qName(name, { xmlVersion })) return name;
   return options.sanitizeName(name, { isAttribute: isAttribute2, matcher: matcher.readOnly() });
 }
-function processTextOrObjNode(object6, key3, level, matcher, xmlVersion) {
-  const attrValues = this.extractAttributes(object6);
+function processTextOrObjNode(object7, key3, level, matcher, xmlVersion) {
+  const attrValues = this.extractAttributes(object7);
   matcher.push(key3, attrValues);
   const isStopNode = this.checkStopNode(matcher);
   if (isStopNode) {
-    const rawContent = this.buildRawContent(object6);
-    const attrStr = this.buildAttributesForStopNode(object6);
+    const rawContent = this.buildRawContent(object7);
+    const attrStr = this.buildAttributesForStopNode(object7);
     matcher.pop();
     return this.buildObjectNode(rawContent, key3, attrStr, level);
   }
-  const result = this.j2x(object6, level + 1, matcher, xmlVersion);
+  const result = this.j2x(object7, level + 1, matcher, xmlVersion);
   matcher.pop();
   if (key3[0] === "?") {
     return this.buildTextValNode("", key3, result.attrStr, level, matcher);
-  } else if (object6[this.options.textNodeName] !== void 0 && Object.keys(object6).length === 1) {
-    return this.buildTextValNode(object6[this.options.textNodeName], key3, result.attrStr, level, matcher);
+  } else if (object7[this.options.textNodeName] !== void 0 && Object.keys(object7).length === 1) {
+    return this.buildTextValNode(object7[this.options.textNodeName], key3, result.attrStr, level, matcher);
   } else {
     return this.buildObjectNode(result.val, key3, result.attrStr, level);
   }
@@ -150951,13 +150951,13 @@ function isSymlink2(path2) {
     return false;
   }
 }
-async function introducedErrors(dir, validate4, file2, isOwnFinding) {
-  const edited = await validate4(dir, { fresh: true });
+async function introducedErrors(dir, validate5, file2, isOwnFinding) {
+  const edited = await validate5(dir, { fresh: true });
   if (edited.code === 0) return void 0;
   if (!comparable(edited)) return `himi validate failed and its report could not be read: ${edited.tail ?? "no output"}`;
   if (edited.errors.every((e2) => isOwnFinding(e2.ruleCode))) return void 0;
   file2.restore();
-  const baseline = await validate4(dir, { fresh: true });
+  const baseline = await validate5(dir, { fresh: true });
   file2.reapply();
   if (!comparable(baseline)) return "himi validate could not check the original config.ts to compare against";
   const introduced = compareErrors(edited.errors, baseline.errors ?? []).introduced.filter((e2) => !isOwnFinding(e2.ruleCode));
@@ -151100,7 +151100,7 @@ function previewPushConfigEdit(dir, options) {
   const { applied, instructions } = enablePushInConfig(readFileSync62(path2, "utf8"), { ...options, fileName: basename13(path2) });
   return { wouldApply: applied, instructions };
 }
-async function applyPushConfigEdit(dir, options, validate4) {
+async function applyPushConfigEdit(dir, options, validate5) {
   const path2 = configEntry(dir);
   if (!path2) return void 0;
   const fileName = basename13(path2);
@@ -151113,7 +151113,7 @@ async function applyPushConfigEdit(dir, options, validate4) {
   const backup = backUpConfig(dir, "notify-setup-backup", fileName, original);
   if (!backup) return refuse7(`.himi is not a plain directory in this package (a symlink?), so ${fileName} was not edited.`);
   writeFileAtomic(path2, edit.source);
-  const introduced = await introducedErrors(dir, validate4, {
+  const introduced = await introducedErrors(dir, validate5, {
     restore: () => writeFileAtomic(path2, original),
     reapply: () => writeFileAtomic(path2, edit.source)
   }, isPushFinding).catch((error) => `himi validate could not run, so the edit was not checked: ${error.message}`);
@@ -152567,15 +152567,15 @@ function loadMemory2(dir) {
   for (const t2 of m2.timeline) {
     if (!isObj3(t2)) continue;
     const file2 = historyName(t2.sha, t2.ext);
-    const ts10 = str4(t2.ts);
+    const ts11 = str4(t2.ts);
     const id = str4(t2.id);
-    if (file2 && ts10 && id) timeline.push({ ts: ts10, id, file: file2 });
+    if (file2 && ts11 && id) timeline.push({ ts: ts11, id, file: file2 });
   }
   return { createdAt: str4(m2.createdAt), shots, timeline };
 }
-function captionAt(entries, ts10) {
+function captionAt(entries, ts11) {
   let best = null;
-  for (const e2 of entries) if (e2.ts <= ts10) best = e2;
+  for (const e2 of entries) if (e2.ts <= ts11) best = e2;
   return best ? best.message : null;
 }
 function thin(items, max) {
@@ -152695,13 +152695,13 @@ function duration(ms2) {
   const m2 = Math.round(ms2 / 6e4);
   return m2 < 60 ? `${m2} min` : `${Math.floor(m2 / 60)} h ${m2 % 60} min`;
 }
-function utcDay(ts10) {
-  const d2 = new Date(ts10);
+function utcDay(ts11) {
+  const d2 = new Date(ts11);
   return Number.isNaN(d2.getTime()) ? "" : `${d2.toUTCString().slice(0, 16)} (UTC)`;
 }
-function sinceStart(start, ts10) {
+function sinceStart(start, ts11) {
   if (!start) return "";
-  const s2 = Math.max(0, Math.round((Date.parse(ts10) - Date.parse(start)) / 1e3));
+  const s2 = Math.max(0, Math.round((Date.parse(ts11) - Date.parse(start)) / 1e3));
   const h2 = Math.floor(s2 / 3600);
   const m2 = Math.floor(s2 % 3600 / 60);
   const sec = String(s2 % 60).padStart(2, "0");
@@ -152711,7 +152711,7 @@ function renderReel(plan, images) {
   const img = (f2, alt, cls = "") => f2 && images.has(f2) ? `<img class="${cls}" src="${images.get(f2)}" alt="${escapeHtml(alt)}">` : "";
   const count2 = (n2) => escapeHtml(String(Number.isSafeInteger(n2) && n2 >= 0 ? n2 : 0));
   const accent = ACCENT.test(plan.accent) ? plan.accent : DEFAULT_ACCENT;
-  const clock = (ts10) => sinceStart(plan.startedAt, ts10);
+  const clock = (ts11) => sinceStart(plan.startedAt, ts11);
   const frames = plan.frames.filter((f2) => images.has(f2.file));
   const flip = frames.length ? `<section class="flip"><div class="phone">${frames.map((f2, i2) => `<img class="fr${i2 === 0 ? " on" : ""}" src="${images.get(f2.file)}" alt="${escapeHtml(plan.focusId ?? "")} at ${clock(f2.ts)}">`).join("")}</div>
 <div class="flipcap"><div class="t" id="ft">${frames[0] ? clock(frames[0].ts) : ""}</div><div id="fc">${escapeHtml(frames[0]?.caption ?? "")}</div><div class="bar"><div id="fb"></div></div></div></section>` : `<p class="muted">No screen versions were recorded \u2014 open the build board with <code>himi studio</code> before building to capture them.</p>`;
@@ -156063,7 +156063,7 @@ async function pinnedFetch(url, init, addresses, maxResponseBytes) {
   const headers2 = Object.fromEntries(new Headers(init.headers).entries());
   const request = url.protocol === "https:" ? httpsRequest : httpRequest;
   const hostname3 = url.hostname.replace(/^\[|\]$/g, "");
-  return await new Promise((resolve66, reject) => {
+  return await new Promise((resolve67, reject) => {
     let settled = false;
     const finish2 = (fn2) => {
       if (settled) return;
@@ -156100,7 +156100,7 @@ async function pinnedFetch(url, init, addresses, maxResponseBytes) {
         }
         const responseHeaders = new Headers();
         for (const [key3, value] of Object.entries(response.headers)) if (value !== void 0) responseHeaders.set(key3, Array.isArray(value) ? value.join(", ") : value);
-        resolve66(new Response(bytes2, { status: response.statusCode, statusText: response.statusMessage, headers: responseHeaders }));
+        resolve67(new Response(bytes2, { status: response.statusCode, statusText: response.statusMessage, headers: responseHeaders }));
       }));
     });
     req.once("error", (error) => finish2(() => reject(error)));
@@ -156400,7 +156400,7 @@ function createLocalTestSandbox() {
           }
         })();
       `;
-      return await new Promise((resolve66, reject) => {
+      return await new Promise((resolve67, reject) => {
         const { port1, port2 } = new MessageChannel();
         const serializableContext = {
           auth: context.auth,
@@ -156476,7 +156476,7 @@ function createLocalTestSandbox() {
             timer = setTimeout(() => finish2(() => reject(new SandboxError("timeout", `execution exceeded ${limits.timeoutMs}ms`))), Math.max(1, limits.timeoutMs));
             return;
           }
-          if (message.ok) finish2(() => resolve66({ value: message.value, durationMs: Date.now() - started }));
+          if (message.ok) finish2(() => resolve67({ value: message.value, durationMs: Date.now() - started }));
           else finish2(() => reject(new SandboxError("execution_failed", message.message ?? "handler failed")));
         });
         worker.once("error", (error) => finish2(() => reject(new SandboxError("execution_failed", error.message))));
@@ -158375,12 +158375,12 @@ function createLoginSession(deps) {
       current = pending;
       const out2 = [];
       const err = [];
-      return new Promise((resolve66) => {
+      return new Promise((resolve67) => {
         let answered = false;
         const answer = () => {
           if (answered) return;
           answered = true;
-          resolve66(current);
+          resolve67(current);
         };
         let child;
         try {
@@ -158503,9 +158503,9 @@ async function startMcpServer(opts) {
     login: createLoginSession({ ...defaultLoginDeps, selfCommand: previewDeps.selfCommand, ...opts.login }),
     ...opts.workspace ? { workspaceBoundary: opts.workspace } : {}
   };
-  const closed = new Promise((resolve66) => {
-    stdin.once("end", resolve66);
-    stdin.once("close", resolve66);
+  const closed = new Promise((resolve67) => {
+    stdin.once("end", resolve67);
+    stdin.once("close", resolve67);
   });
   const handle = serveStdio(
     () => {
@@ -158952,10 +158952,10 @@ function collectSdkModules(files, resolveSubpath) {
   for (const source of Object.values(files)) visit(source);
   return { modules, unsupported };
 }
-function sdkSubpathReader(resolve66) {
+function sdkSubpathReader(resolve67) {
   return (sub) => {
     try {
-      return readFileSync81(resolve66(`@wix/himalaya/${sub}`), "utf8");
+      return readFileSync81(resolve67(`@wix/himalaya/${sub}`), "utf8");
     } catch {
       return null;
     }
@@ -159033,7 +159033,7 @@ async function runBrowserAuthoring(opts) {
   const token = mintToken2(payload);
   const unusable = await probeAuthoringPage(opts.authoringBase, opts.fetchImpl, opts.probeTimeoutMs);
   if (unusable) throw new Error(unusable);
-  return await new Promise((resolve66, reject) => {
+  return await new Promise((resolve67, reject) => {
     let settled = false;
     let url = "";
     const server = createServer5();
@@ -159085,7 +159085,7 @@ async function runBrowserAuthoring(opts) {
         }
         res.writeHead(200, { "content-type": "text/plain" }).end("ok");
         const report3 = body.result;
-        finish2(() => resolve66({ report: report3, url }));
+        finish2(() => resolve67({ report: report3, url }));
       })();
     });
     server.on("error", (e2) => finish2(() => reject(e2)));
@@ -162294,7 +162294,7 @@ var init_iap_client = __esm({
         this.options = options;
         this.fetchImpl = options.fetchImpl ?? ((input, init) => globalThis.fetch(input, init));
         this.now = options.now ?? Date.now;
-        this.sleep = options.sleep ?? ((ms2) => new Promise((resolve66) => setTimeout(resolve66, ms2)));
+        this.sleep = options.sleep ?? ((ms2) => new Promise((resolve67) => setTimeout(resolve67, ms2)));
       }
       fetchImpl;
       now;
@@ -164802,7 +164802,7 @@ function previewIapConfigEdit(dir, options) {
   const { changed, applied, conflicts, instructions } = bindPurchasesAppInConfig(readFileSync92(path2, "utf8"), { ...withStoreBundle(dir, options), fileName: basename20(path2) });
   return { path: path2, changed, applied, conflicts, instructions };
 }
-async function applyIapConfigEdit(dir, options, validate4) {
+async function applyIapConfigEdit(dir, options, validate5) {
   const path2 = configEntry(dir);
   if (!path2) return void 0;
   const fileName = basename20(path2);
@@ -164815,7 +164815,7 @@ async function applyIapConfigEdit(dir, options, validate4) {
   const backup = backUpConfig(dir, "store-iap-backup", fileName, original);
   if (!backup) return refuse7(`.himi is not a plain directory in this package (a symlink?), so ${fileName} was not edited.`);
   writeFileAtomic(path2, edit.source);
-  const introduced = await introducedErrors(dir, validate4, {
+  const introduced = await introducedErrors(dir, validate5, {
     restore: () => writeFileAtomic(path2, original),
     reapply: () => writeFileAtomic(path2, edit.source)
   }, () => false).catch((error) => `himi validate could not run, so the edit was not checked: ${error.message}`);
@@ -165955,11 +165955,11 @@ async function recordBinding(flags, deps, report3, apply) {
   if (!dir) return { note: wanted ? `add ${wanted} and "iap" in capabilities to the app's config (or rerun with --content <dir>)` : void 0 };
   if (!report3.purchasesAppId) return { note: `${dir} was not edited: there is no purchases app on the site yet`, unapplied: true };
   const options = { purchasesAppId: report3.purchasesAppId, siteId: report3.site, bundleId: report3.bundleId };
-  const validate4 = deps.validateConfig;
+  const validate5 = deps.validateConfig;
   let config;
   if (!apply) config = previewIapConfigEdit(dir, options);
-  else if (!validate4) return { note: `${dir} was not edited (himi validate is unavailable here): add ${wanted} by hand`, unapplied: true };
-  else config = await applyIapConfigEdit(dir, options, validate4);
+  else if (!validate5) return { note: `${dir} was not edited (himi validate is unavailable here): add ${wanted} by hand`, unapplied: true };
+  else config = await applyIapConfigEdit(dir, options, validate5);
   if (!config) return { note: `${dir} has no config.ts, so it was not edited: add ${wanted} to the app's config`, unapplied: true };
   return { config, unapplied: config.instructions.length > 0 };
 }
@@ -166196,7 +166196,7 @@ function defaultStoreIapDeps() {
     profileTeam: (profile) => resolveStoreCredentials({ app: profile, cfg: {}, profileFlag: profile, env: {} }).team,
     confirm: confirmOnTerminal,
     now: () => /* @__PURE__ */ new Date(),
-    sleep: (ms2) => new Promise((resolve66) => setTimeout(resolve66, ms2))
+    sleep: (ms2) => new Promise((resolve67) => setTimeout(resolve67, ms2))
   };
 }
 var STORE_IAP_USAGE, SUMMARY_THRESHOLD, SUMMARY_DETAIL_LIMIT, UsageError, CommandOutput, pad, DECISION_ORDER, OUTCOME_ORDER, COMPLETE, DRAFT_MODES, TERRITORY_CODE, LOCALE_CODE, GRID_UNAVAILABLE_NOTE, KeyError, CredentialsError, writesPlanned, COMMANDS;
@@ -167891,7 +167891,7 @@ async function runAllMembers(args) {
     const result = await sendCampaign({
       recipients,
       campaignId: requestId2,
-      wait: deps.wait ?? ((ms2) => new Promise((resolve66) => setTimeout(resolve66, ms2))),
+      wait: deps.wait ?? ((ms2) => new Promise((resolve67) => setTimeout(resolve67, ms2))),
       onProgress: (completed) => {
         if (completed % 10 === 0 || completed === recipients.length) {
           io2.log(JSON.stringify({ ok: true, state: "progress", campaignId: requestId2, completed, recipients: recipients.length }));
@@ -168055,12 +168055,12 @@ async function runNotify(pos, flags, io2, deps = {}) {
   const json8 = flags.json === true;
   const print = (v2) => io2.log(JSON.stringify(v2, null, 2));
   const sub = pos[1];
-  const USAGE2 = "himi notify send --app <app> (--token <t> | --device <id> | --all) --title <s> [--body <s>] [--link <url>]\n                 [--platform ios|android] [--category <c>] [--badge <n>] [--channel <id>] [--silent] [--dry-run] [--json]\n                 [--data k=v ...]\nhimi notify tokens --app <app> [--platform ios|android] [--include-disabled] [--json]\nhimi notify doctor [--json]";
+  const USAGE3 = "himi notify send --app <app> (--token <t> | --device <id> | --all) --title <s> [--body <s>] [--link <url>]\n                 [--platform ios|android] [--category <c>] [--badge <n>] [--channel <id>] [--silent] [--dry-run] [--json]\n                 [--data k=v ...]\nhimi notify tokens --app <app> [--platform ios|android] [--include-disabled] [--json]\nhimi notify doctor [--json]";
   if (!sub || !["send", "tokens", "doctor"].includes(sub)) {
     io2.error(
       JSON.stringify({
         error: sub ? `unknown notify subcommand "${sub}" \u2014 use send | tokens | doctor` : "notify needs a subcommand",
-        usage: USAGE2
+        usage: USAGE3
       })
     );
     return 2;
@@ -168120,7 +168120,7 @@ async function runNotify(pos, flags, io2, deps = {}) {
   }
   const app = str11(flags.app);
   if (!app) {
-    io2.error(JSON.stringify({ error: "--app is required", usage: USAGE2 }));
+    io2.error(JSON.stringify({ error: "--app is required", usage: USAGE3 }));
     return 2;
   }
   if (sub === "tokens") {
@@ -168174,22 +168174,22 @@ async function runNotify(pos, flags, io2, deps = {}) {
   const all = flags.all === true;
   const targets = [token && "--token", device && "--device", all && "--all"].filter(Boolean);
   if (targets.length === 0) {
-    io2.error(JSON.stringify({ error: "pick a target: --token <t>, --device <id>, or --all", usage: USAGE2 }));
+    io2.error(JSON.stringify({ error: "pick a target: --token <t>, --device <id>, or --all", usage: USAGE3 }));
     return 2;
   }
   if (targets.length > 1) {
-    io2.error(JSON.stringify({ error: `targets are mutually exclusive \u2014 got ${targets.join(" and ")}`, usage: USAGE2 }));
+    io2.error(JSON.stringify({ error: `targets are mutually exclusive \u2014 got ${targets.join(" and ")}`, usage: USAGE3 }));
     return 2;
   }
   const data = parseDataFlag(flags.data);
   if (data.error) {
-    io2.error(JSON.stringify({ error: data.error, usage: USAGE2 }));
+    io2.error(JSON.stringify({ error: data.error, usage: USAGE3 }));
     return 2;
   }
   const silent = flags.silent === true;
   const title = str11(flags.title);
   if (!silent && !title) {
-    io2.error(JSON.stringify({ error: "--title is required for a visible notification (use --silent for a background push)", usage: USAGE2 }));
+    io2.error(JSON.stringify({ error: "--title is required for a visible notification (use --silent for a background push)", usage: USAGE3 }));
     return 2;
   }
   const badgeRaw = str11(flags.badge);
@@ -170273,10 +170273,10 @@ function assertPublicSiteUrl(raw) {
   if (refusal) throw new Error(refusal);
 }
 function resolveAll(hostname3) {
-  return new Promise((resolve66, reject) => {
+  return new Promise((resolve67, reject) => {
     dnsLookup(hostname3, { all: true, verbatim: true }, (err, addresses) => {
       if (err) reject(err);
-      else resolve66(addresses);
+      else resolve67(addresses);
     });
   });
 }
@@ -170284,13 +170284,13 @@ function withAbort(start, signal, what) {
   if (signal?.aborted) return Promise.reject(new Error(`${what} aborted`));
   const work = start();
   if (!signal) return work;
-  return new Promise((resolve66, reject) => {
+  return new Promise((resolve67, reject) => {
     const onAbort = () => reject(new Error(`${what} aborted`));
     signal.addEventListener("abort", onAbort, { once: true });
-    work.then(resolve66, reject).finally(() => signal.removeEventListener("abort", onAbort));
+    work.then(resolve67, reject).finally(() => signal.removeEventListener("abort", onAbort));
   });
 }
-async function pinAddress(url, resolve66 = resolveAll, signal) {
+async function pinAddress(url, resolve67 = resolveAll, signal) {
   const host = url.hostname.replace(/^\[|\]$/g, "");
   if (ipv4Octets(host)) {
     if (isBlockedAddress(host)) throw new Error(`${host} is a blocked address`);
@@ -170300,7 +170300,7 @@ async function pinAddress(url, resolve66 = resolveAll, signal) {
     if (isBlockedAddress(host)) throw new Error(`${host} is a blocked address`);
     return { address: host, family: 6 };
   }
-  const addresses = await withAbort(() => resolve66(host), signal, `${host} lookup`);
+  const addresses = await withAbort(() => resolve67(host), signal, `${host} lookup`);
   if (!addresses.length) throw new Error(`${host} resolved to no address`);
   const blocked = addresses.filter((a2) => isBlockedAddress(a2.address)).map((a2) => a2.address);
   if (blocked.length) throw new Error(`${host} resolves to a blocked address (${blocked.join(", ")})`);
@@ -170340,7 +170340,7 @@ function copyIncomingHeaders(headers2) {
   return out2;
 }
 function requestOnce(url, pinned, init) {
-  return new Promise((resolve66, reject) => {
+  return new Promise((resolve67, reject) => {
     const headers2 = { host: url.host, "accept-encoding": "identity" };
     new Headers(init.headers ?? {}).forEach((value, key3) => {
       if (key3.toLowerCase() !== "host") headers2[key3] = value;
@@ -170370,7 +170370,7 @@ function requestOnce(url, pinned, init) {
           reject(err);
           return;
         }
-        resolve66(new Response(body, { status, statusText: res.statusMessage ?? "", headers: out2 }));
+        resolve67(new Response(body, { status, statusText: res.statusMessage ?? "", headers: out2 }));
       }
     );
     req.on("error", reject);
@@ -173400,7 +173400,7 @@ var require_cjs = __commonJS({
       }
       return 0;
     }
-    function extractHostname(url, urlIsValidHostname, validate4 = false) {
+    function extractHostname(url, urlIsValidHostname, validate5 = false) {
       let start = 0;
       let end = url.length;
       let hasUpper = false;
@@ -173449,7 +173449,7 @@ var require_cjs = __commonJS({
                 code === 43)) {
                   const raw = url.charCodeAt(i2);
                   if (raw === 9 || raw === 10 || raw === 13) {
-                    return extractHostname(url.replace(CONTROL_CHARS3, ""), urlIsValidHostname, validate4);
+                    return extractHostname(url.replace(CONTROL_CHARS3, ""), urlIsValidHostname, validate5);
                   }
                   return null;
                 }
@@ -173465,7 +173465,7 @@ var require_cjs = __commonJS({
             for (let i2 = start; i2 < end; i2 += 1) {
               const code = url.charCodeAt(i2);
               if (code === 9 || code === 10 || code === 13) {
-                return extractHostname(url.replace(CONTROL_CHARS3, ""), urlIsValidHostname, validate4);
+                return extractHostname(url.replace(CONTROL_CHARS3, ""), urlIsValidHostname, validate5);
               }
               if (code === 58) {
                 indexOfColon = i2;
@@ -173548,10 +173548,10 @@ var require_cjs = __commonJS({
         let indexOfPort = -1;
         let indexOfFirstColon = -1;
         let hasControl = false;
-        let vValid = validate4;
+        let vValid = validate5;
         let vLastDot = start - 1;
         let vLastCode = -1;
-        if (validate4 && start < end) {
+        if (validate5 && start < end) {
           const c0 = url.charCodeAt(start);
           if (!/*@__INLINE__*/
           (isValidHostnameChar(c0) || c0 === 46 || c0 === 95) || c0 === 45) {
@@ -173571,7 +173571,7 @@ var require_cjs = __commonJS({
               indexOfPort = i2;
             } else if (code === 9 || code === 10 || code === 13) {
               hasControl = true;
-            } else if (validate4) {
+            } else if (validate5) {
               if (code === 46) {
                 if (i2 - vLastDot > 64 || vLastCode === 46 || vLastCode === 45) {
                   vValid = false;
@@ -173593,16 +173593,16 @@ var require_cjs = __commonJS({
             indexOfClosingBracket = i2;
           } else if (code >= 65 && code <= 90) {
             hasUpper = true;
-          } else if (validate4 && !/*@__INLINE__*/
+          } else if (validate5 && !/*@__INLINE__*/
           isValidHostnameChar(code)) {
             vValid = false;
           }
-          if (validate4) {
+          if (validate5) {
             vLastCode = code;
           }
         }
         if (hasControl) {
-          return extractHostname(url.replace(CONTROL_CHARS3, ""), urlIsValidHostname, validate4);
+          return extractHostname(url.replace(CONTROL_CHARS3, ""), urlIsValidHostname, validate5);
         }
         if (indexOfIdentifier !== -1 && indexOfIdentifier >= start && indexOfIdentifier < end) {
           start = indexOfIdentifier + 1;
@@ -173621,7 +173621,7 @@ var require_cjs = __commonJS({
         if (start >= end) {
           return null;
         }
-        if (validate4 && vValid && indexOfIdentifier === -1 && indexOfPort === -1 && indexOfClosingBracket === -1 && url.charCodeAt(end - 1) !== 46 && end - start <= 255 && // total length
+        if (validate5 && vValid && indexOfIdentifier === -1 && indexOfPort === -1 && indexOfClosingBracket === -1 && url.charCodeAt(end - 1) !== 46 && end - start <= 255 && // total length
         end - vLastDot - 1 <= 63 && // last label length
         vLastCode !== 45) {
           extractedHostnameValidated = true;
@@ -174163,10 +174163,10 @@ function permuteDomain(domain, allowSpecialUseDomain) {
 }
 function createPromiseCallback(cb) {
   let callback;
-  let resolve66;
+  let resolve67;
   let reject;
   const promise = new Promise((_resolve, _reject) => {
-    resolve66 = _resolve;
+    resolve67 = _resolve;
     reject = _reject;
   });
   if (typeof cb === "function") {
@@ -174182,7 +174182,7 @@ function createPromiseCallback(cb) {
     callback = (err, result) => {
       try {
         if (err) reject(err);
-        else resolve66(result);
+        else resolve67(result);
       } catch (e2) {
         reject(e2 instanceof Error ? e2 : new Error());
       }
@@ -176127,15 +176127,15 @@ var init_dist = __esm({
         } else {
           serialized = strOrObj;
         }
-        const readSerializedProperty = (property) => {
-          return serialized && typeof serialized === "object" && inOperator(property, serialized) ? serialized[property] : void 0;
+        const readSerializedProperty = (property2) => {
+          return serialized && typeof serialized === "object" && inOperator(property2, serialized) ? serialized[property2] : void 0;
         };
-        const readSerializedBoolean = (property) => {
-          const value = readSerializedProperty(property);
+        const readSerializedBoolean = (property2) => {
+          const value = readSerializedProperty(property2);
           return typeof value === "boolean" ? value : void 0;
         };
-        const readSerializedString = (property) => {
-          const value = readSerializedProperty(property);
+        const readSerializedString = (property2) => {
+          const value = readSerializedProperty(property2);
           return typeof value === "string" ? value : void 0;
         };
         const jar = new _CookieJar(store, {
@@ -176172,15 +176172,15 @@ var init_dist = __esm({
        */
       static deserializeSync(strOrObj, store) {
         const serialized = typeof strOrObj === "string" ? JSON.parse(strOrObj) : strOrObj;
-        const readSerializedProperty = (property) => {
-          return serialized && typeof serialized === "object" && inOperator(property, serialized) ? serialized[property] : void 0;
+        const readSerializedProperty = (property2) => {
+          return serialized && typeof serialized === "object" && inOperator(property2, serialized) ? serialized[property2] : void 0;
         };
-        const readSerializedBoolean = (property) => {
-          const value = readSerializedProperty(property);
+        const readSerializedBoolean = (property2) => {
+          const value = readSerializedProperty(property2);
           return typeof value === "boolean" ? value : void 0;
         };
-        const readSerializedString = (property) => {
-          const value = readSerializedProperty(property);
+        const readSerializedString = (property2) => {
+          const value = readSerializedProperty(property2);
           return typeof value === "string" ? value : void 0;
         };
         const jar = new _CookieJar(store, {
@@ -177357,52 +177357,274 @@ var init_collect = __esm({
   }
 });
 
+// src/one-app/validate-topbar.ts
+import { createHash as createHash45 } from "node:crypto";
+import { readFileSync as readFileSync105, statSync as statSync22 } from "node:fs";
+import { resolve as resolve62, join as join92 } from "node:path";
+import ts9 from "typescript";
+function object4(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function readJson9(path2) {
+  return object4(JSON.parse(readFileSync105(path2, "utf8"))) ?? {};
+}
+function parseArgs(args) {
+  let evidenceDir;
+  let contentDir2;
+  let json8 = false;
+  for (let i2 = 0; i2 < args.length; i2++) {
+    const arg = args[i2];
+    if (arg === "--json") {
+      json8 = true;
+      continue;
+    }
+    if (arg === "--skip-version-check") continue;
+    if (arg !== "--evidence-dir" && arg !== "--content") throw new Error(`Unknown option: ${arg}`);
+    const value = args[++i2];
+    if (!value || value.startsWith("--")) throw new Error(`${arg} requires a directory path.`);
+    if (arg === "--evidence-dir") {
+      if (evidenceDir) throw new Error("Pass --evidence-dir once.");
+      evidenceDir = value;
+    } else {
+      if (contentDir2) throw new Error("Pass --content once.");
+      contentDir2 = value;
+    }
+  }
+  if (!evidenceDir || !contentDir2) throw new Error("Both --evidence-dir and --content are required.");
+  return { evidenceDir: resolve62(evidenceDir), contentDir: resolve62(contentDir2), json: json8 };
+}
+function authoredControls(raw) {
+  const screens = object4(raw.screens);
+  const headers2 = object4(raw.headers);
+  if (!screens || !headers2 || !Object.keys(screens).length) {
+    return { controls: /* @__PURE__ */ new Set(), screens: 0, error: "raw-structure.json is missing authored screens or headers." };
+  }
+  const controls = /* @__PURE__ */ new Set();
+  let count2 = 0;
+  for (const [screenId, rawScreen] of Object.entries(screens)) {
+    const screen = object4(rawScreen);
+    const headerId = typeof screen?.headerId === "string" ? screen.headerId : void 0;
+    if (!headerId) continue;
+    count2++;
+    const header = object4(headers2[headerId]);
+    if (!header) return { controls, screens: count2, error: `Authored header ${headerId} is missing for screen ${screenId}.` };
+    const settings = object4(header?.settings) ?? header;
+    const topBarSettings = object4(settings?.topBarSettings);
+    const choice = (modern, legacy) => {
+      const current = topBarSettings?.[modern];
+      if (current !== void 0) return typeof current === "boolean" ? current : void 0;
+      const previous = settings?.[legacy];
+      if (previous !== void 0) return typeof previous === "boolean" ? previous : void 0;
+      return false;
+    };
+    const showCart = choice("showCartIcon", "showCartIconInTopBar");
+    const showChat = choice("showChatIcon", "showChatIconInTopBar");
+    if (showCart === void 0 || showChat === void 0) {
+      return { controls, screens: count2, error: `Authored cart/chat settings are invalid for screen ${screenId} (header ${headerId}).` };
+    }
+    if (showCart) controls.add("cart");
+    if (showChat) controls.add("chat");
+  }
+  if (!count2) return { controls, screens: 0, error: "No screen references an authored header in raw-structure.json." };
+  return { controls, screens: count2 };
+}
+function property(node, name) {
+  const item = node?.properties.find((candidate) => ts9.isPropertyAssignment(candidate) && ((ts9.isIdentifier(candidate.name) || ts9.isStringLiteral(candidate.name)) && candidate.name.text === name));
+  return item && ts9.isPropertyAssignment(item) ? item.initializer : void 0;
+}
+function unwrap2(node) {
+  while (ts9.isParenthesizedExpression(node) || ts9.isAsExpression(node) || ts9.isSatisfiesExpression(node)) node = node.expression;
+  return node;
+}
+function resolveObject(node, source, seen = /* @__PURE__ */ new Set()) {
+  if (!node) return void 0;
+  const value = unwrap2(node);
+  if (ts9.isObjectLiteralExpression(value)) return value;
+  if (!ts9.isIdentifier(value) || seen.has(value.text)) return void 0;
+  seen.add(value.text);
+  for (const statement of source.statements) {
+    if (!ts9.isVariableStatement(statement)) continue;
+    const declaration = statement.declarationList.declarations.find((item) => ts9.isIdentifier(item.name) && item.name.text === value.text);
+    if (declaration?.initializer) return resolveObject(declaration.initializer, source, seen);
+  }
+  return void 0;
+}
+function stringValue2(node) {
+  if (!node) return void 0;
+  const value = unwrap2(node);
+  return ts9.isStringLiteralLike(value) ? value.text : void 0;
+}
+function actionTokens(action) {
+  const values = ["id", "icon", "label", "accessibilityLabel"].map((key3) => stringValue2(property(action, key3)) ?? "").join(" ").replace(/([a-z0-9])([A-Z])/g, "$1 $2").toLowerCase().match(/[a-z0-9]+/g) ?? [];
+  return new Set(values);
+}
+function hasAction(node, source) {
+  const action = resolveObject(node, source);
+  const actionId = stringValue2(property(action, "actionId"));
+  return typeof actionId === "string" && actionId.trim().length > 0;
+}
+function configActions(configPath) {
+  const source = ts9.createSourceFile(configPath, readFileSync105(configPath, "utf8"), ts9.ScriptTarget.Latest, true, ts9.ScriptKind.TS);
+  if (source.parseDiagnostics.length) return { actions: [], error: "config.ts could not be parsed." };
+  const exportAssignment = source.statements.find(ts9.isExportAssignment);
+  if (!exportAssignment) return { actions: [], error: "config.ts has no default app export." };
+  let exported = unwrap2(exportAssignment.expression);
+  if (ts9.isIdentifier(exported)) {
+    const exportedName = exported.text;
+    for (const statement of source.statements) {
+      if (!ts9.isVariableStatement(statement)) continue;
+      const declaration = statement.declarationList.declarations.find((item) => ts9.isIdentifier(item.name) && item.name.text === exportedName);
+      if (declaration?.initializer) {
+        exported = unwrap2(declaration.initializer);
+        break;
+      }
+    }
+  }
+  if (!ts9.isCallExpression(exported) || !exported.arguments[0]) return { actions: [], error: "config.ts does not default-export defineApp({...})." };
+  const app = resolveObject(exported.arguments[0], source);
+  const navigation = resolveObject(property(app, "navigation"), source);
+  const topBar = resolveObject(property(navigation, "topBarDefault"), source);
+  if (!topBar) return { actions: [], error: "navigation.topBarDefault is absent or cannot be statically inspected." };
+  const actionExpr = property(topBar, "actions");
+  if (!actionExpr) return { actions: [] };
+  const actionsNode = unwrap2(actionExpr);
+  let items;
+  if (ts9.isArrayLiteralExpression(actionsNode)) items = actionsNode.elements.filter(ts9.isExpression);
+  else if (ts9.isIdentifier(actionsNode)) {
+    const declaration = source.statements.filter(ts9.isVariableStatement).flatMap((statement) => [...statement.declarationList.declarations]).find((item) => ts9.isIdentifier(item.name) && item.name.text === actionsNode.text);
+    const init = declaration?.initializer && unwrap2(declaration.initializer);
+    if (!init || !ts9.isArrayLiteralExpression(init)) return { actions: [], error: "navigation.topBarDefault.actions cannot be statically inspected." };
+    items = init.elements.filter(ts9.isExpression);
+  } else return { actions: [], error: "navigation.topBarDefault.actions cannot be statically inspected." };
+  const actions = [];
+  for (const item of items) {
+    const action = resolveObject(item, source);
+    if (!action) continue;
+    actions.push({ tokens: actionTokens(action), tappable: hasAction(property(action, "onTap"), source) });
+  }
+  return { actions };
+}
+function validate4(evidenceDir, contentDir2) {
+  let source;
+  try {
+    const manifest = readJson9(join92(evidenceDir, "manifest.json"));
+    if (manifest.workflow !== "one-app-to-himi-app") throw new Error("manifest.json is not for the one-app-to-himi-app workflow.");
+    if (manifest.stage !== "collected") throw new Error('manifest.json must have stage "collected".');
+    const rawPath = join92(evidenceDir, "raw-structure.json");
+    const rawBytes = readFileSync105(rawPath);
+    const expectedHash = object4(manifest.sha256)?.["raw-structure.json"];
+    if (typeof expectedHash !== "string" || !/^[a-f0-9]{64}$/i.test(expectedHash)) {
+      throw new Error("manifest.json is missing a valid raw-structure.json hash.");
+    }
+    if (createHash45("sha256").update(rawBytes).digest("hex") !== expectedHash) {
+      throw new Error("raw-structure.json does not match the hash recorded in manifest.json.");
+    }
+    source = authoredControls(JSON.parse(rawBytes.toString("utf8")));
+    if (source.error) throw new Error(source.error);
+  } catch (error) {
+    return { ok: false, code: "evidence_invalid", workflow: "one-app-to-himi-app", error: error instanceof Error ? error.message : String(error) };
+  }
+  let target;
+  let configPath;
+  try {
+    configPath = join92(contentDir2, "config.ts");
+    if (!statSync22(configPath).isFile()) throw new Error("config.ts is not a file.");
+    target = configActions(configPath);
+    if (target.error && source.controls.size) throw new Error(target.error);
+  } catch (error) {
+    return { ok: false, code: "config_uninspectable", workflow: "one-app-to-himi-app", error: error instanceof Error ? error.message : String(error) };
+  }
+  const missing = [];
+  for (const control of source.controls) {
+    const phrases = TERMS[control];
+    const matching = target.actions.filter((action) => phrases.some((term) => action.tokens.has(term)));
+    if (!matching.length) missing.push(`${control}: no matching topBarDefault action`);
+    else if (!matching.some((action) => action.tappable)) missing.push(`${control}: matching action has no onTap handler`);
+  }
+  return {
+    ok: missing.length === 0,
+    ...missing.length ? { code: "topbar_coverage_failed" } : {},
+    workflow: "one-app-to-himi-app",
+    source: { basis: "raw-structure.json authored header top-bar settings", screensWithHeaders: source.screens, requiredControls: [...source.controls] },
+    target: { config: configPath, location: "navigation.topBarDefault.actions", actionCount: target.actions.length },
+    missing,
+    ...target.error ? { note: target.error } : {}
+  };
+}
+async function runOneAppTopBarValidation(args, io2) {
+  if (args.includes("--help")) {
+    io2.log(USAGE);
+    return 0;
+  }
+  let options;
+  try {
+    options = parseArgs(args);
+  } catch (error) {
+    io2.error(JSON.stringify({ ok: false, code: "invalid_usage", error: error instanceof Error ? error.message : String(error), usage: USAGE }));
+    return 2;
+  }
+  const result = validate4(options.evidenceDir, options.contentDir);
+  const output = JSON.stringify(result, null, 2);
+  (result.ok ? io2.log : io2.error)(output);
+  return result.ok ? 0 : 1;
+}
+var USAGE, TERMS;
+var init_validate_topbar = __esm({
+  "src/one-app/validate-topbar.ts"() {
+    USAGE = "himi one-app validate-topbar --evidence-dir <.himi/one-app> --content <app-dir> [--json]";
+    TERMS = {
+      cart: ["cart", "bag", "basket", "checkout"],
+      chat: ["chat", "message", "inbox", "conversation", "support"]
+    };
+  }
+});
+
 // src/one-app/graph.ts
 function buildSourceGraph(raw, enriched = {}) {
   const enrichedStructures = Object.values(enriched).filter((value) => value !== void 0);
   function sourceMap2(key3) {
     const result = {};
     for (const structure of enrichedStructures) {
-      for (const [id, value] of Object.entries(object4(structure[key3]))) {
+      for (const [id, value] of Object.entries(object5(structure[key3]))) {
         if (!own4(result, id)) result[id] = value;
       }
     }
-    for (const [id, value] of Object.entries(object4(raw[key3]))) {
-      result[id] = own4(result, id) ? { ...object4(result[id]), ...object4(value) } : value;
+    for (const [id, value] of Object.entries(object5(raw[key3]))) {
+      result[id] = own4(result, id) ? { ...object5(result[id]), ...object5(value) } : value;
     }
     return result;
   }
   function definitionMap(key3) {
     const result = {};
     for (const structure of enrichedStructures) {
-      for (const [id, value] of Object.entries(object4(object4(structure.definitions)[key3]))) {
+      for (const [id, value] of Object.entries(object5(object5(structure.definitions)[key3]))) {
         if (!own4(result, id)) result[id] = value;
       }
     }
-    for (const [id, value] of Object.entries(object4(object4(raw.definitions)[key3]))) {
-      result[id] = own4(result, id) ? { ...object4(result[id]), ...object4(value) } : value;
+    for (const [id, value] of Object.entries(object5(object5(raw.definitions)[key3]))) {
+      result[id] = own4(result, id) ? { ...object5(result[id]), ...object5(value) } : value;
     }
     return result;
   }
   function platformMap(platformStructure, key3) {
-    const result = { ...object4(platformStructure[key3]) };
-    for (const [id, value] of Object.entries(object4(raw[key3]))) {
-      result[id] = own4(result, id) ? { ...object4(result[id]), ...object4(value) } : value;
+    const result = { ...object5(platformStructure[key3]) };
+    for (const [id, value] of Object.entries(object5(raw[key3]))) {
+      result[id] = own4(result, id) ? { ...object5(result[id]), ...object5(value) } : value;
     }
     return result;
   }
   function platformDefinitionMap(platformStructure, key3) {
-    const result = { ...object4(object4(platformStructure.definitions)[key3]) };
-    for (const [id, value] of Object.entries(object4(object4(raw.definitions)[key3]))) {
-      result[id] = own4(result, id) ? { ...object4(result[id]), ...object4(value) } : value;
+    const result = { ...object5(object5(platformStructure.definitions)[key3]) };
+    for (const [id, value] of Object.entries(object5(object5(raw.definitions)[key3]))) {
+      result[id] = own4(result, id) ? { ...object5(result[id]), ...object5(value) } : value;
     }
     return result;
   }
   const screens = sourceMap2("screens");
-  const layouts = object4(raw.layoutItems);
-  const allSections = object4(raw.sections);
-  const sections = Object.fromEntries(Object.entries(allSections).filter(([, v2]) => !string3(object4(v2).sectionDefinitionId)?.startsWith("ntt.")));
-  const headers2 = object4(raw.headers);
+  const layouts = object5(raw.layoutItems);
+  const allSections = object5(raw.sections);
+  const sections = Object.fromEntries(Object.entries(allSections).filter(([, v2]) => !string3(object5(v2).sectionDefinitionId)?.startsWith("ntt.")));
+  const headers2 = object5(raw.headers);
   const topBars = sourceMap2("topBars");
   const topBarButtonDefinitions = definitionMap("topBarButtons");
   const actionDefinitions = definitionMap("actions");
@@ -177414,23 +177636,23 @@ function buildSourceGraph(raw, enriched = {}) {
   const layoutAliases = /* @__PURE__ */ new Map();
   const interactions = [];
   for (const [id, value] of Object.entries(layouts)) {
-    const slug = string3(object4(value).slug);
+    const slug = string3(object5(value).slug);
     if (slug) layoutAliases.set(slug, [...layoutAliases.get(slug) ?? [], id]);
   }
   for (const [id, value] of Object.entries(screens)) {
-    for (const ref of array3(object4(object4(value).layout).items)) {
-      const layoutId = string3(object4(ref).layoutItemId);
+    for (const ref of array3(object5(object5(value).layout).items)) {
+      const layoutId = string3(object5(ref).layoutItemId);
       if (layoutId) parents.set(layoutId, [.../* @__PURE__ */ new Set([...parents.get(layoutId) ?? [], id])]);
     }
   }
   for (const [name, values] of Object.entries({ screens, layoutItems: layouts, sections, headers: headers2 })) {
     for (const [id, value] of Object.entries(values)) {
-      const declared = string3(object4(value).id);
+      const declared = string3(object5(value).id);
       if (declared !== void 0 && declared !== id) warnings.push({ code: "id_conflict", pointer: `/${name}/${part(id)}/id`, reference: declared });
     }
   }
   function order(refs, pointer) {
-    const indexes = refs.map((ref) => object4(ref).orderIndex).filter((v2) => typeof v2 === "number");
+    const indexes = refs.map((ref) => object5(ref).orderIndex).filter((v2) => typeof v2 === "number");
     if (indexes.some((v2, i2) => i2 > 0 && v2 <= indexes[i2 - 1])) warnings.push({ code: "order_conflict", pointer });
   }
   function route(value, contract, pointer) {
@@ -177460,7 +177682,7 @@ function buildSourceGraph(raw, enriched = {}) {
         warnings.push({ code: "action_depth_limit", pointer: current.pointer });
         continue;
       }
-      const item = object4(current.value);
+      const item = object5(current.value);
       const kind = string3(item.type);
       if (kind && ["goToScreen", "vertical", "form", "url", "tel", "mailto"].includes(kind)) {
         const dest = string3(item.screenId);
@@ -177472,14 +177694,14 @@ function buildSourceGraph(raw, enriched = {}) {
   function placements(value, pointer, context = pointer) {
     const refs = array3(value);
     const inScope = refs.filter((ref) => {
-      const id = string3(object4(ref).elementId);
-      return !id || !string3(object4(allSections[id]).sectionDefinitionId)?.startsWith("ntt.");
+      const id = string3(object5(ref).elementId);
+      return !id || !string3(object5(allSections[id]).sectionDefinitionId)?.startsWith("ntt.");
     });
     order(inScope, pointer);
     return refs.flatMap((value2, index) => {
-      const ref = object4(value2);
+      const ref = object5(value2);
       const id = string3(ref.elementId);
-      if (id && string3(object4(allSections[id]).sectionDefinitionId)?.startsWith("ntt.")) return [];
+      if (id && string3(object5(allSections[id]).sectionDefinitionId)?.startsWith("ntt.")) return [];
       const refPointer = `${pointer}/${index}`;
       if (ref.elementType !== "SECTION") {
         warnings.push({ code: "unknown_element_type", pointer: refPointer, reference: string3(ref.elementType) });
@@ -177492,19 +177714,19 @@ function buildSourceGraph(raw, enriched = {}) {
       usedSections.add(id);
       const placementContext = `${context}/${index}`;
       actions(sections[id], `/sections/${part(id)}`, placementContext);
-      return [{ pointer: refPointer, context: placementContext, arrayIndex: index, ...own4(ref, "orderIndex") ? { orderIndex: ref.orderIndex } : {}, sectionId: id, sectionDefinitionId: string3(object4(sections[id]).sectionDefinitionId), reference: ref }];
+      return [{ pointer: refPointer, context: placementContext, arrayIndex: index, ...own4(ref, "orderIndex") ? { orderIndex: ref.orderIndex } : {}, sectionId: id, sectionDefinitionId: string3(object5(sections[id]).sectionDefinitionId), reference: ref }];
     });
   }
   function topBarButtons(value, side2, pointer, context, buttonDefinitions = topBarButtonDefinitions, availableActions = actionDefinitions, trackInteractions = true) {
-    const bar = object4(value);
+    const bar = object5(value);
     const idsKey = `${side2}ButtonIds`;
     const definitionsKey = `${side2}ButtonDefinitions`;
     const refs = own4(bar, idsKey) ? array3(bar[idsKey]) : array3(bar[definitionsKey]);
     return refs.map((ref, index) => {
-      const refObject = object4(ref);
+      const refObject = object5(ref);
       const id = typeof ref === "string" ? ref : string3(refObject.topBarButtonDefinitionId) ?? string3(refObject.id);
       const definition = id && own4(buttonDefinitions, id) ? buttonDefinitions[id] : typeof ref === "object" && ref !== null ? ref : void 0;
-      const actionDefinitionId = string3(object4(definition).actionDefinitionId) ?? string3(refObject.actionDefinitionId);
+      const actionDefinitionId = string3(object5(definition).actionDefinitionId) ?? string3(refObject.actionDefinitionId);
       const actionDefinition = actionDefinitionId && own4(availableActions, actionDefinitionId) ? availableActions[actionDefinitionId] : void 0;
       const buttonPointer = `${pointer}/${side2}/${index}`;
       if (trackInteractions) {
@@ -177520,8 +177742,8 @@ function buildSourceGraph(raw, enriched = {}) {
     });
   }
   const screenGraph = Object.entries(screens).map(([screenId, source]) => {
-    const screen = object4(source);
-    const layout = object4(screen.layout);
+    const screen = object5(source);
+    const layout = object5(screen.layout);
     const type = string3(layout.type);
     const refs = array3(layout.items);
     const pointer = `/screens/${part(screenId)}`;
@@ -177544,7 +177766,7 @@ function buildSourceGraph(raw, enriched = {}) {
     };
     const topBarByPlatform = Object.fromEntries(Object.entries(enriched).flatMap(([platform, platformStructure]) => {
       if (!platformStructure) return [];
-      const platformScreen = { ...object4(object4(platformStructure.screens)[screenId]), ...object4(object4(raw.screens)[screenId]) };
+      const platformScreen = { ...object5(object5(platformStructure.screens)[screenId]), ...object5(object5(raw.screens)[screenId]) };
       const platformTopBarId = string3(platformScreen.topBarId);
       if (!platformTopBarId) return [];
       const platformTopBar = platformMap(platformStructure, "topBars")[platformTopBarId];
@@ -177563,13 +177785,13 @@ function buildSourceGraph(raw, enriched = {}) {
       }]];
     }));
     const pages2 = refs.flatMap((value, index) => {
-      const ref = object4(value), id = string3(ref.layoutItemId);
+      const ref = object5(value), id = string3(ref.layoutItemId);
       if (!id || !own4(layouts, id)) {
         warnings.push({ code: "missing_reference", pointer: `${pointer}/layout/items/${index}`, ...id ? { reference: id } : {} });
         return [];
       }
       usedLayouts.add(id);
-      const item = object4(layouts[id]);
+      const item = object5(layouts[id]);
       return [{
         layoutItemId: id,
         arrayIndex: index,
@@ -177599,7 +177821,7 @@ function buildSourceGraph(raw, enriched = {}) {
     };
   });
   const detachedLayouts = Object.entries(layouts).filter(([id]) => !usedLayouts.has(id)).map(([id, value]) => {
-    const item = object4(value);
+    const item = object5(value);
     return {
       layoutItemId: id,
       title: item.title,
@@ -177609,26 +177831,26 @@ function buildSourceGraph(raw, enriched = {}) {
       placements: placements(item.elements, `/layoutItems/${part(id)}/elements`)
     };
   });
-  const bottomTabs = array3(object4(raw.navigation).bottomTabs);
+  const bottomTabs = array3(object5(raw.navigation).bottomTabs);
   order(bottomTabs, "/navigation/bottomTabs");
   const navigation = bottomTabs.map((value, index) => {
-    const entry = object4(value), id = string3(entry.screenId);
+    const entry = object5(value), id = string3(entry.screenId);
     if (!id) warnings.push({ code: "missing_reference", pointer: `/navigation/bottomTabs/${index}/screenId` });
     return { arrayIndex: index, entry, ...id ? { destination: route(id, "screen", `/navigation/bottomTabs/${index}/screenId`) } : {} };
   });
-  const overrides = Object.entries(object4(raw.screenOverrides)).map(([alias2, value]) => {
-    const id = string3(object4(value).screenId);
+  const overrides = Object.entries(object5(raw.screenOverrides)).map(([alias2, value]) => {
+    const id = string3(object5(value).screenId);
     if (!id) warnings.push({ code: "missing_reference", pointer: `/screenOverrides/${part(alias2)}/screenId` });
     return { alias: alias2, source: value, ...id ? { destination: route(id, "screen", `/screenOverrides/${part(alias2)}/screenId`) } : {} };
   });
-  const profile = object4(raw.businessProfile);
+  const profile = object5(raw.businessProfile);
   const profilePlacements = placements(profile.elements, "/businessProfile/elements");
   return {
     schemaVersion: 1,
     interpretation: "authored-evidence-not-evaluated-access",
     ordering: "source-array-order",
     appSettings: raw.settings,
-    navigation: { entries: navigation, settings: object4(raw.navigation).settings, firstAuthoredScreenId: string3(object4(bottomTabs[0]).screenId) },
+    navigation: { entries: navigation, settings: object5(raw.navigation).settings, firstAuthoredScreenId: string3(object5(bottomTabs[0]).screenId) },
     screens: screenGraph,
     detachedLayouts,
     businessProfile: { settings: profile.settings, placements: profilePlacements },
@@ -177642,10 +177864,10 @@ function buildSourceGraph(raw, enriched = {}) {
     next: "Interpret source settings, definition CTAs, top bars and runtime conditions with himi docs one-app-to-himi-app. This graph indexes basic actions; it does not claim complete business-journey coverage."
   };
 }
-var object4, array3, string3, part, own4;
+var object5, array3, string3, part, own4;
 var init_graph = __esm({
   "src/one-app/graph.ts"() {
-    object4 = (value) => value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
+    object5 = (value) => value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
     array3 = (value) => Array.isArray(value) ? value : [];
     string3 = (value) => typeof value === "string" ? value : void 0;
     part = (value) => value.replaceAll("~", "~0").replaceAll("/", "~1");
@@ -177655,27 +177877,27 @@ var init_graph = __esm({
 
 // src/one-app/navigation.ts
 function sourceNavigationKind(raw) {
-  const navigation = object5(raw.navigation);
-  if (object5(navigation.settings).drawerMode === true) return "side-menu";
+  const navigation = object6(raw.navigation);
+  if (object6(navigation.settings).drawerMode === true) return "side-menu";
   const entries = array4(navigation.bottomTabs);
   if (entries.length > 1) return "bottom-tabs";
-  const screens = object5(raw.screens);
-  const screenId = string4(object5(entries[0]).screenId);
-  const screen = screenId && Object.hasOwn(screens, screenId) ? object5(screens[screenId]) : {};
-  return object5(screen.layout).type === "TOP_TABS" ? "top-tabs" : "single";
+  const screens = object6(raw.screens);
+  const screenId = string4(object6(entries[0]).screenId);
+  const screen = screenId && Object.hasOwn(screens, screenId) ? object6(screens[screenId]) : {};
+  return object6(screen.layout).type === "TOP_TABS" ? "top-tabs" : "single";
 }
 function planNavigation(raw, policy = "bottom-tabs") {
-  const navigation = object5(raw.navigation);
+  const navigation = object6(raw.navigation);
   const entries = array4(navigation.bottomTabs);
-  const screens = object5(raw.screens);
-  const layouts = object5(raw.layoutItems);
+  const screens = object6(raw.screens);
+  const layouts = object6(raw.layoutItems);
   const kind = sourceNavigationKind(raw);
   const warnings = [];
-  const firstEntry = object5(entries[0]);
+  const firstEntry = object6(entries[0]);
   const rootScreenId = string4(firstEntry.screenId) ?? null;
-  const rootScreen = rootScreenId && Object.hasOwn(screens, rootScreenId) ? object5(screens[rootScreenId]) : {};
-  const rootLayout = object5(rootScreen.layout);
-  const settings = object5(navigation.settings);
+  const rootScreen = rootScreenId && Object.hasOwn(screens, rootScreenId) ? object6(screens[rootScreenId]) : {};
+  const rootLayout = object6(rootScreen.layout);
+  const settings = object6(navigation.settings);
   const appInstance = string4(raw.appInstance) ?? null;
   const source = {
     kind,
@@ -177687,8 +177909,8 @@ function planNavigation(raw, policy = "bottom-tabs") {
   const next = "Build navigation from this plan with himi docs one-app-to-himi-app. Report every warning; the plan does not replace the source graph.";
   if (kind === "bottom-tabs") {
     entries.forEach((value, index) => {
-      const id = string4(object5(value).screenId);
-      if (id && Object.hasOwn(screens, id) && object5(object5(screens[id]).layout).type === "TOP_TABS") {
+      const id = string4(object6(value).screenId);
+      if (id && Object.hasOwn(screens, id) && object6(object6(screens[id]).layout).type === "TOP_TABS") {
         warnings.push({ code: "nested_top_tabs", pointer: `/screens/${part2(id)}/layout/type`, reference: `/navigation/bottomTabs/${index}` });
       }
     });
@@ -177699,14 +177921,14 @@ function planNavigation(raw, policy = "bottom-tabs") {
   const tabs = [];
   const hiddenPages = [];
   array4(rootLayout.items).forEach((value, index) => {
-    const layoutItemId = string4(object5(value).layoutItemId);
+    const layoutItemId = string4(object6(value).layoutItemId);
     const itemPointer = `${pointer}/${index}`;
     if (!layoutItemId || !Object.hasOwn(layouts, layoutItemId)) {
       warnings.push({ code: "missing_reference", pointer: itemPointer, ...layoutItemId ? { reference: layoutItemId } : {} });
       return;
     }
-    const layout = object5(layouts[layoutItemId]);
-    if (object5(layout.settings).hideFromNavigation === true) {
+    const layout = object6(layouts[layoutItemId]);
+    if (object6(layout.settings).hideFromNavigation === true) {
       hiddenPages.push({ layoutItemId, pointer: itemPointer });
       return;
     }
@@ -177751,10 +177973,10 @@ function planNavigation(raw, policy = "bottom-tabs") {
     next
   };
 }
-var object5, array4, string4, part2, TOP_TABS_POLICIES, MAX_BAR_TABS;
+var object6, array4, string4, part2, TOP_TABS_POLICIES, MAX_BAR_TABS;
 var init_navigation = __esm({
   "src/one-app/navigation.ts"() {
-    object5 = (value) => value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
+    object6 = (value) => value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
     array4 = (value) => Array.isArray(value) ? value : [];
     string4 = (value) => typeof value === "string" && value ? value : void 0;
     part2 = (value) => value.replaceAll("~", "~0").replaceAll("/", "~1");
@@ -177770,9 +177992,9 @@ __export(cli_exports2, {
   ONE_APP_WORKFLOW: () => ONE_APP_WORKFLOW,
   runOneAppCommand: () => runOneAppCommand
 });
-import { closeSync as closeSync7, constants as constants4, lstatSync as lstatSync22, mkdirSync as mkdirSync43, openSync as openSync6, readFileSync as readFileSync105, realpathSync as realpathSync14, writeFileSync as writeFileSync41 } from "node:fs";
-import { createHash as createHash45 } from "node:crypto";
-import { dirname as dirname49, join as join92, parse as parse3, resolve as resolve62 } from "node:path";
+import { closeSync as closeSync7, constants as constants4, lstatSync as lstatSync22, mkdirSync as mkdirSync43, openSync as openSync6, readFileSync as readFileSync106, realpathSync as realpathSync14, writeFileSync as writeFileSync41 } from "node:fs";
+import { createHash as createHash46 } from "node:crypto";
+import { dirname as dirname49, join as join93, parse as parse3, resolve as resolve63 } from "node:path";
 function readOptions(argv, cwd, commandIncluded) {
   let cursor = 0;
   const skipGlobalSwitches = () => {
@@ -177817,10 +178039,10 @@ function readOptions(argv, cwd, commandIncluded) {
   let prompt = flags.prompt ?? "";
   if (flags["prompt-file"] !== void 0) {
     try {
-      const file2 = resolve62(cwd, flags["prompt-file"]);
+      const file2 = resolve63(cwd, flags["prompt-file"]);
       const stat2 = lstatSync22(file2);
       if (!stat2.isFile() || stat2.size > MAX_PROMPT_BYTES) throw new Error("invalid prompt file");
-      prompt = readFileSync105(file2, "utf8");
+      prompt = readFileSync106(file2, "utf8");
     } catch {
       throw new OneAppError("invalid_prompt", "Use a readable text file of at most 64 KiB for --prompt-file.");
     }
@@ -177835,8 +178057,8 @@ function readOptions(argv, cwd, commandIncluded) {
   if (flags.dir !== void 0 && !flags.dir.trim()) {
     throw new OneAppError("invalid_output_path", "Pass a parent directory with --dir.");
   }
-  const parentDir = resolve62(cwd, flags.dir ?? ".");
-  const workspace = join92(parentDir, name);
+  const parentDir = resolve63(cwd, flags.dir ?? ".");
+  const workspace = join93(parentDir, name);
   assertSafeParents(parentDir);
   if (pathExists(workspace)) throw new OneAppError("output_exists", "The destination already exists. Choose a new --name or --dir.");
   return { metaSiteId, appInstance, prompt, name, parentDir, workspace, target, topTabs };
@@ -177877,10 +178099,21 @@ function writePrivate(path2, contents, append) {
   }
 }
 async function runOneAppCommand(argv, io2, deps = {}, commandIncluded = false) {
+  let commandIndex = 0;
+  while (GLOBAL_SWITCHES.has(argv[commandIndex])) commandIndex++;
+  if (commandIncluded && argv[commandIndex] === "one-app") {
+    commandIndex++;
+    while (GLOBAL_SWITCHES.has(argv[commandIndex])) commandIndex++;
+  }
+  if (argv[commandIndex] === "validate-topbar") {
+    return runOneAppTopBarValidation(argv.slice(commandIndex + 1), io2);
+  }
   if (argv.includes("--help")) {
     io2.log(`${ONE_APP_USAGE}
 
-Collect the source mobile app and hand it to the current coding agent. The agent continues with a faithful plan, local generation and a checked hosted draft. Branded falls back to Free (Spaces) only when absent. This command itself does not launch AI or build an app. --dir is the parent directory; an existing destination is refused. --top-tabs bottom-tabs (default) plans bottom tabs, one per visible page, for a source with top tabs; keep retains the top tabs.`);
+Collect the source mobile app and hand it to the current coding agent. The agent continues with a faithful plan, local generation and a checked hosted draft. Branded falls back to Free (Spaces) only when absent. This command itself does not launch AI or build an app. --dir is the parent directory; an existing destination is refused. --top-tabs bottom-tabs (default) plans bottom tabs, one per visible page, for a source with top tabs; keep retains the top tabs.
+
+validate-topbar checks authored source top-bar controls against the migrated config.ts. It is scoped to a One App evidence directory and does not change general himi validate behavior.`);
     return 0;
   }
   const now = deps.now ?? (() => (/* @__PURE__ */ new Date()).toISOString());
@@ -177893,7 +178126,7 @@ Collect the source mobile app and hand it to the current coding agent. The agent
   const hashes = {};
   const diskWrite = deps.writeFile ?? writePrivate;
   const put = (name, content) => {
-    const path2 = join92(evidenceDir, name);
+    const path2 = join93(evidenceDir, name);
     try {
       assertSafeParents(evidenceDir);
       diskWrite(path2, content, false);
@@ -177901,7 +178134,7 @@ Collect the source mobile app and hand it to the current coding agent. The agent
       throw new OneAppError("artifact_write_failed", "Could not save the migration evidence. Existing files were kept.", { stage });
     }
     artifacts[name] = path2;
-    hashes[name] = createHash45("sha256").update(content).digest("hex");
+    hashes[name] = createHash46("sha256").update(content).digest("hex");
     return path2;
   };
   const progress = (nextStage) => {
@@ -177909,7 +178142,7 @@ Collect the source mobile app and hand it to the current coding agent. The agent
     if (!evidenceDir) return;
     try {
       assertSafeParents(evidenceDir);
-      diskWrite(join92(evidenceDir, "progress.jsonl"), JSON.stringify({ stage, at: now() }) + "\n", true);
+      diskWrite(join93(evidenceDir, "progress.jsonl"), JSON.stringify({ stage, at: now() }) + "\n", true);
     } catch {
       throw new OneAppError("artifact_write_failed", "Could not record migration progress. Existing files were kept.", { stage });
     }
@@ -177925,7 +178158,7 @@ Collect the source mobile app and hand it to the current coding agent. The agent
       assertSafeParents(options.parentDir);
       mkdirSync43(options.workspace, { mode: 448 });
       if (realpathSync14(options.workspace) !== options.workspace) throw new Error("destination changed");
-      evidenceDir = join92(options.workspace, ".himi", "one-app");
+      evidenceDir = join93(options.workspace, ".himi", "one-app");
       mkdirSync43(evidenceDir, { recursive: true, mode: 448 });
     } catch (error) {
       if (error.code === "EEXIST") {
@@ -178029,10 +178262,11 @@ var init_cli2 = __esm({
   "src/one-app/cli.ts"() {
     init_wix_owner();
     init_collect();
+    init_validate_topbar();
     init_errors2();
     init_graph();
     init_navigation();
-    ONE_APP_USAGE = "himi one-app migrate --msid <uuid> [--app-instance branded|free] [--prompt <text> | --prompt-file <file>] [--name <slug>] [--dir <parent>] [--target bo] [--top-tabs bottom-tabs|keep] [--json]";
+    ONE_APP_USAGE = "himi one-app migrate --msid <uuid> [--app-instance branded|free] [--prompt <text> | --prompt-file <file>] [--name <slug>] [--dir <parent>] [--target bo] [--top-tabs bottom-tabs|keep] [--json]\nhimi one-app validate-topbar --evidence-dir <.himi/one-app> --content <app-dir> [--json]";
     ONE_APP_WORKFLOW = "one-app-to-himi-app";
     UUID2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
     SLUG = /^[a-z0-9][a-z0-9-]{0,62}$/;
@@ -180059,15 +180293,15 @@ var init_customer_build = __esm({
 });
 
 // src/site-analyze/apply.ts
-import { existsSync as existsSync86, readFileSync as readFileSync106, writeFileSync as writeFileSync42, copyFileSync as copyFileSync2, mkdirSync as mkdirSync44, realpathSync as realpathSync15, statSync as statSync22 } from "node:fs";
-import { dirname as dirname50, isAbsolute as isAbsolute8, join as join93, resolve as resolve63, sep as sep20 } from "node:path";
+import { existsSync as existsSync86, readFileSync as readFileSync107, writeFileSync as writeFileSync42, copyFileSync as copyFileSync2, mkdirSync as mkdirSync44, realpathSync as realpathSync15, statSync as statSync23 } from "node:fs";
+import { dirname as dirname50, isAbsolute as isAbsolute8, join as join94, resolve as resolve64, sep as sep20 } from "node:path";
 import { spawnSync as spawnSync4 } from "node:child_process";
 function unpairedRedirectNote(overlay) {
   if (!overlay.wix?.clientId || overlay.wix.redirectUri) return void 0;
   return `no OAuth redirect paired with client ${overlay.wix.clientId} \u2014 the app (and prepare:customer) will refuse to start until one is set. Register it with \`himi site client ensure --site ${overlay.siteId?.trim() || "<msid>"} --redirect-uri <uri> --yes\`, then re-run analyze with \`--redirect-uri <uri>\` (or export HIMI_BRANDED_LITE_WIX_REDIRECT_URI)`;
 }
 function posix4(p2) {
-  return resolve63(p2).replace(/\\/g, "/");
+  return resolve64(p2).replace(/\\/g, "/");
 }
 function committedShellProvisioning(path2) {
   return committedShellFor(posix4(path2));
@@ -180075,7 +180309,7 @@ function committedShellProvisioning(path2) {
 function findRepoRoot(cwd) {
   let dir = cwd;
   for (let i2 = 0; i2 < 8; i2++) {
-    if (SHELL_NAMES2.some((name) => existsSync86(join93(dir, shellAppDir(name), "package.json")))) return dir;
+    if (SHELL_NAMES2.some((name) => existsSync86(join94(dir, shellAppDir(name), "package.json")))) return dir;
     const next = dirname50(dir);
     if (next === dir) break;
     dir = next;
@@ -180101,7 +180335,7 @@ function assertNotCommitted(path2, forbidden2) {
       `refusing to overwrite committed ${committedProvisioningPath(committed)} \u2014 use prepare:customer --contract`
     );
   }
-  if (forbidden2 && resolve63(path2) === resolve63(forbidden2)) {
+  if (forbidden2 && resolve64(path2) === resolve64(forbidden2)) {
     const named = committedShellProvisioning(forbidden2);
     throw new Error(
       `refusing to overwrite committed ${named ? committedProvisioningPath(named) : forbidden2} \u2014 pass a content-package provisioning.json or use prepare:customer --contract`
@@ -180178,23 +180412,23 @@ function sameKnownSite(previous, next) {
 }
 function buildMergedContract(options) {
   const { appDir: appDir3, packageDir, overlay } = options;
-  const committedPath = join93(appDir3, "provisioning.json");
+  const committedPath = join94(appDir3, "provisioning.json");
   if (!existsSync86(committedPath)) {
     throw new Error(`shell has no committed provisioning.json at ${committedPath} to build a contract from`);
   }
-  const committed = JSON.parse(readFileSync106(committedPath, "utf8"));
+  const committed = JSON.parse(readFileSync107(committedPath, "utf8"));
   const merged = mergeCustomerOwned(committed, overlay);
   const overlayFontFamily = (overlay.branding ?? {}).fontFamily;
   const branding = merged.branding ?? {};
   const staged = [];
   const contained = (root, rel) => {
     if (isAbsolute8(rel)) return void 0;
-    const full = resolve63(root, rel);
-    return full.startsWith(resolve63(root) + sep20) ? full : void 0;
+    const full = resolve64(root, rel);
+    return full.startsWith(resolve64(root) + sep20) ? full : void 0;
   };
   const stage = (fromRel, toRel) => {
     const from = contained(packageDir, fromRel);
-    const to2 = contained(join93(appDir3, STAGED), toRel.slice(STAGED.length + 1));
+    const to2 = contained(join94(appDir3, STAGED), toRel.slice(STAGED.length + 1));
     if (!from || !to2 || !existsSync86(from)) return void 0;
     let real;
     let realRoot;
@@ -180206,7 +180440,7 @@ function buildMergedContract(options) {
     }
     if (!real.startsWith(realRoot + sep20)) return void 0;
     try {
-      if (!statSync22(real).isFile()) return void 0;
+      if (!statSync23(real).isFile()) return void 0;
       mkdirSync44(dirname50(to2), { recursive: true });
       copyFileSync2(real, to2);
     } catch {
@@ -180217,11 +180451,11 @@ function buildMergedContract(options) {
   };
   const icon = stage("media/icon.png", `${STAGED}/icon.png`);
   if (icon) branding.appIconPath = icon;
-  const facesPath = join93(packageDir, "media/fonts/faces.json");
+  const facesPath = join94(packageDir, "media/fonts/faces.json");
   if (existsSync86(facesPath)) {
     let faces = [];
     try {
-      const parsed = JSON.parse(readFileSync106(facesPath, "utf8"));
+      const parsed = JSON.parse(readFileSync107(facesPath, "utf8"));
       faces = Array.isArray(parsed) ? parsed : [];
     } catch {
       faces = [];
@@ -180242,9 +180476,9 @@ function buildMergedContract(options) {
   merged.branding = branding;
   const body = `${JSON.stringify(merged, null, 2)}
 `;
-  const path2 = join93(packageDir, "provisioning.contract.json");
+  const path2 = join94(packageDir, "provisioning.contract.json");
   writeFileSync42(path2, body);
-  const localPath2 = join93(appDir3, LOCAL_CONTRACT_REL);
+  const localPath2 = join94(appDir3, LOCAL_CONTRACT_REL);
   mkdirSync44(dirname50(localPath2), { recursive: true });
   writeFileSync42(localPath2, body);
   staged.push(localPath2);
@@ -180279,10 +180513,10 @@ function catalogTypography(overlay, template) {
 function staticFaqFor(overlay, overlayPath) {
   const own5 = overlay.faq;
   if (own5 !== void 0) return deriveStaticFaq(own5);
-  const bookPath = join93(dirname50(resolve63(overlayPath)), "book.json");
+  const bookPath = join94(dirname50(resolve64(overlayPath)), "book.json");
   if (!existsSync86(bookPath)) return void 0;
   try {
-    const book = JSON.parse(readFileSync106(bookPath, "utf8"));
+    const book = JSON.parse(readFileSync107(bookPath, "utf8"));
     const copy = book?.copy;
     if (!copy || typeof copy !== "object" || copy.unavailable) return void 0;
     const pairs = deriveStaticFaq(copy.faq);
@@ -180296,10 +180530,10 @@ function staticGalleriesFor(overlay, overlayPath) {
   if (overlay.galleries !== void 0) return deriveStaticGalleries(
     overlay.galleries.map((gallery) => ({ role: "gallery", title: gallery.title, galleryImageUrls: gallery.photos }))
   );
-  const bookPath = join93(dirname50(resolve63(overlayPath)), "book.json");
+  const bookPath = join94(dirname50(resolve64(overlayPath)), "book.json");
   if (!existsSync86(bookPath)) return void 0;
   try {
-    const book = JSON.parse(readFileSync106(bookPath, "utf8"));
+    const book = JSON.parse(readFileSync107(bookPath, "utf8"));
     if (!book.look || book.look.unavailable || !Array.isArray(book.look.pages)) return void 0;
     const galleries = deriveStaticGalleries(book.look.pages);
     return galleries.length || book.look.complete === true ? galleries : void 0;
@@ -180308,11 +180542,11 @@ function staticGalleriesFor(overlay, overlayPath) {
   }
 }
 async function applyOverlays(input) {
-  const cwd = resolve63(input.cwd);
+  const cwd = resolve64(input.cwd);
   const shell = input.shell ?? DEFAULT_BRANDABLE_SHELL;
   assertKnownShell(shell);
-  const overlay = JSON.parse(readFileSync106(input.overlayPath, "utf8"));
-  const tokens2 = JSON.parse(readFileSync106(input.tokensPath, "utf8"));
+  const overlay = JSON.parse(readFileSync107(input.overlayPath, "utf8"));
+  const tokens2 = JSON.parse(readFileSync107(input.tokensPath, "utf8"));
   const faq = staticFaqFor(overlay, input.overlayPath);
   if (faq !== void 0) overlay.faq = faq;
   const galleries = staticGalleriesFor(overlay, input.overlayPath);
@@ -180329,15 +180563,15 @@ async function applyOverlays(input) {
         `shell "${shell}" cannot bake a customer brand \u2014 it ships no prepare:customer script`
       );
     }
-    const appDir3 = join93(repoRoot2, shellAppDir(shell));
-    const committedPath = join93(appDir3, "provisioning.json");
-    const committedSite = existsSync86(committedPath) ? JSON.parse(readFileSync106(committedPath, "utf8")).site : void 0;
+    const appDir3 = join94(repoRoot2, shellAppDir(shell));
+    const committedPath = join94(appDir3, "provisioning.json");
+    const committedSite = existsSync86(committedPath) ? JSON.parse(readFileSync107(committedPath, "utf8")).site : void 0;
     if (committedSite !== void 0 && overlay.site === void 0) {
       throw new Error(
         `shell "${shell}" is a site shell: its contract names the customer's website (a \`site\` block), and this overlay has none. Re-run \`himi site analyze --url <site> --shell ${shell}\` to derive the site's page map (edit \`site.pages\` in provisioning.overlay.json if needed), then --apply.`
       );
     }
-    const packageDir = dirname50(resolve63(input.overlayPath));
+    const packageDir = dirname50(resolve64(input.overlayPath));
     const { path: contract, staged } = buildMergedContract({ appDir: appDir3, packageDir, overlay });
     wrote.push(...staged);
     const r2 = spawnSync4("npm", ["run", "prepare:customer", "--", "--contract", contract], {
@@ -180358,9 +180592,9 @@ async function applyOverlays(input) {
       note: `prepare:customer --contract with a merged contract (committed provisioning.json untouched)${unpairedInRepo ? ` \xB7 ${unpairedInRepo}` : ""}`
     };
   }
-  const pkgProv = join93(cwd, "provisioning.json");
+  const pkgProv = join94(cwd, "provisioning.json");
   assertNotCommitted(pkgProv, input.forbiddenProvisioning);
-  const contentPath = join93(cwd, "himalaya.content.json");
+  const contentPath = join94(cwd, "himalaya.content.json");
   const syncViewNames = (before, after) => {
     const content = readContentManifest(cwd);
     if (!content) return;
@@ -180373,7 +180607,7 @@ async function applyOverlays(input) {
   let packageFaq = faq;
   let packageGalleries = galleries;
   if (existsSync86(pkgProv)) {
-    const cur = JSON.parse(readFileSync106(pkgProv, "utf8"));
+    const cur = JSON.parse(readFileSync107(pkgProv, "utf8"));
     if (galleries === void 0 && !sameKnownSite(cur, overlay)) overlay.galleries = [];
     const merged = deepMerge4(cur, overlay);
     packageFaq = merged.faq;
@@ -180389,9 +180623,9 @@ async function applyOverlays(input) {
   if (Array.isArray(packageGalleries) && packageGalleries.length && !overlay.installedVerticals.includes("galleries")) {
     overlay.installedVerticals.push("galleries");
   }
-  const pkgTokens = join93(cwd, "tokens.json");
+  const pkgTokens = join94(cwd, "tokens.json");
   if (existsSync86(pkgTokens) && (tokens2.colors || tokens2.typography)) {
-    const cur = JSON.parse(readFileSync106(pkgTokens, "utf8"));
+    const cur = JSON.parse(readFileSync107(pkgTokens, "utf8"));
     let tokensIn = tokens2;
     if (tokens2.typography) {
       const fonts = catalogTypography(tokens2.typography, cur.typography);
@@ -180416,9 +180650,9 @@ async function applyOverlays(input) {
     wrote.push(pkgTokens);
   }
   const homeAction = homeRefreshActionId(shell);
-  const homeSrc = join93(cwd, "dev/index.ts");
+  const homeSrc = join94(cwd, "dev/index.ts");
   if (homeAction && existsSync86(homeSrc)) {
-    const prev = readFileSync106(homeSrc, "utf8");
+    const prev = readFileSync107(homeSrc, "utf8");
     const patched = patchBrandParams(prev, overlay, homeAction);
     let next = patched.src;
     if (!patched.foreign && faq?.length && prev.includes('"tier5.himiBrandedFaq.load"') && !prev.includes('"staticFaq"')) {
@@ -180454,7 +180688,7 @@ async function applyOverlays(input) {
     }
   }
   if (!input.iconPath || !existsSync86(input.iconPath)) {
-    const book = input.iconPath ? dirname50(dirname50(resolve63(input.iconPath))) : void 0;
+    const book = input.iconPath ? dirname50(dirname50(resolve64(input.iconPath))) : void 0;
     notes.push(
       book ? `no icon installed \u2014 ${siteLogoAbsence(book).hint}` : "no icon installed and no business book to say why \u2014 `himi icon generate` draws one from the accent, or `himi icon set <file.png>` installs the customer's own mark"
     );
@@ -181418,8 +181652,8 @@ __export(cli_exports3, {
   runSiteAnalyze: () => runSiteAnalyze,
   runSiteFunctionCli: () => runSiteFunctionCli
 });
-import { existsSync as existsSync87, readFileSync as readFileSync107 } from "node:fs";
-import { resolve as resolve64 } from "node:path";
+import { existsSync as existsSync87, readFileSync as readFileSync108 } from "node:fs";
+import { resolve as resolve65 } from "node:path";
 function applyNeedsClient(shell) {
   if (shell === void 0 || !SHELL_NAMES2.includes(shell)) return true;
   return !isSiteShell(shell);
@@ -181452,7 +181686,7 @@ async function runSiteAnalyze(opts) {
   const assetFetch = assetFetchFor(opts);
   const siteFetch = guardedSiteFetch;
   const cwd = opts.cwd ?? process.cwd();
-  const outDir = resolve64(cwd, opts.outDir ?? ".himi/business-book");
+  const outDir = resolve65(cwd, opts.outDir ?? ".himi/business-book");
   let ownerAuth;
   let msid;
   const ownerSite = ownerSiteFor(opts);
@@ -181481,14 +181715,14 @@ async function runSiteAnalyze(opts) {
   if (opts.shell !== void 0 && isSiteShell(opts.shell)) {
     try {
       const kind = siteKindForOrigin(result.book.input.siteUrl);
-      const book = kind === "base44" ? base44BookRoutes(resolve64(cwd, ".himi/base44-book/book.json"), result.book.input.siteUrl) : void 0;
+      const book = kind === "base44" ? base44BookRoutes(resolve65(cwd, ".himi/base44-book/book.json"), result.book.input.siteUrl) : void 0;
       const routes = book?.routes;
       if (book?.skipped) result.warnings = [...result.warnings ?? [], book.skipped];
       const derived = deriveSiteShell({ siteUrl: result.book.input.siteUrl, look: result.book.look, kind, routes });
-      const prevOverlayPath = resolve64(outDir, "provisioning.overlay.json");
+      const prevOverlayPath = resolve65(outDir, "provisioning.overlay.json");
       const prevSite = existsSync87(prevOverlayPath) ? (() => {
         try {
-          return JSON.parse(readFileSync107(prevOverlayPath, "utf8")).site;
+          return JSON.parse(readFileSync108(prevOverlayPath, "utf8")).site;
         } catch {
           return void 0;
         }
@@ -181505,9 +181739,9 @@ async function runSiteAnalyze(opts) {
       ];
     }
   }
-  const previousOverlay = resolve64(outDir, "provisioning.overlay.json");
+  const previousOverlay = resolve65(outDir, "provisioning.overlay.json");
   carryOverGoals(
-    existsSync87(previousOverlay) ? readFileSync107(previousOverlay, "utf8") : void 0,
+    existsSync87(previousOverlay) ? readFileSync108(previousOverlay, "utf8") : void 0,
     result.provisioningOverlay
   );
   const ownerCall = ownerAuth ? ownerTransportFrom(fetchImpl, ownerAuth) : void 0;
@@ -181526,9 +181760,9 @@ async function runSiteAnalyze(opts) {
   if (opts.apply) {
     applied = await applyOverlays({
       cwd,
-      overlayPath: resolve64(outDir, "provisioning.overlay.json"),
-      tokensPath: resolve64(outDir, "tokens.overlay.json"),
-      iconPath: resolve64(outDir, "media/icon.png"),
+      overlayPath: resolve65(outDir, "provisioning.overlay.json"),
+      tokensPath: resolve65(outDir, "tokens.overlay.json"),
+      iconPath: resolve65(outDir, "media/icon.png"),
       shell: opts.shell
     });
     const note = noteWithWarnings(applied.note, warnings);
@@ -181564,8 +181798,8 @@ async function runSiteFunctionCli(opts) {
   const token = opts.token ?? await siteToken(msid);
   let source;
   if (opts.sourcePath) {
-    const p2 = resolve64(opts.cwd ?? process.cwd(), opts.sourcePath);
-    source = readFileSync107(p2, "utf8");
+    const p2 = resolve65(opts.cwd ?? process.cwd(), opts.sourcePath);
+    source = readFileSync108(p2, "utf8");
   }
   let body;
   if (opts.bodyRaw != null) {
@@ -181595,7 +181829,7 @@ async function runSiteFunctionCli(opts) {
 function base44BookRoutes(bookPath, siteUrl) {
   if (!existsSync87(bookPath)) return void 0;
   try {
-    const book = JSON.parse(readFileSync107(bookPath, "utf8"));
+    const book = JSON.parse(readFileSync108(bookPath, "utf8"));
     if (book.kind !== "base44-app-book" || !Array.isArray(book.routes)) return void 0;
     const host = (u2) => {
       try {
@@ -181644,7 +181878,7 @@ async function accountToken2(spawnImpl = spawn6) {
     cached2 = fromEnv;
     return fromEnv;
   }
-  const token = await new Promise((resolve66, reject) => {
+  const token = await new Promise((resolve67, reject) => {
     let child;
     try {
       child = spawnImpl("wix", ["token"]);
@@ -181673,7 +181907,7 @@ async function accountToken2(spawnImpl = spawn6) {
     const scan = (d2) => {
       out2 += String(d2);
       const m2 = out2.match(TOKEN_RE2);
-      if (m2) done(() => resolve66(m2[0]));
+      if (m2) done(() => resolve67(m2[0]));
     };
     child.stdout?.on("data", scan);
     child.stderr?.on("data", scan);
@@ -181850,7 +182084,7 @@ __export(site_create_exports, {
   runSiteList: () => runSiteList,
   writeProvisioningBinding: () => writeProvisioningBinding
 });
-import { existsSync as existsSync88, readFileSync as readFileSync108, writeFileSync as writeFileSync43 } from "node:fs";
+import { existsSync as existsSync88, readFileSync as readFileSync109, writeFileSync as writeFileSync43 } from "node:fs";
 import { resolve as resolvePath2 } from "node:path";
 function oauthClientName(projectName) {
   return `${projectName} client`;
@@ -181999,7 +182233,7 @@ async function runSiteCreate(opts) {
   if (!wantOauthApp) return { ...base, nextSteps: nextSteps(metaSiteId) };
   return { ...base, clientId, redirectUri, nextSteps: nextSteps(metaSiteId, clientId) };
 }
-function writeProvisioningBinding(target, binding2, fs2 = { existsSync: existsSync88, readFileSync: readFileSync108, writeFileSync: writeFileSync43 }) {
+function writeProvisioningBinding(target, binding2, fs2 = { existsSync: existsSync88, readFileSync: readFileSync109, writeFileSync: writeFileSync43 }) {
   const msid = binding2.siteId;
   const path2 = resolvePath2(target);
   const committed = committedShellProvisioning(path2);
@@ -182335,7 +182569,7 @@ var init_site_oauth_client = __esm({
 
 // src/site-analyze/velo-source.ts
 import path from "node:path";
-import ts9 from "typescript";
+import ts10 from "typescript";
 function applySourceEdits(source, edits) {
   const chunks = [];
   let cursor = 0;
@@ -182353,13 +182587,13 @@ function redactVeloSource(source, knownSecrets = []) {
     /\b(?:IST\.[\w.-]+|eyJ[\w-]+\.[\w-]+\.[\w-]+|(?:sk|rk)_(?:live|test)_[\w-]+|gh[pousr]_[\w]+|github_pat_[\w]+|AKIA[A-Z0-9]{16})\b/g,
     REDACTED2
   ).replace(/\b(?:Bearer|Basic)\s+[A-Za-z0-9._~+/=-]+/gi, REDACTED2).replace(/\b([a-z][a-z0-9+.-]*:\/\/)[^\s/'"`]+:[^\s/'"`]+@/gi, "$1[REDACTED]@").replace(/([?&](?:api[-_]?key|token|secret|password|signature)=)[^&#\s'"`]+/gi, "$1[REDACTED]");
-  const parsed = ts9.createSourceFile("backend.ts", source, ts9.ScriptTarget.Latest, true);
+  const parsed = ts10.createSourceFile("backend.ts", source, ts10.ScriptTarget.Latest, true);
   const comments = /* @__PURE__ */ new Map();
   const visitComments = (node) => {
     for (const range of [
-      ...ts9.getLeadingCommentRanges(source, node.pos) ?? [],
-      ...ts9.getTrailingCommentRanges(source, node.pos) ?? [],
-      ...ts9.getTrailingCommentRanges(source, node.end) ?? []
+      ...ts10.getLeadingCommentRanges(source, node.pos) ?? [],
+      ...ts10.getTrailingCommentRanges(source, node.pos) ?? [],
+      ...ts10.getTrailingCommentRanges(source, node.end) ?? []
     ]) comments.set(range.pos, range.end);
     for (const child of node.getChildren(parsed)) visitComments(child);
   };
@@ -182378,22 +182612,22 @@ function redactVeloSource(source, knownSecrets = []) {
     if (/^["'`][A-Za-z0-9_+/=-]{24,}["'`]$/.test(token)) return JSON.stringify(REDACTED2);
     return token;
   };
-  const clean2 = ts9.createSourceFile("backend.ts", source, ts9.ScriptTarget.Latest, true);
+  const clean2 = ts10.createSourceFile("backend.ts", source, ts10.ScriptTarget.Latest, true);
   const masks = [];
   const collectMasks = (node) => {
     const start = node.getStart(clean2);
-    if (ts9.isRegularExpressionLiteral(node)) {
+    if (ts10.isRegularExpressionLiteral(node)) {
       masks.push({ start, end: node.end, text: " ".repeat(node.end - start) });
-    } else if (ts9.isStringLiteral(node) || ts9.isTemplateLiteralToken(node)) {
+    } else if (ts10.isStringLiteral(node) || ts10.isTemplateLiteralToken(node)) {
       masks.push({ start, end: node.end, text: source.slice(start, node.end).replace(/;/g, " ") });
     }
-    ts9.forEachChild(node, collectMasks);
+    ts10.forEachChild(node, collectMasks);
   };
   collectMasks(clean2);
   const assignmentContext = applySourceEdits(source, masks);
   const edits = [];
   const visitLiterals = (node) => {
-    if (ts9.isStringLiteral(node) || ts9.isNoSubstitutionTemplateLiteral(node) || ts9.isTemplateExpression(node)) {
+    if (ts10.isStringLiteral(node) || ts10.isNoSubstitutionTemplateLiteral(node) || ts10.isTemplateExpression(node)) {
       const start = node.getStart(clean2);
       const text9 = source.slice(start, node.end);
       const redacted = redactLiteral(text9, start);
@@ -182402,7 +182636,7 @@ function redactVeloSource(source, knownSecrets = []) {
         return;
       }
     }
-    ts9.forEachChild(node, visitLiterals);
+    ts10.forEachChild(node, visitLiterals);
   };
   visitLiterals(clean2);
   return applySourceEdits(source, edits);
@@ -182441,19 +182675,19 @@ function selectVeloSource(files, request, knownSecrets = []) {
     selected.set(file2.path, { source: excerpt, sourceTruncated: excerpt.length < redacted.length });
     remaining -= excerpt.length;
     const dependencies = [];
-    const parsed = ts9.createSourceFile(file2.path, file2.content, ts9.ScriptTarget.Latest, true);
+    const parsed = ts10.createSourceFile(file2.path, file2.content, ts10.ScriptTarget.Latest, true);
     const specifiers = [];
     const collectImports = (node) => {
       let specifier;
-      if (ts9.isImportDeclaration(node) || ts9.isExportDeclaration(node)) {
+      if (ts10.isImportDeclaration(node) || ts10.isExportDeclaration(node)) {
         specifier = node.moduleSpecifier;
-      } else if (ts9.isImportEqualsDeclaration(node) && ts9.isExternalModuleReference(node.moduleReference)) {
+      } else if (ts10.isImportEqualsDeclaration(node) && ts10.isExternalModuleReference(node.moduleReference)) {
         specifier = node.moduleReference.expression;
-      } else if (ts9.isCallExpression(node) && (node.expression.kind === ts9.SyntaxKind.ImportKeyword || ts9.isIdentifier(node.expression) && node.expression.text === "require")) {
+      } else if (ts10.isCallExpression(node) && (node.expression.kind === ts10.SyntaxKind.ImportKeyword || ts10.isIdentifier(node.expression) && node.expression.text === "require")) {
         specifier = node.arguments[0];
       }
-      if (specifier && ts9.isStringLiteralLike(specifier)) specifiers.push(specifier.text);
-      ts9.forEachChild(node, collectImports);
+      if (specifier && ts10.isStringLiteralLike(specifier)) specifiers.push(specifier.text);
+      ts10.forEachChild(node, collectImports);
     };
     collectImports(parsed);
     for (const specifier of specifiers) {
@@ -182696,12 +182930,12 @@ var init_context = __esm({
 });
 
 // src/cli.ts
-import { mkdtempSync as mkdtempSync6, readFileSync as readFileSync109, mkdirSync as mkdirSync45, writeFileSync as writeFileSync44, existsSync as existsSync89, rmSync as rmSync24, readdirSync as readdirSync36, statSync as statSync23, lstatSync as lstatSync23, accessSync, constants as constants5, renameSync as renameSync13, cpSync as cpSync3 } from "node:fs";
+import { mkdtempSync as mkdtempSync6, readFileSync as readFileSync110, mkdirSync as mkdirSync45, writeFileSync as writeFileSync44, existsSync as existsSync89, rmSync as rmSync24, readdirSync as readdirSync36, statSync as statSync24, lstatSync as lstatSync23, accessSync, constants as constants5, renameSync as renameSync13, cpSync as cpSync3 } from "node:fs";
 import { execFile as execFile2, execFileSync as execFileSync7, spawnSync as spawnSync5, spawn as spawn7 } from "node:child_process";
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
-import { createHash as createHash46, randomUUID as randomUUID11 } from "node:crypto";
+import { createHash as createHash47, randomUUID as randomUUID11 } from "node:crypto";
 import { tmpdir as tmpdir7, homedir as homedir15, hostname as hostname2 } from "node:os";
-import { join as join94, resolve as resolve65, relative as relative16, basename as basename21, dirname as dirname51 } from "node:path";
+import { join as join95, resolve as resolve66, relative as relative16, basename as basename21, dirname as dirname51 } from "node:path";
 import { fileURLToPath as fileURLToPath30 } from "node:url";
 
 // ../serve-cli/src/client.ts
@@ -184788,8 +185022,8 @@ var str10 = (v2) => typeof v2 === "string" ? v2 : void 0;
 var num3 = (v2) => typeof v2 === "string" && v2 !== "" && Number.isFinite(Number(v2)) ? Number(v2) : void 0;
 function embeddedTemplateCatalog() {
   return availableTemplates().map((name) => {
-    const path2 = join94(templateSourceDir(name), TEMPLATE_META_FILE);
-    const meta = JSON.parse(readFileSync109(path2, "utf8"));
+    const path2 = join95(templateSourceDir(name), TEMPLATE_META_FILE);
+    const meta = JSON.parse(readFileSync110(path2, "utf8"));
     if (!meta || typeof meta.title !== "string" || typeof meta.description !== "string" || !Array.isArray(meta.tags)) {
       throw new Error(`${path2} must be { title: string, description: string, tags: string[], category?: string }`);
     }
@@ -184809,7 +185043,7 @@ var PRODUCED_HINTS = {
 };
 var DEVELOPER_PORTAL_URL = `${SERVE_ORIGIN_PUBLIC_APPS}/docs`;
 var MAX_APP_SOURCE_BYTES_HELP = "4 MiB (4,194,304 bytes)";
-var USAGE = `himi \u2014 the Himalaya authoring CLI (remote dev loop)
+var USAGE2 = `himi \u2014 the Himalaya authoring CLI (remote dev loop)
 
   himi captcha setup|status --app <name> [--site <msid>] [--content <dir>]
                                            create/store or inspect CAPTCHA keys (not login tokens).
@@ -185657,7 +185891,7 @@ WHAT A PATCH DOES NOT CARRY \u2014 all reported in the output, never silent
 
   himi docs releasing-with-himi-serve`;
 var COMMANDS2 = [
-  { name: "one-app", summary: "collect One App source configuration, normalized evidence and an optional user prompt for the current coding agent to reconstruct faithfully, validate and publish a hosted draft. Branded (default, including explicit branded) falls back to Free/Spaces only when absent. The command returns stage collected and a continuation guide; it does not launch a model or build the app. --dir is the parent of the new package; existing targets are refused. A source with top tabs is planned as bottom tabs unless --top-tabs keep. User-scoped Wix authentication is required; WIX_API_KEY is not used.", required: "migrate --msid <uuid> [--app-instance branded|free] [--prompt <text> | --prompt-file <file>] [--name <slug>] [--dir <parent>] [--target bo] [--top-tabs bottom-tabs|keep] [--json]" },
+  { name: "one-app", summary: "collect One App source configuration, normalized evidence and an optional user prompt for the current coding agent to reconstruct faithfully, validate and publish a hosted draft; validate-topbar checks authored cart/chat controls against the migrated app config using this migration's raw evidence only. Branded (default, including explicit branded) falls back to Free/Spaces only when absent. Collection does not launch a model or build the app. --dir is the parent of the new package; existing targets are refused. A source with top tabs is planned as bottom tabs unless --top-tabs keep. User-scoped Wix authentication is required; WIX_API_KEY is not used.", required: "migrate --msid <uuid> [--app-instance branded|free] [--prompt <text> | --prompt-file <file>] [--name <slug>] [--dir <parent>] [--target bo] [--top-tabs bottom-tabs|keep] [--json] | validate-topbar --evidence-dir <.himi/one-app> --content <app-dir> [--json]" },
   { name: "hhp", summary: "author responsive HTML/CSS/TypeScript screens compiled to native SDUI and T5 workers; scaffold, inspect the app profile, lint or compile declared sources", required: "init <screen> | profile | lint | compile [--app <name>|--content <dir>] [--json] [--dry-run]" },
   { name: "captcha", summary: "create and store native CAPTCHA keys in Serve, or inspect setup status; customer setup verifies Wix site ownership; does not enable member CAPTCHA SDKs", required: "setup|status --app <app> [--content <dir>] [--site <msid>] [--ios-bundle-id <id>] [--android-package-name <id>] [--target <t>]" },
   { name: "init", summary: "scaffold a starter content package (OTA-only; no native shells). --template <t> starts from a full reference app (branded-lite = consumer storefront over a Wix site; owner-lite = owner CRUD/management) instead of the minimal counter; --templates lists bundled ones; --remote fetches the template off the serve plane (falls back to the bundled copy offline). The new app also gets its agent files (the same set `himi agent-init` writes: AGENTS.md, CLAUDE.md, the himalaya skill, HIMALAYA.md, a SessionStart hook) so the next session started inside it picks the work up; --no-agent skips them. It also makes the build board (.himi/studio/, exactly as `himi studio --no-open` does \u2014 it never opens a browser), so every later render, test, validate, push and progress entry refreshes it; and, for a template bundled with this CLI, it makes the FIRST PICTURE itself (never for a --remote one: that is its publisher's code, and a render runs it on this machine, so next[] leaves the render to the agent after it has read the code): exactly `himi render <homeScreenId> --png --mocks --device iphone` (offline \u2014 no request; never --live; --mocks loads the app's recorded data when it has any), run as a child it kills after a time budget, writing .himi/shots/<home>.png and journaling it (by: himi) as the STARTING POINT (\"Starting point: the <template> template, before any of your changes\") so the board and the journal hold a picture when init returns. init also records the source it wrote (.himi/init-source.json: a content fingerprint, Markdown left out), and the first home PNG render after the source diverges from it is journaled once as \"First look at your app\" \u2014 reported as `firstLook: {image}` or `{skipped: <reason>}`, never a failed init; `--no-first-look` skips it (for scripts and CI that render themselves). For a bundled template (never a --remote one \u2014 the preview would build and serve its publisher's code) init also STARTS the live preview itself: `himi run --watch --content <dir> --port <p> --no-open --idle-exit 30`, detached in its own process group with its output in .himi/watch.log, never waited for (the url is chosen before it builds), recorded in .himi/watch.json, and reported as `watch: {started, pid, url, board, log}` \u2014 or `{skipped: <reason>}` for a `CI` environment, a test runner, a watch already running, or a start that failed (never a failed init). Nothing else skips it: outside CI it is started, and `watch.note` says an opt-out was ignored. The envelope LEADS with `doNow`: three lines to run now (the consent preflight, the live preview \u2014 its url and board when init started it, else `himi run --watch --content <dir> &` with the board's path \u2014 and the postcard line), and ENDS with the same lines as `doNowAgain`, so an agent that reads only the head or only the tail (`| tail`) gets them; at a terminal they are also printed as plain text on stderr, before the JSON and again after it. Its `next[]` LEADS with the steps for THIS session, in this order for every app \u2014 the offline first render and that picture's `himi progress` postcard (only when init could not make the picture), the skill's consent preflight (authorize or mock any Wix or external startup request; with none, go straight on), and only then the live preview (the running one's url, or `himi run --watch &` when init did not start it) \u2014 ahead of the next-session guidance", required: "<name> [--dir] [--template <t>] [--remote] [--base44-app-id <id>] [--base44-app-url <https://tenant>] [--no-agent] [--no-first-look] | --templates" },
@@ -185723,7 +185957,7 @@ var COMMANDS2 = [
 ];
 function cliVersion() {
   try {
-    return JSON.parse(readFileSync109(new URL("../package.json", import.meta.url), "utf8")).version ?? "unknown";
+    return JSON.parse(readFileSync110(new URL("../package.json", import.meta.url), "utf8")).version ?? "unknown";
   } catch {
     return "unknown";
   }
@@ -185774,18 +186008,18 @@ function createScopedRegistryResolver(exec = execNpmConfig) {
 }
 var SCOPED_REGISTRY_TIMEOUT_MS = 5e3;
 function execNpmConfig(file2, args, options) {
-  return new Promise((resolve66, reject) => {
-    execFile2(file2, args, { ...options, windowsHide: true }, (error, stdout) => error ? reject(error) : resolve66(String(stdout)));
+  return new Promise((resolve67, reject) => {
+    execFile2(file2, args, { ...options, windowsHide: true }, (error, stdout) => error ? reject(error) : resolve67(String(stdout)));
   });
 }
 var npmScopedWixRegistry = createScopedRegistryResolver();
 async function scopedRegistryBefore(lookup4, deadline, onTimeout) {
   let cancel = () => {
   };
-  const expired = new Promise((resolve66) => {
+  const expired = new Promise((resolve67) => {
     const timer = setTimeout(() => {
       onTimeout?.();
-      resolve66(void 0);
+      resolve67(void 0);
     }, Math.max(0, deadline - Date.now()));
     cancel = () => clearTimeout(timer);
   });
@@ -185848,16 +186082,16 @@ function ageInDays(publishedAt, now = Date.now()) {
 }
 function packageVersion(path2) {
   try {
-    const version4 = JSON.parse(readFileSync109(path2, "utf8")).version;
+    const version4 = JSON.parse(readFileSync110(path2, "utf8")).version;
     return typeof version4 === "string" && version4 ? version4 : void 0;
   } catch {
     return void 0;
   }
 }
 function resolvedSdkVersion(fromDir = process.cwd(), bundledManifest = new URL("./authoring-runtime/node_modules/@wix/himalaya/package.json", import.meta.url)) {
-  let dir = resolve65(fromDir);
+  let dir = resolve66(fromDir);
   for (; ; ) {
-    const version4 = packageVersion(join94(dir, "node_modules", "@wix", "himalaya", "package.json"));
+    const version4 = packageVersion(join95(dir, "node_modules", "@wix", "himalaya", "package.json"));
     if (version4) return { version: version4, source: "local" };
     const parent = dirname51(dir);
     if (parent === dir) break;
@@ -185867,7 +186101,7 @@ function resolvedSdkVersion(fromDir = process.cwd(), bundledManifest = new URL("
   if (bundled) return { version: bundled, source: "bundled" };
   try {
     const root = execFileSync7("npm", ["root", "-g"], { stdio: ["ignore", "pipe", "ignore"] }).toString().trim();
-    const version4 = root ? packageVersion(join94(root, "@wix", "himalaya", "package.json")) : void 0;
+    const version4 = root ? packageVersion(join95(root, "@wix", "himalaya", "package.json")) : void 0;
     return version4 ? { version: version4, source: "global" } : {};
   } catch {
     return {};
@@ -185914,11 +186148,11 @@ var UPDATE_RETRY_AFTER_FAILURE_MS = 60 * 60 * 1e3;
 var UPDATE_SNOOZE_MS = 24 * 60 * 60 * 1e3;
 var UPDATE_REEXEC_ENV = "HIMI_UPDATED_ONCE";
 function updateCachePath(env = process.env) {
-  return env.HIMI_UPDATE_CACHE_FILE ?? join94(homedir15(), ".himalaya", "update-check.json");
+  return env.HIMI_UPDATE_CACHE_FILE ?? join95(homedir15(), ".himalaya", "update-check.json");
 }
 function readUpdateCache(path2) {
   try {
-    const parsed = JSON.parse(readFileSync109(path2, "utf8"));
+    const parsed = JSON.parse(readFileSync110(path2, "utf8"));
     return parsed && typeof parsed === "object" ? parsed : {};
   } catch {
     return {};
@@ -185987,11 +186221,11 @@ function createUpdateRunner(spawn8 = spawnSync5) {
     },
     installedVersion: () => {
       const root = globalNodeModulesRoot();
-      return root ? packageVersion(join94(root, "@wix", "himalaya-cli", "package.json")) : void 0;
+      return root ? packageVersion(join95(root, "@wix", "himalaya-cli", "package.json")) : void 0;
     },
     reexec: (argv) => {
       const root = globalNodeModulesRoot();
-      const entry = root ? join94(root, "@wix", "himalaya-cli", "dist", "cli.mjs") : void 0;
+      const entry = root ? join95(root, "@wix", "himalaya-cli", "dist", "cli.mjs") : void 0;
       if (!entry || !existsSync89(entry)) return void 0;
       const result = spawnSync5(process.execPath, [entry, ...argv], {
         // inherit keeps PIPED STDIN working — commands that read stdin must survive a re-exec.
@@ -186039,7 +186273,7 @@ function staleUpdateLockFile(cachePath, now) {
   for (const path2 of [`${cachePath}.lock.break`, `${cachePath}.lock`]) {
     let content;
     try {
-      content = readFileSync109(path2, "utf8");
+      content = readFileSync110(path2, "utf8");
     } catch {
       continue;
     }
@@ -186047,7 +186281,7 @@ function staleUpdateLockFile(cachePath, now) {
     let since = stamped;
     if (!Number.isFinite(since)) {
       try {
-        since = statSync23(path2).mtimeMs;
+        since = statSync24(path2).mtimeMs;
       } catch {
         continue;
       }
@@ -186062,7 +186296,7 @@ function acquireUpdateLock(cachePath, now, hooks = {}) {
   const mine = lockStamp(now);
   const readLock = (path2) => {
     try {
-      return readFileSync109(path2, "utf8");
+      return readFileSync110(path2, "utf8");
     } catch {
       return void 0;
     }
@@ -186196,7 +186430,7 @@ function createTrimValidator(deps = {}, spawnFn = spawn7) {
     return { code, counts, ...errors ? { errors } : {}, ...code !== 0 ? { tail: said.slice(-4e3) } : {} };
   };
   return async (dir, opts = {}) => {
-    const argv = ["validate", "--content", resolve65(dir), "--strict", "--skip-version-check"];
+    const argv = ["validate", "--content", resolve66(dir), "--strict", "--skip-version-check"];
     if (!opts.fresh) {
       const out2 = [];
       const err = [];
@@ -186654,9 +186888,9 @@ function executableOnPath(name, env = process.env) {
   const suffixes = process.platform === "win32" ? (env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean) : [""];
   for (const dir of entries) {
     for (const suffix of suffixes) {
-      const candidate = join94(dir, `${name}${suffix}`);
+      const candidate = join95(dir, `${name}${suffix}`);
       try {
-        if (!statSync23(candidate).isFile()) continue;
+        if (!statSync24(candidate).isFile()) continue;
         if (process.platform !== "win32") accessSync(candidate, constants5.X_OK);
         return true;
       } catch {
@@ -186763,7 +186997,7 @@ async function nativeConfigAdvisories(app, configSource) {
     const { iosProjectYml: iosProjectYml2 } = await Promise.resolve().then(() => (init_paths2(), paths_exports));
     const { androidOptedIn: androidOptedIn3, LABEL_IOS_SPLASH: LABEL_IOS_SPLASH2 } = await Promise.resolve().then(() => (init_splash(), splash_exports));
     const iosYmlPath = iosProjectYml2(app);
-    const iosYml = existsSync89(iosYmlPath) ? readFileSync109(iosYmlPath, "utf8") : "";
+    const iosYml = existsSync89(iosYmlPath) ? readFileSync110(iosYmlPath, "utf8") : "";
     let optedIn = iosYml.includes(LABEL_IOS_SPLASH2);
     if (!optedIn) {
       const { androidManifestPath: androidManifestPath3 } = await Promise.resolve().then(() => (init_gen_native_config(), gen_native_config_exports));
@@ -186777,7 +187011,7 @@ async function nativeConfigAdvisories(app, configSource) {
 }
 function readConfigSource(dir) {
   try {
-    return readFileSync109(join94(dir, "config.ts"), "utf8");
+    return readFileSync110(join95(dir, "config.ts"), "utf8");
   } catch {
     return null;
   }
@@ -186830,8 +187064,8 @@ function keptPlan(kept) {
 var NoBase44SlotError = class extends Error {
 };
 async function initFromRemoteTemplate(name, parentDir, template, c2, opts = {}) {
-  const dir = resolve65(parentDir, name);
-  if (existsSync89(join94(dir, "himalaya.content.json"))) {
+  const dir = resolve66(parentDir, name);
+  if (existsSync89(join95(dir, "himalaya.content.json"))) {
     throw new Error(`content package already exists at ${dir}`);
   }
   const r2 = await c2.fetchTemplateSource(TEMPLATE_APP_PREFIX + template);
@@ -186846,7 +187080,7 @@ async function initFromRemoteTemplate(name, parentDir, template, c2, opts = {})
   return finishScaffold(materializeSource(archive.files, name, dir), template);
 }
 function contentDir(flags) {
-  return resolve65(str10(flags.content) ?? process.cwd());
+  return resolve66(str10(flags.content) ?? process.cwd());
 }
 function renameRestoredSource(restored, declaredApp, renamed) {
   const text9 = {};
@@ -186878,7 +187112,7 @@ function restoreDestinationIssue(dest, force) {
   const link = symlinkDestinationIssue(dest);
   if (link) return link;
   if (!existsSync89(dest)) return null;
-  if (!statSync23(dest).isDirectory()) {
+  if (!statSync24(dest).isDirectory()) {
     return { error: `${dest} exists and is not a directory`, hint: "pass --out/--name to land somewhere else, or remove the file" };
   }
   if (readdirSync36(dest).length > 0 && !force) {
@@ -186890,9 +187124,9 @@ function restoreDestinationIssue(dest, force) {
   return null;
 }
 function isHimalayaMonorepoCheckout(start) {
-  let dir = resolve65(start);
+  let dir = resolve66(start);
   for (; ; ) {
-    if (existsSync89(join94(dir, "tools", "himi-cli", "src", "cli.ts")) && existsSync89(join94(dir, "core", "serve", "src", "server.ts"))) return true;
+    if (existsSync89(join95(dir, "tools", "himi-cli", "src", "cli.ts")) && existsSync89(join95(dir, "core", "serve", "src", "server.ts"))) return true;
     const parent = dirname51(dir);
     if (parent === dir) return false;
     dir = parent;
@@ -186952,8 +187186,8 @@ function materializeForPreview(appDir3, slug, displayName3) {
   const forBuild = Object.fromEntries(
     Object.entries(files).map(([rel, body]) => [rel, rel === "himalaya.content.json" ? substituteIdentity(body, slug) : body])
   );
-  const repoRoot2 = resolve65(fileURLToPath30(new URL("../../..", import.meta.url)));
-  const root = join94(repoRoot2, "node_modules", ".cache", "himi-template-preview");
+  const repoRoot2 = resolve66(fileURLToPath30(new URL("../../..", import.meta.url)));
+  const root = join95(repoRoot2, "node_modules", ".cache", "himi-template-preview");
   const stillRunning = (pid) => {
     try {
       process.kill(pid, 0);
@@ -186967,12 +187201,12 @@ function materializeForPreview(appDir3, slug, displayName3) {
       if (!entry.isDirectory()) continue;
       const pid = Number(entry.name.startsWith(`${slug}-`) ? entry.name.slice(slug.length + 1) : NaN);
       if (Number.isInteger(pid) && pid > 0 && pid !== process.pid && !stillRunning(pid)) {
-        rmSync24(join94(root, entry.name), { recursive: true, force: true });
+        rmSync24(join95(root, entry.name), { recursive: true, force: true });
       }
     }
   } catch {
   }
-  const dest = join94(root, `${slug}-${process.pid}`);
+  const dest = join95(root, `${slug}-${process.pid}`);
   rmSync24(dest, { recursive: true, force: true });
   mkdirSync45(dest, { recursive: true });
   try {
@@ -186985,8 +187219,8 @@ function materializeForPreview(appDir3, slug, displayName3) {
 }
 async function appId(dir) {
   try {
-    const { readFileSync: readFileSync110 } = await import("node:fs");
-    const m2 = JSON.parse(readFileSync110(join94(dir, "himalaya.content.json"), "utf8"));
+    const { readFileSync: readFileSync111 } = await import("node:fs");
+    const m2 = JSON.parse(readFileSync111(join95(dir, "himalaya.content.json"), "utf8"));
     if (m2.name) return m2.name;
   } catch {
   }
@@ -186994,8 +187228,8 @@ async function appId(dir) {
 }
 async function contentVisibility(dir) {
   try {
-    const { readFileSync: readFileSync110 } = await import("node:fs");
-    const m2 = JSON.parse(readFileSync110(join94(dir, "himalaya.content.json"), "utf8"));
+    const { readFileSync: readFileSync111 } = await import("node:fs");
+    const m2 = JSON.parse(readFileSync111(join95(dir, "himalaya.content.json"), "utf8"));
     if (m2.visibility === "public" || m2.visibility === "unlisted") return m2.visibility;
   } catch {
   }
@@ -187265,7 +187499,7 @@ Seed your coding agent with \`himi agent-init\`. Guides: ${idx.portalUrl}`);
       return 0;
     }
     case "agent-init": {
-      const dir = resolve65(str10(flags.dir) ?? process.cwd());
+      const dir = resolve66(str10(flags.dir) ?? process.cwd());
       const { seedAgentFiles: seedAgentFiles2, NotAContentPackage: NotAContentPackage2 } = await Promise.resolve().then(() => (init_agent_context(), agent_context_exports));
       let res;
       try {
@@ -187287,7 +187521,7 @@ Seed your coding agent with \`himi agent-init\`. Guides: ${idx.portalUrl}`);
         ...res.removed.length ? { removed: res.removed, note: "older copies at the app root, moved to .himi/legacy-agent-files/ (a backup, in case one became app code) \u2014 the current ones live in .agents/skills/himalaya/" } : {},
         // In a git repo the refresh moves the diff identity an earlier `himi test` attested (that
         // hash is shared with the repo gates and deliberately exempts nothing but its own metadata).
-        ...existsSync89(join94(dir, ".himi", "attestations", "latest.json")) ? { next: "if `himi push` then refuses the attestation as stale, re-run `himi test` \u2014 in a git checkout this refresh changed the tree it covered" } : {},
+        ...existsSync89(join95(dir, ".himi", "attestations", "latest.json")) ? { next: "if `himi push` then refuses the attestation as stale, re-run `himi test` \u2014 in a git checkout this refresh changed the tree it covered" } : {},
         ...res.skipped.length ? { skipped: res.skipped } : {},
         portalUrl: idx.portalUrl
       });
@@ -187308,7 +187542,7 @@ async function recordedReleaseForContentQuietly(dir, resolution, onDrift) {
   try {
     const { buildContentForValidation: buildContentForValidation2, buildReleaseFromContent: buildReleaseFromContent2, bundleOutDir: bundleOutDir2 } = await loadAuthoring();
     const bres = await buildContentForValidation2(dir, { resolution });
-    out2 = mkdtempSync6(join94(tmpdir7(), "himi-ux-record-"));
+    out2 = mkdtempSync6(join95(tmpdir7(), "himi-ux-record-"));
     const hasWorkers = bres.built.length > 0 || bres.compileErrors.length > 0;
     const outcome = await buildReleaseFromContent2(dir, out2, { ...hasWorkers ? { tier5Dir: bundleOutDir2(dir) } : {}, collect: { lint: true } });
     const releaseId = outcome.manifest.releaseId;
@@ -187489,7 +187723,7 @@ async function producedWidgetFamilies(dir) {
     let js2;
     for (const candidate of [`${name}.bundle.js`, `${name}.js`, name]) {
       try {
-        js2 = readFileSync109(join94(outDir, candidate), "utf8");
+        js2 = readFileSync110(join95(outDir, candidate), "utf8");
         break;
       } catch {
       }
@@ -187520,7 +187754,7 @@ async function producedWidgetFamilies(dir) {
   }
   return { families, source: "dist/bundles" };
 }
-var boardOpen = (dir) => existsSync89(join94(dir, ".himi", "studio", "index.html"));
+var boardOpen = (dir) => existsSync89(join95(dir, ".himi", "studio", "index.html"));
 var BOARD_REFRESHERS = /* @__PURE__ */ new Set(["render", "test", "validate", "build", "push", "icon", "site", "ux", "progress"]);
 async function leaveForBoard(dir, record2, value) {
   if (!boardOpen(dir)) return;
@@ -187544,7 +187778,7 @@ async function liveMapFor(dir) {
 }
 var commandScratch = new AsyncLocalStorage2();
 function commandScratchDir(prefix) {
-  const dir = mkdtempSync6(join94(tmpdir7(), prefix));
+  const dir = mkdtempSync6(join95(tmpdir7(), prefix));
   commandScratch.getStore()?.push(dir);
   return dir;
 }
@@ -187605,7 +187839,7 @@ async function runCommand(argv, io2, deps) {
     const footer = `
 
 himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail off-repo, you are almost certainly on an out-of-date CLI: \`npm i -g @wix/himalaya-cli@latest\`.`;
-    io2.log(flags.json ? JSON.stringify(helpJson(), null, 2) : USAGE + footer);
+    io2.log(flags.json ? JSON.stringify(helpJson(), null, 2) : USAGE2 + footer);
     return command === "help" || flags.help ? 0 : 2;
   }
   if (flagErrors.length > 0 && flags.help !== true && command !== "one-app") {
@@ -187855,7 +188089,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
           return 2;
         }
         const template = str10(flags.template);
-        const parentDir = resolve65(str10(flags.dir) ?? process.cwd());
+        const parentDir = resolve66(str10(flags.dir) ?? process.cwd());
         const base44AppId = flags["base44-app-id"] === void 0 ? void 0 : String(flags["base44-app-id"]);
         const base44AppUrl = flags["base44-app-url"] === void 0 ? void 0 : String(flags["base44-app-url"]);
         if (base44AppUrl !== void 0) {
@@ -187898,7 +188132,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
             const owed = openApprovals2(readApprovals2(dir).events).length;
             next.push(`carried the planning journal into the app (${carried.join(", ")}${owed ? `; ${owed} approval${owed === 1 ? "" : "s"} still owed` : ""}) \u2014 \`himi progress --brief\` there shows it`);
           }
-          const planInParent = ["SPEC.md", "MOBILE-UX.md"].filter((f2) => existsSync89(join94(parentDir, f2)));
+          const planInParent = ["SPEC.md", "MOBILE-UX.md"].filter((f2) => existsSync89(join95(parentDir, f2)));
           if (planInParent.length) {
             next.push(`${planInParent.join(" and ")} in ${parentDir} ${planInParent.length > 1 ? "are" : "is"} not the app's \u2014 if that is the approved plan, move it over the template's boilerplate in ${dir}`);
           }
@@ -188059,13 +188293,13 @@ ${doNow.map((l2) => `  ${l2}`).join("\n")}`);
               if (adding) {
                 const from = str10(flags.from);
                 if (!from) throw new TrimRefusal2('--add <id> needs --from <file> holding the whole new SCREENS entry (`  "<id>": { "screenId": "<id>", \u2026 },`)');
-                print(adopt.addScreen(dir, adding, readFileSync109(from, "utf8"), { parent: str10(flags.parent), tab: str10(flags.tab), displayName: str10(flags["display-name"]) }));
+                print(adopt.addScreen(dir, adding, readFileSync110(from, "utf8"), { parent: str10(flags.parent), tab: str10(flags.tab), displayName: str10(flags["display-name"]) }));
                 return 0;
               }
               if (target) {
                 const from = str10(flags.from);
                 if (!from) throw new TrimRefusal2("--write <id> needs --from <file> holding the whole entry, as --show prints it");
-                print(adopt.replaceScreen(dir, target, readFileSync109(from, "utf8")));
+                print(adopt.replaceScreen(dir, target, readFileSync110(from, "utf8")));
                 return 0;
               }
               if (show) {
@@ -188147,7 +188381,7 @@ ${doNow.map((l2) => `  ${l2}`).join("\n")}`);
             const { keepFromSpec: keepFromSpec2 } = await Promise.resolve().then(() => (init_template_adopt(), template_adopt_exports));
             const dir = contentDir(flags);
             try {
-              const spec = keepFromSpec2(dir, str10(flags["from-spec"]) ?? join94(dir, "SPEC.md"));
+              const spec = keepFromSpec2(dir, str10(flags["from-spec"]) ?? join95(dir, "SPEC.md"));
               const own5 = typeof keep === "string" ? keep.split(",").map((k2) => k2.trim()).filter(Boolean) : [];
               keep = [.../* @__PURE__ */ new Set([...spec.keep, ...own5])].join(",");
               fromSpec = { fromSpec: {
@@ -188188,7 +188422,7 @@ ${doNow.map((l2) => `  ${l2}`).join("\n")}`);
           const result = { ...outcome.result, ...fromSpec };
           const adoptDir = contentDir(flags);
           const kept = flags["dry-run"] !== true && (outcome.code === 0 || outcome.result.forcedKeep === true);
-          if (kept && existsSync89(join94(adoptDir, adoptBits.ADOPT_FILE))) {
+          if (kept && existsSync89(join95(adoptDir, adoptBits.ADOPT_FILE))) {
             try {
               const inv = adoptBits.inspectApp(adoptDir);
               adoptBits.writeInventory(adoptDir, inv, { companions: "if-missing" });
@@ -188213,11 +188447,11 @@ ${doNow.map((l2) => `  ${l2}`).join("\n")}`);
                 return 2;
               }
             }
-            const appDir3 = resolve65(str10(flags.dir) ?? process.cwd());
-            const sourceDir = resolve65(str10(flags["source-dir"]) ?? appDir3);
+            const appDir3 = resolve66(str10(flags.dir) ?? process.cwd());
+            const sourceDir = resolve66(str10(flags["source-dir"]) ?? appDir3);
             let meta;
             try {
-              meta = JSON.parse(readFileSync109(join94(sourceDir, TEMPLATE_META_FILE), "utf8"));
+              meta = JSON.parse(readFileSync110(join95(sourceDir, TEMPLATE_META_FILE), "utf8"));
             } catch {
               io2.error(JSON.stringify({ error: `no ${TEMPLATE_META_FILE} in ${sourceDir} \u2014 a template must declare { title, description, tags } to be published`, hint: `add ${TEMPLATE_META_FILE} next to himalaya.content.json (or pass --source-dir <dir>)` }));
               return 2;
@@ -188227,7 +188461,7 @@ ${doNow.map((l2) => `  ${l2}`).join("\n")}`);
               return 2;
             }
             try {
-              const appearance = extractTemplateAppearance(JSON.parse(readFileSync109(join94(sourceDir, "tokens.json"), "utf8")));
+              const appearance = extractTemplateAppearance(JSON.parse(readFileSync110(join95(sourceDir, "tokens.json"), "utf8")));
               meta = { ...appearance, ...meta };
             } catch {
             }
@@ -188249,14 +188483,14 @@ ${doNow.map((l2) => `  ${l2}`).join("\n")}`);
             const force = flags.force === true;
             const { buildContentForValidation: buildContentForValidation2, buildReleaseFromContent: buildReleaseFromContent2, bundleOutDir: bundleOutDir2 } = await loadAuthoring();
             const bres = await buildContentForValidation2(buildDir, { resolution: resolutionFlag(flags) });
-            const out2 = mkdtempSync6(join94(tmpdir7(), "himi-template-"));
+            const out2 = mkdtempSync6(join95(tmpdir7(), "himi-template-"));
             publishScratch.push(out2);
             const hasWorkers = bres.built.length > 0 || bres.compileErrors.length > 0;
             const outcome = await buildReleaseFromContent2(buildDir, out2, {
               ...hasWorkers ? { tier5Dir: bundleOutDir2(buildDir) } : {},
               collect: { lint: true, strict }
             });
-            const scaffoldSourceFindings = resolve65(sourceDir) === resolve65(appDir3) ? [] : [
+            const scaffoldSourceFindings = resolve66(sourceDir) === resolve66(appDir3) ? [] : [
               ...(await Promise.resolve().then(() => (init_capabilities(), capabilities_exports))).capabilityConfigFindings(sourceDir, buildDir),
               ...tokenColorIssues(sourceDir),
               ...surfaceIssues(sourceDir, void 0, strict),
@@ -188307,13 +188541,13 @@ ${doNow.map((l2) => `  ${l2}`).join("\n")}`);
               }));
               return 1;
             }
-            const iconPath = str10(flags.icon) ? resolve65(str10(flags.icon)) : templateIconPath(name);
+            const iconPath = str10(flags.icon) ? resolve66(str10(flags.icon)) : templateIconPath(name);
             let iconHash;
             if (iconPath) {
               try {
-                const bytes2 = readFileSync109(iconPath);
+                const bytes2 = readFileSync110(iconPath);
                 payload.icon = bytes2.toString("base64");
-                iconHash = createHash46("sha256").update(bytes2).digest("hex");
+                iconHash = createHash47("sha256").update(bytes2).digest("hex");
               } catch {
               }
             }
@@ -188616,7 +188850,7 @@ ${doNow.map((l2) => `  ${l2}`).join("\n")}`);
           const path2 = dpxSessionTokenPath();
           let raw;
           try {
-            raw = readFileSync109(path2, "utf8");
+            raw = readFileSync110(path2, "utf8");
           } catch {
             throw new Error(`no DPX BO session at ${path2}; run dpx auth login, write dpx auth token to that path, then himi login --dpx --target bo`);
           }
@@ -188743,11 +188977,11 @@ ${doNow.map((l2) => `  ${l2}`).join("\n")}`);
           }
           if (studio) {
             const { himiStudioPluginFiles: himiStudioPluginFiles2 } = await Promise.resolve().then(() => (init_claude_plugin(), claude_plugin_exports));
-            const dir2 = resolve65(out2);
+            const dir2 = resolve66(out2);
             const files2 = himiStudioPluginFiles2();
             for (const f2 of files2) {
-              mkdirSync45(dirname51(join94(dir2, f2.path)), { recursive: true });
-              writeFileSync44(join94(dir2, f2.path), f2.text);
+              mkdirSync45(dirname51(join95(dir2, f2.path)), { recursive: true });
+              writeFileSync44(join95(dir2, f2.path), f2.text);
             }
             print({ ok: true, dir: dir2, files: files2.map((f2) => f2.path), next: [`claude plugin validate ${dir2}`, `claude --plugin-dir ${dir2}`] });
             return 0;
@@ -188759,11 +188993,11 @@ ${doNow.map((l2) => `  ${l2}`).join("\n")}`);
             return 1;
           }
           const { himiPluginFiles: himiPluginFiles2 } = await Promise.resolve().then(() => (init_claude_plugin(), claude_plugin_exports));
-          const dir = resolve65(out2);
+          const dir = resolve66(out2);
           const files = himiPluginFiles2(skills.skillMd);
           for (const f2 of files) {
-            mkdirSync45(dirname51(join94(dir, f2.path)), { recursive: true });
-            writeFileSync44(join94(dir, f2.path), f2.text);
+            mkdirSync45(dirname51(join95(dir, f2.path)), { recursive: true });
+            writeFileSync44(join95(dir, f2.path), f2.text);
           }
           print({ ok: true, dir, files: files.map((f2) => f2.path), next: [`claude plugin validate ${dir}`, `claude --plugin-dir ${dir}`] });
           return 0;
@@ -188773,20 +189007,20 @@ ${doNow.map((l2) => `  ${l2}`).join("\n")}`);
           run,
           version: cliVersion(),
           withFiles: flags["with-files"] === true,
-          ...process.env.HIMI_WORKSPACE ? { workspace: resolve65(process.env.HIMI_WORKSPACE) } : {}
+          ...process.env.HIMI_WORKSPACE ? { workspace: resolve66(process.env.HIMI_WORKSPACE) } : {}
         });
         return 0;
       }
       case "studio": {
         const { openStudio: openStudio2 } = await Promise.resolve().then(() => (init_studio(), studio_exports));
         const dir = contentDir(flags);
-        if (!existsSync89(join94(dir, "himalaya.content.json"))) {
+        if (!existsSync89(join95(dir, "himalaya.content.json"))) {
           io2.error(JSON.stringify({ ok: false, error: "not_a_content_package", dir, hint: "run from the app directory (or pass --content <dir>) \u2014 the board reads that package's .himi/" }));
           return 2;
         }
         if (pos[1] === "reel") {
           const { buildReel: buildReel2 } = await Promise.resolve().then(() => (init_studio_reel(), studio_reel_exports));
-          const out2 = resolve65(str10(flags.out) ?? join94(dir, ".himi", "making-of.html"));
+          const out2 = resolve66(str10(flags.out) ?? join95(dir, ".himi", "making-of.html"));
           const { html, plan } = buildReel2(dir);
           mkdirSync45(dirname51(out2), { recursive: true });
           writeFileSync44(out2, html);
@@ -188858,7 +189092,7 @@ ${handover.hint[0].toUpperCase()}${handover.hint.slice(1)}.`);
         } = await Promise.resolve().then(() => (init_progress(), progress_exports));
         const dir = contentDir(flags);
         const journal2 = journalPath2(dir);
-        const isContentPackage = existsSync89(join94(dir, "himalaya.content.json"));
+        const isContentPackage = existsSync89(join95(dir, "himalaya.content.json"));
         const hint = isContentPackage ? {} : { hint: "no himalaya.content.json here \u2014 run from the app directory (or pass --content <dir>) so the build board finds this journal" };
         const message = pos.slice(1).join(" ").trim();
         const approvalFlags = ["approve", "done", "drop"].filter((f2) => flags[f2] !== void 0);
@@ -189010,7 +189244,7 @@ ${handover.hint[0].toUpperCase()}${handover.hint.slice(1)}.`);
       case "test": {
         const dir = contentDir(flags);
         const structuredOutput = flags.json === true || io2.isTTY !== true;
-        if (existsSync89(join94(dir, "functions"))) {
+        if (existsSync89(join95(dir, "functions"))) {
           const { invokeLocalFunction: invokeLocalFunction2, loadFunctionsApp: loadFunctionsApp2 } = await Promise.resolve().then(() => (init_functions(), functions_exports));
           const loaded = await loadFunctionsApp2(dir);
           const results = [];
@@ -189142,7 +189376,7 @@ ${handover.hint[0].toUpperCase()}${handover.hint.slice(1)}.`);
             io2.error(JSON.stringify({ error: `screen "${screen.screenId}" has no Tier-5 worker, so there is nothing for the browser loop to build` }));
             return 2;
           }
-          const sources = collectWorkerSources2(join94(dir, "tier5-src"), screen.bundleName);
+          const sources = collectWorkerSources2(join95(dir, "tier5-src"), screen.bundleName);
           if (!sources) {
             io2.error(JSON.stringify({ error: `no worker source found at tier5-src/${screen.bundleName} \u2014 the browser loop compiles SOURCE, not the built bundle` }));
             return 2;
@@ -189321,7 +189555,7 @@ ${handover.hint[0].toUpperCase()}${handover.hint.slice(1)}.`);
             const sp = await runShotsPass2({
               descriptors: scopeDescriptors2(outcome.descriptors ?? [], pos.slice(1), invalidScreens),
               tokens: outcome.tokens,
-              outDir: join94(dir, ".himi", "shots"),
+              outDir: join95(dir, ".himi", "shots"),
               width: 390,
               layers: { rules: shotRules, ...cmsSeed ? { cmsSeed } : {}, ...canned ? { canned: canned.byKey } : {}, ...base44Data ? { base44Data } : {} },
               ...budgetMs ? { budgetMs } : {},
@@ -189360,7 +189594,7 @@ ${handover.hint[0].toUpperCase()}${handover.hint.slice(1)}.`);
           releaseId: result.releaseId,
           releasePayload: release2,
           descriptors: attestedDescriptors,
-          screenshots: Object.fromEntries(writtenShots.filter((name) => crawledScreens.has(name.replace(/\.png$/, ""))).map((name) => [name.replace(/\.png$/, ""), join94(dir, ".himi", "shots", name)])),
+          screenshots: Object.fromEntries(writtenShots.filter((name) => crawledScreens.has(name.replace(/\.png$/, ""))).map((name) => [name.replace(/\.png$/, ""), join95(dir, ".himi", "shots", name)])),
           coverage: {
             screens: crawledScreens.size,
             actionsDispatched: result.actions.exercised,
@@ -189485,7 +189719,7 @@ ${[...afterRun.next, ...testReminder ? [testReminder] : []].join("\n")}`);
             return 2;
           }
           try {
-            const raw = stateArg.trim().startsWith("{") ? stateArg : readFileSync109(stateArg.replace(/^@/, ""), "utf8");
+            const raw = stateArg.trim().startsWith("{") ? stateArg : readFileSync110(stateArg.replace(/^@/, ""), "utf8");
             injectedState = JSON.parse(raw);
           } catch (e2) {
             io2.error(JSON.stringify({ error: `--state must be inline JSON or a path to a .json file \u2014 ${e2.message}` }));
@@ -189500,7 +189734,7 @@ ${[...afterRun.next, ...testReminder ? [testReminder] : []].join("\n")}`);
             return 2;
           }
           try {
-            const raw = inputArg.trim().startsWith("{") ? inputArg : readFileSync109(inputArg.replace(/^@/, ""), "utf8");
+            const raw = inputArg.trim().startsWith("{") ? inputArg : readFileSync110(inputArg.replace(/^@/, ""), "utf8");
             const parsed = JSON.parse(raw);
             if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) throw new Error("must be a JSON object");
             injectedInput = parsed;
@@ -189584,11 +189818,11 @@ ${[...afterRun.next, ...testReminder ? [testReminder] : []].join("\n")}`);
         const diagnostics = (outcome.lint ?? []).find((s2) => s2.screenId === screenId)?.issues ?? [];
         let pngFile;
         let attestationPngFile;
-        const shotPath = join94(dir, ".himi", "shots", `${screenId}.png`);
+        const shotPath = join95(dir, ".himi", "shots", `${screenId}.png`);
         const pngTarget = typeof flags.png === "string" ? str10(flags.png) : flags.png === true ? shotPath : void 0;
         if (pngTarget && r2.pngBase64) {
           pngFile = writePngFile(pngTarget, r2.pngBase64);
-          attestationPngFile = resolve65(pngTarget) === resolve65(shotPath) ? pngFile : writePngFile(shotPath, r2.pngBase64);
+          attestationPngFile = resolve66(pngTarget) === resolve66(shotPath) ? pngFile : writePngFile(shotPath, r2.pngBase64);
         }
         if (renderWidth !== void 0 && r2.renderable) {
           recordRenderWidth(dir, {
@@ -189935,7 +190169,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
           return 2;
         }
         const renamed = str10(flags.name);
-        const dest = resolve65(str10(flags.out) ?? process.cwd(), renamed ?? wanted);
+        const dest = resolve66(str10(flags.out) ?? process.cwd(), renamed ?? wanted);
         const replace = flags.replace === true;
         const force = replace || flags.force === true;
         const linked = symlinkDestinationIssue(dest);
@@ -189944,7 +190178,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
           return 1;
         }
         if (existsSync89(dest)) {
-          if (!statSync23(dest).isDirectory()) {
+          if (!statSync24(dest).isDirectory()) {
             io2.error(JSON.stringify({
               error: `${dest} exists and is not a directory`,
               hint: "pass --out/--name to land somewhere else, or remove the file"
@@ -189956,7 +190190,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             io2.error(JSON.stringify({ error: `${dest} already exists and is not empty`, hint: "pass --force to write into it anyway (merging, and naming what it keeps), --replace to restore exactly what was archived, or --out/--name to land somewhere else" }));
             return 1;
           }
-          if (replace && occupied && !existsSync89(join94(dest, "himalaya.content.json"))) {
+          if (replace && occupied && !existsSync89(join95(dest, "himalaya.content.json"))) {
             io2.error(JSON.stringify({
               error: `${dest} is not a content package \u2014 refusing to --replace it`,
               hint: "--replace only clears a directory that holds himalaya.content.json. Check --out/--name, or pass --force to merge into it instead."
@@ -190192,7 +190426,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
           let localSourceHash;
           try {
             const { collectAppSource: collectAppSource2, zipAppSource: zipAppSource2 } = await Promise.resolve().then(() => (init_app_source(), app_source_exports));
-            localSourceHash = createHash46("sha256").update(zipAppSource2(collectAppSource2(dir).entries).toString("base64")).digest("hex");
+            localSourceHash = createHash47("sha256").update(zipAppSource2(collectAppSource2(dir).entries).toString("base64")).digest("hex");
           } catch {
           }
           return runReleasePatch({
@@ -190620,7 +190854,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             return 2;
           }
           try {
-            const res = writePack(resolve65(releaseDir), only, resolve65(str10(flags.out) ?? process.cwd()));
+            const res = writePack(resolve66(releaseDir), only, resolve66(str10(flags.out) ?? process.cwd()));
             print({
               ok: true,
               app: res.app,
@@ -190669,7 +190903,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
         }
         const { buildContentForValidation: buildContentForValidation2, buildReleaseFromContent: buildReleaseFromContent2, bundleOutDir: bundleOutDir2 } = await loadAuthoring();
         const bres = await buildContentForValidation2(dir, { resolution: resolutionFlag(flags) });
-        const built = mkdtempSync6(join94(tmpdir7(), "himi-pack-"));
+        const built = mkdtempSync6(join95(tmpdir7(), "himi-pack-"));
         const hasWorkers = bres.built.length > 0 || bres.compileErrors.length > 0;
         const outcome = await buildReleaseFromContent2(dir, built, {
           ...hasWorkers ? { tier5Dir: bundleOutDir2(dir) } : {},
@@ -190699,7 +190933,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
           return 1;
         }
         try {
-          const res = writePack(built, app, resolve65(str10(flags.out) ?? dir), sourceArchive);
+          const res = writePack(built, app, resolve66(str10(flags.out) ?? dir), sourceArchive);
           print({
             ok: true,
             app: res.app,
@@ -190744,7 +190978,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
         const { HIMI_PACKAGE_SOURCE_PATH: HIMI_PACKAGE_SOURCE_PATH2, isSafeAppId: isSafeAppId2, packageContents: packageContents2 } = await Promise.resolve().then(() => (init_himi_package(), himi_package_exports));
         let opened;
         try {
-          opened = openPackageFile2(resolve65(file2));
+          opened = openPackageFile2(resolve66(file2));
         } catch (e2) {
           io2.error(JSON.stringify({ error: e2.message }));
           return 1;
@@ -190757,7 +190991,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
           io2.error(JSON.stringify({
             ok: false,
             error: "app_source_not_in_package",
-            detail: `${resolve65(file2)} is a release package: it carries built output (screens, bundles, tokens) and no source`,
+            detail: `${resolve66(file2)} is a release package: it carries built output (screens, bundles, tokens) and no source`,
             hint: "re-pack it from the content package with `himi pack --dev`, or restore from the serve plane with `himi pull <app>`"
           }));
           return 1;
@@ -190780,7 +191014,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             return 1;
           }
         }
-        const dest = resolve65(str10(flags.out) ?? process.cwd(), renamed ?? opened.header.app);
+        const dest = resolve66(str10(flags.out) ?? process.cwd(), renamed ?? opened.header.app);
         const issue2 = restoreDestinationIssue(dest, flags.force === true);
         if (issue2) {
           io2.error(JSON.stringify(issue2));
@@ -190867,7 +191101,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
         }
         try {
           const { openPackageFile: openPackageFile2 } = await Promise.resolve().then(() => (init_pack(), pack_exports));
-          const opened = openPackageFile2(resolve65(file2));
+          const opened = openPackageFile2(resolve66(file2));
           if (!opened.validation.ok || !opened.header) {
             io2.error(JSON.stringify({ error: "refusing to share an invalid package", issues: opened.validation.errors }));
             return 1;
@@ -190877,12 +191111,12 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             io2.error(JSON.stringify({
               ok: false,
               error: "refusing to share a package that carries the app's source",
-              detail: `${resolve65(file2)} was packed with --dev, and a share link is public and unauthenticated \u2014 anyone with the URL could \`himi import\` your codebase`,
+              detail: `${resolve66(file2)} was packed with --dev, and a share link is public and unauthenticated \u2014 anyone with the URL could \`himi import\` your codebase`,
               hint: "share a release package instead (`himi pack` with no --dev), or hand the dev package over directly"
             }));
             return 1;
           }
-          const archive = readFileSync109(resolve65(file2));
+          const archive = readFileSync110(resolve66(file2));
           const result = await client2().createPackageShare({
             app: opened.header.app,
             releaseId: opened.header.releaseId,
@@ -190979,11 +191213,11 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             const app = await appId(dir2);
             const { buildContentBundles: buildContentBundles2, buildReleaseFromContent: buildReleaseFromContent2, bundleOutDir: bundleOutDir2 } = await loadAuthoring();
             const bres = await buildContentBundles2(dir2, { resolution: resolutionFlag(flags) });
-            temp = mkdtempSync6(join94(tmpdir7(), "himi-run-build-"));
+            temp = mkdtempSync6(join95(tmpdir7(), "himi-run-build-"));
             const hasWorkers = bres.built.length > 0 || bres.compileErrors.length > 0;
             const initial = await buildReleaseFromContent2(dir2, temp, { ...hasWorkers ? { tier5Dir: bundleOutDir2(dir2) } : {}, ...RUN_CONTENT_BUILD2 });
             servedMissing = initial.missingBundles;
-            source = join94(temp, app);
+            source = join95(temp, app);
           }
           const chromeArg = str10(flags.chrome) ?? "preview";
           if (chromeArg !== "preview" && chromeArg !== "app") {
@@ -191022,7 +191256,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             if (!recordKit) return;
             startedAt = (/* @__PURE__ */ new Date()).toISOString();
             const failure = record2(served2, { ok: true, at: startedAt });
-            if (!recorded) io2.error(JSON.stringify({ run: "run_record_skipped", message: `${failure ?? `${join94(dir, ".himi")} is not a real directory`}, so the build board will not frame this preview.` }));
+            if (!recorded) io2.error(JSON.stringify({ run: "run_record_skipped", message: `${failure ?? `${join95(dir, ".himi")} is not a real directory`}, so the build board will not frame this preview.` }));
             await refreshBoard();
           };
           const retract = async () => {
@@ -191045,9 +191279,9 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             });
             await announce(run2);
             print({ ok: true, app: run2.app, url: run2.url, port: run2.port, plane: "browser" });
-            await new Promise((resolve66) => {
+            await new Promise((resolve67) => {
               const stop = () => {
-                void retract().catch((e2) => io2.error(JSON.stringify({ run: "stop_cleanup_failed", message: e2.message }))).finally(() => run2.close().finally(() => resolve66()));
+                void retract().catch((e2) => io2.error(JSON.stringify({ run: "stop_cleanup_failed", message: e2.message }))).finally(() => run2.close().finally(() => resolve67()));
               };
               dropEarlySignals?.();
               process.once("SIGINT", stop);
@@ -191058,7 +191292,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
           const watchKit = watch2 ? await Promise.resolve().then(() => (init_run_watch(), run_watch_exports)) : null;
           const hhpPreviewRoute = watch2 ? (await Promise.resolve().then(() => (init_hhp_preview(), hhp_preview_exports))).hhpPreviewResponse : null;
           const bus = watchKit ? new watchKit.ReloadBus() : void 0;
-          if (watch2) served = mkdtempSync6(join94(tmpdir7(), "himi-run-served-"));
+          if (watch2) served = mkdtempSync6(join95(tmpdir7(), "himi-run-served-"));
           const running = await runPackage2(source, {
             port,
             chrome: chromeArg,
@@ -191087,8 +191321,8 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             await announce(running);
             if (watchKit && bus) {
               const { buildContentBundles: buildContentBundles2, buildReleaseFromContent: buildReleaseFromContent2, bundleOutDir: bundleOutDir2 } = await loadAuthoring();
-              const live3 = join94(running.releaseRoot, running.app);
-              const manifestOf = (tree) => JSON.parse(readFileSync109(join94(tree, "release-manifest.json"), "utf8"));
+              const live3 = join95(running.releaseRoot, running.app);
+              const manifestOf = (tree) => JSON.parse(readFileSync110(join95(tree, "release-manifest.json"), "utf8"));
               let current = manifestOf(live3);
               const failed3 = async (message) => {
                 if (stopping) return;
@@ -191099,7 +191333,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
               };
               rebuild = watchKit.serialize(async () => {
                 const t0 = Date.now();
-                const next = mkdtempSync6(join94(tmpdir7(), "himi-run-build-"));
+                const next = mkdtempSync6(join95(tmpdir7(), "himi-run-build-"));
                 try {
                   const bres = await buildContentBundles2(dir, { resolution: resolutionFlag(flags) });
                   if (bres.compileErrors.length) {
@@ -191116,16 +191350,16 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
                     return;
                   }
                   if (stopping) return;
-                  const fresh = manifestOf(join94(next, running.app));
+                  const fresh = manifestOf(join95(next, running.app));
                   const diff = watchKit.diffReleases(current, fresh);
                   const { describeChanges: describeChanges2, headline: headline2 } = await Promise.resolve().then(() => (init_build_changes(), build_changes_exports));
-                  const changes = describeChanges2(live3, join94(next, running.app), diff);
+                  const changes = describeChanges2(live3, join95(next, running.app), diff);
                   const retired = `${live3}.retired-${Date.now()}`;
                   renameSync13(live3, retired);
                   try {
-                    renameSync13(join94(next, running.app), live3);
+                    renameSync13(join95(next, running.app), live3);
                   } catch {
-                    cpSync3(join94(next, running.app), live3, { recursive: true });
+                    cpSync3(join95(next, running.app), live3, { recursive: true });
                   }
                   rmSync24(retired, { recursive: true, force: true });
                   current = fresh;
@@ -191808,7 +192042,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
           lintNote: "`himi patch` sends a raw file. Nothing here built or linted your app \u2014 `himi push --only <selector>` is the same edit with the full lint gate in front of it."
         };
         if (kind === "tokens" || kind === "app-config") {
-          const body = readFileSync109(file2, "utf8");
+          const body = readFileSync110(file2, "utf8");
           const patch2 = kind === "tokens" ? { tokens: body } : { appConfig: body };
           return runReleasePatch({
             ...common,
@@ -191823,7 +192057,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             io2.error(JSON.stringify({ error: "patch screen needs a <screenId>", usage: PATCH_USAGE }));
             return 2;
           }
-          const descriptor = readFileSync109(file2, "utf8");
+          const descriptor = readFileSync110(file2, "utf8");
           let parsed;
           try {
             parsed = JSON.parse(descriptor);
@@ -191880,8 +192114,8 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             extra: { kind, screen: id, file: { path: file2, bytes: Buffer.byteLength(descriptor, "utf8") } }
           });
         }
-        const bytes2 = readFileSync109(file2);
-        const sha2 = createHash46("sha256").update(bytes2).digest("hex");
+        const bytes2 = readFileSync110(file2);
+        const sha2 = createHash47("sha256").update(bytes2).digest("hex");
         const forScreens = (str10(flags["for-screen"]) ?? "").split(",").map((s2) => s2.trim()).filter(Boolean);
         if (flags["no-rebind"] !== void 0 && flags["no-rebind"] !== true) {
           io2.error(JSON.stringify({ ok: false, error: "no_rebind_takes_no_value", message: "--no-rebind is a switch and takes no value; pass it bare.", usage: PATCH_USAGE }));
@@ -192024,7 +192258,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
           }
           let def;
           try {
-            const parsed = JSON.parse(arg.startsWith("@") ? readFileSync109(arg.slice(1), "utf8") : arg);
+            const parsed = JSON.parse(arg.startsWith("@") ? readFileSync110(arg.slice(1), "utf8") : arg);
             if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
               io2.error(JSON.stringify({ error: "invalid_definition", problems: [`--definition must be a JSON object, got ${Array.isArray(parsed) ? "an array" : parsed === null ? "null" : typeof parsed}`] }));
               return 2;
@@ -192306,7 +192540,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
         const rememberLastDist = async (jobs2) => {
           try {
             const dir = contentDir(flags);
-            if (!existsSync89(join94(dir, "himalaya.content.json"))) return;
+            if (!existsSync89(join95(dir, "himalaya.content.json"))) return;
             const { lastDistFromJob: lastDistFromJob2, writeLastDist: writeLastDist2 } = await Promise.resolve().then(() => (init_capabilities(), capabilities_exports));
             const own5 = await appId(dir);
             for (const job of jobs2) {
@@ -192546,7 +192780,7 @@ ${label3}`);
         const platform = str10(flags.platform)?.split(",").map((p2) => p2.trim()).filter(Boolean);
         {
           const distDir = contentDir(flags);
-          if (existsSync89(join94(distDir, "himalaya.content.json"))) {
+          if (existsSync89(join95(distDir, "himalaya.content.json"))) {
             const issues = await iconIssues(distDir, flags.strict === true, { requireDeclared: true, requireVerified: true });
             const errors = issues.filter((i2) => i2.severity === "error");
             for (const i2 of issues.filter((i3) => i3.severity === "warning")) {
@@ -192886,7 +193120,7 @@ ${label3}`);
           const dpxPath = dpxSessionTokenPath();
           let dpx;
           try {
-            dpx = readFileSync109(dpxPath, "utf8").trim();
+            dpx = readFileSync110(dpxPath, "utf8").trim();
           } catch {
             io2.error(JSON.stringify({ error: `no dpx session at ${dpxPath} \u2014 run \`dpx auth login\` then \`dpx auth token > ${dpxPath}\` (dpx 2.x keeps its own state in ~/.dpx/auth.json and does NOT write the legacy session file), or omit --dpx` }));
             return 1;
@@ -193349,7 +193583,7 @@ ${report3.ok ? "OK \u2014 data + serve plane reachable." : typeof report3.hint =
           const path2 = dpxSessionTokenPath();
           let raw;
           try {
-            raw = readFileSync109(path2, "utf8");
+            raw = readFileSync110(path2, "utf8");
           } catch {
             io2.error(JSON.stringify({ error: `no DPX BO session at ${path2}` }));
             return 1;
@@ -193597,7 +193831,7 @@ ${report3.ok ? "OK \u2014 data + serve plane reachable." : typeof report3.hint =
             return 1;
           };
           const gen = await Promise.resolve().then(() => (init_generate(), generate_exports));
-          const missing = gen.ENGINE_FILES.filter((f2) => !existsSync89(join94(dir, f2)));
+          const missing = gen.ENGINE_FILES.filter((f2) => !existsSync89(join95(dir, f2)));
           if (missing.length) {
             return fail6("content_dir_not_base44_starter", `${dir} is not a base44-starter content package: the generated screens import a shared engine it does not have (${missing.join(", ")})`, { missing, hint: "scaffold one with `himi init <name> --template base44-starter --base44-app-id <id>`" });
           }
@@ -193682,8 +193916,8 @@ ${report3.ok ? "OK \u2014 data + serve plane reachable." : typeof report3.hint =
           const slug = str10(flags.app);
           if (!provisioning || str10(flags.content) !== void 0 || !slug) return contentDir(flags);
           if (!/^[a-z0-9][a-z0-9-]*$/.test(slug)) return void 0;
-          const dir = resolve65("apps", slug);
-          return existsSync89(join94(dir, "config.ts")) || existsSync89(join94(dir, "config.mjs")) ? dir : void 0;
+          const dir = resolve66("apps", slug);
+          return existsSync89(join95(dir, "config.ts")) || existsSync89(join95(dir, "config.mjs")) ? dir : void 0;
         };
         if (sub === "entities" || sub === "functions") {
           if (sub === "entities" && !["query", "create", "seed"].includes(pos[2] ?? "")) {
@@ -194068,7 +194302,7 @@ Code: ${userCode}`);
       }
       default:
         io2.error(JSON.stringify({ error: `unknown command: ${command}` }));
-        io2.log(USAGE);
+        io2.log(USAGE2);
         return 2;
     }
   } catch (err) {