@wix/himalaya-cli 0.1013.0 → 0.1015.0

package/dist/cli.mjs

@@ -1341,7 +1341,7 @@ function sentinelizeIdentity(body, identity) {
   }
   if (identity.name) {
     const re = new RegExp(`\\b(${NAME_FIELDS.join("|")})(["']?\\s*[:=]\\s*)(["'])${escapeRe(identity.name)}\\3`, "g");
-    out = out.replace(re, (_m, key2, sep14, q) => `${key2}${sep14}${q}__HIMI_APP_NAME__${q}`);
+    out = out.replace(re, (_m, key2, sep15, q) => `${key2}${sep15}${q}__HIMI_APP_NAME__${q}`);
   }
   return out;
 }
@@ -2368,7 +2368,7 @@ async function mintToken(args, label2, cacheKey, spawnImpl) {
     tokenCache.set(cacheKey, fromEnv);
     return fromEnv;
   }
-  const token = await new Promise((resolve47, reject) => {
+  const token = await new Promise((resolve48, reject) => {
     let child;
     try {
       child = spawnImpl("wix", [...args]);
@@ -2397,12 +2397,12 @@ async function mintToken(args, label2, cacheKey, spawnImpl) {
     child.stdout?.on("data", (d) => {
       out += String(d);
       const m = out.match(TOKEN_RE);
-      if (m) done(() => resolve47(m[0]));
+      if (m) done(() => resolve48(m[0]));
     });
     child.stderr?.on("data", (d) => {
       out += String(d);
       const m = out.match(TOKEN_RE);
-      if (m) done(() => resolve47(m[0]));
+      if (m) done(() => resolve48(m[0]));
     });
     child.on("error", (e) => done(() => reject(new Error(mintHelp(label2, e.message)))));
     child.on("exit", (code) => done(() => reject(new Error(
@@ -5345,7 +5345,6 @@ function walk(node, registry, path2, out) {
 var SYSTEM_FONT_FAMILY;
 var init_tokens = __esm({
   "../../core/ts/src/tokens.ts"() {
-    "use strict";
     SYSTEM_FONT_FAMILY = "$system";
   }
 });
@@ -15593,7 +15592,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((resolve47, reject) => {
+  return await new Promise((resolve48, reject) => {
     const streamed = () => {
       queueMicrotask(() => {
         req.emit("close");
@@ -15609,7 +15608,7 @@ async function injectRequest(listener, request) {
         else headers2.set(name, value);
       }
       const bodyless = out.status === 204 || out.status === 304 || request.method === "HEAD";
-      resolve47(new Response(bodyless ? null : out.body, { status: out.status, headers: headers2 }));
+      resolve48(new Response(bodyless ? null : out.body, { status: out.status, headers: headers2 }));
     }, streamed);
     res.on("inject-error", reject);
     try {
@@ -16304,7 +16303,7 @@ function redactBodyString(body) {
     } catch {
     }
   }
-  return body.replace(FORM_ASSIGNMENT_RE, (m, name) => isSensitiveBodyName(name) ? `${name}=${REDACTED}` : m).replace(JSON_FIELD_RE, (m, name, sep14) => isSensitiveBodyName(name) ? `"${name}"${sep14}"${REDACTED}"` : m).replace(JSON_FIELD_UNTERMINATED_RE, (m, name, sep14) => isSensitiveBodyName(name) ? `"${name}"${sep14}"${REDACTED}` : m).replace(BEARER_RE, (_m, s) => `${s} ${REDACTED}`);
+  return body.replace(FORM_ASSIGNMENT_RE, (m, name) => isSensitiveBodyName(name) ? `${name}=${REDACTED}` : m).replace(JSON_FIELD_RE, (m, name, sep15) => isSensitiveBodyName(name) ? `"${name}"${sep15}"${REDACTED}"` : m).replace(JSON_FIELD_UNTERMINATED_RE, (m, name, sep15) => isSensitiveBodyName(name) ? `"${name}"${sep15}"${REDACTED}` : m).replace(BEARER_RE, (_m, s) => `${s} ${REDACTED}`);
 }
 function createWixGatewayState() {
   return { mode: "record", rules: [], traffic: [], clients: /* @__PURE__ */ new Set(), seq: 0, ruleSeq: 0 };
@@ -17996,12 +17995,12 @@ function finalizeRecording(key2, rec) {
   if (rec.finalize) return rec.finalize;
   rec.finalize = (async () => {
     clearTimeout(rec.autoStop);
-    await new Promise((resolve47) => {
+    await new Promise((resolve48) => {
       let done = false;
       const finish2 = () => {
         if (!done) {
           done = true;
-          resolve47();
+          resolve48();
         }
       };
       rec.child.once("close", finish2);
@@ -18112,7 +18111,7 @@ var init_preview = __esm({
     DEVICE_LIST_TIMEOUT_MS = 5e3;
     defaultRunner2 = {
       capture(cmd, args, timeoutMs = DEFAULT_CAPTURE_TIMEOUT_MS) {
-        return new Promise((resolve47, reject) => {
+        return new Promise((resolve48, reject) => {
           const child = spawn3(cmd, args, { stdio: ["ignore", "pipe", "pipe"] });
           const out = [];
           const err = [];
@@ -18134,7 +18133,7 @@ var init_preview = __esm({
           child.stderr.on("data", (b) => err.push(b));
           child.on("error", (e) => settle(reject, e));
           child.on("close", (code) => {
-            if (code === 0) settle(resolve47, Buffer.concat(out));
+            if (code === 0) settle(resolve48, Buffer.concat(out));
             else settle(reject, new Error(`${cmd} exited ${code}: ${Buffer.concat(err).toString("utf8")}`));
           });
         });
@@ -23189,8 +23188,8 @@ function ensureCountUpRuntime() {
     const neg = fixed.startsWith("-");
     const body = neg ? fixed.slice(1) : fixed;
     const [int, frac] = body.split(".");
-    const sep14 = int.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
-    return (neg ? "-" : "") + sep14 + (frac ? "." + frac : "");
+    const sep15 = int.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+    return (neg ? "-" : "") + sep15 + (frac ? "." + frac : "");
   };
   const animateEl = (el) => {
     const node = el;
@@ -28914,7 +28913,7 @@ async function stabilizePngPage(page, scheme) {
     const browser = globalThis;
     browser.document.documentElement.style.colorScheme = selected;
     await browser.document.fonts?.ready;
-    await new Promise((resolve47) => browser.requestAnimationFrame(() => browser.requestAnimationFrame(() => resolve47())));
+    await new Promise((resolve48) => browser.requestAnimationFrame(() => browser.requestAnimationFrame(() => resolve48())));
   }, scheme);
 }
 async function renderPngBatch(items) {
@@ -32486,7 +32485,7 @@ async function handleWebWix(req, res, state) {
     }
     if (match && (match.rule.kind ?? "mock") === "mock") {
       const mocked = match.rule.response;
-      if (mocked.delayMs) await new Promise((resolve47) => setTimeout(resolve47, mocked.delayMs));
+      if (mocked.delayMs) await new Promise((resolve48) => setTimeout(resolve48, mocked.delayMs));
       const responseBody = mocked.template ? renderTemplate(mocked.body, match.captures) : mocked.body;
       recordWixTraffic(state.wix, state.appName, state.adminUrl, {
         ts: started,
@@ -34488,12 +34487,12 @@ var init_query = __esm({
 });
 
 // ../../core/dev-server/src/crawl-input.ts
-function resolved(v, resolve47) {
-  if (typeof v === "string") return v.startsWith("$service:") ? resolve47(v) : v;
+function resolved(v, resolve48) {
+  if (typeof v === "string") return v.startsWith("$service:") ? resolve48(v) : v;
   if (Array.isArray(v)) {
     const out = v.flatMap((el) => {
       if (typeof el !== "string" || !el.startsWith("$service:")) return [el];
-      const r = resolve47(el);
+      const r = resolve48(el);
       return Array.isArray(r) ? r : [r];
     });
     return out;
@@ -34507,9 +34506,9 @@ function hasRowBinding(props) {
     return itemToken(v) || Array.isArray(v) && v.some(itemToken);
   });
 }
-function declaredOptionIds(props, resolve47) {
+function declaredOptionIds(props, resolve48) {
   const literal = props.options ?? props.tabs ?? props.chips;
-  const bound = props.optionsPath !== void 0 ? resolved(props.optionsPath, resolve47) : void 0;
+  const bound = props.optionsPath !== void 0 ? resolved(props.optionsPath, resolve48) : void 0;
   const raw = Array.isArray(bound) ? bound : literal;
   if (!Array.isArray(raw)) return [];
   const out = [];
@@ -34552,24 +34551,24 @@ function seedTokens(state, limit = 48) {
   walk2(state, 0);
   return out;
 }
-function synthesizeInput(control, resolve47, tokens) {
+function synthesizeInput(control, resolve48, tokens) {
   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, resolve47);
+    const ids = declaredOptionIds(props, resolve48);
     if (!ids.length) return null;
     if (row.encoding === "string-array") {
-      const currentRaw2 = resolved(props.selectedIds, resolve47);
+      const currentRaw2 = resolved(props.selectedIds, resolve48);
       const current3 = (Array.isArray(currentRaw2) ? currentRaw2 : []).filter((x) => typeof x === "string");
       const pick4 = ids.find((o) => !current3.includes(o));
       if (pick4 === void 0) return null;
       const value = props.multiSelect === true ? [...current3, pick4] : [pick4];
       return { key: row.key, value, from: row.from, current: current3, control: id };
     }
-    const currentRaw = resolved(props.selectedId, resolve47);
+    const currentRaw = resolved(props.selectedId, resolve48);
     const current2 = typeof currentRaw === "string" ? currentRaw : void 0;
     const pick3 = ids.find((o) => o !== current2);
     if (pick3 === void 0) return null;
@@ -34577,7 +34576,7 @@ function synthesizeInput(control, resolve47, tokens) {
   }
   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 : resolve47(binding2);
+  const bound = binding2 === void 0 ? void 0 : resolve48(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;
@@ -35835,8 +35834,8 @@ async function crawlScreenInner(opts) {
       if (linkable.has(target)) return true;
       for (const base of linkable) {
         if (target.length > base.length + 1 && target.startsWith(base)) {
-          const sep14 = target[base.length];
-          if (sep14 === "_" || sep14 === "/") return true;
+          const sep15 = target[base.length];
+          if (sep15 === "_" || sep15 === "/") return true;
         }
       }
       return false;
@@ -38090,6 +38089,7 @@ __export(progress_exports, {
   MAX_MESSAGE_CHARS: () => MAX_MESSAGE_CHARS,
   PROGRESS_FILE: () => PROGRESS_FILE,
   ProgressError: () => ProgressError,
+  UnsafeHimiDirError: () => UnsafeHimiDirError,
   appLabel: () => appLabel,
   appendProgress: () => appendProgress,
   appleScriptString: () => appleScriptString,
@@ -38099,11 +38099,14 @@ __export(progress_exports, {
   notifyDesktop: () => notifyDesktop,
   parseStep: () => parseStep,
   readProgress: () => readProgress,
-  summarizeProgress: () => summarizeProgress
+  realDirIn: () => realDirIn,
+  summarizeProgress: () => summarizeProgress,
+  writeFileAtomic: () => writeFileAtomic
 });
 import { spawn as spawn4 } from "node:child_process";
 import { createHash as createHash19 } from "node:crypto";
-import { appendFileSync, closeSync, existsSync as existsSync38, mkdirSync as mkdirSync17, openSync, readFileSync as readFileSync41, readSync, renameSync as renameSync3, statSync as statSync7, writeFileSync as writeFileSync13 } from "node:fs";
+import { randomUUID as randomUUID2 } from "node:crypto";
+import { appendFileSync, closeSync, existsSync as existsSync38, lstatSync as lstatSync5, mkdirSync as mkdirSync17, openSync, readFileSync as readFileSync41, readSync, renameSync as renameSync3, rmSync as rmSync6, statSync as statSync7, writeFileSync as writeFileSync13 } from "node:fs";
 import { join as join35, relative as relative5, resolve as resolve32, sep as sep8 } from "node:path";
 function parseStep(raw) {
   const v = raw.trim().toLowerCase();
@@ -38131,21 +38134,49 @@ function archiveImage(dir, src) {
   if (size > MAX_IMAGE_BYTES) {
     throw new ProgressError("image_too_large", `${src} is ${size} bytes; a progress image is capped at ${MAX_IMAGE_BYTES} \u2014 render at phone width (--device iphone)`);
   }
-  const archived = archiveBytes(dir, readFileSync41(abs));
+  let archived;
+  try {
+    archived = archiveBytes(dir, readFileSync41(abs));
+  } catch (e) {
+    if (e instanceof UnsafeHimiDirError) throw new ProgressError("unsafe_himi_dir", e.message);
+    throw e;
+  }
   if (!archived) throw new ProgressError("not_an_image", `${src} is not a PNG, JPEG, GIF or WebP image`);
   return { file: archived.file, sha256: archived.sha256, source: src };
 }
+function realDirIn(dir, rel) {
+  let at = dir;
+  for (const part of rel.split(/[\\/]+/).filter(Boolean)) {
+    at = join35(at, part);
+    try {
+      if (!lstatSync5(at).isDirectory()) return null;
+    } catch (e) {
+      if (e.code !== "ENOENT") return null;
+      mkdirSync17(at);
+      if (!lstatSync5(at).isDirectory()) return null;
+    }
+  }
+  return at;
+}
+function writeFileAtomic(file, content) {
+  const tmp = `${file}.${process.pid}.${randomUUID2()}.tmp`;
+  try {
+    writeFileSync13(tmp, content, { flag: "wx" });
+    renameSync3(tmp, file);
+  } catch (e) {
+    rmSync6(tmp, { force: true });
+    throw e;
+  }
+}
 function archiveBytes(dir, bytes2) {
   const ext = imageExtension(bytes2);
   if (!ext) return null;
   const sha2565 = createHash19("sha256").update(bytes2).digest("hex");
   const rel = join35(HISTORY_DIR, `${sha2565}.${ext}`);
   const dest = join35(dir, rel);
+  if (!realDirIn(dir, HISTORY_DIR)) throw new UnsafeHimiDirError(HISTORY_DIR);
   if (!existsSync38(dest)) {
-    mkdirSync17(join35(dir, HISTORY_DIR), { recursive: true });
-    const tmp = `${dest}.${process.pid}.tmp`;
-    writeFileSync13(tmp, bytes2);
-    renameSync3(tmp, dest);
+    writeFileAtomic(dest, bytes2);
   }
   return { sha256: sha2565, ext, file: toPosix(rel) };
 }
@@ -38165,8 +38196,9 @@ function appendProgress(dir, input) {
     ...input.step ? { step: input.step, stepNumber: JOURNEY_STEPS.indexOf(input.step) + 1 } : {},
     ...images.length ? { images } : {}
   };
-  mkdirSync17(join35(dir, ".himi"), { recursive: true });
+  if (!realDirIn(dir, ".himi")) throw new ProgressError("unsafe_himi_dir", new UnsafeHimiDirError(".himi").message);
   const file = join35(dir, PROGRESS_FILE);
+  if (existsSync38(file) && lstatSync5(file).isSymbolicLink()) throw new ProgressError("unsafe_himi_dir", `${PROGRESS_FILE} is a symlink \u2014 refusing to append through it`);
   appendFileSync(file, `${endsWithNewline(file) ? "" : "\n"}${JSON.stringify(entry)}
 `);
   return entry;
@@ -38269,7 +38301,7 @@ function journalPath(dir) {
   const rel = relative5(process.cwd(), abs);
   return rel && !rel.startsWith("..") ? rel : abs;
 }
-var JOURNEY_STEPS, PROGRESS_FILE, HISTORY_DIR, MAX_MESSAGE_CHARS, MAX_IMAGE_BYTES, ProgressError, toPosix, NOTIFY_TIMEOUT_MS;
+var JOURNEY_STEPS, PROGRESS_FILE, HISTORY_DIR, MAX_MESSAGE_CHARS, MAX_IMAGE_BYTES, ProgressError, toPosix, UnsafeHimiDirError, NOTIFY_TIMEOUT_MS;
 var init_progress = __esm({
   "src/progress.ts"() {
     JOURNEY_STEPS = ["discover", "classify", "plan", "implement", "brand", "validate", "review", "download"];
@@ -38284,6 +38316,11 @@ var init_progress = __esm({
       }
     };
     toPosix = (p) => p.split(sep8).join("/");
+    UnsafeHimiDirError = class extends Error {
+      constructor(rel) {
+        super(`${rel} is not a real directory inside the content package (a symlink?) \u2014 refusing to write through it`);
+      }
+    };
     NOTIFY_TIMEOUT_MS = 3e3;
   }
 });
@@ -38305,7 +38342,7 @@ __export(studio_exports, {
   writeStudioRecord: () => writeStudioRecord
 });
 import { createHash as createHash20 } from "node:crypto";
-import { existsSync as existsSync39, mkdirSync as mkdirSync18, readdirSync as readdirSync20, readFileSync as readFileSync42, realpathSync as realpathSync4, renameSync as renameSync4, statSync as statSync8, writeFileSync as writeFileSync14 } from "node:fs";
+import { existsSync as existsSync39, readdirSync as readdirSync20, readFileSync as readFileSync42, realpathSync as realpathSync4, statSync as statSync8 } from "node:fs";
 import { basename as basename9, extname as extname3, join as join36, relative as relative6, resolve as resolve33, sep as sep9 } from "node:path";
 import { pathToFileURL as pathToFileURL7 } from "node:url";
 function realInside(dir, abs) {
@@ -38433,9 +38470,10 @@ function liveRun(dir) {
   const url = text(rec?.url);
   const pid = rec?.pid;
   if (!url || !/^https?:\/\//i.test(url) || typeof pid !== "number") return null;
+  const build2 = obj(rec?.build);
   try {
     process.kill(pid, 0);
-    return { url };
+    return { url, buildError: build2?.ok === false ? text(build2.error) ?? "the last rebuild failed" : null };
   } catch {
     return null;
   }
@@ -38509,14 +38547,13 @@ function buildView(dir, memory, now) {
   return { v, ...view };
 }
 function writeAtomic(file, content) {
-  const tmp = `${file}.${process.pid}.tmp`;
-  writeFileSync14(tmp, content);
-  renameSync4(tmp, file);
+  writeFileAtomic(file, content);
 }
 function writeBoard(dir, now) {
+  if (!realDirIn(dir, STUDIO_DIR)) throw new UnsafeHimiDirError(STUDIO_DIR);
+  if (!realDirIn(dir, HISTORY_DIR)) throw new UnsafeHimiDirError(HISTORY_DIR);
   const memory = observeShots(dir, loadMemory(dir, now), now);
   const view = buildView(dir, memory, now);
-  mkdirSync18(join36(dir, STUDIO_DIR), { recursive: true });
   writeAtomic(join36(dir, MEMORY_FILE), JSON.stringify(memory));
   writeAtomic(join36(dir, STATE_FILE), `window.__himiStudio && window.__himiStudio(${scriptJson(view)});
 `);
@@ -38538,7 +38575,7 @@ function openStudio(dir, now = /* @__PURE__ */ new Date()) {
 }
 function writeStudioRecord(dir, record2, value) {
   try {
-    mkdirSync18(join36(dir, ".himi"), { recursive: true });
+    if (!realDirIn(dir, ".himi")) return;
     writeAtomic(join36(dir, record2), `${JSON.stringify(value, null, 2)}
 `);
   } catch {
@@ -38624,7 +38661,7 @@ function render(s){
   $("nowmsg").textContent=last?last.message:"Waiting for the first postcard.";
   $("nowmeta").textContent=last?("Now \xB7 "+(last.step?("step "+last.stepNumber+" of 8, "+last.step+" \xB7 "):"")+ago(last.ts)):"Now";
   var focus=$("focus");clear(focus);var film=$("film");clear(film);
-  if(s.live){$("focuslbl").textContent="Live preview";var f=el("div","phone");var fr=document.createElement("iframe");fr.src=s.live.url;fr.title="Live preview";f.appendChild(fr);focus.appendChild(f);focus.appendChild(el("div","cap","Repaints as the app is edited \xB7 "+s.live.url))}
+  if(s.live){$("focuslbl").textContent="Live preview";var f=el("div","phone");var fr=document.createElement("iframe");fr.src=s.live.url;fr.title="Live preview";f.appendChild(fr);focus.appendChild(f);if(s.live.buildError){var be=el("div","chip bad",null);be.style.display="block";be.style.marginTop="8px";be.textContent="Last edit did not build, still showing the last good version: "+s.live.buildError;focus.appendChild(be)}focus.appendChild(el("div","cap","Repaints as the app is edited \xB7 "+s.live.url))}
   else if(s.focus&&s.focus.frames.length){var fl=s.focus.frames;$("focuslbl").textContent="Latest \xB7 "+s.focus.id;var p=el("div","phone");p.appendChild(img(fl[fl.length-1].img));focus.appendChild(p);focus.appendChild(el("div","cap",fl.length+(fl.length===1?" version":" versions")+" so far"))}
   else{$("focuslbl").textContent="Latest";focus.appendChild(el("div","empty","The first render appears here."))}
   if(s.focus&&s.focus.frames.length>1)s.focus.frames.forEach(function(fm){film.appendChild(img(fm.img))});
@@ -39318,7 +39355,7 @@ var init_push_setup_apple_credentials = __esm({
 });
 
 // src/push-onboarding.ts
-import { existsSync as existsSync40, mkdirSync as mkdirSync19, readFileSync as readFileSync44, statSync as statSync9, writeFileSync as writeFileSync15, chmodSync as chmodSync2 } from "node:fs";
+import { existsSync as existsSync40, mkdirSync as mkdirSync18, readFileSync as readFileSync44, statSync as statSync9, writeFileSync as writeFileSync14, chmodSync as chmodSync2 } from "node:fs";
 import { basename as basename10, dirname as dirname22, join as join37, resolve as resolve35 } from "node:path";
 function readJson3(path2) {
   try {
@@ -39468,8 +39505,8 @@ function readPushOnboarding(dir) {
 }
 function writeFile(dir, file) {
   const path2 = join37(resolve35(dir), PUSH_ONBOARDING_PATH);
-  mkdirSync19(dirname22(path2), { recursive: true, mode: 448 });
-  writeFileSync15(path2, JSON.stringify(file, null, 2) + "\n", { mode: 384 });
+  mkdirSync18(dirname22(path2), { recursive: true, mode: 448 });
+  writeFileSync14(path2, JSON.stringify(file, null, 2) + "\n", { mode: 384 });
   try {
     chmodSync2(path2, 384);
   } catch {
@@ -40230,7 +40267,7 @@ __export(template_trim_exports, {
   routeMatcher: () => routeMatcher,
   runTemplateTrim: () => runTemplateTrim
 });
-import { cpSync, existsSync as existsSync41, mkdirSync as mkdirSync20, readdirSync as readdirSync21, readFileSync as readFileSync45, renameSync as renameSync5, rmSync as rmSync6, statSync as statSync10, writeFileSync as writeFileSync16 } from "node:fs";
+import { cpSync, existsSync as existsSync41, mkdirSync as mkdirSync19, readdirSync as readdirSync21, readFileSync as readFileSync45, renameSync as renameSync4, rmSync as rmSync7, statSync as statSync10, writeFileSync as writeFileSync15 } from "node:fs";
 import { dirname as dirname23, join as join38 } from "node:path";
 function routeMatcher(pattern) {
   const detail = /^\^([A-Za-z0-9_]+)\(\?:\[_\/\]\(\.\+\)\)\?\$$/.exec(pattern);
@@ -40988,16 +41025,16 @@ async function runTemplateTrim(req, deps) {
   const restore = () => {
     for (const [path2, rel] of originals) {
       const original = readFileSync45(join38(backup, rel));
-      if (!existsSync41(path2) || !readFileSync45(path2).equals(original)) writeFileSync16(path2, original);
+      if (!existsSync41(path2) || !readFileSync45(path2).equals(original)) writeFileSync15(path2, original);
     }
-    for (const name of [...moved].reverse()) renameSync5(join38(backup, "tier5-src", name), join38(dir, "tier5-src", name));
+    for (const name of [...moved].reverse()) renameSync4(join38(backup, "tier5-src", name), join38(dir, "tier5-src", name));
   };
   const dropBackup = () => {
-    rmSync6(backup, { recursive: true, force: true });
+    rmSync7(backup, { recursive: true, force: true });
     for (const d of [dirname23(backup), join38(dir, ".himi")]) {
       if (d === join38(dir, ".himi") && hadHimi) break;
       try {
-        if (!readdirSync21(d).length) rmSync6(d, { recursive: true });
+        if (!readdirSync21(d).length) rmSync7(d, { recursive: true });
       } catch {
       }
     }
@@ -41021,21 +41058,21 @@ async function runTemplateTrim(req, deps) {
     return { code: 1, result: { ok: false, error: `${error} (${message}); every file was restored`, rolledBack: true, ...base(validate4) } };
   };
   try {
-    mkdirSync20(join38(backup, "dev"), { recursive: true });
+    mkdirSync19(join38(backup, "dev"), { recursive: true });
     for (const [path2, rel] of originals) cpSync(path2, join38(backup, rel));
-    if (plan.removedWorkers.length) mkdirSync20(join38(backup, "tier5-src"), { recursive: true });
+    if (plan.removedWorkers.length) mkdirSync19(join38(backup, "tier5-src"), { recursive: true });
   } catch (e) {
     dropBackup();
     return { code: 1, result: { ok: false, error: `could not back up the app before trimming it (${e.message}); nothing was changed`, rolledBack: true, ...base() } };
   }
   try {
-    const moveDir = deps.moveDir ?? renameSync5;
+    const moveDir = deps.moveDir ?? renameSync4;
     for (const name of plan.removedWorkers) {
       moveDir(join38(dir, "tier5-src", name), join38(backup, "tier5-src", name));
       moved.push(name);
     }
-    if (plan.dev !== dev) writeFileSync16(devPath, plan.dev);
-    if (plan.config !== config) writeFileSync16(configPath, plan.config);
+    if (plan.dev !== dev) writeFileSync15(devPath, plan.dev);
+    if (plan.config !== config) writeFileSync15(configPath, plan.config);
   } catch (e) {
     return abort("the trim failed while writing", e);
   }
@@ -41736,7 +41773,7 @@ __export(pack_exports, {
 });
 import { createHash as createHash21 } from "node:crypto";
 import { deflateRawSync, inflateRawSync } from "node:zlib";
-import { existsSync as existsSync42, mkdirSync as mkdirSync21, readFileSync as readFileSync46, readdirSync as readdirSync22, rmSync as rmSync7, statSync as statSync11, writeFileSync as writeFileSync17 } from "node:fs";
+import { existsSync as existsSync42, mkdirSync as mkdirSync20, readFileSync as readFileSync46, readdirSync as readdirSync22, rmSync as rmSync8, statSync as statSync11, writeFileSync as writeFileSync16 } from "node:fs";
 import { dirname as dirname24, join as join39, resolve as resolve37 } from "node:path";
 function writeZip(entries) {
   const sorted2 = entries.slice().sort((a, b) => a.path < b.path ? -1 : a.path > b.path ? 1 : 0);
@@ -41913,10 +41950,10 @@ function packRelease(releaseRoot, app, out, opts = {}) {
   const appDir2 = join39(resolve37(releaseRoot), app);
   const { all, header, skipped } = buildEntries(appDir2, app, opts);
   const buf = writeZip(all);
-  const isDir = existsSync42(out) && statSync11(out).isDirectory();
-  const outFile = isDir ? join39(resolve37(out), packageFileName(app, header.releaseId)) : resolve37(out);
-  mkdirSync21(dirname24(outFile), { recursive: true });
-  writeFileSync17(outFile, buf);
+  const isDir2 = existsSync42(out) && statSync11(out).isDirectory();
+  const outFile = isDir2 ? join39(resolve37(out), packageFileName(app, header.releaseId)) : resolve37(out);
+  mkdirSync20(dirname24(outFile), { recursive: true });
+  writeFileSync16(outFile, buf);
   return { app, releaseId: header.releaseId, header, out: outFile, bytes: buf.length, entryCount: all.length, skipped };
 }
 function resolvePackageDirDest(outDir, app, releaseId) {
@@ -41955,12 +41992,12 @@ function packReleaseToDir(releaseRoot, app, outDir, opts = {}) {
   const appDir2 = join39(resolve37(releaseRoot), app);
   const { all, header, skipped } = buildEntries(appDir2, app, opts);
   const dest = resolvePackageDirDest(resolve37(outDir), app, header.releaseId);
-  rmSync7(dest, { recursive: true, force: true });
+  rmSync8(dest, { recursive: true, force: true });
   let bytes2 = 0;
   for (const entry of all) {
     const target = join39(dest, entry.path);
-    mkdirSync21(dirname24(target), { recursive: true });
-    writeFileSync17(target, entry.bytes);
+    mkdirSync20(dirname24(target), { recursive: true });
+    writeFileSync16(target, entry.bytes);
     bytes2 += entry.bytes.length;
   }
   return { app, releaseId: header.releaseId, header, out: dest, bytes: bytes2, entryCount: all.length, skipped };
@@ -42038,11 +42075,11 @@ function unpackTo(buf, dest, appFallback) {
   if (!isSafeAppId(app)) throw new Error(`package declares an unsafe app id ${JSON.stringify(app)} \u2014 refusing to unpack it`);
   const root = resolve37(dest);
   const appDir2 = join39(root, app);
-  rmSync7(appDir2, { recursive: true, force: true });
+  rmSync8(appDir2, { recursive: true, force: true });
   for (const [rel, bytes2] of entries) {
     const target = join39(appDir2, rel);
-    mkdirSync21(dirname24(target), { recursive: true });
-    writeFileSync17(target, bytes2);
+    mkdirSync20(dirname24(target), { recursive: true });
+    writeFileSync16(target, bytes2);
   }
   return { root, appDir: appDir2, app };
 }
@@ -42076,14 +42113,14 @@ __export(app_source_exports, {
   writeConflicts: () => writeConflicts,
   zipAppSource: () => zipAppSource
 });
-import { readdirSync as readdirSync23, lstatSync as lstatSync5, readFileSync as readFileSync47, mkdirSync as mkdirSync22, writeFileSync as writeFileSync18, existsSync as existsSync43, rmSync as rmSync8, rmdirSync, unlinkSync as unlinkSync3 } from "node:fs";
+import { readdirSync as readdirSync23, lstatSync as lstatSync6, readFileSync as readFileSync47, mkdirSync as mkdirSync21, writeFileSync as writeFileSync17, existsSync as existsSync43, rmSync as rmSync9, rmdirSync, unlinkSync as unlinkSync3 } from "node:fs";
 import { join as join40, resolve as resolve38, sep as sep10 } from "node:path";
 import { deflateRawSync as deflateRawSync2 } from "node:zlib";
 function walkSourceTree(dir, file, skip) {
   const walk2 = (relDir) => {
     for (const name of readdirSync23(join40(dir, relDir))) {
       const rel = relDir ? join40(relDir, name) : name;
-      const st = lstatSync5(join40(dir, rel));
+      const st = lstatSync6(join40(dir, rel));
       if (st.isSymbolicLink()) {
         skip(rel);
         continue;
@@ -42142,7 +42179,7 @@ function readAppSource(zip) {
 }
 function pathKind(p) {
   try {
-    return lstatSync5(p);
+    return lstatSync6(p);
   } catch {
     return null;
   }
@@ -42154,7 +42191,7 @@ function writeAppSource(entries, destDir) {
       `refusing to restore into ${root}: the destination itself is a symlink, so every file would be written outside it. Remove it, or pass --out/--name somewhere else.`
     );
   }
-  mkdirSync22(root, { recursive: true });
+  mkdirSync21(root, { recursive: true });
   const written = [];
   for (const entry of entries) {
     if (isDeniedSourcePath(entry.path)) continue;
@@ -42165,11 +42202,11 @@ function writeAppSource(entries, destDir) {
       const kind = pathKind(dir);
       if (kind?.isSymbolicLink()) unlinkSync3(dir);
       else if (kind) continue;
-      mkdirSync22(dir);
+      mkdirSync21(dir);
     }
     const target = join40(root, ...segments);
     if (pathKind(target)?.isSymbolicLink()) unlinkSync3(target);
-    writeFileSync18(target, entry.bytes);
+    writeFileSync17(target, entry.bytes);
     written.push(entry.path);
   }
   return written;
@@ -42224,7 +42261,7 @@ function writeConflicts(entries, destDir) {
 function removeStaleSource(entries, destDir) {
   const root = resolve38(destDir);
   const removed = staleSourcePaths(entries, root);
-  for (const rel of removed) rmSync8(join40(root, ...rel.split("/")), { force: true });
+  for (const rel of removed) rmSync9(join40(root, ...rel.split("/")), { force: true });
   const needed = /* @__PURE__ */ new Set();
   for (const entry of entries) {
     if (isDeniedSourcePath(entry.path)) continue;
@@ -42239,7 +42276,7 @@ function pruneEmptyDirs(root, rel, needed, removed) {
   for (const name of readdirSync23(rel ? join40(root, rel) : root)) {
     const childRel = rel ? join40(rel, name) : name;
     const posix3 = childRel.split(sep10).join("/");
-    const kind = lstatSync5(join40(root, childRel));
+    const kind = lstatSync6(join40(root, childRel));
     if (kind.isSymbolicLink() || !kind.isDirectory() || isDeniedSourceDir(name, rel)) {
       empty = false;
       continue;
@@ -42304,7 +42341,7 @@ __export(eject_exports, {
   EJECTABLE: () => EJECTABLE,
   ejectModule: () => ejectModule
 });
-import { existsSync as existsSync44, mkdirSync as mkdirSync23, readFileSync as readFileSync48, writeFileSync as writeFileSync19 } from "node:fs";
+import { existsSync as existsSync44, mkdirSync as mkdirSync22, readFileSync as readFileSync48, writeFileSync as writeFileSync18 } from "node:fs";
 import { dirname as dirname25, join as join41, relative as relative7, resolve as resolve39, sep as sep11 } from "node:path";
 function locate(repoRootOrCwd, mod) {
   const inRepo = resolve39(repoRootOrCwd, `stdlib/flows/${mod}/src/index.ts`);
@@ -42335,7 +42372,7 @@ function ejectModule(opts) {
   }
   const ext = found.form === "source" ? "ts" : "mjs";
   const target = join41(contentDir2, "tier5-src", "_ejected", `${mod}.${ext}`);
-  mkdirSync23(dirname25(target), { recursive: true });
+  mkdirSync22(dirname25(target), { recursive: true });
   const banner = `// EJECTED from @wix/himalaya/${mod}. This app owns this file now.
 //
 // Central fixes to @wix/himalaya/${mod} NO LONGER REACH THIS APP \u2014 including any
@@ -42352,7 +42389,7 @@ function ejectModule(opts) {
     /(["'])@himalaya\/([a-z0-9-]+(?:\/[a-z0-9-]+)?)\1/g,
     (_m, q, sub) => `${q}@wix/himalaya/${sub}${q}`
   );
-  writeFileSync19(target, banner + normalized);
+  writeFileSync18(target, banner + normalized);
   const rewired = [];
   for (const f of files) {
     if (!existsSync44(f)) continue;
@@ -42368,7 +42405,7 @@ function ejectModule(opts) {
       );
     }
     if (after !== before) {
-      writeFileSync19(f, after);
+      writeFileSync18(f, after);
       rewired.push(f);
     }
   }
@@ -42404,7 +42441,7 @@ __export(test_exports, {
   scopeDescriptors: () => scopeDescriptors,
   writeRecordedMocks: () => writeRecordedMocks
 });
-import { existsSync as existsSync45, mkdirSync as mkdirSync24, readFileSync as readFileSync49, writeFileSync as writeFileSync20 } from "node:fs";
+import { existsSync as existsSync45, mkdirSync as mkdirSync23, readFileSync as readFileSync49, writeFileSync as writeFileSync19 } from "node:fs";
 import { join as join42, resolve as resolve40 } from "node:path";
 function readTestConfig(dir) {
   const p = resolve40(dir, TEST_CONFIG_FILE);
@@ -42580,8 +42617,8 @@ function writeRecordedMocks(opts) {
     };
   }
   const fs = opts.io ?? {
-    mkdir: (p) => mkdirSync24(p, { recursive: true }),
-    write: (p, s) => writeFileSync20(p, s)
+    mkdir: (p) => mkdirSync23(p, { recursive: true }),
+    write: (p, s) => writeFileSync19(p, s)
   };
   fs.mkdir(join42(opts.dir, "dev"));
   fs.write(join42(opts.dir, "dev", "net-mocks.json"), JSON.stringify(opts.mocks, null, 2) + "\n");
@@ -43342,7 +43379,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 hostname2 = url.hostname.replace(/^\[|\]$/g, "");
-  return await new Promise((resolve47, reject) => {
+  return await new Promise((resolve48, reject) => {
     let settled = false;
     const finish2 = (fn) => {
       if (settled) return;
@@ -43379,7 +43416,7 @@ async function pinnedFetch(url, init, addresses, maxResponseBytes) {
         }
         const responseHeaders = new Headers();
         for (const [key2, value] of Object.entries(response.headers)) if (value !== void 0) responseHeaders.set(key2, Array.isArray(value) ? value.join(", ") : value);
-        resolve47(new Response(bytes2, { status: response.statusCode, statusText: response.statusMessage, headers: responseHeaders }));
+        resolve48(new Response(bytes2, { status: response.statusCode, statusText: response.statusMessage, headers: responseHeaders }));
       }));
     });
     req.once("error", (error) => finish2(() => reject(error)));
@@ -43679,7 +43716,7 @@ function createLocalTestSandbox() {
           }
         })();
       `;
-      return await new Promise((resolve47, reject) => {
+      return await new Promise((resolve48, reject) => {
         const { port1, port2 } = new MessageChannel();
         const serializableContext = {
           auth: context.auth,
@@ -43755,7 +43792,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(() => resolve47({ value: message.value, durationMs: Date.now() - started }));
+          if (message.ok) finish2(() => resolve48({ 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))));
@@ -44900,7 +44937,7 @@ __export(native_decode_exports, {
   runNativeDecode: () => runNativeDecode
 });
 import { execFileSync as execFileSync5, spawnSync as spawnSync2 } from "node:child_process";
-import { existsSync as existsSync48, mkdtempSync as mkdtempSync2, readFileSync as readFileSync52, rmSync as rmSync9, writeFileSync as writeFileSync21 } from "node:fs";
+import { existsSync as existsSync48, mkdtempSync as mkdtempSync2, readFileSync as readFileSync52, rmSync as rmSync10, writeFileSync as writeFileSync20 } from "node:fs";
 import { tmpdir as tmpdir3 } from "node:os";
 import { join as join45 } from "node:path";
 import { fileURLToPath as fileURLToPath20 } from "node:url";
@@ -45034,7 +45071,7 @@ function runNativeDecode(options) {
       if (typeof descriptor.descriptorJson !== "string") {
         throw new Error(`native decode cannot judge ${descriptor.screenId}: the release builder did not return its exact baked JSON bytes`);
       }
-      writeFileSync21(join45(descriptorDir, `${encodeURIComponent(descriptor.screenId)}.json`), descriptor.descriptorJson);
+      writeFileSync20(join45(descriptorDir, `${encodeURIComponent(descriptor.screenId)}.json`), descriptor.descriptorJson);
     }
     options.progress?.("building cached Swift oracle");
     execFileSync5("swift", ["build", "--package-path", options.packageDir, "--product", "himi-decode-oracle"], {
@@ -45060,7 +45097,7 @@ function runNativeDecode(options) {
     const stderr = failure.stderr ? ` \u2014 ${String(failure.stderr).trim().slice(0, 2e3)}` : "";
     throw new Error(`iOS decoder oracle failed: ${failure.message}${stderr}`);
   } finally {
-    rmSync9(descriptorDir, { recursive: true, force: true });
+    rmSync10(descriptorDir, { recursive: true, force: true });
   }
 }
 function runAndroidNativeDecode(options) {
@@ -45072,7 +45109,7 @@ function runAndroidNativeDecode(options) {
       if (typeof descriptor.descriptorJson !== "string") {
         throw new Error(`native decode cannot judge ${descriptor.screenId}: the release builder did not return its exact baked JSON bytes`);
       }
-      writeFileSync21(join45(descriptorDir, `${encodeURIComponent(descriptor.screenId)}.json`), descriptor.descriptorJson);
+      writeFileSync20(join45(descriptorDir, `${encodeURIComponent(descriptor.screenId)}.json`), descriptor.descriptorJson);
     }
     options.progress?.(`running real Kotlin decoder over ${options.descriptors.length} screen${options.descriptors.length === 1 ? "" : "s"}`);
     execFileSync5(options.gradlew, [
@@ -45098,7 +45135,7 @@ function runAndroidNativeDecode(options) {
     const stderr = failure.stderr ? ` \u2014 ${String(failure.stderr).trim().slice(0, 2e3)}` : "";
     throw new Error(`Android decoder oracle failed: ${failure.message}${stderr}`);
   } finally {
-    rmSync9(descriptorDir, { recursive: true, force: true });
+    rmSync10(descriptorDir, { recursive: true, force: true });
   }
 }
 function fieldAt(path2) {
@@ -45242,10 +45279,10 @@ function collectSdkModules(files, resolveSubpath) {
   for (const source of Object.values(files)) visit(source);
   return { modules, unsupported };
 }
-function sdkSubpathReader(resolve47) {
+function sdkSubpathReader(resolve48) {
   return (sub) => {
     try {
-      return readFileSync53(resolve47(`@wix/himalaya/${sub}`), "utf8");
+      return readFileSync53(resolve48(`@wix/himalaya/${sub}`), "utf8");
     } catch {
       return null;
     }
@@ -45323,7 +45360,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((resolve47, reject) => {
+  return await new Promise((resolve48, reject) => {
     let settled = false;
     let url = "";
     const server = createServer3();
@@ -45375,7 +45412,7 @@ async function runBrowserAuthoring(opts) {
         }
         res.writeHead(200, { "content-type": "text/plain" }).end("ok");
         const report2 = body.result;
-        finish2(() => resolve47({ report: report2, url }));
+        finish2(() => resolve48({ report: report2, url }));
       })();
     });
     server.on("error", (e) => finish2(() => reject(e)));
@@ -45417,7 +45454,7 @@ __export(coverage_exports, {
   suppressedNativeKeys: () => suppressedNativeKeys,
   trendAndStore: () => trendAndStore
 });
-import { existsSync as existsSync50, mkdirSync as mkdirSync25, readFileSync as readFileSync54, writeFileSync as writeFileSync22 } from "node:fs";
+import { existsSync as existsSync50, mkdirSync as mkdirSync24, readFileSync as readFileSync54, writeFileSync as writeFileSync21 } from "node:fs";
 import { dirname as dirname26, join as join47 } from "node:path";
 function suppressedNativeKeys(oracle) {
   return [...oracle.ios ? [] : ["native-decode|ios"], ...oracle.android ? [] : ["native-decode|android"]];
@@ -45600,8 +45637,8 @@ function trendAndStore(dir, entries, suppressed) {
   const current = entries.map((e) => e.key);
   const stored = [.../* @__PURE__ */ new Set([...current, ...(previous ?? []).filter((key2) => (suppressed ?? []).includes(key2))])];
   try {
-    mkdirSync25(dirname26(p), { recursive: true });
-    writeFileSync22(p, JSON.stringify({ keys: stored, ts: (/* @__PURE__ */ new Date()).toISOString() }, null, 2));
+    mkdirSync24(dirname26(p), { recursive: true });
+    writeFileSync21(p, JSON.stringify({ keys: stored, ts: (/* @__PURE__ */ new Date()).toISOString() }, null, 2));
   } catch {
     return null;
   }
@@ -45645,8 +45682,8 @@ function diffAndStoreObservations(dir, current) {
   } catch {
   }
   try {
-    mkdirSync25(dirname26(p), { recursive: true });
-    writeFileSync22(p, JSON.stringify({ screens: current, ts: (/* @__PURE__ */ new Date()).toISOString() }, null, 2));
+    mkdirSync24(dirname26(p), { recursive: true });
+    writeFileSync21(p, JSON.stringify({ screens: current, ts: (/* @__PURE__ */ new Date()).toISOString() }, null, 2));
   } catch {
     return null;
   }
@@ -45887,6 +45924,29 @@ var init_assets = __esm({
   }
 });
 
+// ../../core/serve-runtime/src/pinned-read.ts
+async function checkPinnedRead(input) {
+  const { secret, token, app, releaseId, screenId, authorizePreview } = input;
+  if (!secret) return authorizePreview ? { status: 503, body: { error: "preview_token_unavailable" } } : null;
+  if (!token) return await input.isLive() ? null : { status: 401, body: { error: "preview_token_required", app, releaseId } };
+  const verified = await verifyPreviewToken({ token, secret, app, releaseId, screenId });
+  if (verified.ok) {
+    if (authorizePreview ? !await authorizePreview(verified.claims) : !!verified.claims.siteLease) {
+      return { status: 403, body: { error: "site_preview_forbidden" } };
+    }
+    return null;
+  }
+  return {
+    status: verified.error === "scope_mismatch" ? 403 : 401,
+    body: { error: `preview_token_${verified.error}`, app, releaseId, ...screenId ? { screenId } : {} }
+  };
+}
+var init_pinned_read = __esm({
+  "../../core/serve-runtime/src/pinned-read.ts"() {
+    init_preview_token();
+  }
+});
+
 // ../../core/serve-runtime/package-share.ts
 function parseStored(bytes2, id) {
   if (!bytes2) return null;
@@ -46093,6 +46153,15 @@ function json3(status, body, headers2 = {}) {
 function isCookieAuthorizedPath(path2) {
   return path2 === "/v1/__webwix/call" || path2 === "/v1/owner" || path2.startsWith("/v1/owner/") || path2 === "/v1/__webwix/identity" || path2 === "/v1/__webwix/login" || path2 === "/v1/__webwix/register" || path2 === "/v1/__webwix/logout" || path2 === MEMBER_CALLBACK_PATH;
 }
+function webwixCallLog(served, status) {
+  const directRung = served.rung === "visitor" || served.rung === "owner";
+  return {
+    rung: served.rung,
+    ...directRung ? { fallback: served.fallback === true } : {},
+    ...served.app ? { app: served.app } : {},
+    status
+  };
+}
 function makeServeHandler(opts) {
   let storePromise = null;
   const getStore = () => storePromise ??= (async () => {
@@ -46222,23 +46291,16 @@ ${releaseId}`;
     return new Response(body, { status: 200, headers: { "content-type": JSON_CT, etag, "cache-control": cache, ...vary } });
   }
   async function authorizePinnedRead(request, url, app, releaseId, screenId) {
-    const secret = opts.previewTokenSecret;
-    if (!secret) return opts.authorizePreview ? json3(503, { error: "preview_token_unavailable" }) : null;
-    const token = resolvePreviewToken(request, url);
-    const live2 = await manifest(app);
-    const isLive = live2?.releaseId === releaseId;
-    if (!token) return isLive ? null : json3(401, { error: "preview_token_required", app, releaseId });
-    const verified = await verifyPreviewToken({ token, secret, app, releaseId, screenId });
-    if (verified.ok) {
-      if (opts.authorizePreview ? !await opts.authorizePreview(verified.claims) : !!verified.claims.siteLease) return json3(403, { error: "site_preview_forbidden" });
-      return null;
-    }
-    return json3(verified.error === "scope_mismatch" ? 403 : 401, {
-      error: `preview_token_${verified.error}`,
+    const denied = await checkPinnedRead({
+      secret: opts.previewTokenSecret,
+      token: resolvePreviewToken(request, url),
       app,
       releaseId,
-      ...screenId ? { screenId } : {}
+      screenId,
+      isLive: async () => (await manifest(app))?.releaseId === releaseId,
+      authorizePreview: opts.authorizePreview
     });
+    return denied && json3(denied.status, denied.body);
   }
   const corsHeaders = (request) => {
     const origin = request.headers.get("origin");
@@ -46406,83 +46468,109 @@ ${releaseId}`;
         return json3(200, { authenticated: false, userId: null, email: null, webwixDirect }, { "cache-control": "no-store" });
       }
       if (request.method === "POST" && path2 === "/v1/__webwix/call") {
-        if (opts.webwixBridge === false) {
-          return json3(503, { error: "webwix_bridge_disabled" });
-        }
-        const app2 = resolveApp(request, url);
-        if (!app2) return json3(400, { error: "app_required" });
-        const resolvedCfg = await appConfigFor(request, url, app2);
-        if (!resolvedCfg.ok) return resolvedCfg.response;
-        const cfgBytes = resolvedCfg.bytes;
-        let call;
+        const served = { rung: "none" };
+        let status = 500;
         try {
-          call = await request.json();
-        } catch {
-          return json3(400, { error: "invalid_json" });
-        }
-        if (call.checkOwnerSession !== void 0 && (typeof call.checkOwnerSession !== "boolean" || call.checkOwnerSession && call.ownerMsid === void 0)) {
-          return json3(400, { error: "invalid_owner_session_check" });
-        }
-        const method = String(call.method ?? "GET").toUpperCase();
-        const reqPath = String(call.path ?? "/");
-        const body = call.body === void 0 ? void 0 : typeof call.body === "string" ? call.body : JSON.stringify(call.body);
-        const forwardedHeaders = normalizeWixForwardedHeaders(call.headers);
-        const callerCookie = request.headers.get("cookie") ?? "";
-        if (!call.checkOwnerSession && webwixOwnerRungOn() && method === "POST" && isOwnerSitesPath(reqPath) && /wixSession2=/.test(callerCookie)) {
-          try {
-            const envelope = await wixOwnerSitesCall(reqPath, callerCookie, body, webwixFetch);
-            if (envelope.status >= 200 && envelope.status < 300) return json3(200, envelope);
-            return json3(200, {
-              status: 501,
-              body: JSON.stringify({ error: "webwix_owner_sites_failed", upstream: envelope.status })
-            });
-          } catch (e) {
-            return json3(200, {
-              status: 501,
-              body: JSON.stringify({ error: "webwix_owner_sites_failed", detail: String(e?.message ?? e).slice(0, 200) })
-            });
-          }
-        }
-        if (call.ownerMsid !== void 0) {
-          if (!webwixOwnerRungOn()) {
-            return json3(503, { error: "webwix_owner_disabled" });
-          }
-          const msid = String(call.ownerMsid);
-          if (!isSafeMsid(msid)) return json3(400, { error: "webwix_owner_bad_msid" });
-          const cookie = request.headers.get("cookie") ?? "";
-          if (!/wixSession2=/.test(cookie)) return json3(501, { error: "webwix_owner_no_session", app: app2 });
-          try {
-            const instance = await webwixOwnerInstances.instance(msid, cookie);
-            if (call.checkOwnerSession === true) return json3(200, { status: 200, body: JSON.stringify({ ready: true }) }, { "cache-control": "no-store" });
-            const first = await wixVisitorCall(method, reqPath, body, instance, webwixFetch, forwardedHeaders);
-            if (first.status !== 401) return json3(200, first);
-            webwixOwnerInstances.invalidate(msid, cookie);
-            const fresh = await webwixOwnerInstances.instance(msid, cookie);
-            return json3(200, await wixVisitorCall(method, reqPath, body, fresh, webwixFetch, forwardedHeaders));
-          } catch (e) {
-            const msg = String(e?.message ?? e);
-            if (msg.includes("absolute URLs")) {
-              return absoluteUrlRejection(reqPath) === "owner-only" ? json3(501, { error: "webwix_owner_only", app: app2 }) : json3(400, { error: "absolute_urls_not_allowed" });
+          const res = await (async () => {
+            if (opts.webwixBridge === false) {
+              return json3(503, { error: "webwix_bridge_disabled" });
             }
-            if (msg.includes("owner mint failed")) {
-              if (/owner mint failed \(5\d\d\)/.test(msg)) return json3(502, { error: "webwix_bridge_upstream_failed" });
-              return json3(501, { error: "webwix_owner_mint_failed", app: app2 });
+            const app2 = resolveApp(request, url);
+            if (!app2) return json3(400, { error: "app_required" });
+            const resolvedCfg = await appConfigFor(request, url, app2);
+            if (!resolvedCfg.ok) return resolvedCfg.response;
+            served.app = app2;
+            const cfgBytes = resolvedCfg.bytes;
+            let call;
+            try {
+              call = await request.json();
+            } catch {
+              return json3(400, { error: "invalid_json" });
+            }
+            served.fallback = call.fallback === true;
+            if (call.checkOwnerSession !== void 0 && (typeof call.checkOwnerSession !== "boolean" || call.checkOwnerSession && call.ownerMsid === void 0)) {
+              return json3(400, { error: "invalid_owner_session_check" });
+            }
+            const method = String(call.method ?? "GET").toUpperCase();
+            const reqPath = String(call.path ?? "/");
+            const body = call.body === void 0 ? void 0 : typeof call.body === "string" ? call.body : JSON.stringify(call.body);
+            const forwardedHeaders = normalizeWixForwardedHeaders(call.headers);
+            const callerCookie = request.headers.get("cookie") ?? "";
+            if (!call.checkOwnerSession && webwixOwnerRungOn() && method === "POST" && isOwnerSitesPath(reqPath) && /wixSession2=/.test(callerCookie)) {
+              served.rung = "sites";
+              try {
+                const envelope = await wixOwnerSitesCall(reqPath, callerCookie, body, webwixFetch);
+                if (envelope.status >= 200 && envelope.status < 300) return json3(200, envelope);
+                return json3(200, {
+                  status: 501,
+                  body: JSON.stringify({ error: "webwix_owner_sites_failed", upstream: envelope.status })
+                });
+              } catch (e) {
+                return json3(200, {
+                  status: 501,
+                  body: JSON.stringify({ error: "webwix_owner_sites_failed", detail: String(e?.message ?? e).slice(0, 200) })
+                });
+              }
+            }
+            if (call.ownerMsid !== void 0) {
+              served.rung = call.checkOwnerSession === true ? "gate" : "owner";
+              if (!webwixOwnerRungOn()) {
+                return json3(503, { error: "webwix_owner_disabled" });
+              }
+              const msid = String(call.ownerMsid);
+              if (!isSafeMsid(msid)) return json3(400, { error: "webwix_owner_bad_msid" });
+              const cookie = request.headers.get("cookie") ?? "";
+              if (!/wixSession2=/.test(cookie)) return json3(501, { error: "webwix_owner_no_session", app: app2 });
+              try {
+                const instance = await webwixOwnerInstances.instance(msid, cookie);
+                if (call.checkOwnerSession === true) return json3(200, { status: 200, body: JSON.stringify({ ready: true }) }, { "cache-control": "no-store" });
+                const first = await wixVisitorCall(method, reqPath, body, instance, webwixFetch, forwardedHeaders);
+                if (first.status !== 401) return json3(200, first);
+                webwixOwnerInstances.invalidate(msid, cookie);
+                const fresh = await webwixOwnerInstances.instance(msid, cookie);
+                return json3(200, await wixVisitorCall(method, reqPath, body, fresh, webwixFetch, forwardedHeaders));
+              } catch (e) {
+                const msg = String(e?.message ?? e);
+                if (msg.includes("absolute URLs")) {
+                  return absoluteUrlRejection(reqPath) === "owner-only" ? json3(501, { error: "webwix_owner_only", app: app2 }) : json3(400, { error: "absolute_urls_not_allowed" });
+                }
+                if (msg.includes("owner mint failed")) {
+                  if (/owner mint failed \(5\d\d\)/.test(msg)) return json3(502, { error: "webwix_bridge_upstream_failed" });
+                  return json3(501, { error: "webwix_owner_mint_failed", app: app2 });
+                }
+                return json3(502, { error: "webwix_bridge_upstream_failed", detail: msg.slice(0, 200) });
+              }
+            }
+            const resolved2 = wixClientIdOf(utf8Decode(cfgBytes));
+            if ("error" in resolved2) {
+              return json3(501, { error: `webwix_bridge_${resolved2.error}`, app: app2 });
+            }
+            served.rung = "visitor";
+            const memberStore = memberSessions();
+            const memberBoundApp = memberApp(request);
+            if (memberAuthOn() && memberStore && memberBoundApp !== null && memberBoundApp === app2) {
+              const nowAuth = wixMemberAuthOf(utf8Decode(cfgBytes), callbackUrlFor(url));
+              const memberToken = nowAuth.ok ? await memberTokenFor(memberStore, readSessionCookie(request.headers.get("cookie")), memberBoundApp, nowAuth.config.clientId) : null;
+              if (memberToken) {
+                served.rung = "member";
+                try {
+                  return json3(200, await wixVisitorCall(method, reqPath, body, memberToken, webwixFetch, forwardedHeaders), { "cache-control": "no-store" });
+                } catch (e) {
+                  const msg = String(e?.message ?? e);
+                  if (msg.includes("absolute URLs")) {
+                    return absoluteUrlRejection(reqPath) === "owner-only" ? json3(501, { error: "webwix_owner_only", app: app2 }) : json3(400, { error: "absolute_urls_not_allowed" });
+                  }
+                  return json3(502, { error: "webwix_bridge_upstream_failed", detail: msg.slice(0, 200) });
+                }
+              }
             }
-            return json3(502, { error: "webwix_bridge_upstream_failed", detail: msg.slice(0, 200) });
-          }
-        }
-        const resolved2 = wixClientIdOf(utf8Decode(cfgBytes));
-        if ("error" in resolved2) {
-          return json3(501, { error: `webwix_bridge_${resolved2.error}`, app: app2 });
-        }
-        const memberStore = memberSessions();
-        const memberBoundApp = memberApp(request);
-        if (memberAuthOn() && memberStore && memberBoundApp !== null && memberBoundApp === app2) {
-          const nowAuth = wixMemberAuthOf(utf8Decode(cfgBytes), callbackUrlFor(url));
-          const memberToken = nowAuth.ok ? await memberTokenFor(memberStore, readSessionCookie(request.headers.get("cookie")), memberBoundApp, nowAuth.config.clientId) : null;
-          if (memberToken) {
             try {
-              return json3(200, await wixVisitorCall(method, reqPath, body, memberToken, webwixFetch, forwardedHeaders), { "cache-control": "no-store" });
+              const token = await webwixTokens.token(resolved2.clientId);
+              const first = await wixVisitorCall(method, reqPath, body, token, webwixFetch, forwardedHeaders);
+              if (first.status !== 401) return json3(200, first);
+              webwixTokens.invalidate(resolved2.clientId);
+              const fresh = await webwixTokens.token(resolved2.clientId);
+              return json3(200, await wixVisitorCall(method, reqPath, body, fresh, webwixFetch, forwardedHeaders));
             } catch (e) {
               const msg = String(e?.message ?? e);
               if (msg.includes("absolute URLs")) {
@@ -46490,22 +46578,15 @@ ${releaseId}`;
               }
               return json3(502, { error: "webwix_bridge_upstream_failed", detail: msg.slice(0, 200) });
             }
+          })();
+          status = res.status;
+          return res;
+        } finally {
+          try {
+            opts.onWebwixCall?.(webwixCallLog(served, status));
+          } catch {
           }
         }
-        try {
-          const token = await webwixTokens.token(resolved2.clientId);
-          const first = await wixVisitorCall(method, reqPath, body, token, webwixFetch, forwardedHeaders);
-          if (first.status !== 401) return json3(200, first);
-          webwixTokens.invalidate(resolved2.clientId);
-          const fresh = await webwixTokens.token(resolved2.clientId);
-          return json3(200, await wixVisitorCall(method, reqPath, body, fresh, webwixFetch, forwardedHeaders));
-        } catch (e) {
-          const msg = String(e?.message ?? e);
-          if (msg.includes("absolute URLs")) {
-            return absoluteUrlRejection(reqPath) === "owner-only" ? json3(501, { error: "webwix_owner_only", app: app2 }) : json3(400, { error: "absolute_urls_not_allowed" });
-          }
-          return json3(502, { error: "webwix_bridge_upstream_failed", detail: msg.slice(0, 200) });
-        }
       }
       if (request.method !== "GET") return json3(405, { error: "method_not_allowed" });
       if (path2 === "/__health") return json3(200, { ok: true });
@@ -46540,6 +46621,11 @@ ${releaseId}`;
       }
       if (path2 === "/v1/owner/instance") {
         if (opts.webwixBridge === false) return json3(503, { error: "webwix_bridge_disabled" });
+        const gateApp = url.searchParams.get("app");
+        if (gateApp) {
+          const cfg = await appConfigFor(request, url, gateApp);
+          if (!cfg.ok) return cfg.response;
+        }
         if (!webwixOwnerRungOn()) return json3(503, { error: "webwix_owner_disabled" });
         const msid = url.searchParams.get("msid") ?? "";
         if (!isSafeMsid(msid)) return json3(400, { error: "webwix_owner_bad_msid" });
@@ -46669,6 +46755,10 @@ ${releaseId}`;
       const cfgMatch = /^\/v1\/app-config\/([^/]+)$/.exec(path2);
       const app = cfgMatch?.[1] ?? resolveApp(request, url);
       const pin = resolvePin(request, url);
+      if (app && pin) {
+        const denied = await authorizePinnedRead(request, url, app, pin);
+        if (denied) return denied;
+      }
       if (path2 === "/v1/template-source") {
         if (!app) return json3(400, { error: "missing_app" });
         if (!store.getSource) return json3(501, { error: "templates_unsupported" });
@@ -46685,10 +46775,6 @@ ${releaseId}`;
           headers: { "content-type": JSON_CT, etag, "cache-control": DOC_CACHE_CONTROL, "x-himalaya-app": app }
         });
       }
-      if (app && pin) {
-        const denied = await authorizePinnedRead(request, url, app, pin);
-        if (denied) return denied;
-      }
       if (path2 === "/v1/authoring-docs" || /^\/v1\/authoring-docs\/(spec|mobile-ux)$/.test(path2)) {
         if (!app) return json3(400, { error: "missing_app" });
         const m = pin ? await pinnedManifest(app, pin) : await manifest(app);
@@ -47008,7 +47094,7 @@ var init_server = __esm({
     init_store();
     init_base64();
     init_contract();
-    init_preview_token();
+    init_pinned_read();
     init_package_share();
     init_wix_bridge();
     init_wix_member_auth();
@@ -47198,8 +47284,29 @@ function makeRunHandler(opts) {
       return new Response(null, { status: 204 });
     }
     if (path2 === "/v1/screen-events") {
-      return new Response(new ReadableStream({ start() {
-      } }), {
+      const source = opts.screenEvents;
+      let unsubscribe;
+      const body = new ReadableStream({
+        start(controller) {
+          if (!source) return;
+          const encoder = new TextEncoder();
+          controller.enqueue(encoder.encode(": himi run --watch\n\n"));
+          unsubscribe = source.subscribe((event, data) => {
+            try {
+              controller.enqueue(encoder.encode(`event: ${event}
+data: ${JSON.stringify(data ?? {})}
+
+`));
+            } catch {
+              unsubscribe?.();
+            }
+          });
+        },
+        cancel() {
+          unsubscribe?.();
+        }
+      });
+      return new Response(body, {
         status: 200,
         headers: { "content-type": "text/event-stream", "cache-control": "no-store", connection: "keep-alive" }
       });
@@ -47262,6 +47369,24 @@ async function toRequest(req) {
 async function writeResponse(res, response) {
   res.statusCode = response.status;
   response.headers.forEach((value, key2) => res.setHeader(key2, value));
+  if (response.body && /^text\/event-stream\b/i.test(response.headers.get("content-type") ?? "")) {
+    res.flushHeaders();
+    const reader = response.body.getReader();
+    res.on("close", () => {
+      void reader.cancel().catch(() => {
+      });
+    });
+    try {
+      for (; ; ) {
+        const { done, value } = await reader.read();
+        if (done) break;
+        res.write(value);
+      }
+    } catch {
+    }
+    res.end();
+    return;
+  }
   const ab = await response.arrayBuffer();
   res.end(ab.byteLength ? Buffer.from(ab) : void 0);
 }
@@ -47324,19 +47449,19 @@ var init_preview_assets_generated = __esm({
   "../../packages/serve/src/preview-assets.generated.ts"() {
     init_preview_assets_format();
     PREVIEW_ASSET_MANIFEST = [
-      { key: "assets/index-tPdez24X.js", contentType: "application/javascript; charset=utf-8", offset: 8, length: 1012335, sha256: "9af3d246668e3b69acbdbaebf33129e45f99fdaa32230f782b675fcdeeb38773" },
-      { key: "fonts/WixMadeforDisplay-Bold.ttf", contentType: "font/ttf", offset: 1012343, length: 90924, sha256: "ec4c7d63772d980d6e147b2df6215fd2737e4b04cebe0cf7e11dc695fb63cdcf" },
-      { key: "fonts/WixMadeforDisplay-ExtraBold.ttf", contentType: "font/ttf", offset: 1103267, length: 90984, sha256: "bf4c16a2774edd38a921edf3099469866cd74c094fd596f3fa4e81f54a04dfaa" },
-      { key: "fonts/WixMadeforDisplay-Medium.ttf", contentType: "font/ttf", offset: 1194251, length: 90980, sha256: "368faca44fb9f7207e4af784e94750b1ee59c1098b8689e0f4a918926f244fb5" },
-      { key: "fonts/WixMadeforDisplay-Regular.ttf", contentType: "font/ttf", offset: 1285231, length: 90872, sha256: "97ed8f1a6772abe26e3d8af5cecfc4b02faa94497d585b0398b5053b739a70c1" },
-      { key: "fonts/WixMadeforDisplay-SemiBold.ttf", contentType: "font/ttf", offset: 1376103, length: 90980, sha256: "642feab8a48ddf6c7a89d7c2a7c0edfa0e6e773f671287e460e222703563191e" },
-      { key: "fonts/WixMadeforText-Bold.ttf", contentType: "font/ttf", offset: 1467083, length: 108636, sha256: "37c179b4fefb63ea9637322b84583a2df53aa226c150294eea1675c14b1b8e29" },
-      { key: "fonts/WixMadeforText-ExtraBold.ttf", contentType: "font/ttf", offset: 1575719, length: 109084, sha256: "62e2fe4718129f36ecdb0ae4de385bd6b81ecc876146447167c6c140fad699a9" },
-      { key: "fonts/WixMadeforText-Medium.ttf", contentType: "font/ttf", offset: 1684803, length: 109048, sha256: "4ecf270136af928612c76fe4ebade91d8156975e5ea4c0cf9225501dd1788e02" },
-      { key: "fonts/WixMadeforText-Regular.ttf", contentType: "font/ttf", offset: 1793851, length: 107700, sha256: "dee56f09fd3efc127c1ea95557edc74110c1460a46287da36e0af25efd341ef5" },
-      { key: "fonts/WixMadeforText-SemiBold.ttf", contentType: "font/ttf", offset: 1901551, length: 88108, sha256: "dced97a77624bc5f8b1ae65850360908297f4588e09feb6f22792d29dc7e765b" },
-      { key: "index.html", contentType: "text/html; charset=utf-8", offset: 1989659, length: 4448, sha256: "c4235c7ba4a7bdea831017711424c9e4f8a8b33466bef53f4def1bfcea6a3b15" },
-      { key: "t5-frame.html", contentType: "text/html; charset=utf-8", offset: 1994107, length: 17209, sha256: "dffc9718e2faa63ae2cc919e0a842f585ed565aaaa7c53778e90379442c731b6" }
+      { key: "assets/index-TpXF5JLO.js", contentType: "application/javascript; charset=utf-8", offset: 8, length: 1013412, sha256: "e6d1da59c13ca586b7834f4d08ca9e136b7fea8be9355d952d757fc66fc779a5" },
+      { key: "fonts/WixMadeforDisplay-Bold.ttf", contentType: "font/ttf", offset: 1013420, length: 90924, sha256: "ec4c7d63772d980d6e147b2df6215fd2737e4b04cebe0cf7e11dc695fb63cdcf" },
+      { key: "fonts/WixMadeforDisplay-ExtraBold.ttf", contentType: "font/ttf", offset: 1104344, length: 90984, sha256: "bf4c16a2774edd38a921edf3099469866cd74c094fd596f3fa4e81f54a04dfaa" },
+      { key: "fonts/WixMadeforDisplay-Medium.ttf", contentType: "font/ttf", offset: 1195328, length: 90980, sha256: "368faca44fb9f7207e4af784e94750b1ee59c1098b8689e0f4a918926f244fb5" },
+      { key: "fonts/WixMadeforDisplay-Regular.ttf", contentType: "font/ttf", offset: 1286308, length: 90872, sha256: "97ed8f1a6772abe26e3d8af5cecfc4b02faa94497d585b0398b5053b739a70c1" },
+      { key: "fonts/WixMadeforDisplay-SemiBold.ttf", contentType: "font/ttf", offset: 1377180, length: 90980, sha256: "642feab8a48ddf6c7a89d7c2a7c0edfa0e6e773f671287e460e222703563191e" },
+      { key: "fonts/WixMadeforText-Bold.ttf", contentType: "font/ttf", offset: 1468160, length: 108636, sha256: "37c179b4fefb63ea9637322b84583a2df53aa226c150294eea1675c14b1b8e29" },
+      { key: "fonts/WixMadeforText-ExtraBold.ttf", contentType: "font/ttf", offset: 1576796, length: 109084, sha256: "62e2fe4718129f36ecdb0ae4de385bd6b81ecc876146447167c6c140fad699a9" },
+      { key: "fonts/WixMadeforText-Medium.ttf", contentType: "font/ttf", offset: 1685880, length: 109048, sha256: "4ecf270136af928612c76fe4ebade91d8156975e5ea4c0cf9225501dd1788e02" },
+      { key: "fonts/WixMadeforText-Regular.ttf", contentType: "font/ttf", offset: 1794928, length: 107700, sha256: "dee56f09fd3efc127c1ea95557edc74110c1460a46287da36e0af25efd341ef5" },
+      { key: "fonts/WixMadeforText-SemiBold.ttf", contentType: "font/ttf", offset: 1902628, length: 88108, sha256: "dced97a77624bc5f8b1ae65850360908297f4588e09feb6f22792d29dc7e765b" },
+      { key: "index.html", contentType: "text/html; charset=utf-8", offset: 1990736, length: 4448, sha256: "5f0ee56640a5dfc73d3b2b78526aa1f7966de1bec39fe746e0d9ba39d57d829e" },
+      { key: "t5-frame.html", contentType: "text/html; charset=utf-8", offset: 1995184, length: 17209, sha256: "dffc9718e2faa63ae2cc919e0a842f585ed565aaaa7c53778e90379442c731b6" }
     ];
   }
 });
@@ -47352,7 +47477,7 @@ __export(run_exports, {
   runPackage: () => runPackage,
   withoutProdServe: () => withoutProdServe
 });
-import { cpSync as cpSync2, existsSync as existsSync52, mkdirSync as mkdirSync26, mkdtempSync as mkdtempSync3, readFileSync as readFileSync57, rmSync as rmSync10, statSync as statSync13 } from "node:fs";
+import { cpSync as cpSync2, existsSync as existsSync52, mkdirSync as mkdirSync25, mkdtempSync as mkdtempSync3, readFileSync as readFileSync57, rmSync as rmSync11, statSync as statSync13 } from "node:fs";
 import { tmpdir as tmpdir4 } from "node:os";
 import { dirname as dirname27, join as join49 } from "node:path";
 import { fileURLToPath as fileURLToPath22 } from "node:url";
@@ -47362,7 +47487,8 @@ function makePackageRunHandler(opts) {
     app: opts.app,
     assets: opts.assets,
     ...opts.chrome ? { chrome: opts.chrome } : {},
-    header: opts.header ?? null
+    header: opts.header ?? null,
+    ...opts.screenEvents ? { screenEvents: opts.screenEvents } : {}
   });
 }
 async function fetchBytes(url) {
@@ -47386,8 +47512,8 @@ async function resolvePackage(source, workDir) {
       const root2 = workDir ?? mkdtempSync3(join49(tmpdir4(), "himi-run-"));
       const target = join49(root2, app2);
       if (join49(source) !== target) {
-        mkdirSync26(root2, { recursive: true });
-        rmSync10(target, { recursive: true, force: true });
+        mkdirSync25(root2, { recursive: true });
+        rmSync11(target, { recursive: true, force: true });
         cpSync2(source, target, { recursive: true });
       }
       return {
@@ -47407,7 +47533,7 @@ async function resolvePackage(source, workDir) {
   const { app, appDir: appDir2 } = unpackTo(bytes2, root);
   const opened = openPackageDir(appDir2);
   if (!opened.validation.ok) {
-    rmSync10(workDir ? appDir2 : root, { recursive: true, force: true });
+    rmSync11(workDir ? appDir2 : root, { recursive: true, force: true });
     throw new Error(`package is not valid:
   ${opened.validation.errors.join("\n  ")}`);
   }
@@ -47454,16 +47580,19 @@ async function runPackage(source, opts = {}) {
   const resolved2 = await resolvePackage(source, opts.workDir);
   const assets = opts.assets ?? (opts.spa ? /* @__PURE__ */ new Map() : await loadPreviewAssets());
   if (!opts.spa && assets.size === 0) {
-    if (resolved2.temp) rmSync10(resolved2.temp, { recursive: true, force: true });
+    if (resolved2.temp) rmSync11(resolved2.temp, { recursive: true, force: true });
     throw new Error(NO_SPA_MESSAGE);
   }
-  const handler = makePackageRunHandler({
+  const plane = makePackageRunHandler({
     releaseRoot: resolved2.releaseRoot,
     app: resolved2.app,
     assets,
     chrome: opts.chrome,
-    header: resolved2.header
+    header: resolved2.header,
+    ...opts.screenEvents ? { screenEvents: opts.screenEvents } : {}
   });
+  const extra = opts.extraRoutes;
+  const handler = extra ? (request) => extra(request) ?? plane(request) : plane;
   const server = nodeAdapter(handler);
   const host = opts.host ?? "127.0.0.1";
   const port = await new Promise((resolvePort, reject) => {
@@ -47481,10 +47610,13 @@ async function runPackage(source, opts = {}) {
     releaseId: resolved2.releaseId,
     port,
     url,
+    releaseRoot: resolved2.releaseRoot,
+    origin,
     warnings: resolved2.warnings,
     close: () => new Promise((done) => {
+      server.closeAllConnections?.();
       server.close(() => {
-        if (resolved2.temp) rmSync10(resolved2.temp, { recursive: true, force: true });
+        if (resolved2.temp) rmSync11(resolved2.temp, { recursive: true, force: true });
         done();
       });
     })
@@ -47504,6 +47636,250 @@ var init_run = __esm({
   }
 });
 
+// src/run-watch.ts
+var run_watch_exports = {};
+__export(run_watch_exports, {
+  ReloadBus: () => ReloadBus,
+  boardFile: () => boardFile,
+  diffReleases: () => diffReleases,
+  himiDir: () => himiDir,
+  ignoredChange: () => ignoredChange,
+  isEmptyDiff: () => isEmptyDiff,
+  rebuildBlocker: () => rebuildBlocker,
+  reloadEvents: () => reloadEvents,
+  removeRunRecord: () => removeRunRecord,
+  serialize: () => serialize,
+  watchContent: () => watchContent,
+  watchFlagConflict: () => watchFlagConflict,
+  watchedContentDir: () => watchedContentDir,
+  writeRunRecord: () => writeRunRecord
+});
+import { closeSync as closeSync2, constants, existsSync as existsSync53, fstatSync, lstatSync as lstatSync7, statSync as statSync14, mkdirSync as mkdirSync26, openSync as openSync2, readFileSync as readFileSync58, realpathSync as realpathSync6, renameSync as renameSync5, rmSync as rmSync12, writeFileSync as writeFileSync22, watch as fsWatch } from "node:fs";
+import { randomUUID as randomUUID3 } from "node:crypto";
+import { extname as extname4, join as join50, resolve as resolve42, sep as sep13 } from "node:path";
+function diffReleases(prev, next) {
+  const bundles = Object.keys(next.bundles).filter((b) => prev.bundles[b]?.sha256 !== next.bundles[b].sha256).sort();
+  const changedBundles = new Set(bundles);
+  const screens = Object.entries(next.screens).filter(([id, s]) => {
+    const before = prev.screens[id];
+    return !before || before.descriptorHash !== s.descriptorHash || before.bundle !== s.bundle || s.bundle !== null && changedBundles.has(s.bundle);
+  }).map(([id]) => id).sort();
+  const prevIds = Object.keys(prev.screens).sort().join("\n");
+  const nextIds = Object.keys(next.screens).sort().join("\n");
+  return {
+    screens,
+    bundles,
+    tokens: prev.tokensHash !== next.tokensHash,
+    config: prev.appConfigHash !== next.appConfigHash || prevIds !== nextIds
+  };
+}
+function reloadEvents(d) {
+  const out = [];
+  if (d.bundles.length) out.push(["bundle.invalidated", { bundles: d.bundles }]);
+  if (d.screens.length) out.push(["screen.invalidated", { screenIds: d.screens }]);
+  if (d.tokens) out.push(["tokens.changed", {}]);
+  if (d.config) out.push(["config.invalidated", {}]);
+  return out;
+}
+function ignoredChange(relPath, isDirectory = () => false) {
+  const parts = relPath.split(/[\\/]/).filter(Boolean);
+  if (!parts.length) return true;
+  const [top] = parts;
+  if ([".himi", "dist", "node_modules", ".git", ".build"].includes(top)) return true;
+  if ((top === "shots" || top === "evidence") && (parts.length > 1 || isDirectory(top))) return true;
+  const name = parts[parts.length - 1];
+  return /(^\.#|~$|\.sw[a-p]$|^\.DS_Store$|\.tmp$)/.test(name);
+}
+function watchContent(dir, onChange, opts = {}) {
+  const debounceMs = opts.debounceMs ?? 200;
+  const watch2 = opts.watch ?? ((p, o, l) => fsWatch(p, o, (event, file) => l(event, file === null ? null : String(file))));
+  let timer = null;
+  const pending = /* @__PURE__ */ new Set();
+  const watcher = watch2(dir, { recursive: true }, (_event, file) => {
+    if (!file || ignoredChange(file, (rel) => isDir(join50(dir, rel)))) return;
+    pending.add(file);
+    if (timer) clearTimeout(timer);
+    timer = setTimeout(() => {
+      timer = null;
+      const paths = [...pending];
+      pending.clear();
+      onChange(paths);
+    }, debounceMs);
+  });
+  return {
+    close() {
+      if (timer) clearTimeout(timer);
+      watcher.close();
+    }
+  };
+}
+function watchedContentDir(source) {
+  if (!source || /^https?:\/\//i.test(source)) return null;
+  const dir = resolve42(source);
+  try {
+    return statSync14(dir).isDirectory() && existsSync53(join50(dir, "himalaya.content.json")) ? dir : null;
+  } catch {
+    return null;
+  }
+}
+function watchFlagConflict(opts) {
+  if (opts.source) {
+    return { error: "watch_needs_source", message: "--watch rebuilds a content package on every save, so it cannot watch a packaged release or a URL. Pass the app's directory (the one with himalaya.content.json), --content <dir>, or run it from there with no argument." };
+  }
+  if (opts.browser) {
+    return { error: "watch_with_browser", message: "--watch rebuilds and serves from this process; --browser runs the whole plane inside the tab. Pick one." };
+  }
+  if (opts.spa) {
+    return { error: "watch_with_spa", message: "--watch pushes each rebuild to the open tab over this server's own origin, and a hosted SPA (--spa) listens on its origin instead, so it would never repaint. Drop --spa to watch with the bundled web host, or drop --watch." };
+  }
+  return null;
+}
+function rebuildBlocker(outcome, servedMissing) {
+  const failed2 = outcome.failedToBuild[0];
+  if (failed2) return `${failed2.screenId}: ${failed2.error.split("\n")[0]}`;
+  const had = new Set(servedMissing.map((m) => `${m.screen}\0${m.bundle}`));
+  const lost = outcome.missingBundles.find((m) => !had.has(`${m.screen}\0${m.bundle}`));
+  if (lost) return `${lost.screen}: its worker bundle "${lost.bundle}" is referenced but was not built`;
+  return null;
+}
+function serialize(task) {
+  let running = null;
+  let again = false;
+  let stopped = false;
+  const go = () => {
+    if (stopped) return;
+    if (running) {
+      again = true;
+      return;
+    }
+    running = (async () => {
+      try {
+        await task();
+      } finally {
+        running = null;
+        if (again && !stopped) {
+          again = false;
+          go();
+        }
+      }
+    })();
+  };
+  return Object.assign(() => go(), {
+    async stop() {
+      stopped = true;
+      again = false;
+      await running?.catch(() => {
+      });
+    }
+  });
+}
+function himiDir(dir) {
+  const root = join50(dir, ".himi");
+  try {
+    return lstatSync7(root).isDirectory() ? root : null;
+  } catch (e) {
+    if (e.code !== "ENOENT") return null;
+    mkdirSync26(root, { recursive: true });
+    return lstatSync7(root).isDirectory() ? root : null;
+  }
+}
+function writeRunRecord(dir, record2) {
+  const root = himiDir(dir);
+  if (!root) return false;
+  const tmp = join50(root, `.run.json.${process.pid}.${randomUUID3()}.tmp`);
+  try {
+    writeFileSync22(tmp, `${JSON.stringify(record2, null, 2)}
+`, { flag: "wx" });
+    renameSync5(tmp, join50(root, "run.json"));
+  } catch (e) {
+    rmSync12(tmp, { force: true });
+    throw e;
+  }
+  return true;
+}
+function removeRunRecord(dir) {
+  const root = join50(dir, ".himi");
+  try {
+    if (!lstatSync7(root).isDirectory()) return;
+  } catch {
+    return;
+  }
+  rmSync12(join50(root, "run.json"), { force: true });
+}
+function boardFile(dir, pathname) {
+  let rel = null;
+  if (pathname === "/__himi/studio/" || pathname === "/__himi/studio/index.html") rel = join50("studio", "index.html");
+  else if (pathname === "/__himi/studio/state.js") rel = join50("studio", "state.js");
+  else {
+    const m = /^\/__himi\/history\/([0-9a-f]{64}\.(png|jpg|gif|webp))$/.exec(pathname);
+    if (m) rel = join50("history", m[1]);
+  }
+  if (!rel) return null;
+  const bytes2 = readConfined(resolve42(dir, ".himi"), rel);
+  if (!bytes2) return new Response("not found", { status: 404 });
+  return new Response(bytes2, {
+    status: 200,
+    headers: { "content-type": BOARD_TYPES[extname4(rel)] ?? "application/octet-stream", "cache-control": rel.startsWith("history") ? "public, max-age=31536000, immutable" : "no-store" }
+  });
+}
+function readConfined(root, rel) {
+  try {
+    if (!lstatSync7(root).isDirectory()) return null;
+    const parts = rel.split(sep13);
+    let at = root;
+    for (let i = 0; i < parts.length; i++) {
+      at = join50(at, parts[i]);
+      const st = lstatSync7(at);
+      if (st.isSymbolicLink() || !(i === parts.length - 1 ? st.isFile() : st.isDirectory())) return null;
+    }
+    const canonicalRoot = realpathSync6(root);
+    if (!realpathSync6(at).startsWith(canonicalRoot + sep13)) return null;
+    const fd = openSync2(at, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0));
+    try {
+      if (!fstatSync(fd).isFile()) return null;
+      return readFileSync58(fd);
+    } finally {
+      closeSync2(fd);
+    }
+  } catch {
+    return null;
+  }
+}
+var isEmptyDiff, ReloadBus, isDir, BOARD_TYPES;
+var init_run_watch = __esm({
+  "src/run-watch.ts"() {
+    isEmptyDiff = (d) => !d.screens.length && !d.bundles.length && !d.tokens && !d.config;
+    ReloadBus = class {
+      subscribers = /* @__PURE__ */ new Set();
+      subscribe(send2) {
+        this.subscribers.add(send2);
+        return () => this.subscribers.delete(send2);
+      }
+      publish(event, data) {
+        for (const send2 of [...this.subscribers]) send2(event, data);
+      }
+      get listeners() {
+        return this.subscribers.size;
+      }
+    };
+    isDir = (path2) => {
+      try {
+        return statSync14(path2).isDirectory();
+      } catch {
+        return false;
+      }
+    };
+    BOARD_TYPES = {
+      ".html": "text/html; charset=utf-8",
+      ".js": "text/javascript; charset=utf-8",
+      ".png": "image/png",
+      ".jpg": "image/jpeg",
+      ".gif": "image/gif",
+      ".webp": "image/webp"
+    };
+  }
+});
+
 // src/run-browser.ts
 var run_browser_exports = {};
 __export(run_browser_exports, {
@@ -47512,19 +47888,19 @@ __export(run_browser_exports, {
   runInBrowser: () => runInBrowser
 });
 import { createServer as createServer5 } from "node:http";
-import { existsSync as existsSync53, readFileSync as readFileSync58 } from "node:fs";
+import { existsSync as existsSync54, readFileSync as readFileSync59 } from "node:fs";
 import { spawnSync as spawnSync3 } from "node:child_process";
-import { dirname as dirname28, resolve as resolve42 } from "node:path";
+import { dirname as dirname28, resolve as resolve43 } from "node:path";
 import { fileURLToPath as fileURLToPath23 } from "node:url";
 function stagedDir() {
-  return process.env.HIMI_BROWSER_PLANE_OUT ? resolve42(process.env.HIMI_BROWSER_PLANE_OUT) : resolve42(REPO, "packages", "serve", "dist", "browser-plane");
+  return process.env.HIMI_BROWSER_PLANE_OUT ? resolve43(process.env.HIMI_BROWSER_PLANE_OUT) : resolve43(REPO, "packages", "serve", "dist", "browser-plane");
 }
 function missingStaged() {
-  return [...SERVED].filter((f) => !existsSync53(resolve42(stagedDir(), f))).sort();
+  return [...SERVED].filter((f) => !existsSync54(resolve43(stagedDir(), f))).sort();
 }
 function ensureBrowserPlaneStaged() {
   if (missingStaged().length === 0) return { ok: true, detail: "already staged" };
-  const r = spawnSync3(process.execPath, [resolve42(REPO, "core/serve/scripts/stage-browser-plane.mjs")], {
+  const r = spawnSync3(process.execPath, [resolve43(REPO, "core/serve/scripts/stage-browser-plane.mjs")], {
     cwd: REPO,
     encoding: "utf8"
   });
@@ -47610,7 +47986,7 @@ async function runInBrowser(releaseRoot, app, header, opts = {}) {
     }
     const name = path2 === "/" || path2 === "/index.html" ? "host.html" : path2.slice(1);
     if (SERVED.has(name)) {
-      if (!existsSync53(resolve42(stagedDir(), name))) {
+      if (!existsSync54(resolve43(stagedDir(), name))) {
         const restaged = ensureBrowserPlaneStaged();
         if (!restaged.ok) {
           res.writeHead(503, { "content-type": "application/json" });
@@ -47620,7 +47996,7 @@ async function runInBrowser(releaseRoot, app, header, opts = {}) {
       }
       let bytes2;
       try {
-        bytes2 = readFileSync58(resolve42(stagedDir(), name));
+        bytes2 = readFileSync59(resolve43(stagedDir(), name));
       } catch (e) {
         res.writeHead(503, { "content-type": "application/json" });
         res.end(JSON.stringify({ error: "browser_plane_unstaged", file: name, detail: String(e) }));
@@ -47661,7 +48037,7 @@ var init_run_browser = __esm({
     init_open_url();
     init_file_store();
     HERE = dirname28(fileURLToPath23(import.meta.url));
-    REPO = resolve42(HERE, "..", "..", "..");
+    REPO = resolve43(HERE, "..", "..", "..");
     SERVED = /* @__PURE__ */ new Set(["host.html", "sw.js", "package-reader.js"]);
   }
 });
@@ -48080,10 +48456,10 @@ __export(preflight_exports, {
   parseStoreConfig: () => parseStoreConfig,
   requireEnv: () => requireEnv
 });
-import { existsSync as existsSync54, readFileSync as readFileSync59 } from "node:fs";
-import { isAbsolute as isAbsolute3, relative as relative9, resolve as resolve43 } from "node:path";
+import { existsSync as existsSync55, readFileSync as readFileSync60 } from "node:fs";
+import { isAbsolute as isAbsolute3, relative as relative9, resolve as resolve44 } from "node:path";
 function isInsideRepo(p) {
-  const rel = relative9(REPO_ROOT3, resolve43(p));
+  const rel = relative9(REPO_ROOT3, resolve44(p));
   return rel !== "" && !rel.startsWith("..") && !isAbsolute3(rel);
 }
 function assertCredentialOutsideRepo(label2, p) {
@@ -48137,10 +48513,10 @@ function parseStoreConfig(text5) {
 }
 function loadStoreConfig(app) {
   const p = storeConfigPath(app);
-  if (!existsSync54(p)) {
+  if (!existsSync55(p)) {
     throw new Error(`No store config at ${p}. Create apps/${app}/store/store.config.yaml first (see /setup-store-signing).`);
   }
-  return parseStoreConfig(readFileSync59(p, "utf8"));
+  return parseStoreConfig(readFileSync60(p, "utf8"));
 }
 var init_preflight = __esm({
   "../store-release/preflight.ts"() {
@@ -48159,19 +48535,19 @@ __export(credential_profile_exports, {
   profilePath: () => profilePath,
   resolveStoreCredentials: () => resolveStoreCredentials
 });
-import { existsSync as existsSync55, readFileSync as readFileSync60 } from "node:fs";
+import { existsSync as existsSync56, readFileSync as readFileSync61 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
-import { join as join50 } from "node:path";
+import { join as join51 } from "node:path";
 function credentialsDir(home = homedir5()) {
-  return join50(home, ".himalaya", "store-credentials");
+  return join51(home, ".himalaya", "store-credentials");
 }
 function profilePath(name, home = homedir5()) {
   if (!PROFILE_NAME.test(name)) {
     throw new Error(
-      `credential profile ${JSON.stringify(name)} is not a profile name \u2014 use letters, digits, ".", "_" or "-" starting with a letter or digit. It names ${join50(credentialsDir(home), "<name>.json")}; it is never a path.`
+      `credential profile ${JSON.stringify(name)} is not a profile name \u2014 use letters, digits, ".", "_" or "-" starting with a letter or digit. It names ${join51(credentialsDir(home), "<name>.json")}; it is never a path.`
     );
   }
-  return join50(credentialsDir(home), `${name}.json`);
+  return join51(credentialsDir(home), `${name}.json`);
 }
 function parseProfile(text5, label2) {
   let doc;
@@ -48202,8 +48578,8 @@ function resolveStoreCredentials(opts) {
   const { app, cfg } = opts;
   const env = opts.env ?? process.env;
   const home = opts.home ?? homedir5();
-  const read = opts.readProfile ?? ((p) => readFileSync60(p, "utf8"));
-  const exists = opts.profileExists ?? existsSync55;
+  const read = opts.readProfile ?? ((p) => readFileSync61(p, "utf8"));
+  const exists = opts.profileExists ?? existsSync56;
   const ios = cfg.ios ?? {};
   const flagName = opts.profileFlag?.trim();
   const named = namedProfile(cfg, opts.profileFlag);
@@ -48283,9 +48659,9 @@ __export(preflight_app_exports, {
   preflightApp: () => preflightApp,
   profileAccount: () => profileAccount
 });
-import { readFileSync as readFileSync61, existsSync as existsSync56, readdirSync as readdirSync26, statSync as statSync14 } from "node:fs";
+import { readFileSync as readFileSync62, existsSync as existsSync57, readdirSync as readdirSync26, statSync as statSync15 } from "node:fs";
 import { createHash as createHash25 } from "node:crypto";
-import { join as join51 } from "node:path";
+import { join as join52 } from "node:path";
 function analyze(projectYml, storeConfig, icon, account) {
   const f = [];
   const has = (re, s) => re.test(s);
@@ -48349,13 +48725,13 @@ function profileAccount(app, storeConfig, opts = {}) {
   }
 }
 async function preflightApp(app, opts = {}) {
-  const projectYml = existsSync56(iosProjectYml(app)) ? readFileSync61(iosProjectYml(app), "utf8") : "";
-  const storeConfig = existsSync56(storeConfigPath(app)) ? readFileSync61(storeConfigPath(app), "utf8") : "";
+  const projectYml = existsSync57(iosProjectYml(app)) ? readFileSync62(iosProjectYml(app), "utf8") : "";
+  const storeConfig = existsSync57(storeConfigPath(app)) ? readFileSync62(storeConfigPath(app), "utf8") : "";
   if (!storeConfig) return [{ level: "error", message: `no apps/${app}/store/store.config.yaml \u2014 run /setup-store-signing first.` }];
   const findings = analyze(
     projectYml,
     storeConfig,
-    await appIconState(join51(appDir(app), "ios")),
+    await appIconState(join52(appDir(app), "ios")),
     profileAccount(app, storeConfig, opts)
   );
   findings.push(...analyzeListing(metadataFilesPresent(app), listScreenshots(app)));
@@ -48384,17 +48760,17 @@ function analyzeSubmissionRecord(appLevel, review, opts) {
   return f;
 }
 function appLevelMetadataFiles(app, locale = "en-US") {
-  const root = join51(storeDir(app), "metadata");
+  const root = join52(storeDir(app), "metadata");
   const out = /* @__PURE__ */ new Set();
-  if (existsSync56(root)) {
+  if (existsSync57(root)) {
     for (const n of readdirSync26(root)) if (n.endsWith(".txt")) out.add(n);
   }
-  if (existsSync56(join51(root, locale, "privacy_url.txt"))) out.add("privacy_url.txt");
+  if (existsSync57(join52(root, locale, "privacy_url.txt"))) out.add("privacy_url.txt");
   return out;
 }
 function reviewInfoFiles(app) {
-  const dir = join51(storeDir(app), "review_information");
-  if (!existsSync56(dir)) return /* @__PURE__ */ new Set();
+  const dir = join52(storeDir(app), "review_information");
+  if (!existsSync57(dir)) return /* @__PURE__ */ new Set();
   return new Set(readdirSync26(dir).filter((n) => n.endsWith(".txt")));
 }
 function isValidAppStoreSize(w, h) {
@@ -48504,12 +48880,12 @@ function analyzePlayListing(assets) {
   return f;
 }
 function playListingAssets(app, locale = "en-US") {
-  const dir = join51(storeDir(app), "play", locale, "images");
+  const dir = join52(storeDir(app), "play", locale, "images");
   const read = (names) => {
     for (const name of names) {
-      const p = join51(dir, name);
+      const p = join52(dir, name);
       try {
-        if (statSync14(p).isFile()) return { name, bytes: readFileSync61(p) };
+        if (statSync15(p).isFile()) return { name, bytes: readFileSync62(p) };
       } catch {
       }
     }
@@ -48540,26 +48916,26 @@ function analyzeListing(metaFiles, shots) {
   return f;
 }
 function metadataFilesPresent(app, locale = "en-US") {
-  const dir = join51(storeDir(app), "metadata", locale);
-  if (!existsSync56(dir)) return /* @__PURE__ */ new Set();
+  const dir = join52(storeDir(app), "metadata", locale);
+  if (!existsSync57(dir)) return /* @__PURE__ */ new Set();
   return new Set(readdirSync26(dir).filter((n) => n.endsWith(".txt")));
 }
 function listScreenshots(app, locale = "en-US") {
   const out = [];
-  const flat = join51(storeDir(app), "screenshots", locale);
-  if (existsSync56(flat)) {
+  const flat = join52(storeDir(app), "screenshots", locale);
+  if (existsSync57(flat)) {
     for (const png of readdirSync26(flat).filter((n) => n.endsWith(".png"))) {
-      const sz = pngSize(readFileSync61(join51(flat, png)));
+      const sz = pngSize(readFileSync62(join52(flat, png)));
       if (sz) out.push({ name: png, w: sz.w, h: sz.h });
     }
   }
-  const legacy = join51(storeDir(app), "metadata", locale, "screenshots");
-  if (existsSync56(legacy)) {
+  const legacy = join52(storeDir(app), "metadata", locale, "screenshots");
+  if (existsSync57(legacy)) {
     for (const deviceDir of readdirSync26(legacy)) {
-      const d = join51(legacy, deviceDir);
-      if (!statSync14(d).isDirectory()) continue;
+      const d = join52(legacy, deviceDir);
+      if (!statSync15(d).isDirectory()) continue;
       for (const png of readdirSync26(d).filter((n) => n.endsWith(".png"))) {
-        const sz = pngSize(readFileSync61(join51(d, png)));
+        const sz = pngSize(readFileSync62(join52(d, png)));
         if (sz) out.push({ name: `${deviceDir}/${png}`, w: sz.w, h: sz.h });
       }
     }
@@ -48567,13 +48943,13 @@ function listScreenshots(app, locale = "en-US") {
   return out;
 }
 function placeholderHashes2() {
-  const templateIos = join51(appDir("_template"), "ios");
-  if (!existsSync56(templateIos)) return [LEGACY_PLACEHOLDER_SHA2562];
+  const templateIos = join52(appDir("_template"), "ios");
+  if (!existsSync57(templateIos)) return [LEGACY_PLACEHOLDER_SHA2562];
   for (const target of readdirSync26(templateIos)) {
-    const p = join51(templateIos, target, "Assets.xcassets", "AppIcon.appiconset", "icon_1024.png");
+    const p = join52(templateIos, target, "Assets.xcassets", "AppIcon.appiconset", "icon_1024.png");
     try {
-      if (!statSync14(p).isFile()) continue;
-      return [LEGACY_PLACEHOLDER_SHA2562, createHash25("sha256").update(readFileSync61(p)).digest("hex")];
+      if (!statSync15(p).isFile()) continue;
+      return [LEGACY_PLACEHOLDER_SHA2562, createHash25("sha256").update(readFileSync62(p)).digest("hex")];
     } catch {
     }
   }
@@ -48604,12 +48980,12 @@ async function pixelIssues(bytes2) {
   }
 }
 async function appIconState(iosDir) {
-  if (!existsSync56(iosDir)) return { exists: false, isPlaceholder: false, storeIssues: [] };
+  if (!existsSync57(iosDir)) return { exists: false, isPlaceholder: false, storeIssues: [] };
   for (const target of readdirSync26(iosDir)) {
-    const p = join51(iosDir, target, "Assets.xcassets", "AppIcon.appiconset", "icon_1024.png");
+    const p = join52(iosDir, target, "Assets.xcassets", "AppIcon.appiconset", "icon_1024.png");
     try {
-      if (!statSync14(p).isFile()) continue;
-      const bytes2 = readFileSync61(p);
+      if (!statSync15(p).isFile()) continue;
+      const bytes2 = readFileSync62(p);
       const hash = createHash25("sha256").update(bytes2).digest("hex");
       const pixels = await pixelIssues(bytes2);
       return {
@@ -48681,7 +49057,7 @@ __export(version_exports, {
   setAndroidVersion: () => setAndroidVersion,
   setIosVersion: () => setIosVersion
 });
-import { readFileSync as readFileSync62, writeFileSync as writeFileSync23 } from "node:fs";
+import { readFileSync as readFileSync63, writeFileSync as writeFileSync23 } from "node:fs";
 function readIosVersion(projectYml) {
   const marketing = matchScalar(projectYml, "CFBundleShortVersionString");
   const build2 = matchScalar(projectYml, "CFBundleVersion");
@@ -48739,8 +49115,8 @@ function setAndroidVersion(gradle, v) {
 function bumpVersion(app, opts) {
   const iosPath = iosProjectYml(app);
   const gradlePath = androidGradle(app);
-  const iosYml = readFileSync62(iosPath, "utf8");
-  const gradle = readFileSync62(gradlePath, "utf8");
+  const iosYml = readFileSync63(iosPath, "utf8");
+  const gradle = readFileSync63(gradlePath, "utf8");
   const current = readIosVersion(iosYml);
   const next = {
     marketing: opts.marketing ?? current.marketing,
@@ -48757,7 +49133,7 @@ var init_version = __esm({
 });
 
 // ../store-release/register-bundle.ts
-import { readFileSync as readFileSync63 } from "node:fs";
+import { readFileSync as readFileSync64 } from "node:fs";
 import { createPrivateKey as createPrivateKey2, sign } from "node:crypto";
 function b64url2(b) {
   return Buffer.from(b).toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
@@ -48775,7 +49151,7 @@ function bundleIdBody(identifier, name, platform = "IOS") {
 async function registerBundleId(opts) {
   const env = requireEnv(["ASC_KEY_ID", "ASC_ISSUER_ID", "ASC_KEY_PATH"]);
   assertCredentialOutsideRepo("ASC_KEY_PATH", env.ASC_KEY_PATH);
-  const jwt = ascJwt(env.ASC_KEY_ID, env.ASC_ISSUER_ID, readFileSync63(env.ASC_KEY_PATH, "utf8"), Math.floor(Date.now() / 1e3));
+  const jwt = ascJwt(env.ASC_KEY_ID, env.ASC_ISSUER_ID, readFileSync64(env.ASC_KEY_PATH, "utf8"), Math.floor(Date.now() / 1e3));
   const res = await fetch(`${ASC_API}/v1/bundleIds`, {
     method: "POST",
     headers: { Authorization: `Bearer ${jwt}`, "Content-Type": "application/json" },
@@ -48829,7 +49205,7 @@ __export(asc_status_exports, {
   ascStatus: () => ascStatus,
   buildVerdict: () => buildVerdict
 });
-import { readFileSync as readFileSync64 } from "node:fs";
+import { readFileSync as readFileSync65 } from "node:fs";
 function buildVerdict(builds) {
   if (!builds.length) {
     return "NO builds registered \u2014 if you uploaded recently and it's been >15 min, the binary was REJECTED IN PROCESSING (reason is email-only; run validate-binary.ts / scan-purpose-strings.ts to reproduce it).";
@@ -48843,7 +49219,7 @@ function buildVerdict(builds) {
 function client(creds) {
   const env = creds ?? requireEnv(["ASC_KEY_ID", "ASC_ISSUER_ID", "ASC_KEY_PATH"]);
   assertCredentialOutsideRepo("ASC_KEY_PATH", env.ASC_KEY_PATH);
-  const jwt = ascJwt(env.ASC_KEY_ID, env.ASC_ISSUER_ID, readFileSync64(env.ASC_KEY_PATH, "utf8"), Math.floor(Date.now() / 1e3));
+  const jwt = ascJwt(env.ASC_KEY_ID, env.ASC_ISSUER_ID, readFileSync65(env.ASC_KEY_PATH, "utf8"), Math.floor(Date.now() / 1e3));
   return async (path2) => {
     const r = await fetch(`${ASC}${path2}`, { headers: { Authorization: `Bearer ${jwt}` } });
     return { status: r.status, json: await r.json().catch(() => ({})) };
@@ -49003,7 +49379,7 @@ __export(secrets_exports, {
   runRemoteSecretsCommand: () => runRemoteSecretsCommand,
   runSecretsCommand: () => runSecretsCommand
 });
-import { readFileSync as readFileSync65 } from "node:fs";
+import { readFileSync as readFileSync66 } from "node:fs";
 function environment(value) {
   if (value === "preview" || value === "production") return value;
   throw new Error("--environment must be preview or production");
@@ -49034,7 +49410,7 @@ async function runSecretsCommand(operation, flags, io, options = {}) {
       io.log(JSON.stringify(await vault.list({ app, environment: env })));
       return 0;
     }
-    const value = options.readValue ? options.readValue() : readFileSync65(0, "utf8").replace(/\r?\n$/, "");
+    const value = options.readValue ? options.readValue() : readFileSync66(0, "utf8").replace(/\r?\n$/, "");
     if (operation === "set") await vault.set({ app, environment: env, name, value });
     else if (operation === "rotate") await vault.rotate({ app, environment: env, name, value });
     else throw new Error(`unknown secrets operation ${operation}`);
@@ -49063,7 +49439,7 @@ async function runRemoteSecretsCommand(operation, flags, io, options) {
     }
     let body;
     if (operation !== "list") {
-      const value = options.readValue ? options.readValue() : readFileSync65(0, "utf8").replace(/\r?\n$/, "");
+      const value = options.readValue ? options.readValue() : readFileSync66(0, "utf8").replace(/\r?\n$/, "");
       body = JSON.stringify({ value });
     }
     const response = await (options.fetchImpl ?? fetch)(url, { method: operation === "list" ? "GET" : operation === "set" ? "PUT" : "POST", headers: headers2, body });
@@ -49099,15 +49475,15 @@ __export(notify_exports, {
   runNotify: () => runNotify,
   saveAdminSession: () => saveAdminSession
 });
-import { chmodSync as chmodSync3, mkdirSync as mkdirSync27, readFileSync as readFileSync66, writeFileSync as writeFileSync24 } from "node:fs";
+import { chmodSync as chmodSync3, mkdirSync as mkdirSync27, readFileSync as readFileSync67, writeFileSync as writeFileSync24 } from "node:fs";
 import { homedir as homedir6 } from "node:os";
-import { dirname as dirname30, join as join52 } from "node:path";
+import { dirname as dirname30, join as join53 } from "node:path";
 function defaultSessionsPath() {
-  return process.env.HIMI_ADMIN_SESSIONS_FILE ?? join52(homedir6(), ".himalaya", "admin-sessions.json");
+  return process.env.HIMI_ADMIN_SESSIONS_FILE ?? join53(homedir6(), ".himalaya", "admin-sessions.json");
 }
 function loadSessionsFile(path2 = defaultSessionsPath()) {
   try {
-    return JSON.parse(readFileSync66(path2, "utf8"));
+    return JSON.parse(readFileSync67(path2, "utf8"));
   } catch {
     return {};
   }
@@ -51764,10 +52140,10 @@ function assertPublicSiteUrl(raw) {
   if (refusal) throw new Error(refusal);
 }
 function resolveAll(hostname2) {
-  return new Promise((resolve47, reject) => {
+  return new Promise((resolve48, reject) => {
     dnsLookup(hostname2, { all: true, verbatim: true }, (err, addresses) => {
       if (err) reject(err);
-      else resolve47(addresses);
+      else resolve48(addresses);
     });
   });
 }
@@ -51775,13 +52151,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((resolve47, reject) => {
+  return new Promise((resolve48, reject) => {
     const onAbort = () => reject(new Error(`${what} aborted`));
     signal.addEventListener("abort", onAbort, { once: true });
-    work.then(resolve47, reject).finally(() => signal.removeEventListener("abort", onAbort));
+    work.then(resolve48, reject).finally(() => signal.removeEventListener("abort", onAbort));
   });
 }
-async function pinAddress(url, resolve47 = resolveAll, signal) {
+async function pinAddress(url, resolve48 = resolveAll, signal) {
   const host = url.hostname.replace(/^\[|\]$/g, "");
   if (ipv4Octets(host)) {
     if (isBlockedAddress(host)) throw new Error(`${host} is a blocked address`);
@@ -51791,7 +52167,7 @@ async function pinAddress(url, resolve47 = resolveAll, signal) {
     if (isBlockedAddress(host)) throw new Error(`${host} is a blocked address`);
     return { address: host, family: 6 };
   }
-  const addresses = await withAbort(() => resolve47(host), signal, `${host} lookup`);
+  const addresses = await withAbort(() => resolve48(host), signal, `${host} lookup`);
   if (!addresses.length) throw new Error(`${host} resolved to no address`);
   const blocked = addresses.filter((a) => isBlockedAddress(a.address)).map((a) => a.address);
   if (blocked.length) throw new Error(`${host} resolves to a blocked address (${blocked.join(", ")})`);
@@ -51831,7 +52207,7 @@ function copyIncomingHeaders(headers2) {
   return out;
 }
 function requestOnce(url, pinned, init) {
-  return new Promise((resolve47, reject) => {
+  return new Promise((resolve48, reject) => {
     const headers2 = { host: url.host, "accept-encoding": "identity" };
     new Headers(init.headers ?? {}).forEach((value, key2) => {
       if (key2.toLowerCase() !== "host") headers2[key2] = value;
@@ -51861,7 +52237,7 @@ function requestOnce(url, pinned, init) {
           reject(err);
           return;
         }
-        resolve47(new Response(body, { status, statusText: res.statusMessage ?? "", headers: out }));
+        resolve48(new Response(body, { status, statusText: res.statusMessage ?? "", headers: out }));
       }
     );
     req.on("error", reject);
@@ -52665,7 +53041,7 @@ var init_brand_font = __esm({
 
 // src/site-analyze/write-artifacts.ts
 import { mkdirSync as mkdirSync28, writeFileSync as writeFileSync25 } from "node:fs";
-import { join as join53 } from "node:path";
+import { join as join54 } from "node:path";
 function attachVeloSources(book, sources, put) {
   const byPath = new Map((sources ?? []).map((s) => [s.path, s.text]));
   for (const f of book.velo.files) {
@@ -52820,12 +53196,12 @@ async function downloadMedia(book, fetchImpl, put) {
 }
 async function writeBusinessBook(result, opts) {
   const out = opts.outDir;
-  mkdirSync28(join53(out, "evidence/pages"), { recursive: true });
-  mkdirSync28(join53(out, "media/catalog"), { recursive: true });
+  mkdirSync28(join54(out, "evidence/pages"), { recursive: true });
+  mkdirSync28(join54(out, "media/catalog"), { recursive: true });
   const files = [];
   const put = (rel, body) => {
-    const p = join53(out, rel);
-    mkdirSync28(join53(p, ".."), { recursive: true });
+    const p = join54(out, rel);
+    mkdirSync28(join54(p, ".."), { recursive: true });
     writeFileSync25(p, body);
     files.push(rel);
   };
@@ -52919,15 +53295,15 @@ var init_customer_build = __esm({
 });
 
 // src/site-analyze/apply.ts
-import { existsSync as existsSync57, readFileSync as readFileSync67, writeFileSync as writeFileSync26, copyFileSync as copyFileSync3, mkdirSync as mkdirSync29, realpathSync as realpathSync6, statSync as statSync15 } from "node:fs";
-import { dirname as dirname31, isAbsolute as isAbsolute4, join as join54, resolve as resolve44, sep as sep13 } from "node:path";
+import { existsSync as existsSync58, readFileSync as readFileSync68, writeFileSync as writeFileSync26, copyFileSync as copyFileSync3, mkdirSync as mkdirSync29, realpathSync as realpathSync7, statSync as statSync16 } from "node:fs";
+import { dirname as dirname31, isAbsolute as isAbsolute4, join as join55, resolve as resolve45, sep as sep14 } 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 posix2(p) {
-  return resolve44(p).replace(/\\/g, "/");
+  return resolve45(p).replace(/\\/g, "/");
 }
 function committedShellProvisioning(path2) {
   return committedShellFor(posix2(path2));
@@ -52935,7 +53311,7 @@ function committedShellProvisioning(path2) {
 function findRepoRoot(cwd) {
   let dir = cwd;
   for (let i = 0; i < 8; i++) {
-    if (SHELL_NAMES2.some((name) => existsSync57(join54(dir, shellAppDir(name), "package.json")))) return dir;
+    if (SHELL_NAMES2.some((name) => existsSync58(join55(dir, shellAppDir(name), "package.json")))) return dir;
     const next = dirname31(dir);
     if (next === dir) break;
     dir = next;
@@ -52961,7 +53337,7 @@ function assertNotCommitted(path2, forbidden) {
       `refusing to overwrite committed ${committedProvisioningPath(committed)} \u2014 use prepare:customer --contract`
     );
   }
-  if (forbidden && resolve44(path2) === resolve44(forbidden)) {
+  if (forbidden && resolve45(path2) === resolve45(forbidden)) {
     const named = committedShellProvisioning(forbidden);
     throw new Error(
       `refusing to overwrite committed ${named ? committedProvisioningPath(named) : forbidden} \u2014 pass a content-package provisioning.json or use prepare:customer --contract`
@@ -53003,35 +53379,35 @@ function mergeCustomerOwned(committed, overlay) {
 }
 function buildMergedContract(options) {
   const { appDir: appDir2, packageDir, overlay } = options;
-  const committedPath = join54(appDir2, "provisioning.json");
-  if (!existsSync57(committedPath)) {
+  const committedPath = join55(appDir2, "provisioning.json");
+  if (!existsSync58(committedPath)) {
     throw new Error(`shell has no committed provisioning.json at ${committedPath} to build a contract from`);
   }
-  const committed = JSON.parse(readFileSync67(committedPath, "utf8"));
+  const committed = JSON.parse(readFileSync68(committedPath, "utf8"));
   const merged = mergeCustomerOwned(committed, overlay);
   const overlayFontFamily = (overlay.branding ?? {}).fontFamily;
   const branding = merged.branding ?? {};
   const staged = [];
   const contained = (root, rel) => {
     if (isAbsolute4(rel)) return void 0;
-    const full = resolve44(root, rel);
-    return full.startsWith(resolve44(root) + sep13) ? full : void 0;
+    const full = resolve45(root, rel);
+    return full.startsWith(resolve45(root) + sep14) ? full : void 0;
   };
   const stage = (fromRel, toRel) => {
     const from = contained(packageDir, fromRel);
-    const to = contained(join54(appDir2, STAGED), toRel.slice(STAGED.length + 1));
-    if (!from || !to || !existsSync57(from)) return void 0;
+    const to = contained(join55(appDir2, STAGED), toRel.slice(STAGED.length + 1));
+    if (!from || !to || !existsSync58(from)) return void 0;
     let real;
     let realRoot;
     try {
-      real = realpathSync6(from);
-      realRoot = realpathSync6(packageDir);
+      real = realpathSync7(from);
+      realRoot = realpathSync7(packageDir);
     } catch {
       return void 0;
     }
-    if (!real.startsWith(realRoot + sep13)) return void 0;
+    if (!real.startsWith(realRoot + sep14)) return void 0;
     try {
-      if (!statSync15(real).isFile()) return void 0;
+      if (!statSync16(real).isFile()) return void 0;
       mkdirSync29(dirname31(to), { recursive: true });
       copyFileSync3(real, to);
     } catch {
@@ -53042,11 +53418,11 @@ function buildMergedContract(options) {
   };
   const icon = stage("media/icon.png", `${STAGED}/icon.png`);
   if (icon) branding.appIconPath = icon;
-  const facesPath = join54(packageDir, "media/fonts/faces.json");
-  if (existsSync57(facesPath)) {
+  const facesPath = join55(packageDir, "media/fonts/faces.json");
+  if (existsSync58(facesPath)) {
     let faces = [];
     try {
-      const parsed = JSON.parse(readFileSync67(facesPath, "utf8"));
+      const parsed = JSON.parse(readFileSync68(facesPath, "utf8"));
       faces = Array.isArray(parsed) ? parsed : [];
     } catch {
       faces = [];
@@ -53067,20 +53443,20 @@ function buildMergedContract(options) {
   merged.branding = branding;
   const body = `${JSON.stringify(merged, null, 2)}
 `;
-  const path2 = join54(packageDir, "provisioning.contract.json");
+  const path2 = join55(packageDir, "provisioning.contract.json");
   writeFileSync26(path2, body);
-  const localPath = join54(appDir2, LOCAL_CONTRACT_REL);
+  const localPath = join55(appDir2, LOCAL_CONTRACT_REL);
   mkdirSync29(dirname31(localPath), { recursive: true });
   writeFileSync26(localPath, body);
   staged.push(localPath);
   return { path: path2, staged };
 }
 async function applyOverlays(input) {
-  const cwd = resolve44(input.cwd);
+  const cwd = resolve45(input.cwd);
   const shell = input.shell ?? DEFAULT_BRANDABLE_SHELL;
   assertKnownShell(shell);
-  const overlay = JSON.parse(readFileSync67(input.overlayPath, "utf8"));
-  const tokens = JSON.parse(readFileSync67(input.tokensPath, "utf8"));
+  const overlay = JSON.parse(readFileSync68(input.overlayPath, "utf8"));
+  const tokens = JSON.parse(readFileSync68(input.tokensPath, "utf8"));
   const wrote = [];
   const notes = [];
   const repoRoot2 = findRepoRoot(cwd);
@@ -53090,8 +53466,8 @@ async function applyOverlays(input) {
         `shell "${shell}" cannot bake a customer brand \u2014 it ships no prepare:customer script`
       );
     }
-    const appDir2 = join54(repoRoot2, shellAppDir(shell));
-    const packageDir = dirname31(resolve44(input.overlayPath));
+    const appDir2 = join55(repoRoot2, shellAppDir(shell));
+    const packageDir = dirname31(resolve45(input.overlayPath));
     const { path: contract, staged } = buildMergedContract({ appDir: appDir2, packageDir, overlay });
     wrote.push(...staged);
     const r = spawnSync4("npm", ["run", "prepare:customer", "--", "--contract", contract], {
@@ -53112,10 +53488,10 @@ async function applyOverlays(input) {
       note: `prepare:customer --contract with a merged contract (committed provisioning.json untouched)${unpairedInRepo ? ` \xB7 ${unpairedInRepo}` : ""}`
     };
   }
-  const pkgProv = join54(cwd, "provisioning.json");
+  const pkgProv = join55(cwd, "provisioning.json");
   assertNotCommitted(pkgProv, input.forbiddenProvisioning);
-  if (existsSync57(pkgProv)) {
-    const cur = JSON.parse(readFileSync67(pkgProv, "utf8"));
+  if (existsSync58(pkgProv)) {
+    const cur = JSON.parse(readFileSync68(pkgProv, "utf8"));
     const merged = deepMerge4(cur, overlay);
     writeFileSync26(pkgProv, JSON.stringify(merged, null, 2) + "\n");
     wrote.push(pkgProv);
@@ -53123,9 +53499,9 @@ async function applyOverlays(input) {
     writeFileSync26(pkgProv, JSON.stringify(overlay, null, 2) + "\n");
     wrote.push(pkgProv);
   }
-  const pkgTokens = join54(cwd, "tokens.json");
-  if (existsSync57(pkgTokens) && (tokens.colors || tokens.typography)) {
-    const cur = JSON.parse(readFileSync67(pkgTokens, "utf8"));
+  const pkgTokens = join55(cwd, "tokens.json");
+  if (existsSync58(pkgTokens) && (tokens.colors || tokens.typography)) {
+    const cur = JSON.parse(readFileSync68(pkgTokens, "utf8"));
     const merged = deepMerge4(cur, tokens);
     const mergedColors = merged.colors;
     if (mergedColors && typeof mergedColors === "object" && !Array.isArray(mergedColors)) {
@@ -53144,9 +53520,9 @@ async function applyOverlays(input) {
     wrote.push(pkgTokens);
   }
   const homeAction = homeRefreshActionId(shell);
-  const homeSrc = join54(cwd, "dev/index.ts");
-  if (homeAction && existsSync57(homeSrc)) {
-    const prev = readFileSync67(homeSrc, "utf8");
+  const homeSrc = join55(cwd, "dev/index.ts");
+  if (homeAction && existsSync58(homeSrc)) {
+    const prev = readFileSync68(homeSrc, "utf8");
     const patched = patchBrandParams(prev, overlay, homeAction);
     let next = patched.src;
     if (!patched.foreign && overlay.installedVerticals?.length) {
@@ -53169,13 +53545,13 @@ async function applyOverlays(input) {
       notes.push(`${patched.unparsed} onAppear params block(s) in ${homeSrc} could not be read \u2014 any brand values inside them were not applied`);
     }
   }
-  if (!input.iconPath || !existsSync57(input.iconPath)) {
-    const book = input.iconPath ? dirname31(dirname31(resolve44(input.iconPath))) : void 0;
+  if (!input.iconPath || !existsSync58(input.iconPath)) {
+    const book = input.iconPath ? dirname31(dirname31(resolve45(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"
     );
   }
-  if (input.iconPath && existsSync57(input.iconPath)) {
+  if (input.iconPath && existsSync58(input.iconPath)) {
     try {
       const installed = await installIcon(cwd, input.iconPath, { derivePlay: true });
       wrote.push(...installed.wrote);
@@ -54113,10 +54489,10 @@ function permuteDomain(domain, allowSpecialUseDomain) {
 }
 function createPromiseCallback(cb) {
   let callback;
-  let resolve47;
+  let resolve48;
   let reject;
   const promise = new Promise((_resolve, _reject) => {
-    resolve47 = _resolve;
+    resolve48 = _resolve;
     reject = _reject;
   });
   if (typeof cb === "function") {
@@ -54132,7 +54508,7 @@ function createPromiseCallback(cb) {
     callback = (err, result) => {
       try {
         if (err) reject(err);
-        else resolve47(result);
+        else resolve48(result);
       } catch (e) {
         reject(e instanceof Error ? e : new Error());
       }
@@ -56704,7 +57080,7 @@ var init_crawl_look = __esm({
 });
 
 // src/site-analyze/site-function.ts
-import { randomUUID as randomUUID2 } from "node:crypto";
+import { randomUUID as randomUUID4 } from "node:crypto";
 function createRevisionUrl(msid, esi) {
   const q = new URLSearchParams({ editorSessionId: esi, esi, metaSiteId: msid });
   return `https://editor.wix.com/html/v1/create_revision?${q}`;
@@ -57149,7 +57525,7 @@ function codeAppIdFromRevision(json5) {
 async function snapshotAndPublish(fetchImpl, token, msid, opts = {}) {
   const production = opts.production !== false;
   const initiator = opts.initiator ?? "himi";
-  const esi = randomUUID2();
+  const esi = randomUUID4();
   const rev = await veloCall(fetchImpl, "POST", createRevisionUrl(msid, esi), {
     token,
     msid,
@@ -57330,8 +57706,8 @@ __export(cli_exports, {
   runSiteAnalyze: () => runSiteAnalyze,
   runSiteFunctionCli: () => runSiteFunctionCli
 });
-import { readFileSync as readFileSync68 } from "node:fs";
-import { resolve as resolve45 } from "node:path";
+import { readFileSync as readFileSync69 } from "node:fs";
+import { resolve as resolve46 } from "node:path";
 function assetFetchFor(_opts) {
   return pinnedFetch2;
 }
@@ -57340,7 +57716,7 @@ async function runSiteAnalyze(opts) {
   const assetFetch = assetFetchFor(opts);
   const siteFetch = guardedSiteFetch;
   const cwd = opts.cwd ?? process.cwd();
-  const outDir = resolve45(cwd, opts.outDir ?? ".himi/business-book");
+  const outDir = resolve46(cwd, opts.outDir ?? ".himi/business-book");
   let ownerAuth;
   let msid;
   try {
@@ -57378,9 +57754,9 @@ async function runSiteAnalyze(opts) {
   if (opts.apply) {
     applied = await applyOverlays({
       cwd,
-      overlayPath: resolve45(outDir, "provisioning.overlay.json"),
-      tokensPath: resolve45(outDir, "tokens.overlay.json"),
-      iconPath: resolve45(outDir, "media/icon.png"),
+      overlayPath: resolve46(outDir, "provisioning.overlay.json"),
+      tokensPath: resolve46(outDir, "tokens.overlay.json"),
+      iconPath: resolve46(outDir, "media/icon.png"),
       shell: opts.shell
     });
     const note = noteWithWarnings(applied.note, warnings);
@@ -57416,8 +57792,8 @@ async function runSiteFunctionCli(opts) {
   const token = opts.token ?? await siteToken(msid);
   let source;
   if (opts.sourcePath) {
-    const p = resolve45(opts.cwd ?? process.cwd(), opts.sourcePath);
-    source = readFileSync68(p, "utf8");
+    const p = resolve46(opts.cwd ?? process.cwd(), opts.sourcePath);
+    source = readFileSync69(p, "utf8");
   }
   let body;
   if (opts.bodyRaw != null) {
@@ -57468,7 +57844,7 @@ async function accountToken2(spawnImpl = spawn5) {
     cached2 = fromEnv;
     return fromEnv;
   }
-  const token = await new Promise((resolve47, reject) => {
+  const token = await new Promise((resolve48, reject) => {
     let child;
     try {
       child = spawnImpl("wix", ["token"]);
@@ -57497,7 +57873,7 @@ async function accountToken2(spawnImpl = spawn5) {
     const scan = (d) => {
       out += String(d);
       const m = out.match(TOKEN_RE2);
-      if (m) done(() => resolve47(m[0]));
+      if (m) done(() => resolve48(m[0]));
     };
     child.stdout?.on("data", scan);
     child.stderr?.on("data", scan);
@@ -57674,7 +58050,7 @@ __export(site_create_exports, {
   runSiteList: () => runSiteList,
   writeProvisioningBinding: () => writeProvisioningBinding
 });
-import { existsSync as existsSync58, readFileSync as readFileSync69, writeFileSync as writeFileSync27 } from "node:fs";
+import { existsSync as existsSync59, readFileSync as readFileSync70, writeFileSync as writeFileSync27 } from "node:fs";
 import { resolve as resolvePath2 } from "node:path";
 function oauthClientName(projectName) {
   return `${projectName} client`;
@@ -57823,7 +58199,7 @@ async function runSiteCreate(opts) {
   if (!wantOauthApp) return { ...base, nextSteps: nextSteps(metaSiteId) };
   return { ...base, clientId, redirectUri, nextSteps: nextSteps(metaSiteId, clientId) };
 }
-function writeProvisioningBinding(target, binding2, fs = { existsSync: existsSync58, readFileSync: readFileSync69, writeFileSync: writeFileSync27 }) {
+function writeProvisioningBinding(target, binding2, fs = { existsSync: existsSync59, readFileSync: readFileSync70, writeFileSync: writeFileSync27 }) {
   const msid = binding2.siteId;
   const path2 = resolvePath2(target);
   const committed = committedShellProvisioning(path2);
@@ -58496,11 +58872,11 @@ var init_context = __esm({
 });
 
 // src/cli.ts
-import { mkdtempSync as mkdtempSync4, readFileSync as readFileSync70, mkdirSync as mkdirSync30, writeFileSync as writeFileSync28, existsSync as existsSync59, rmSync as rmSync11, readdirSync as readdirSync27, statSync as statSync16, lstatSync as lstatSync6, accessSync, constants } from "node:fs";
+import { mkdtempSync as mkdtempSync4, readFileSync as readFileSync71, mkdirSync as mkdirSync30, writeFileSync as writeFileSync28, existsSync as existsSync60, rmSync as rmSync13, readdirSync as readdirSync27, statSync as statSync17, lstatSync as lstatSync8, accessSync, constants as constants2, renameSync as renameSync6, cpSync as cpSync3 } from "node:fs";
 import { execFile, execFileSync as execFileSync7, spawnSync as spawnSync5, spawn as spawn6 } from "node:child_process";
-import { createHash as createHash26, randomUUID as randomUUID3 } from "node:crypto";
+import { createHash as createHash26, randomUUID as randomUUID5 } from "node:crypto";
 import { tmpdir as tmpdir5, homedir as homedir7, hostname } from "node:os";
-import { join as join55, resolve as resolve46, relative as relative10, basename as basename13, dirname as dirname32 } from "node:path";
+import { join as join56, resolve as resolve47, relative as relative10, basename as basename13, dirname as dirname32 } from "node:path";
 import { fileURLToPath as fileURLToPath24 } from "node:url";
 
 // ../serve-cli/src/client.ts
@@ -60209,7 +60585,7 @@ async function browserLogin(opts) {
   const log = opts.log ?? (() => {
   });
   const timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS;
-  return await new Promise((resolve47, reject) => {
+  return await new Promise((resolve48, reject) => {
     let settled = false;
     let loginUrl = "";
     const server = createServer();
@@ -60273,7 +60649,7 @@ async function browserLogin(opts) {
           return;
         }
         res.writeHead(200, { "content-type": "text/html; charset=utf-8", "cache-control": "no-store", connection: "close" }).end(CLOSE_PAGE);
-        finish2(() => resolve47({ token, loginUrl }));
+        finish2(() => resolve48({ token, loginUrl }));
       });
     });
     server.on("error", (err) => finish2(() => reject(err)));
@@ -61776,8 +62152,8 @@ var str5 = (v) => typeof v === "string" ? v : void 0;
 var num2 = (v) => typeof v === "string" && v !== "" && Number.isFinite(Number(v)) ? Number(v) : void 0;
 function embeddedTemplateCatalog() {
   return availableTemplates().map((name) => {
-    const path2 = join55(templateSourceDir(name), TEMPLATE_META_FILE);
-    const meta = JSON.parse(readFileSync70(path2, "utf8"));
+    const path2 = join56(templateSourceDir(name), TEMPLATE_META_FILE);
+    const meta = JSON.parse(readFileSync71(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 }`);
     }
@@ -62059,11 +62435,12 @@ var USAGE = `himi \u2014 the Himalaya authoring CLI (remote dev loop)
                                            file is not the plane's per-release archive.
   himi share --file <package.himi> [--expires-at <ISO>] | revoke --app <app> <shareId>
                                            publish a content-addressed package link for a released app
-  himi run [<package.himi|dir|url>] [--browser] [--port <n>] [--chrome preview|app] [--screen <id>] [--surface <id>] [--no-open]
+  himi run [<package.himi|dir|url>] [--browser] [--watch] [--port <n>] [--chrome preview|app] [--screen <id>] [--surface <id>] [--no-open]
                                            serve a package on localhost + open it in a browser. No serve
                                            plane, no dev-server. With no argument it packs the current
                                            content package first \u2014 edit, run, look at it.
-                                           Blocks until Ctrl-C.
+                                           --watch rebuilds on every save and repaints the open tab
+                                           (a failed build keeps the last good preview). Blocks until Ctrl-C.
   himi flags list|set|ramp|rm [<key>] [--app <a>]
                                            read/change operational flags (RFC 0013); writes report
                                            servedNow from the device door, never just ok
@@ -62406,7 +62783,7 @@ var COMMANDS = [
   { name: "import", summary: "turn a `himi pack --dev` package back into an EDITABLE content package \u2014 the file counterpart of `himi pull`, needing no serve plane, no account and no network. Refuses an invalid package before trusting its source (the content hash is recomputed over every entry on open, so the archive is provably the one that was packed), and refuses a RELEASE package by naming the absence \u2014 it carries built output and no source \u2014 rather than reporting a missing file. `--name` re-substitutes the app identity through the same machinery `himi init --template` and `himi pull --name` use, so the restored tree is a NEW app rather than a second copy of the same one, and a name that also appears inside a screen id (`feed` in `feed_home`) is left alone. A non-empty destination needs `--force` and a merge NAMES what it kept (`left: [...]`), the same contract `himi pull --force` has; a shape clash is refused whole before anything is written. There is no `--replace`: a file you were handed is not the plane's per-release archive.", required: "<package.himi> [--out <dir>] [--name <new>] [--force]" },
   { name: "pull", summary: "restore an app's SOURCE from the serve plane into an editable content package \u2014 the other half of `himi push`, which archives the content package on every publish. Owner or editor only: a viewer may download the RUNNING app (`/v1/owner/package`), not the codebase it was built from. A PAST release is restorable, not only the live one \u2014 the archive is content-addressed per release, so it has none of the live-single-slot problem that makes `himi pack` current-release-only. Two limits: pruning keeps the current release plus the newest ~20 ledger entries, and a release id identifies OTA content rather than source, so a source-only change republishes under the same id and replaces that id's archive. A release published before source archiving shipped, or pushed with `--no-source`, answers `app_source_not_found` and says to push again. `--name` re-substitutes the app identity through the same machinery `himi init --template` uses, so the restored tree is a NEW app rather than a second copy of the same one, and a name that also appears inside a screen id (`feed` in `feed_home`) is left alone. A NON-EMPTY destination is refused unless you say which you mean: `--force` merges and reports \u2014 it writes the archive over what is there, keeps files the release does not carry, and NAMES every one of them as `left: [...]` so a tree that matches no release is never silent (#2437); `--replace` restores exactly what was archived, removing those files first (`removed: [...]`) and implying `--force`. `--replace` refuses a directory holding no `himalaya.content.json`, so a mistyped `--out` cannot clear an unrelated tree, and the only paths it can remove are the ones a push would have archived \u2014 `.git/`, `node_modules/`, `dist/`, `.env*` and key material are out of its reach by construction.", required: "<app> [--release <id>] [--out <dir>] [--name <new>] [--force|--replace] [--target <t>]" },
   { name: "share", summary: "publish or revoke a content-addressed `.himi` share link. The package must be a validated archive for an already-published release; the resulting https URL is safe to QR, copy, or open in Himi Player.", required: "--file <package.himi> [--expires-at <ISO>] | revoke --app <app> <shareId>" },
-  { name: "run", summary: "serve a .himi package on localhost and open it in a browser \u2014 no serve plane, no dev-server, no setup. Given no argument it builds the current content package first, so `himi run` is the inner loop: edit, run, look at it. The SPA and /v1 are served from ONE origin because Tier-5 bundle fetches on web are same-origin-only. --chrome preview frames the app in a device chassis; --chrome app serves it as a plain web app. Blocks until Ctrl-C, like any dev server. --browser runs the whole plane INSIDE the tab (service worker + in-memory store) so no app code executes in this process or on any pod.", required: "[<package.himi|dir|url>] [--browser] [--content <dir>] [--port <n>] [--chrome preview|app] [--screen <id>] [--surface <id>] [--no-open] [--spa <url>]" },
+  { name: "run", summary: "serve a .himi package on localhost and open it in a browser \u2014 no serve plane, no dev-server, no setup. Given no argument it builds the current content package first, so `himi run` is the inner loop: edit, run, look at it. The SPA and /v1 are served from ONE origin because Tier-5 bundle fetches on web are same-origin-only. --chrome preview frames the app in a device chassis; --chrome app serves it as a plain web app. Blocks until Ctrl-C, like any dev server. --browser runs the whole plane INSIDE the tab (service worker + in-memory store) so no app code executes in this process or on any pod. --watch keeps the preview LIVE: every save in the content package rebuilds it and repaints the open tab with only what changed (the dev-server's hot-reload events); a build that fails keeps the last good preview on screen and says why. It also frames itself on the build board (`himi studio`) and serves the board at /__himi/studio/ on the same origin.", required: "[<package.himi|dir|url>] [--browser] [--watch] [--content <dir>] [--port <n>] [--chrome preview|app] [--screen <id>] [--surface <id>] [--no-open] [--spa <url>]" },
   { name: "preview", summary: "print the shareable web URL + himi:// deep link + agent /v1/preview JSON URLs for an app+release; --surface frames the web preview as any catalog surface (?surface=)", required: "--app --release [--screen] [--surface]" },
   { name: "surfaces", summary: "the surface catalog vs this app's envelope (platforms.json): targeted surfaces, the opt-in key for the rest, per-surface preview links with --app --release, and which widget families the package produces with --measure-widgets (which runs its built bundles)", required: "[--content <dir>] [--app --release] [--measure-widgets]" },
   { name: "context", summary: "fetch the agent preview envelope (GET /v1/preview/a/<app>) \u2014 ok/issues/screens/links; exit 1 if ok:false", required: "--app --release [--screen] [--include telemetry]" },
@@ -62438,7 +62815,7 @@ var COMMANDS = [
 ];
 function cliVersion() {
   try {
-    return JSON.parse(readFileSync70(new URL("../package.json", import.meta.url), "utf8")).version ?? "unknown";
+    return JSON.parse(readFileSync71(new URL("../package.json", import.meta.url), "utf8")).version ?? "unknown";
   } catch {
     return "unknown";
   }
@@ -62489,16 +62866,16 @@ function createScopedRegistryResolver(exec = execNpmConfig) {
 }
 var SCOPED_REGISTRY_TIMEOUT_MS = 5e3;
 function execNpmConfig(file, args, options) {
-  return new Promise((resolve47, reject) => {
-    execFile(file, args, { ...options, windowsHide: true }, (error, stdout) => error ? reject(error) : resolve47(String(stdout)));
+  return new Promise((resolve48, reject) => {
+    execFile(file, args, { ...options, windowsHide: true }, (error, stdout) => error ? reject(error) : resolve48(String(stdout)));
   });
 }
 var npmScopedWixRegistry = createScopedRegistryResolver();
 async function scopedRegistryBefore(lookup2, deadline) {
   let cancel = () => {
   };
-  const expired = new Promise((resolve47) => {
-    const timer = setTimeout(() => resolve47(void 0), Math.max(0, deadline - Date.now()));
+  const expired = new Promise((resolve48) => {
+    const timer = setTimeout(() => resolve48(void 0), Math.max(0, deadline - Date.now()));
     cancel = () => clearTimeout(timer);
   });
   try {
@@ -62556,16 +62933,16 @@ function ageInDays(publishedAt, now = Date.now()) {
 }
 function packageVersion(path2) {
   try {
-    const version2 = JSON.parse(readFileSync70(path2, "utf8")).version;
+    const version2 = JSON.parse(readFileSync71(path2, "utf8")).version;
     return typeof version2 === "string" && version2 ? version2 : 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 = resolve46(fromDir);
+  let dir = resolve47(fromDir);
   for (; ; ) {
-    const version2 = packageVersion(join55(dir, "node_modules", "@wix", "himalaya", "package.json"));
+    const version2 = packageVersion(join56(dir, "node_modules", "@wix", "himalaya", "package.json"));
     if (version2) return { version: version2, source: "local" };
     const parent = dirname32(dir);
     if (parent === dir) break;
@@ -62575,7 +62952,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 version2 = root ? packageVersion(join55(root, "@wix", "himalaya", "package.json")) : void 0;
+    const version2 = root ? packageVersion(join56(root, "@wix", "himalaya", "package.json")) : void 0;
     return version2 ? { version: version2, source: "global" } : {};
   } catch {
     return {};
@@ -62622,11 +62999,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 ?? join55(homedir7(), ".himalaya", "update-check.json");
+  return env.HIMI_UPDATE_CACHE_FILE ?? join56(homedir7(), ".himalaya", "update-check.json");
 }
 function readUpdateCache(path2) {
   try {
-    const parsed = JSON.parse(readFileSync70(path2, "utf8"));
+    const parsed = JSON.parse(readFileSync71(path2, "utf8"));
     return parsed && typeof parsed === "object" ? parsed : {};
   } catch {
     return {};
@@ -62665,7 +63042,7 @@ function globalPrefixWritable() {
   const root = globalNodeModulesRoot();
   if (!root) return false;
   try {
-    accessSync(root, constants.W_OK);
+    accessSync(root, constants2.W_OK);
     return true;
   } catch {
     return false;
@@ -62694,12 +63071,12 @@ function createUpdateRunner(spawn7 = spawnSync5) {
     },
     installedVersion: () => {
       const root = globalNodeModulesRoot();
-      return root ? packageVersion(join55(root, "@wix", "himalaya-cli", "package.json")) : void 0;
+      return root ? packageVersion(join56(root, "@wix", "himalaya-cli", "package.json")) : void 0;
     },
     reexec: (argv) => {
       const root = globalNodeModulesRoot();
-      const entry = root ? join55(root, "@wix", "himalaya-cli", "dist", "cli.mjs") : void 0;
-      if (!entry || !existsSync59(entry)) return void 0;
+      const entry = root ? join56(root, "@wix", "himalaya-cli", "dist", "cli.mjs") : void 0;
+      if (!entry || !existsSync60(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.
         stdio: "inherit",
@@ -62727,7 +63104,7 @@ function thisHost() {
   return hostname().replace(/\s+/g, "_");
 }
 function lockStamp(now) {
-  return `${now} ${process.pid} ${thisHost()} ${randomUUID3()}`;
+  return `${now} ${process.pid} ${thisHost()} ${randomUUID5()}`;
 }
 function processAlive(pid) {
   try {
@@ -62746,7 +63123,7 @@ function staleUpdateLockFile(cachePath, now) {
   for (const path2 of [`${cachePath}.lock.break`, `${cachePath}.lock`]) {
     let content;
     try {
-      content = readFileSync70(path2, "utf8");
+      content = readFileSync71(path2, "utf8");
     } catch {
       continue;
     }
@@ -62754,7 +63131,7 @@ function staleUpdateLockFile(cachePath, now) {
     let since = stamped;
     if (!Number.isFinite(since)) {
       try {
-        since = statSync16(path2).mtimeMs;
+        since = statSync17(path2).mtimeMs;
       } catch {
         continue;
       }
@@ -62769,7 +63146,7 @@ function acquireUpdateLock(cachePath, now, hooks = {}) {
   const mine = lockStamp(now);
   const readLock = (path2) => {
     try {
-      return readFileSync70(path2, "utf8");
+      return readFileSync71(path2, "utf8");
     } catch {
       return void 0;
     }
@@ -62784,7 +63161,7 @@ function acquireUpdateLock(cachePath, now, hooks = {}) {
   };
   const removeIfMine = (path2) => {
     try {
-      if (readLock(path2) === mine) rmSync11(path2, { force: true });
+      if (readLock(path2) === mine) rmSync13(path2, { force: true });
     } catch {
     }
   };
@@ -62807,7 +63184,7 @@ function acquireUpdateLock(cachePath, now, hooks = {}) {
       hooks.underBreakLock?.();
       if (current === void 0) return tryCreate(lockPath) ? release : void 0;
       if (!isAbandoned(current)) return void 0;
-      rmSync11(lockPath, { force: true });
+      rmSync13(lockPath, { force: true });
       return tryCreate(lockPath) ? release : void 0;
     } finally {
       removeIfMine(breakPath);
@@ -63307,10 +63684,10 @@ 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 = join55(dir, `${name}${suffix}`);
+      const candidate = join56(dir, `${name}${suffix}`);
       try {
-        if (!statSync16(candidate).isFile()) continue;
-        if (process.platform !== "win32") accessSync(candidate, constants.X_OK);
+        if (!statSync17(candidate).isFile()) continue;
+        if (process.platform !== "win32") accessSync(candidate, constants2.X_OK);
         return true;
       } catch {
       }
@@ -63416,7 +63793,7 @@ async function nativeConfigAdvisories(app, configSource) {
     const { iosProjectYml: iosProjectYml2 } = await Promise.resolve().then(() => (init_paths(), 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 = existsSync59(iosYmlPath) ? readFileSync70(iosYmlPath, "utf8") : "";
+    const iosYml = existsSync60(iosYmlPath) ? readFileSync71(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));
@@ -63430,7 +63807,7 @@ async function nativeConfigAdvisories(app, configSource) {
 }
 function readConfigSource(dir) {
   try {
-    return readFileSync70(join55(dir, "config.ts"), "utf8");
+    return readFileSync71(join56(dir, "config.ts"), "utf8");
   } catch {
     return null;
   }
@@ -63441,8 +63818,8 @@ function writePngFile(path2, base64) {
   return path2;
 }
 async function initFromRemoteTemplate(name, parentDir, template, c) {
-  const dir = resolve46(parentDir, name);
-  if (existsSync59(join55(dir, "himalaya.content.json"))) {
+  const dir = resolve47(parentDir, name);
+  if (existsSync60(join56(dir, "himalaya.content.json"))) {
     throw new Error(`content package already exists at ${dir}`);
   }
   const r = await c.fetchTemplateSource(TEMPLATE_APP_PREFIX + template);
@@ -63454,7 +63831,7 @@ async function initFromRemoteTemplate(name, parentDir, template, c) {
   return finishScaffold(materializeSource(archive.files, name, dir), template);
 }
 function contentDir(flags) {
-  return resolve46(str5(flags.content) ?? process.cwd());
+  return resolve47(str5(flags.content) ?? process.cwd());
 }
 function renameRestoredSource(restored, declaredApp, renamed) {
   const text5 = {};
@@ -63472,7 +63849,7 @@ function renameRestoredSource(restored, declaredApp, renamed) {
 function symlinkDestinationIssue(dest) {
   let kind;
   try {
-    kind = lstatSync6(dest);
+    kind = lstatSync8(dest);
   } catch {
     return null;
   }
@@ -63485,8 +63862,8 @@ function symlinkDestinationIssue(dest) {
 function restoreDestinationIssue(dest, force) {
   const link = symlinkDestinationIssue(dest);
   if (link) return link;
-  if (!existsSync59(dest)) return null;
-  if (!statSync16(dest).isDirectory()) {
+  if (!existsSync60(dest)) return null;
+  if (!statSync17(dest).isDirectory()) {
     return { error: `${dest} exists and is not a directory`, hint: "pass --out/--name to land somewhere else, or remove the file" };
   }
   if (readdirSync27(dest).length > 0 && !force) {
@@ -63498,9 +63875,9 @@ function restoreDestinationIssue(dest, force) {
   return null;
 }
 function isHimalayaMonorepoCheckout(start) {
-  let dir = resolve46(start);
+  let dir = resolve47(start);
   for (; ; ) {
-    if (existsSync59(join55(dir, "tools", "himi-cli", "src", "cli.ts")) && existsSync59(join55(dir, "core", "serve", "src", "server.ts"))) return true;
+    if (existsSync60(join56(dir, "tools", "himi-cli", "src", "cli.ts")) && existsSync60(join56(dir, "core", "serve", "src", "server.ts"))) return true;
     const parent = dirname32(dir);
     if (parent === dir) return false;
     dir = parent;
@@ -63542,8 +63919,8 @@ function materializeForPreview(appDir2, slug, displayName) {
   const forBuild = Object.fromEntries(
     Object.entries(files).map(([rel, body]) => [rel, rel === "himalaya.content.json" ? substituteIdentity(body, slug) : body])
   );
-  const repoRoot2 = resolve46(fileURLToPath24(new URL("../../..", import.meta.url)));
-  const root = join55(repoRoot2, "node_modules", ".cache", "himi-template-preview");
+  const repoRoot2 = resolve47(fileURLToPath24(new URL("../../..", import.meta.url)));
+  const root = join56(repoRoot2, "node_modules", ".cache", "himi-template-preview");
   const stillRunning = (pid) => {
     try {
       process.kill(pid, 0);
@@ -63557,21 +63934,21 @@ function materializeForPreview(appDir2, slug, displayName) {
       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)) {
-        rmSync11(join55(root, entry.name), { recursive: true, force: true });
+        rmSync13(join56(root, entry.name), { recursive: true, force: true });
       }
     }
   } catch {
   }
-  const dest = join55(root, `${slug}-${process.pid}`);
-  rmSync11(dest, { recursive: true, force: true });
+  const dest = join56(root, `${slug}-${process.pid}`);
+  rmSync13(dest, { recursive: true, force: true });
   mkdirSync30(dest, { recursive: true });
   materializeSource(forBuild, displayName, dest, slug);
   return dest;
 }
 async function appId(dir) {
   try {
-    const { readFileSync: readFileSync71 } = await import("node:fs");
-    const m = JSON.parse(readFileSync71(join55(dir, "himalaya.content.json"), "utf8"));
+    const { readFileSync: readFileSync72 } = await import("node:fs");
+    const m = JSON.parse(readFileSync72(join56(dir, "himalaya.content.json"), "utf8"));
     if (m.name) return m.name;
   } catch {
   }
@@ -63579,8 +63956,8 @@ async function appId(dir) {
 }
 async function contentVisibility(dir) {
   try {
-    const { readFileSync: readFileSync71 } = await import("node:fs");
-    const m = JSON.parse(readFileSync71(join55(dir, "himalaya.content.json"), "utf8"));
+    const { readFileSync: readFileSync72 } = await import("node:fs");
+    const m = JSON.parse(readFileSync72(join56(dir, "himalaya.content.json"), "utf8"));
     if (m.visibility === "public" || m.visibility === "unlisted") return m.visibility;
   } catch {
   }
@@ -63782,7 +64159,7 @@ Seed your coding agent with \`himi agent-init\`. Guides: ${idx.portalUrl}`);
       return 0;
     }
     case "agent-init": {
-      const dir = resolve46(str5(flags.dir) ?? process.cwd());
+      const dir = resolve47(str5(flags.dir) ?? process.cwd());
       const res = writeAgentContext(dir);
       print({ ok: true, dir: res.dir, files: res.files, portalUrl: idx.portalUrl });
       return 0;
@@ -63804,7 +64181,7 @@ async function recordedReleaseForContentQuietly(dir, resolution, onDrift) {
   try {
     const { buildContentForValidation: buildContentForValidation2, buildReleaseFromContent: buildReleaseFromContent2, bundleOutDir: bundleOutDir2 } = await loadAuthoring();
     const bres = await buildContentForValidation2(dir, { resolution });
-    out = mkdtempSync4(join55(tmpdir5(), "himi-ux-record-"));
+    out = mkdtempSync4(join56(tmpdir5(), "himi-ux-record-"));
     const hasWorkers = bres.built.length > 0 || bres.compileErrors.length > 0;
     const outcome = await buildReleaseFromContent2(dir, out, { ...hasWorkers ? { tier5Dir: bundleOutDir2(dir) } : {}, collect: { lint: true } });
     const releaseId = outcome.manifest.releaseId;
@@ -63817,7 +64194,7 @@ async function recordedReleaseForContentQuietly(dir, resolution, onDrift) {
     return null;
   } finally {
     if (out !== void 0) try {
-      rmSync11(out, { recursive: true, force: true });
+      rmSync13(out, { recursive: true, force: true });
     } catch {
     }
   }
@@ -63982,7 +64359,7 @@ async function producedWidgetFamilies(dir) {
     let js;
     for (const candidate of [`${name}.bundle.js`, `${name}.js`, name]) {
       try {
-        js = readFileSync70(join55(outDir, candidate), "utf8");
+        js = readFileSync71(join56(outDir, candidate), "utf8");
         break;
       } catch {
       }
@@ -64013,7 +64390,7 @@ async function producedWidgetFamilies(dir) {
   }
   return { families, source: "dist/bundles" };
 }
-var boardOpen = (dir) => existsSync59(join55(dir, ".himi", "studio", "index.html"));
+var boardOpen = (dir) => existsSync60(join56(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;
@@ -64280,7 +64657,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
           return 2;
         }
         const template = str5(flags.template);
-        const parentDir = resolve46(str5(flags.dir) ?? process.cwd());
+        const parentDir = resolve47(str5(flags.dir) ?? process.cwd());
         if (template && flags.remote === true) {
           try {
             const res2 = await initFromRemoteTemplate(name, parentDir, template, client2());
@@ -64397,11 +64774,11 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
           return outcome.code;
         }
         if (sub === "publish") {
-          const appDir2 = resolve46(str5(flags.dir) ?? process.cwd());
-          const sourceDir = resolve46(str5(flags["source-dir"]) ?? appDir2);
+          const appDir2 = resolve47(str5(flags.dir) ?? process.cwd());
+          const sourceDir = resolve47(str5(flags["source-dir"]) ?? appDir2);
           let meta;
           try {
-            meta = JSON.parse(readFileSync70(join55(sourceDir, TEMPLATE_META_FILE), "utf8"));
+            meta = JSON.parse(readFileSync71(join56(sourceDir, TEMPLATE_META_FILE), "utf8"));
           } catch {
             io.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;
@@ -64411,7 +64788,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
             return 2;
           }
           try {
-            const appearance = extractTemplateAppearance(JSON.parse(readFileSync70(join55(sourceDir, "tokens.json"), "utf8")));
+            const appearance = extractTemplateAppearance(JSON.parse(readFileSync71(join56(sourceDir, "tokens.json"), "utf8")));
             meta = { ...appearance, ...meta };
           } catch {
           }
@@ -64423,13 +64800,13 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
           const force = flags.force === true;
           const { buildContentForValidation: buildContentForValidation2, buildReleaseFromContent: buildReleaseFromContent2, bundleOutDir: bundleOutDir2 } = await loadAuthoring();
           const bres = await buildContentForValidation2(buildDir, { resolution: resolutionFlag(flags) });
-          const out = mkdtempSync4(join55(tmpdir5(), "himi-template-"));
+          const out = mkdtempSync4(join56(tmpdir5(), "himi-template-"));
           const hasWorkers = bres.built.length > 0 || bres.compileErrors.length > 0;
           const outcome = await buildReleaseFromContent2(buildDir, out, {
             ...hasWorkers ? { tier5Dir: bundleOutDir2(buildDir) } : {},
             collect: { lint: true, strict }
           });
-          const scaffoldSourceFindings = resolve46(sourceDir) === resolve46(appDir2) ? [] : [
+          const scaffoldSourceFindings = resolve47(sourceDir) === resolve47(appDir2) ? [] : [
             ...tokenColorIssues(sourceDir),
             ...surfaceIssues(sourceDir, void 0, strict),
             ...await fontIssues(sourceDir, strict),
@@ -64472,11 +64849,11 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
             }));
             return 1;
           }
-          const iconPath = str5(flags.icon) ? resolve46(str5(flags.icon)) : templateIconPath(name);
+          const iconPath = str5(flags.icon) ? resolve47(str5(flags.icon)) : templateIconPath(name);
           let iconHash;
           if (iconPath) {
             try {
-              const bytes2 = readFileSync70(iconPath);
+              const bytes2 = readFileSync71(iconPath);
               payload.icon = bytes2.toString("base64");
               iconHash = createHash26("sha256").update(bytes2).digest("hex");
             } catch {
@@ -64709,7 +65086,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
         const { navIssues: navIssues2 } = await Promise.resolve().then(() => (init_nav_lint(), nav_lint_exports));
         const { buildContentForValidation: buildContentForValidation2, buildReleaseFromContent: buildReleaseFromContent2, bundleOutDir: bundleOutDir2 } = await loadAuthoring();
         const bres = await buildContentForValidation2(dir, { resolution: resolutionFlag(flags) });
-        const out = mkdtempSync4(join55(tmpdir5(), "himi-validate-"));
+        const out = mkdtempSync4(join56(tmpdir5(), "himi-validate-"));
         const hasWorkers = bres.built.length > 0 || bres.compileErrors.length > 0;
         const outcome = await buildReleaseFromContent2(dir, out, {
           ...hasWorkers ? { tier5Dir: bundleOutDir2(dir) } : {},
@@ -64752,7 +65129,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
           const path2 = dpxSessionTokenPath();
           let raw;
           try {
-            raw = readFileSync70(path2, "utf8");
+            raw = readFileSync71(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`);
           }
@@ -64872,7 +65249,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
       case "studio": {
         const { openStudio: openStudio2 } = await Promise.resolve().then(() => (init_studio(), studio_exports));
         const dir = contentDir(flags);
-        if (!existsSync59(join55(dir, "himalaya.content.json"))) {
+        if (!existsSync60(join56(dir, "himalaya.content.json"))) {
           io.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;
         }
@@ -64897,7 +65274,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
         const { appendProgress: appendProgress2, readProgress: readProgress2, summarizeProgress: summarizeProgress2, parseStep: parseStep2, notifyDesktop: notifyDesktop2, appLabel: appLabel2, journalPath: journalPath2, ProgressError: ProgressError2, JOURNEY_STEPS: JOURNEY_STEPS2 } = await Promise.resolve().then(() => (init_progress(), progress_exports));
         const dir = contentDir(flags);
         const journal = journalPath2(dir);
-        const hint = existsSync59(join55(dir, "himalaya.content.json")) ? {} : { hint: "no himalaya.content.json here \u2014 run from the app directory (or pass --content <dir>) so the build board finds this journal" };
+        const hint = existsSync60(join56(dir, "himalaya.content.json")) ? {} : { 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();
         if (!message) {
           if (flags.step !== void 0 || flags.image !== void 0 || flags.notify === true) {
@@ -64989,7 +65366,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
       case "test": {
         const dir = contentDir(flags);
         const structuredOutput = flags.json === true || io.isTTY !== true;
-        if (existsSync59(join55(dir, "functions"))) {
+        if (existsSync60(join56(dir, "functions"))) {
           const { invokeLocalFunction: invokeLocalFunction2, loadFunctionsApp: loadFunctionsApp2 } = await Promise.resolve().then(() => (init_functions(), functions_exports));
           const loaded = await loadFunctionsApp2(dir);
           const results = [];
@@ -65076,7 +65453,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
           }
         }
         const bres = await buildContentBundles2(dir, { resolution: resolutionFlag(flags) });
-        const out = mkdtempSync4(join55(tmpdir5(), "himi-test-"));
+        const out = mkdtempSync4(join56(tmpdir5(), "himi-test-"));
         const hasWorkers = bres.built.length > 0 || bres.compileErrors.length > 0;
         const outcome = await buildReleaseFromContent2(dir, out, {
           ...hasWorkers ? { tier5Dir: bundleOutDir2(dir) } : {},
@@ -65121,7 +65498,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
             io.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(join55(dir, "tier5-src"), screen.bundleName);
+          const sources = collectWorkerSources2(join56(dir, "tier5-src"), screen.bundleName);
           if (!sources) {
             io.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;
@@ -65282,7 +65659,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
             const sp = await runShotsPass2({
               descriptors: scopeDescriptors2(outcome.descriptors ?? [], pos.slice(1), invalidScreens),
               tokens: outcome.tokens,
-              outDir: join55(dir, ".himi", "shots"),
+              outDir: join56(dir, ".himi", "shots"),
               width: 390,
               layers: { rules: shotRules, ...cmsSeed ? { cmsSeed } : {}, ...canned ? { canned: canned.byKey } : {} },
               ...budgetMs ? { budgetMs } : {},
@@ -65292,7 +65669,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
                 renderDescriptorWeb: renderDescriptorWeb2,
                 renderPngBatch: renderPngBatch2,
                 writePng: (path2, base64) => writePngFile(path2, base64),
-                clearDir: (d) => rmSync11(d, { recursive: true, force: true })
+                clearDir: (d) => rmSync13(d, { recursive: true, force: true })
               }
             });
             writtenShots = sp.written;
@@ -65320,7 +65697,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
           releaseId: result.releaseId,
           releasePayload: release,
           descriptors: attestedDescriptors,
-          screenshots: Object.fromEntries(writtenShots.filter((name) => crawledScreens.has(name.replace(/\.png$/, ""))).map((name) => [name.replace(/\.png$/, ""), join55(dir, ".himi", "shots", name)])),
+          screenshots: Object.fromEntries(writtenShots.filter((name) => crawledScreens.has(name.replace(/\.png$/, ""))).map((name) => [name.replace(/\.png$/, ""), join56(dir, ".himi", "shots", name)])),
           coverage: {
             screens: crawledScreens.size,
             actionsDispatched: result.actions.exercised,
@@ -65410,7 +65787,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
             return 2;
           }
           try {
-            const raw = stateArg.trim().startsWith("{") ? stateArg : readFileSync70(stateArg.replace(/^@/, ""), "utf8");
+            const raw = stateArg.trim().startsWith("{") ? stateArg : readFileSync71(stateArg.replace(/^@/, ""), "utf8");
             injectedState = JSON.parse(raw);
           } catch (e) {
             io.error(JSON.stringify({ error: `--state must be inline JSON or a path to a .json file \u2014 ${e.message}` }));
@@ -65425,7 +65802,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
             return 2;
           }
           try {
-            const raw = inputArg.trim().startsWith("{") ? inputArg : readFileSync70(inputArg.replace(/^@/, ""), "utf8");
+            const raw = inputArg.trim().startsWith("{") ? inputArg : readFileSync71(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;
@@ -65474,7 +65851,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
         }
         const { buildContentBundles: buildContentBundles2, buildReleaseFromContent: buildReleaseFromContent2, bundleOutDir: bundleOutDir2 } = await loadAuthoring();
         const bres = await buildContentBundles2(dir, { resolution: resolutionFlag(flags) });
-        const out = mkdtempSync4(join55(tmpdir5(), "himi-render-"));
+        const out = mkdtempSync4(join56(tmpdir5(), "himi-render-"));
         const hasWorkers = bres.built.length > 0 || bres.compileErrors.length > 0;
         const outcome = await buildReleaseFromContent2(dir, out, {
           ...hasWorkers ? { tier5Dir: bundleOutDir2(dir) } : {},
@@ -65488,11 +65865,11 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
         const diagnostics = (outcome.lint ?? []).find((s) => s.screenId === screenId)?.issues ?? [];
         let pngFile;
         let attestationPngFile;
-        const shotPath = join55(dir, ".himi", "shots", `${screenId}.png`);
+        const shotPath = join56(dir, ".himi", "shots", `${screenId}.png`);
         const pngTarget = typeof flags.png === "string" ? str5(flags.png) : flags.png === true ? shotPath : void 0;
         if (pngTarget && r.pngBase64) {
           pngFile = writePngFile(pngTarget, r.pngBase64);
-          attestationPngFile = resolve46(pngTarget) === resolve46(shotPath) ? pngFile : writePngFile(shotPath, r.pngBase64);
+          attestationPngFile = resolve47(pngTarget) === resolve47(shotPath) ? pngFile : writePngFile(shotPath, r.pngBase64);
         }
         if (renderWidth !== void 0 && r.renderable) {
           recordRenderWidth(dir, {
@@ -65816,7 +66193,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
           return 2;
         }
         const renamed = str5(flags.name);
-        const dest = resolve46(str5(flags.out) ?? process.cwd(), renamed ?? wanted);
+        const dest = resolve47(str5(flags.out) ?? process.cwd(), renamed ?? wanted);
         const replace = flags.replace === true;
         const force = replace || flags.force === true;
         const linked = symlinkDestinationIssue(dest);
@@ -65824,8 +66201,8 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
           io.error(JSON.stringify(linked));
           return 1;
         }
-        if (existsSync59(dest)) {
-          if (!statSync16(dest).isDirectory()) {
+        if (existsSync60(dest)) {
+          if (!statSync17(dest).isDirectory()) {
             io.error(JSON.stringify({
               error: `${dest} exists and is not a directory`,
               hint: "pass --out/--name to land somewhere else, or remove the file"
@@ -65837,7 +66214,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             io.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 && !existsSync59(join55(dest, "himalaya.content.json"))) {
+          if (replace && occupied && !existsSync60(join56(dest, "himalaya.content.json"))) {
             io.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."
@@ -65976,7 +66353,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
         const force = flags.force === true;
         const { buildContentForValidation: buildContentForValidation2, buildReleaseFromContent: buildReleaseFromContent2, bundleOutDir: bundleOutDir2 } = await loadAuthoring();
         const bres = await buildContentForValidation2(dir, { resolution: resolutionFlag(flags) });
-        const out = mkdtempSync4(join55(tmpdir5(), "himi-push-"));
+        const out = mkdtempSync4(join56(tmpdir5(), "himi-push-"));
         const hasWorkers = bres.built.length > 0 || bres.compileErrors.length > 0;
         const outcome = await buildReleaseFromContent2(dir, out, {
           ...hasWorkers ? { tier5Dir: bundleOutDir2(dir) } : {},
@@ -66448,7 +66825,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             return 2;
           }
           try {
-            const res = writePack(resolve46(releaseDir), only, resolve46(str5(flags.out) ?? process.cwd()));
+            const res = writePack(resolve47(releaseDir), only, resolve47(str5(flags.out) ?? process.cwd()));
             print({
               ok: true,
               app: res.app,
@@ -66497,7 +66874,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 = mkdtempSync4(join55(tmpdir5(), "himi-pack-"));
+        const built = mkdtempSync4(join56(tmpdir5(), "himi-pack-"));
         const hasWorkers = bres.built.length > 0 || bres.compileErrors.length > 0;
         const outcome = await buildReleaseFromContent2(dir, built, {
           ...hasWorkers ? { tier5Dir: bundleOutDir2(dir) } : {},
@@ -66514,12 +66891,12 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
           ...await navIssues2(dir, strict)
         ]);
         if (hasErrors && !force) {
-          rmSync11(built, { recursive: true, force: true });
+          rmSync13(built, { recursive: true, force: true });
           print({ ...report2, packed: false, hint: "lint found errors \u2014 fix them, or re-run `himi pack --force` to pack anyway" });
           return 1;
         }
         try {
-          const res = writePack(built, app, resolve46(str5(flags.out) ?? dir), sourceArchive);
+          const res = writePack(built, app, resolve47(str5(flags.out) ?? dir), sourceArchive);
           print({
             ok: true,
             app: res.app,
@@ -66550,7 +66927,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
           io.error(JSON.stringify({ error: e.message }));
           return 1;
         } finally {
-          rmSync11(built, { recursive: true, force: true });
+          rmSync13(built, { recursive: true, force: true });
         }
       }
       // ---- himi import — turn a dev .himi back into an editable content package ----
@@ -66564,7 +66941,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(resolve46(file));
+          opened = openPackageFile2(resolve47(file));
         } catch (e) {
           io.error(JSON.stringify({ error: e.message }));
           return 1;
@@ -66577,7 +66954,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
           io.error(JSON.stringify({
             ok: false,
             error: "app_source_not_in_package",
-            detail: `${resolve46(file)} is a release package: it carries built output (screens, bundles, tokens) and no source`,
+            detail: `${resolve47(file)} 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;
@@ -66600,7 +66977,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             return 1;
           }
         }
-        const dest = resolve46(str5(flags.out) ?? process.cwd(), renamed ?? opened.header.app);
+        const dest = resolve47(str5(flags.out) ?? process.cwd(), renamed ?? opened.header.app);
         const issue2 = restoreDestinationIssue(dest, flags.force === true);
         if (issue2) {
           io.error(JSON.stringify(issue2));
@@ -66685,7 +67062,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(resolve46(file));
+          const opened = openPackageFile2(resolve47(file));
           if (!opened.validation.ok || !opened.header) {
             io.error(JSON.stringify({ error: "refusing to share an invalid package", issues: opened.validation.errors }));
             return 1;
@@ -66695,12 +67072,12 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             io.error(JSON.stringify({
               ok: false,
               error: "refusing to share a package that carries the app's source",
-              detail: `${resolve46(file)} was packed with --dev, and a share link is public and unauthenticated \u2014 anyone with the URL could \`himi import\` your codebase`,
+              detail: `${resolve47(file)} 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 = readFileSync70(resolve46(file));
+          const archive = readFileSync71(resolve47(file));
           const result = await client2().createPackageShare({
             app: opened.header.app,
             releaseId: opened.header.releaseId,
@@ -66731,16 +67108,33 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
         const { runPackage: runPackage2 } = await Promise.resolve().then(() => (init_run(), run_exports));
         let source = pos[1];
         let temp = null;
+        const watch2 = flags.watch === true;
+        if (watch2) {
+          const { watchFlagConflict: watchFlagConflict2, watchedContentDir: watchedContentDir2 } = await Promise.resolve().then(() => (init_run_watch(), run_watch_exports));
+          const watchedDir = watchedContentDir2(source);
+          if (watchedDir) {
+            flags.content = watchedDir;
+            source = void 0;
+          }
+          const conflict = watchFlagConflict2({ source, browser: flags.browser === true, spa: str5(flags.spa) });
+          if (conflict) {
+            io.error(JSON.stringify({ ok: false, ...conflict }));
+            return 2;
+          }
+        }
+        let served = null;
+        let servedMissing = [];
         try {
           if (!source) {
-            const dir = contentDir(flags);
-            const app = await appId(dir);
+            const dir2 = contentDir(flags);
+            const app = await appId(dir2);
             const { buildContentBundles: buildContentBundles2, buildReleaseFromContent: buildReleaseFromContent2, bundleOutDir: bundleOutDir2 } = await loadAuthoring();
-            const bres = await buildContentBundles2(dir, { resolution: resolutionFlag(flags) });
-            temp = mkdtempSync4(join55(tmpdir5(), "himi-run-build-"));
+            const bres = await buildContentBundles2(dir2, { resolution: resolutionFlag(flags) });
+            temp = mkdtempSync4(join56(tmpdir5(), "himi-run-build-"));
             const hasWorkers = bres.built.length > 0 || bres.compileErrors.length > 0;
-            await buildReleaseFromContent2(dir, temp, { ...hasWorkers ? { tier5Dir: bundleOutDir2(dir) } : {} });
-            source = join55(temp, app);
+            const initial = await buildReleaseFromContent2(dir2, temp, { ...hasWorkers ? { tier5Dir: bundleOutDir2(dir2) } : {} });
+            servedMissing = initial.missingBundles;
+            source = join56(temp, app);
           }
           const chromeArg = str5(flags.chrome) ?? "preview";
           if (chromeArg !== "preview" && chromeArg !== "app") {
@@ -66765,45 +67159,142 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
               open: flags["no-open"] !== true
             });
             print({ ok: true, app: run2.app, url: run2.url, port: run2.port, plane: "browser" });
-            await new Promise((resolve47) => {
+            await new Promise((resolve48) => {
               const stop = () => {
-                void run2.close().finally(() => resolve47());
+                void run2.close().finally(() => resolve48());
               };
               process.once("SIGINT", stop);
               process.once("SIGTERM", stop);
             });
             return 0;
           }
+          const dir = contentDir(flags);
+          const watchKit = watch2 ? await Promise.resolve().then(() => (init_run_watch(), run_watch_exports)) : null;
+          const bus = watchKit ? new watchKit.ReloadBus() : void 0;
+          if (watch2) served = mkdtempSync4(join56(tmpdir5(), "himi-run-served-"));
           const running = await runPackage2(source, {
             port,
             chrome: chromeArg,
             screen: str5(flags.screen),
             surface: str5(flags.surface),
             spa: str5(flags.spa),
-            open: flags["no-open"] !== true
+            open: flags["no-open"] !== true,
+            ...watchKit && served && bus ? { workDir: served, screenEvents: bus, extraRoutes: (request) => watchKit.boardFile(dir, new URL(request.url).pathname) } : {}
           });
+          let watcher;
+          let rebuild;
+          let recorded = false;
+          let stopping = false;
+          const refreshBoard = async () => {
+            if (!boardOpen(dir)) return;
+            const { refreshStudio: refreshStudio2 } = await Promise.resolve().then(() => (init_studio(), studio_exports));
+            refreshStudio2(dir);
+          };
+          if (watchKit && bus) {
+            try {
+              const startedAt = (/* @__PURE__ */ new Date()).toISOString();
+              const record2 = (build2) => {
+                if (watchKit.writeRunRecord(dir, { url: running.url, port: running.port, pid: process.pid, startedAt, build: build2 })) recorded = true;
+              };
+              record2({ ok: true, at: startedAt });
+              if (!recorded) io.error(JSON.stringify({ watch: "run_record_skipped", message: `${join56(dir, ".himi")} is not a real directory, so the build board will not frame this preview.` }));
+              await refreshBoard();
+              const { buildContentBundles: buildContentBundles2, buildReleaseFromContent: buildReleaseFromContent2, bundleOutDir: bundleOutDir2 } = await loadAuthoring();
+              const live2 = join56(running.releaseRoot, running.app);
+              const manifestOf = (tree) => JSON.parse(readFileSync71(join56(tree, "release-manifest.json"), "utf8"));
+              let current = manifestOf(live2);
+              const failed2 = async (message) => {
+                if (stopping) return;
+                bus.publish("build.failed", { message });
+                record2({ ok: false, at: (/* @__PURE__ */ new Date()).toISOString(), error: message });
+                await refreshBoard();
+                io.error(JSON.stringify({ watch: "build_failed", keptLastGood: true, message }));
+              };
+              rebuild = watchKit.serialize(async () => {
+                const t0 = Date.now();
+                const next = mkdtempSync4(join56(tmpdir5(), "himi-run-build-"));
+                try {
+                  const bres = await buildContentBundles2(dir, { resolution: resolutionFlag(flags) });
+                  if (bres.compileErrors.length) {
+                    const first = bres.compileErrors[0];
+                    const diag = first.errors[0];
+                    await failed2(`${first.bundle}: ${diag ? `${diag.file ? `${diag.file}${diag.line ? `:${diag.line}` : ""} ` : ""}${diag.text}` : "did not compile"}`);
+                    return;
+                  }
+                  const hasWorkers = bres.built.length > 0;
+                  const outcome = await buildReleaseFromContent2(dir, next, { ...hasWorkers ? { tier5Dir: bundleOutDir2(dir) } : {} });
+                  const blocker = watchKit.rebuildBlocker(outcome, servedMissing);
+                  if (blocker) {
+                    await failed2(blocker);
+                    return;
+                  }
+                  if (stopping) return;
+                  const fresh = manifestOf(join56(next, running.app));
+                  const diff = watchKit.diffReleases(current, fresh);
+                  const retired = `${live2}.retired-${Date.now()}`;
+                  renameSync6(live2, retired);
+                  try {
+                    renameSync6(join56(next, running.app), live2);
+                  } catch {
+                    cpSync3(join56(next, running.app), live2, { recursive: true });
+                  }
+                  rmSync13(retired, { recursive: true, force: true });
+                  current = fresh;
+                  servedMissing = outcome.missingBundles;
+                  for (const [event, data] of watchKit.reloadEvents(diff)) bus.publish(event, data);
+                  record2({ ok: true, at: (/* @__PURE__ */ new Date()).toISOString() });
+                  await refreshBoard();
+                  io.error(JSON.stringify({ watch: "rebuilt", ms: Date.now() - t0, screens: diff.screens, tokens: diff.tokens, config: diff.config, tabs: bus.listeners }));
+                } catch (e) {
+                  await failed2(e.message.split("\n")[0]);
+                } finally {
+                  rmSync13(next, { recursive: true, force: true });
+                }
+              });
+              watcher = watchKit.watchContent(dir, () => rebuild?.());
+            } catch (e) {
+              if (recorded) watchKit.removeRunRecord(dir);
+              await running.close();
+              throw e;
+            }
+          }
           print({
             ok: true,
             app: running.app,
             releaseId: running.releaseId,
             url: running.url,
             port: running.port,
+            ...watch2 ? { watching: dir, ...boardOpen(dir) ? { board: `${running.origin}/__himi/studio/` } : {} } : {},
             ...running.warnings.length ? { warnings: running.warnings } : {},
             stop: "Ctrl-C"
           });
           await new Promise((done) => {
-            const stop = () => {
-              void running.close().then(done);
+            const stop = async () => {
+              stopping = true;
+              watcher?.close();
+              try {
+                await rebuild?.stop();
+                if (recorded) {
+                  watchKit?.removeRunRecord(dir);
+                  await refreshBoard();
+                }
+              } catch (e) {
+                io.error(JSON.stringify({ watch: "stop_cleanup_failed", message: e.message }));
+              } finally {
+                await running.close();
+                done();
+              }
             };
-            process.once("SIGINT", stop);
-            process.once("SIGTERM", stop);
+            process.once("SIGINT", () => void stop());
+            process.once("SIGTERM", () => void stop());
           });
           return 0;
         } catch (e) {
           io.error(JSON.stringify({ error: e.message }));
           return 1;
         } finally {
-          if (temp) rmSync11(temp, { recursive: true, force: true });
+          if (temp) rmSync13(temp, { recursive: true, force: true });
+          if (served) rmSync13(served, { recursive: true, force: true });
         }
       }
       case "preview": {
@@ -67344,7 +67835,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
           io.error(JSON.stringify({ error: `patch ${kind} needs --file`, usage: PATCH_USAGE }));
           return 2;
         }
-        if (!existsSync59(file)) {
+        if (!existsSync60(file)) {
           io.error(JSON.stringify({ error: `no such file: ${file}` }));
           return 2;
         }
@@ -67400,7 +67891,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 = readFileSync70(file, "utf8");
+          const body = readFileSync71(file, "utf8");
           const patch2 = kind === "tokens" ? { tokens: body } : { appConfig: body };
           return runReleasePatch({
             ...common,
@@ -67415,7 +67906,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             io.error(JSON.stringify({ error: "patch screen needs a <screenId>", usage: PATCH_USAGE }));
             return 2;
           }
-          const descriptor = readFileSync70(file, "utf8");
+          const descriptor = readFileSync71(file, "utf8");
           try {
             JSON.parse(descriptor);
           } catch (e) {
@@ -67455,7 +67946,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             extra: { kind, screen: id, file: { path: file, bytes: Buffer.byteLength(descriptor, "utf8") } }
           });
         }
-        const bytes2 = readFileSync70(file);
+        const bytes2 = readFileSync71(file);
         const sha = createHash26("sha256").update(bytes2).digest("hex");
         const forScreens = (str5(flags["for-screen"]) ?? "").split(",").map((s) => s.trim()).filter(Boolean);
         if (flags["no-rebind"] !== void 0 && flags["no-rebind"] !== true) {
@@ -67599,7 +68090,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
           }
           let def;
           try {
-            const parsed = JSON.parse(arg.startsWith("@") ? readFileSync70(arg.slice(1), "utf8") : arg);
+            const parsed = JSON.parse(arg.startsWith("@") ? readFileSync71(arg.slice(1), "utf8") : arg);
             if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
               io.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;
@@ -68063,7 +68554,7 @@ ${label2}`);
         const platform = str5(flags.platform)?.split(",").map((p) => p.trim()).filter(Boolean);
         {
           const distDir = contentDir(flags);
-          if (existsSync59(join55(distDir, "himalaya.content.json"))) {
+          if (existsSync60(join56(distDir, "himalaya.content.json"))) {
             const issues = await iconIssues(distDir, flags.strict === true, { requireDeclared: true, requireVerified: true });
             const errors = issues.filter((i) => i.severity === "error");
             for (const i of issues.filter((i2) => i2.severity === "warning")) {
@@ -68332,7 +68823,7 @@ ${label2}`);
           const dpxPath = dpxSessionTokenPath();
           let dpx;
           try {
-            dpx = readFileSync70(dpxPath, "utf8").trim();
+            dpx = readFileSync71(dpxPath, "utf8").trim();
           } catch {
             io.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;
@@ -68734,7 +69225,7 @@ ${report2.ok ? "OK \u2014 data + serve plane reachable." : typeof report2.hint =
           const path2 = dpxSessionTokenPath();
           let raw;
           try {
-            raw = readFileSync70(path2, "utf8");
+            raw = readFileSync71(path2, "utf8");
           } catch {
             io.error(JSON.stringify({ error: `no DPX BO session at ${path2}` }));
             return 1;