okno 1.0.0-beta.22 → 1.0.0-beta.24

package/dist/cli.d.ts

@@ -1,3 +1,8 @@
 #!/usr/bin/env node
-export {};
+/**
+ * `okno` CLI. The canonical command is BARE `npx okno` — the context-aware
+ * installer (adds the plugin, scaffolds, offers MCP). `okno mcp` runs the MCP
+ * server. Each path lazy-imports its deps so neither pays for the other's.
+ */
+declare function main(): Promise<void>;
 //# sourceMappingURL=cli.d.ts.map

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AA6BA,OAAO,EAAE,CAAA"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA;;;;GAIG;AAIH,iBAAe,IAAI,kBAuBlB"}

package/dist/cli.js

@@ -1,22 +1,25 @@
 #!/usr/bin/env node
-const [n] = process.argv.slice(2);
-switch (n) {
-  case "mcp": {
-    const { runMcp: o } = await import("./mcp.js");
-    await o();
-    break;
-  }
-  case "help":
-  case "--help":
-  case "-h": {
-    console.log(
-      ["", "  npx okno         Add okno to this project", "  npx okno mcp     Run the okno MCP server (for your AI client)", ""].join(`
+async function c() {
+  const [n] = process.argv.slice(2);
+  switch (n) {
+    case "mcp": {
+      const { runMcp: o } = await import("./mcp.js");
+      await o();
+      break;
+    }
+    case "help":
+    case "--help":
+    case "-h": {
+      console.log(
+        ["", "  npx okno         Add okno to this project", "  npx okno mcp     Run the okno MCP server (for your AI client)", ""].join(`
 `)
-    );
-    break;
-  }
-  default: {
-    const { runInit: o } = await import("./init.js");
-    await o();
+      );
+      break;
+    }
+    default: {
+      const { runInit: o } = await import("./init.js");
+      await o();
+    }
   }
 }
+c();

package/dist/codegen/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/codegen/generate.ts"],"names":[],"mappings":"AAUA;;;;;;;GAOG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,iBAyHhE"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/codegen/generate.ts"],"names":[],"mappings":"AAUA;;;;;;;GAOG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,iBAoIhE"}

package/dist/{dispatch-CENEluBI.js → dispatch-Ce0p8-Vu.js}

@@ -1,14 +1,14 @@
-import { join as g, relative as U, sep as I, dirname as P, resolve as ie } from "node:path";
+import { join as g, relative as z, sep as I, dirname as P, resolve as ie } from "node:path";
 import { readdir as x, readFile as _e, writeFile as $e } from "node:fs/promises";
-import { existsSync as _, readFileSync as b, readdirSync as D, statSync as ke, realpathSync as we, writeFileSync as T, mkdirSync as M, unlinkSync as L, renameSync as Se } from "node:fs";
+import { existsSync as _, readFileSync as S, readdirSync as D, statSync as ke, realpathSync as we, writeFileSync as T, mkdirSync as M, unlinkSync as F, renameSync as be } from "node:fs";
 import { execSync as ee } from "node:child_process";
-import { fileURLToPath as be } from "node:url";
+import { fileURLToPath as Se } from "node:url";
 import { p as J } from "./parse-tlTHgSSs.js";
-import { o as ve } from "./order-bAkdncZC.js";
+import { o as Oe } from "./order-bAkdncZC.js";
 import { simpleGit as le } from "simple-git";
-import { b as q, a as Oe, e as je } from "./encode-BfJY0Xy5.js";
-import { applyKeyChanges as ce, setStringsSchema as Te, saveFields as Ae, setLocales as xe, setName as Pe, setUrl as Re, renameSlug as Me, reorderKind as Ee, setLayout as Ne, setCollectionOrder as Ie, setDrafts as We, deleteSchemaEntry as Fe, scaffoldEntry as Le, fieldsToContent as ze, EngineError as Ce } from "./engine/index.js";
-const Ue = /* @__PURE__ */ new Set([".astro", ".svelte", ".ts", ".tsx", ".js", ".jsx", ".mjs", ".vue"]), Je = /* @__PURE__ */ new Set([
+import { b as q, a as ve, e as je } from "./encode-BfJY0Xy5.js";
+import { applyKeyChanges as ce, setStringsSchema as Te, saveFields as Ae, setLocales as xe, setName as Pe, setUrl as Re, renameSlug as Me, reorderKind as Ee, setLayout as Ne, setCollectionOrder as Ie, setDrafts as We, deleteSchemaEntry as Le, scaffoldEntry as Fe, fieldsToContent as Ce, EngineError as Ue } from "./engine/index.js";
+const ze = /* @__PURE__ */ new Set([".astro", ".svelte", ".ts", ".tsx", ".js", ".jsx", ".mjs", ".vue"]), Je = /* @__PURE__ */ new Set([
   "node_modules",
   ".astro",
   ".svelte-kit",
@@ -39,7 +39,7 @@ async function Z(e, n) {
       const t = u.name.lastIndexOf(".");
       if (t === -1) continue;
       const o = u.name.slice(t);
-      if (!Ue.has(o)) continue;
+      if (!ze.has(o)) continue;
       let r;
       try {
         r = await _e(i, "utf-8");
@@ -79,18 +79,29 @@ async function $t(e, n) {
     "	readonly exists: boolean",
     "}",
     "",
-    "/** Array-membership boundary — only on array items (never on a scalar `{...field}` spread, so it can't collide with HTML attributes). Spread onto the item wrapper: `<article {...item.slot}>` → data-okno-item=\"<list>.<i>\". `slot` is a reserved field key so content can't shadow it. */",
+    "/** Array-membership boundary — only on array items (never on a scalar `{...field}` spread, so it can't collide with HTML attributes). BLOCK wrappers spread `.slot` explicitly (`<article {...item.slot}>`); a LEAF multiple (media/link/text) gets `data-okno-item` straight off `{...item}` (see OknoSlotItem), so one spread = edit + reorder. `slot` is a reserved field key so content can't shadow it. */",
     'type OknoSlot = { readonly slot: { readonly "data-okno-item": string } }',
+    "/** The reorder hook carried directly on an array item's spread (`{...item}`), so a leaf multiple needs no separate `{...item.slot}`. */",
+    'type OknoSlotItem = { readonly "data-okno-item": string }',
+    "/** One array member. A LEAF (media/link/text) is spread bare — `{...item}` — so it carries `data-okno-item` but NOT the object-valued `.slot` (spreading that onto an element sets the HTML `slot` attr to an object → type error). A BLOCK/reference member has inner fields and is spread via its wrapper's `.slot`, so it keeps `OknoSlot`. */",
+    "type OknoArrayItem<U> =",
+    "	U extends string | number | boolean",
+    "		? OknoWrapped<U> & OknoSlotItem",
+    "		: U extends { src: string }",
+    "			? OknoWrapped<U> & OknoSlotItem",
+    "			: U extends { url: string; text: string }",
+    "				? OknoWrapped<U> & OknoSlotItem",
+    "				: OknoWrapped<U> & OknoSlot",
     "",
     "/** A media value's `.image` handle — a spreadable bundle for a framework image component (Astro `<Image {...cover.image}>`): build-optimized `src` (from `okno/files`), plus alt/dimensions and the edit hook. Use `<img {...cover}>` for the raw/universal path. `src` is loose (framework's shape, e.g. Astro `ImageMetadata`) so okno stays framework-agnostic. */",
     'type OknoImage = { src: any; alt: string; width?: number; height?: number; readonly "data-okno": string }',
     "",
-    "/** Recursively wraps content types so values are spreadable/renderable. Media (`{src}`) and link (`{url,text}`) objects keep RAW attribute values so `<img {...media}>` / `<a {...link}>` type-check; media also exposes `.image`; other objects expose wrapped fields + the data-okno hook. Array items also carry `.slot`. */",
+    "/** Recursively wraps content types so values are spreadable/renderable. Media (`{src}`) and link (`{url,text}`) objects keep RAW attribute values so `<img {...media}>` / `<a {...link}>` type-check; media also exposes `.image`; other objects expose wrapped fields + the data-okno hook. Array items also carry `.slot` (block wrappers) AND `data-okno-item` on the bare spread (leaf multiples). */",
     "type OknoWrapped<T> =",
     "	T extends string | number | boolean",
     "		? OknoValue<T>",
     "		: T extends ReadonlyArray<infer U>",
-    "			? (OknoWrapped<U> & OknoSlot)[]",
+    "			? OknoArrayItem<U>[]",
     "			: T extends { src: string }",
     '				? Omit<T, "focal"> & OknoValue<T> & { readonly image: OknoImage } & (T extends { focal: infer F } ? { readonly focal: OknoWrapped<F> } : {})',
     "				: T extends { url: string; text: string }",
@@ -114,17 +125,17 @@ async function $t(e, n) {
       ([, w]) => w?.type === "reference" && typeof w.collection == "string" && a.has(w.collection)
     ), $ = d.filter(([, w]) => w?.type === "enum"), k = '"created" | "updated"';
     if (y.length === 0 && $.length === 0) return `OknoWrapped<Omit<${c}, ${k}>> & OknoMeta`;
-    const v = `${[...y, ...$].map(([w]) => `"${w}"`).join(" | ")} | ${k}`, O = [
-      ...y.map(([w, S]) => {
-        const R = `typeof import("./collections/${S.collection}/${a.get(S.collection)}").default`;
-        return `${w}: ${S.multiple ? `${R}[]` : R}`;
+    const O = `${[...y, ...$].map(([w]) => `"${w}"`).join(" | ")} | ${k}`, v = [
+      ...y.map(([w, b]) => {
+        const R = `typeof import("./collections/${b.collection}/${a.get(b.collection)}").default`;
+        return `${w}: ${b.multiple ? `${R}[]` : R}`;
       }),
-      ...$.map(([w, S]) => {
-        const R = (Array.isArray(S.options) ? S.options : []).map((A) => typeof A == "string" ? A : A?.value).filter((A) => typeof A == "string"), F = `{ name: string; value: ${R.length ? R.map((A) => JSON.stringify(A)).join(" | ") : "string"} }`;
-        return `${w}: ${S.multiple ? `${F}[]` : F}`;
+      ...$.map(([w, b]) => {
+        const R = (Array.isArray(b.options) ? b.options : []).map((A) => typeof A == "string" ? A : A?.value).filter((A) => typeof A == "string"), L = `{ name: string; value: ${R.length ? R.map((A) => JSON.stringify(A)).join(" | ") : "string"} }`;
+        return `${w}: ${b.multiple ? `${L}[]` : L}`;
       })
     ].join("; ");
-    return `OknoWrapped<Omit<${c}, ${v}> & { ${O} }> & OknoMeta`;
+    return `OknoWrapped<Omit<${c}, ${O}> & { ${v} }> & OknoMeta`;
   }, [u, i, t] = await Promise.all([
     Z(n, "pages"),
     Z(n, "globals"),
@@ -134,7 +145,7 @@ async function $t(e, n) {
     ...ue("okno:pages", "pages", await Q(g(e, "pages")), u, m)
   ), l.push(...Ze(s, t, m)), l.push(
     ...ue("okno:globals", "globals", await Q(g(e, "globals")), i, m)
-  ), l.push(...Ge(qe(e), He(f))), l.push(...Ve()), l.push(...Be());
+  ), l.push(...Ge(qe(e), He(f))), l.push(...Be()), l.push(...Ve());
   for (const o of ["pages", "collections", "globals", "locales", "strings", "content"])
     l.push(`declare module "okno/${o}" {`, `	export * from "okno:${o}";`, "}", "");
   await $e(g(e, "modules.d.ts"), l.join(`
@@ -148,7 +159,7 @@ function ue(e, n, s, a, f) {
     l.has(u) || m.push(`	export const ${u}: OknoUnscaffolded`);
   return [`declare module "${e}" {`, ...m, "}", ""];
 }
-function Ve() {
+function Be() {
   return [
     'declare module "okno:locales" {',
     '	/** A configured language. `id` is the BCP-47 tag (e.g. "zh-Hant"), `name` the display label, `slug` the URL segment you map into routing. `link(url)` returns this page\'s hreflang <link> descriptor — spread onto a <link> (pass Astro.url for an absolute href). Okno owns no routing; you map these. */',
@@ -164,7 +175,7 @@ function Ve() {
     ""
   ];
 }
-function Be() {
+function Ve() {
   return [
     'declare module "okno:content" {',
     '	/** Unified content namespace — `import * as okno from "okno:content"` then `okno.pages.home`, `okno.globals.nav`, `okno.collections.articles`, `okno.strings.nav.home`. */',
@@ -232,7 +243,7 @@ function Xe(e) {
   const n = g(e, "schema.ts");
   if (!_(n)) return null;
   try {
-    let s = b(n, "utf8");
+    let s = S(n, "utf8");
     const a = s.indexOf("export default");
     return a === -1 ? null : (s = s.slice(a + 14).replace(/\bas const\b/g, "").replace(/\bsatisfies\s+[A-Za-z0-9_.]+/g, "").trim(), s.endsWith(";") && (s = s.slice(0, -1).trim()), JSON.parse(s));
   } catch {
@@ -243,7 +254,7 @@ function qe(e) {
   const n = g(e, "strings.ts");
   if (!_(n)) return [];
   try {
-    let s = b(n, "utf8");
+    let s = S(n, "utf8");
     const a = s.indexOf("export default");
     if (a === -1) return [];
     s = s.slice(a + 14).replace(/\bas const\b/g, "").replace(/\bsatisfies\s+[A-Za-z0-9_.]+/g, "").trim(), s.endsWith(";") && (s = s.slice(0, -1).trim());
@@ -291,20 +302,20 @@ function kt() {
 }
 function wt() {
   const e = te("git rev-parse --show-toplevel");
-  return e ? U(e, process.cwd()).split(I).join("/") : "";
+  return e ? z(e, process.cwd()).split(I).join("/") : "";
 }
-const ne = '__oknoSetImages(import.meta.glob("/okno/files/**/*.{png,jpg,jpeg,webp,avif,gif,svg,tiff}", { eager: false }))', fe = P(be(import.meta.url)), De = [
+const ne = '__oknoSetImages(import.meta.glob("/okno/files/**/*.{png,jpg,jpeg,webp,avif,gif,svg,tiff}", { eager: false }))', fe = P(Se(import.meta.url)), De = [
   ie(fe, "./runtime/wrap.js"),
   // bundled at dist/ (Vite plugin chunk)
   ie(fe, "../runtime/wrap.js")
   // bundled at dist/next/ (Next entry)
 ];
-function St() {
+function bt() {
   for (const e of De)
-    if (_(e)) return b(e, "utf-8");
+    if (_(e)) return S(e, "utf-8");
   return null;
 }
-function bt() {
+function St() {
   return [
     'export * as pages from "okno:pages"',
     'export * as globals from "okno:globals"',
@@ -313,11 +324,11 @@ function bt() {
   ].join(`
 `);
 }
-function B(e) {
+function V(e) {
   const n = g(e, "schema.ts");
   if (!_(n)) return null;
   try {
-    const a = J(b(n, "utf-8"))?.locales?.supported;
+    const a = J(S(n, "utf-8"))?.locales?.supported;
     if (!Array.isArray(a) || a.length === 0) return null;
     const f = a.map((l) => typeof l == "string" ? l : l?.id).filter((l) => typeof l == "string");
     return f.length ? new Set(f) : null;
@@ -325,7 +336,7 @@ function B(e) {
     return null;
   }
 }
-function C(e, n) {
+function U(e, n) {
   return n ? n.has(e) : nt.test(e);
 }
 function et(e) {
@@ -344,7 +355,7 @@ function tt(e) {
   const n = g(e, "schema.ts"), s = {}, a = /* @__PURE__ */ new Set();
   if (!_(n)) return { orders: s, drafts: a };
   try {
-    const l = J(b(n, "utf-8"))?.collections ?? {};
+    const l = J(S(n, "utf-8"))?.collections ?? {};
     for (const [m, u] of Object.entries(l))
       Array.isArray(u?.order) && (s[m] = u.order.filter((i) => typeof i == "string")), u?.drafts === !0 && a.add(m);
   } catch {
@@ -358,15 +369,15 @@ function oe(e) {
 function he(e) {
   return e.replace(".ts", "").replace(/-/g, "_");
 }
-function V(e) {
+function B(e) {
   return e.replace(".ts", "");
 }
-function vt(e) {
+function Ot(e) {
   const n = g(e, "schema.ts");
   let s = [], a = "";
   if (_(n))
     try {
-      const f = J(b(n, "utf-8")), l = f?.locales?.supported;
+      const f = J(S(n, "utf-8")), l = f?.locales?.supported;
       Array.isArray(l) && (s = l.map((m) => typeof m == "string" ? { id: m } : m).filter((m) => !!m && typeof m.id == "string").map((m) => ({
         id: m.id,
         name: m.name || et(m.id),
@@ -403,7 +414,7 @@ function vt(e) {
   ].join(`
 `);
 }
-async function Ot(e) {
+async function vt(e) {
   const n = g(e, "strings.ts");
   if (!_(n))
     return [
@@ -411,13 +422,13 @@ async function Ot(e) {
       'export const strings = __oknoMakeStrings({}, {}, "")'
     ].join(`
 `);
-  const s = g(e, "schema.ts"), a = _(s), f = B(e), l = g(e, "strings"), m = [];
+  const s = g(e, "schema.ts"), a = _(s), f = V(e), l = g(e, "strings"), m = [];
   if (_(l)) {
     const r = await x(l, { withFileTypes: !0 });
     for (const p of r) {
       if (!p.isFile() || !p.name.endsWith(".ts") || p.name === "index.ts") continue;
       const c = p.name.replace(/\.ts$/, "");
-      C(c, f) && m.push(c);
+      U(c, f) && m.push(c);
     }
   }
   const u = [
@@ -450,24 +461,24 @@ async function jt(e, n = /* @__PURE__ */ new Set()) {
     return `__oknoResolveEnums(__oknoResolveRefs(_${t}, ${r}, __collections, ${m}), ${r}, ${m})`;
   }, i = /* @__PURE__ */ new Set();
   if (_(s)) {
-    const t = B(e), r = (await x(s, { withFileTypes: !0 })).filter((c) => c.isDirectory() && C(c.name, t)).map((c) => c.name);
+    const t = V(e), r = (await x(s, { withFileTypes: !0 })).filter((c) => c.isDirectory() && U(c.name, t)).map((c) => c.name);
     m = JSON.stringify(r);
     const p = await se(s);
     for (const c of p) {
-      const h = oe(c), d = he(c), y = V(c), $ = g(s, c);
+      const h = oe(c), d = he(c), y = B(c), $ = g(s, c);
       if (r.length === 0) {
         l.push(`import _${h} from "${$}"`), l.push(`export const ${d} = __oknoWrap(${u(h, y)}, "${y}")`), i.add(d);
         continue;
       }
-      const k = [`import _${h}_default from "${$}"`], v = [];
-      for (const O of r) {
-        const w = g(s, O, c);
+      const k = [`import _${h}_default from "${$}"`], O = [];
+      for (const v of r) {
+        const w = g(s, v, c);
         if (_(w)) {
-          const S = G(O);
-          k.push(`import _${h}_${S} from "${w}"`), v.push(`"${O}": _${h}_${S}`);
+          const b = G(v);
+          k.push(`import _${h}_${b} from "${w}"`), O.push(`"${v}": _${h}_${b}`);
         }
       }
-      l.push(...k), l.push(`const _${h} = __oknoLocalize(_${h}_default, { ${v.join(", ")} })`), l.push(`export const ${d} = __oknoWrap(${u(h, y)}, "${y}")`), i.add(d);
+      l.push(...k), l.push(`const _${h} = __oknoLocalize(_${h}_default, { ${O.join(", ")} })`), l.push(`export const ${d} = __oknoWrap(${u(h, y)}, "${y}")`), i.add(d);
     }
   }
   for (const t of n)
@@ -486,11 +497,11 @@ async function Tt(e, n = /* @__PURE__ */ new Set(), s = !1) {
     return d.join(`
 `) || "export {}";
   }
-  const f = B(e), l = await x(a, { withFileTypes: !0 }), m = l.filter((d) => d.isDirectory() && C(d.name, f)).map((d) => d.name), u = l.filter((d) => d.isDirectory() && !m.includes(d.name)).map((d) => d.name), i = JSON.stringify(m);
+  const f = V(e), l = await x(a, { withFileTypes: !0 }), m = l.filter((d) => d.isDirectory() && U(d.name, f)).map((d) => d.name), u = l.filter((d) => d.isDirectory() && !m.includes(d.name)).map((d) => d.name), i = JSON.stringify(m);
   for (const d of u) {
     const y = await x(g(a, d), { withFileTypes: !0 }).catch(() => []);
     for (const $ of y)
-      $.isDirectory() && C($.name, f) && console.warn(
+      $.isDirectory() && U($.name, f) && console.warn(
         `[okno] "collections/${d}/${$.name}/" looks like a misplaced locale folder. Collection locale overrides go at "collections/${$.name}/${d}/<slug>.ts" (locale right after "collections/"). This folder will NOT be localized.`
       );
   }
@@ -501,31 +512,31 @@ async function Tt(e, n = /* @__PURE__ */ new Set(), s = !1) {
   p && c.push(`import __schema from "${r}"`);
   const h = [];
   for (const d of u) {
-    const y = g(a, d), $ = ve(await se(y), V, t[d]), k = d.replace(/-/g, "_"), v = s && o.has(d), O = [];
+    const y = g(a, d), $ = Oe(await se(y), B, t[d]), k = d.replace(/-/g, "_"), O = s && o.has(d), v = [];
     for (const w of $) {
-      const S = `_${k}_${oe(w)}`, R = V(w), K = g(y, w);
+      const b = `_${k}_${oe(w)}`, R = B(w), K = g(y, w);
       if (m.length === 0)
-        c.push(`import ${S} from "${K}"`);
+        c.push(`import ${b} from "${K}"`);
       else {
-        const F = [`import ${S}_default from "${K}"`], A = [];
+        const L = [`import ${b}_default from "${K}"`], A = [];
         for (const H of m) {
           const re = g(a, H, d, w);
           if (_(re)) {
             const ae = G(H);
-            F.push(`import ${S}_${ae} from "${re}"`), A.push(`"${H}": ${S}_${ae}`);
+            L.push(`import ${b}_${ae} from "${re}"`), A.push(`"${H}": ${b}_${ae}`);
           }
         }
-        c.push(...F), c.push(`const ${S} = __oknoLocalize(${S}_default, { ${A.join(", ")} })`);
+        c.push(...L), c.push(`const ${b} = __oknoLocalize(${b}_default, { ${A.join(", ")} })`);
       }
-      O.push({ varName: S, itemName: R });
+      v.push({ varName: b, itemName: R });
     }
-    c.push(`const __oknoRaw_${k} = [${O.map((w) => w.varName).join(", ")}]`), h.push({ name: d, safe: k, draftsOn: v, items: O });
+    c.push(`const __oknoRaw_${k} = [${v.map((w) => w.varName).join(", ")}]`), h.push({ name: d, safe: k, draftsOn: O, items: v });
   }
   p && c.push(`const __oknoNs = { ${h.map((d) => `${d.safe}: __oknoRaw_${d.safe}`).join(", ")} }`);
   for (const d of h) {
     const y = (k) => {
-      const v = `__schema?.collections?.["${d.name}"]?.fields`;
-      return `__oknoWrap(${p ? `__oknoResolveEnums(__oknoResolveRefs(${k.varName}, ${v}, __oknoNs, ${i}), ${v}, ${i})` : k.varName}, "${d.name}.${k.itemName}")`;
+      const O = `__schema?.collections?.["${d.name}"]?.fields`;
+      return `__oknoWrap(${p ? `__oknoResolveEnums(__oknoResolveRefs(${k.varName}, ${O}, __oknoNs, ${i}), ${O}, ${i})` : k.varName}, "${d.name}.${k.itemName}")`;
     }, $ = d.draftsOn ? `[${d.items.map((k) => `[${k.varName}, ${y(k)}]`).join(", ")}].filter((e) => e[0]?.status !== "draft").map((e) => e[1])` : `[${d.items.map(y).join(", ")}]`;
     c.push(`export const ${d.safe} = ${$}`);
   }
@@ -545,24 +556,24 @@ async function At(e, n = /* @__PURE__ */ new Set()) {
     return `__oknoResolveEnums(__oknoResolveRefs(_${t}, ${r}, __collections, ${m}), ${r}, ${m})`;
   }, i = /* @__PURE__ */ new Set();
   if (_(s)) {
-    const t = B(e), r = (await x(s, { withFileTypes: !0 })).filter((c) => c.isDirectory() && C(c.name, t)).map((c) => c.name);
+    const t = V(e), r = (await x(s, { withFileTypes: !0 })).filter((c) => c.isDirectory() && U(c.name, t)).map((c) => c.name);
     m = JSON.stringify(r);
     const p = await se(s);
     for (const c of p) {
-      const h = oe(c), d = he(c), y = V(c), $ = g(s, c);
+      const h = oe(c), d = he(c), y = B(c), $ = g(s, c);
       if (r.length === 0) {
         l.push(`import _${h} from "${$}"`), l.push(`export const ${d} = __oknoWrap(${u(h, y)}, "${y}")`), i.add(d);
         continue;
       }
-      const k = [`import _${h}_default from "${$}"`], v = [];
-      for (const O of r) {
-        const w = g(s, O, c);
+      const k = [`import _${h}_default from "${$}"`], O = [];
+      for (const v of r) {
+        const w = g(s, v, c);
         if (_(w)) {
-          const S = G(O);
-          k.push(`import _${h}_${S} from "${w}"`), v.push(`"${O}": _${h}_${S}`);
+          const b = G(v);
+          k.push(`import _${h}_${b} from "${w}"`), O.push(`"${v}": _${h}_${b}`);
         }
       }
-      l.push(...k), l.push(`const _${h} = __oknoLocalize(_${h}_default, { ${v.join(", ")} })`), l.push(`export const ${d} = __oknoWrap(${u(h, y)}, "${y}")`), i.add(d);
+      l.push(...k), l.push(`const _${h} = __oknoLocalize(_${h}_default, { ${O.join(", ")} })`), l.push(`export const ${d} = __oknoWrap(${u(h, y)}, "${y}")`), i.add(d);
     }
   }
   for (const t of n)
@@ -596,14 +607,14 @@ function ot(e) {
         const m = g(f, l.name);
         if (l.isDirectory()) s(m);
         else if (l.name.endsWith(".ts") && l.name !== "index.ts") {
-          const u = U(e, m).split(I).join("/");
-          n[u] = b(m, "utf-8");
+          const u = z(e, m).split(I).join("/");
+          n[u] = S(m, "utf-8");
         }
       }
   };
   for (const f of st) s(g(e, f));
   const a = g(e, "strings.ts");
-  return _(a) && (n["strings.ts"] = b(a, "utf-8")), s(g(e, "strings")), n;
+  return _(a) && (n["strings.ts"] = S(a, "utf-8")), s(g(e, "strings")), n;
 }
 function ye(e) {
   const n = g(e, "files"), s = [], a = (f) => {
@@ -612,7 +623,7 @@ function ye(e) {
         const m = g(f, l.name);
         if (l.isDirectory()) a(m);
         else if (l.name !== ".okno-tree.json") {
-          const u = U(n, m).split(I).join("/");
+          const u = z(n, m).split(I).join("/");
           s.push({ path: `files/${u}`, filename: l.name, size: ke(m).size });
         }
       }
@@ -622,10 +633,10 @@ function ye(e) {
 function rt(e) {
   const n = g(e, "schema.ts"), s = g(e, "users.json"), a = g(e, "settings.json"), f = g(e, "origins.json");
   return {
-    schema: _(n) ? b(n, "utf-8") : null,
-    users: _(s) ? b(s, "utf-8") : null,
-    settings: _(a) ? b(a, "utf-8") : null,
-    origins: _(f) ? b(f, "utf-8") : null,
+    schema: _(n) ? S(n, "utf-8") : null,
+    users: _(s) ? S(s, "utf-8") : null,
+    settings: _(a) ? S(a, "utf-8") : null,
+    origins: _(f) ? S(f, "utf-8") : null,
     content: ot(e),
     files: ye(e)
   };
@@ -637,7 +648,7 @@ function j(e) {
 
 `, a = {};
   if (_(n)) {
-    const f = b(n, "utf-8"), l = f.indexOf("export default");
+    const f = S(n, "utf-8"), l = f.indexOf("export default");
     l > 0 && (s = f.slice(0, l));
     try {
       a = J(f) ?? {};
@@ -648,7 +659,7 @@ function j(e) {
   return { schema: a, header: s };
 }
 function at(e, n, s) {
-  T(g(e, "schema.ts"), Oe(n, s));
+  T(g(e, "schema.ts"), ve(n, s));
 }
 function it(e, n, s, a, f) {
   const l = g(e, n), m = new Set(f), u = [];
@@ -663,7 +674,7 @@ function it(e, n, s, a, f) {
   for (const o of i) {
     let r;
     try {
-      r = J(b(o, "utf-8"));
+      r = J(S(o, "utf-8"));
     } catch {
       continue;
     }
@@ -683,7 +694,7 @@ function it(e, n, s, a, f) {
       continue;
     if (!c) continue;
     N(o), T(o, q(p));
-    const h = U(e, o).split(I).join("/");
+    const h = z(e, o).split(I).join("/");
     u.push({ rel: h, abs: o }), console.log(`[okno] field-change migrated content: ${h}`, { renames: a, deletes: f });
   }
   return u;
@@ -693,17 +704,17 @@ function Y(e) {
   return X || (X = ee("git rev-parse --show-toplevel", { cwd: e, encoding: "utf-8" }).trim()), X;
 }
 function pe(e) {
-  return U(Y(e), we(e)).split(I).join("/");
+  return z(Y(e), we(e)).split(I).join("/");
 }
-let z;
+let C;
 function lt(e) {
-  if (z !== void 0) return z;
+  if (C !== void 0) return C;
   try {
-    z = ee("git config user.name", { cwd: e, encoding: "utf-8" }).trim() || "local";
+    C = ee("git config user.name", { cwd: e, encoding: "utf-8" }).trim() || "local";
   } catch {
-    z = "local";
+    C = "local";
   }
-  return z;
+  return C;
 }
 async function Pt(e, n) {
   const { method: s, route: a } = n, f = { files: [], modules: [] }, l = (t, o) => {
@@ -726,7 +737,7 @@ async function Pt(e, n) {
       const t = (await n.json())?.path;
       if (!t) return i(400, { error: "Missing path" });
       const o = E(e, t);
-      return o ? (_(o) && (L(o), l(t, o)), i(200, { ok: !0 })) : i(400, { error: "Invalid path" });
+      return o ? (_(o) && (F(o), l(t, o)), i(200, { ok: !0 })) : i(400, { error: "Invalid path" });
     }
     if (s === "POST" && a === "strings/save") {
       const { path: t, content: o } = await n.json();
@@ -770,7 +781,7 @@ async function Pt(e, n) {
       Ae(h, t, o, r), u(h, d);
       const y = p && typeof p == "object" ? p : {}, $ = Array.isArray(c) ? c : [];
       if (Object.keys(y).length > 0 || $.length > 0)
-        for (const { rel: k, abs: v } of it(e, t, o, y, $)) l(k, v);
+        for (const { rel: k, abs: O } of it(e, t, o, y, $)) l(k, O);
       return i(200, { ok: !0, commit: { fileSha: "" }, schema: h });
     }
     if (s === "POST" && a === "schema/set-locales") {
@@ -796,7 +807,7 @@ async function Pt(e, n) {
       if (h) return i(200, { ok: !0, unchanged: !0 });
       u(p, c);
       const d = `${t}/${o}.ts`, y = `${t}/${r}.ts`, $ = E(e, d), k = E(e, y);
-      return $ && k && _($) && (M(P(k), { recursive: !0 }), N($), N(k), T(k, b($)), L($), l(d, $), l(y, k)), i(200, { ok: !0, commit: { fileSha: "" }, schema: p, from: o, to: r, kind: t });
+      return $ && k && _($) && (M(P(k), { recursive: !0 }), N($), N(k), T(k, S($)), F($), l(d, $), l(y, k)), i(200, { ok: !0, commit: { fileSha: "" }, schema: p, from: o, to: r, kind: t });
     }
     if (s === "POST" && a === "schema/reorder") {
       const { kind: t, order: o } = await n.json();
@@ -826,19 +837,19 @@ async function Pt(e, n) {
       const { kind: t, name: o } = await n.json();
       if (!t || !o) return i(400, { error: "Missing kind or name" });
       const { schema: r, header: p } = j(e);
-      Fe(r, t, o), u(r, p);
+      Le(r, t, o), u(r, p);
       const c = `${t}/${o}.ts`, h = E(e, c);
-      return h && _(h) && (N(h), L(h), l(c, h)), i(200, { ok: !0, commit: { fileSha: "" }, schema: r });
+      return h && _(h) && (N(h), F(h), l(c, h)), i(200, { ok: !0, commit: { fileSha: "" }, schema: r });
     }
     if (s === "POST" && a === "setup/scaffold-page") {
       const { name: t, kind: o, fields: r, label: p } = await n.json();
       if (!t || !o) return i(400, { error: "Missing name or kind" });
       const c = r ?? [], { schema: h, header: d } = j(e);
-      if (Le(h, t, o, c, p), u(h, d), o !== "blocks") {
+      if (Fe(h, t, o, c, p), u(h, d), o !== "blocks") {
         const y = `${o}/${t}.ts`, $ = E(e, y);
         if ($) {
           const k = o === "collections" ? `export default []
-` : q(ze(c));
+` : q(Ce(c));
           M(P($), { recursive: !0 }), N($), T($, k), l(y, $);
         }
       }
@@ -848,7 +859,7 @@ async function Pt(e, n) {
       const t = g(e, "files", ".okno-tree.json");
       return i(200, {
         files: ye(e),
-        manifest: _(t) ? b(t, "utf-8") : null
+        manifest: _(t) ? S(t, "utf-8") : null
       });
     }
     if (s === "POST" && a === "files/blob") {
@@ -872,14 +883,14 @@ async function Pt(e, n) {
       const t = (await n.json())?.path;
       if (!t) return i(400, { error: "Missing path" });
       const o = W(e, t);
-      return o ? (_(o) && L(o), i(200, { ok: !0 })) : i(400, { error: "Invalid path" });
+      return o ? (_(o) && F(o), i(200, { ok: !0 })) : i(400, { error: "Invalid path" });
     }
     if (s === "POST" && a === "files/delete-many") {
       const t = (await n.json())?.paths;
       if (!Array.isArray(t)) return i(400, { error: "Missing paths" });
       for (const o of t) {
         const r = W(e, String(o));
-        r && _(r) && L(r);
+        r && _(r) && F(r);
       }
       return i(200, { ok: !0 });
     }
@@ -887,7 +898,7 @@ async function Pt(e, n) {
       const { from: t, to: o } = await n.json();
       if (!t || !o) return i(400, { error: "Missing from or to" });
       const r = W(e, t), p = W(e, o);
-      return !r || !p ? i(400, { error: "Invalid path" }) : _(r) ? (M(P(p), { recursive: !0 }), Se(r, p), i(200, { ok: !0, commit: { fileSha: "" } })) : i(404, { error: "Source not found" });
+      return !r || !p ? i(400, { error: "Invalid path" }) : _(r) ? (M(P(p), { recursive: !0 }), be(r, p), i(200, { ok: !0, commit: { fileSha: "" } })) : i(404, { error: "Source not found" });
     }
     if (s === "POST" && a === "users/save") {
       const t = (await n.json())?.users;
@@ -908,7 +919,7 @@ async function Pt(e, n) {
     }
     return null;
   } catch (t) {
-    return t instanceof Ce ? { status: t.status, body: { error: t.message } } : { status: 500, body: { error: t instanceof Error ? t.message : String(t) } };
+    return t instanceof Ue ? { status: t.status, body: { error: t.message } } : { status: 500, body: { error: t instanceof Error ? t.message : String(t) } };
   }
 }
 export {
@@ -916,10 +927,10 @@ export {
   Tt as a,
   jt as b,
   At as c,
-  Ot as d,
-  vt as e,
-  bt as f,
-  St as g,
+  vt as d,
+  Ot as e,
+  St as f,
+  bt as g,
   wt as h,
   kt as i,
   $t as j,