fresnel-icon 0.2.0 → 0.2.1

package/dist/cli.js

@@ -18,8 +18,12 @@ var APPEARANCE_LABEL = {
 function appearanceKeys(a) {
   switch (a) {
     case "dark":
-    case "clear-dark":
       return ["dark"];
+    // Clear and Tinted (light and dark) are all rendered from Icon Composer's Mono, written as "tinted".
+    // Apple: "For mono, you can preview clear and tinted variants"; Assets.car keeps only light / dark /
+    // tintable renditions. A dark value does not carry over to Clear dark [推測: strong].
+    case "clear-light":
+    case "clear-dark":
     case "tinted-light":
     case "tinted-dark":
       return ["tinted"];
@@ -135,6 +139,7 @@ function readProps(obj) {
 function writeProps(props, order, structural = {}) {
   const out = {};
   const emitted = /* @__PURE__ */ new Set();
+  let fromFile = true;
   const emit = (rawKey) => {
     if (emitted.has(rawKey)) return;
     if (rawKey in structural) {
@@ -142,17 +147,28 @@ function writeProps(props, order, structural = {}) {
       emitted.add(rawKey);
       return;
     }
+    const literal = props[rawKey];
+    if (rawKey.endsWith(SPEC_SUFFIX) && literal?.plain) {
+      out[rawKey] = structuredClone(literal.plain.value);
+      emitted.add(rawKey);
+      return;
+    }
     const isSpec = rawKey.endsWith(SPEC_SUFFIX);
     const base = isSpec ? rawKey.slice(0, -SPEC_SUFFIX.length) : rawKey;
     const p = props[base];
     if (!p) return;
-    if (isSpec ? p.specs && p.specs.length > 0 : p.plain) {
+    if (isSpec ? p.specs && (p.specs.length > 0 || fromFile) : p.plain) {
       out[rawKey] = structuredClone(isSpec ? p.specs : p.plain.value);
       emitted.add(rawKey);
     }
   };
   for (const k of order) emit(k);
+  fromFile = false;
   for (const [base, p] of Object.entries(props)) {
+    if (base.endsWith(SPEC_SUFFIX) && p.plain) {
+      emit(base);
+      continue;
+    }
     if (p.plain) emit(base);
     if (p.specs?.length) emit(base + SPEC_SUFFIX);
   }
@@ -200,6 +216,11 @@ function baseValue(p) {
   if (b) return b.value;
   return p.plain?.value;
 }
+function variantValue(p, v) {
+  const vv = toVariant(v);
+  if (isEmpty(vv)) return baseValue(p);
+  return p?.specs?.find((e) => sameVariant(e, vv))?.value;
+}
 function variantsOf(p) {
   return (p?.specs ?? []).filter((e) => !isBaseEntry(e)).map((e) => ({ ...e.appearance ? { appearance: e.appearance } : {}, ...e.idiom ? { idiom: e.idiom } : {} }));
 }
@@ -392,6 +413,7 @@ function svgSize(svg) {
   return { width: 1024, height: 1024 };
 }
 function pngSize(b) {
+  if (b.length < 24) return { width: 0, height: 0 };
   const dv = new DataView(b.buffer, b.byteOffset, b.byteLength);
   return { width: dv.getUint32(16), height: dv.getUint32(20) };
 }
@@ -403,6 +425,10 @@ function jpgSize(b) {
       continue;
     }
     const marker = b[i + 1];
+    if (marker === 255) {
+      i++;
+      continue;
+    }
     const len = b[i + 2] << 8 | b[i + 3];
     if (marker >= 192 && marker <= 207 && ![196, 200, 204].includes(marker)) {
       return { height: b[i + 5] << 8 | b[i + 6], width: b[i + 7] << 8 | b[i + 8] };
@@ -442,15 +468,26 @@ function expandInternalEntities(svg) {
     if (v.length <= 2048 && !/[&<]/.test(v)) ents.set(m[1], v);
   }
   const body = svg.slice(0, doctype.index) + svg.slice(doctype.index + doctype[0].length);
-  return body.replace(/&([\w.-]+);/g, (m, name) => ents.get(name) ?? m);
+  let budget = Math.max(1 << 20, body.length * 4);
+  return body.replace(/&([\w.-]+);/g, (m, name) => {
+    const v = ents.get(name);
+    if (v === void 0 || v.length > budget) return m;
+    budget -= v.length;
+    return v;
+  });
 }
+var DATA_IMAGE = /^data:image\/(?:png|jpe?g|gif|webp|svg\+xml)(?:;[\w.+-]+=[\w.+-]+)*;base64,[a-z0-9+/=\s]*$/i;
 function safeUrlRef(v) {
   const t = v.trim().replace(/^['"]|['"]$/g, "").trim();
-  return t.startsWith("#") || /^data:image\/(png|jpe?g|gif|webp);base64,[a-z0-9+/=\s]*$/i.test(t);
+  return t.startsWith("#") || DATA_IMAGE.test(t);
 }
+function decodeXmlEntities(v) {
+  return v.replace(/&#x([0-9a-f]+);/gi, (_m, h) => String.fromCodePoint(parseInt(h, 16) % 1114112)).replace(/&#(\d+);/g, (_m, d) => String.fromCodePoint(Number(d) % 1114112)).replace(/&(lt|gt|quot|apos|amp);/g, (_m, n2) => ({ lt: "<", gt: ">", quot: '"', apos: "'", amp: "&" })[n2]);
+}
+var escapeXmlText = (v) => v.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 function cleanCss(css0) {
   const css = css0.replace(/\\([0-9a-f]{1,6})\s?/gi, (_m, h) => String.fromCodePoint(parseInt(h, 16) % 1114112)).replace(/\\(.)/g, "$1");
-  return css.replace(/@import\b[^;]*;?/gi, "").replace(/url\s*\(([^)]*)\)/gi, (m, inner) => safeUrlRef(inner) ? m : "none").replace(/expression\s*\(/gi, "(").replace(/javascript\s*:/gi, "");
+  return css.replace(/@import\b[^;]*;?/gi, "").replace(/url\s*\(([^)]*)\)/gi, (m, inner) => safeUrlRef(inner) ? m : "none").replace(/(?:-webkit-)?image-set\s*\(|\bsrc\s*\(/gi, "(").replace(/expression\s*\(/gi, "(").replace(/javascript\s*:/gi, "");
 }
 function cleanAttrs(raw) {
   const out = [];
@@ -471,8 +508,10 @@ function cleanAttrs(raw) {
     if (/javascript:|vbscript:/.test(plain) || lname === "xml:base") continue;
     let v = value;
     if (lname === "style" || /url\(/.test(plain)) {
-      v = cleanCss(v);
-      if (/url\((?!['"]?#)/.test(decodeForCheck(v).replace(/url\(['"]?data:image\/(png|jpe?g|gif|webp);base64,/g, "url(#"))) continue;
+      const css = cleanCss(decodeXmlEntities(v));
+      const refs = [...decodeForCheck(css).matchAll(/url\(([^)]*)\)/g)].map((m2) => m2[1]);
+      if (refs.some((r) => !safeUrlRef(r))) continue;
+      v = escapeXmlText(css);
     }
     out.push(`${name}="${v.replace(/"/g, "&quot;")}"`);
   }
@@ -486,7 +525,7 @@ function sanitizeOnce(svg) {
   while (i < svg.length) {
     const lt = svg.indexOf("<", i);
     const text2 = lt < 0 ? svg.slice(i) : svg.slice(i, lt);
-    if (!skip.length) out += inStyle ? cleanCss(text2) : text2;
+    if (!skip.length) out += inStyle ? escapeXmlText(cleanCss(decodeXmlEntities(text2))) : text2;
     if (lt < 0) break;
     if (svg.startsWith("<!--", lt)) {
       const e = svg.indexOf("-->", lt + 4);
@@ -496,7 +535,7 @@ function sanitizeOnce(svg) {
     if (svg.startsWith("<![CDATA[", lt)) {
       const e = svg.indexOf("]]>", lt);
       const body = svg.slice(lt + 9, e < 0 ? svg.length : e);
-      if (!skip.length) out += inStyle ? `<![CDATA[${cleanCss(body)}]]>` : `<![CDATA[${body}]]>`;
+      if (!skip.length) out += inStyle ? escapeXmlText(cleanCss(body)) : `<![CDATA[${body}]]>`;
       i = e < 0 ? svg.length : e + 3;
       continue;
     }
@@ -569,12 +608,12 @@ function sanitizeOnce(svg) {
 }
 function sanitizeSvg(svg) {
   let s = expandInternalEntities(svg);
-  for (let n2 = 0; n2 < 5; n2++) {
+  for (let n2 = 0; n2 < 8; n2++) {
     const next = sanitizeOnce(s);
-    if (next === s) break;
+    if (next === s) return s;
     s = next;
   }
-  return s;
+  return '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"/>';
 }
 function svgFacts(svg) {
   const widths = [...svg.matchAll(/stroke-width\s*[:=]\s*["']?\s*([0-9.]+)/gi)].map((m) => Number(m[1])).filter((n2) => n2 > 0);
@@ -601,7 +640,15 @@ function assetText(a) {
 function mimeOf(a) {
   return a.kind === "svg" ? "image/svg+xml" : a.kind === "png" ? "image/png" : a.kind === "jpg" ? "image/jpeg" : "application/octet-stream";
 }
+var MAX_DECODE_PIXELS = 64e6;
 function decodePng(b) {
+  try {
+    return decodePngUnchecked(b);
+  } catch {
+    return null;
+  }
+}
+function decodePngUnchecked(b) {
   const dv = new DataView(b.buffer, b.byteOffset, b.byteLength);
   let off = 8;
   let width = 0;
@@ -629,6 +676,7 @@ function decodePng(b) {
     off += 12 + len;
   }
   if (depth !== 8 || interlace !== 0) return null;
+  if (!width || !height || width * height > MAX_DECODE_PIXELS) return null;
   const ch = { 0: 1, 2: 3, 3: 1, 4: 2, 6: 4 }[ctype];
   if (!ch) return null;
   const total = idat.reduce((a, x) => a + x.length, 0);
@@ -806,7 +854,7 @@ function isSafeBundlePath(rel) {
   return rel.split("/").every((p) => p !== "" && p !== "." && p !== ".." && !p.startsWith(".") && p.length <= 255);
 }
 function readBundle(files) {
-  const jsonKey = Object.keys(files).find((k) => k === "icon.json" || k.endsWith("/icon.json"));
+  const jsonKey = Object.keys(files).filter((k) => k === "icon.json" || k.endsWith("/icon.json")).sort((a, b) => a.split("/").length - b.split("/").length || a.length - b.length)[0];
   if (!jsonKey) throw new IconFormatError("icon.json not found in the bundle");
   const prefix = jsonKey.slice(0, -"icon.json".length);
   const base = parseIconJson(strFromU8(files[jsonKey]));
@@ -815,7 +863,7 @@ function readBundle(files) {
   for (const [k, v] of Object.entries(files)) {
     if (!k.startsWith(prefix) || k === jsonKey || k.endsWith("/")) continue;
     const rel = k.slice(prefix.length);
-    if (!isSafeBundlePath(rel)) continue;
+    if (!isSafeBundlePath(rel) || rel.endsWith(".fresnel-tmp")) continue;
     if (rel.startsWith("Assets/") && rel.split("/").length === 2) {
       const name = rel.slice("Assets/".length);
       if (name) assets[name] = makeAsset(name, v);
@@ -850,10 +898,12 @@ function syncFeatures(doc) {
 }
 function writeBundle(doc, extra = {}) {
   const synced = { props: { ...doc.props }, groups: doc.groups };
+  if (synced.props.features) synced.props.features = structuredClone(synced.props.features);
   syncFeatures(synced);
   const files = { ...extra };
-  files["icon.json"] = strToU8(serializeIconJson({ ...doc, props: synced.props }));
   for (const a of Object.values(doc.assets)) files[`Assets/${a.name}`] = a.bytes;
+  delete files["icon.json"];
+  files["icon.json"] = strToU8(serializeIconJson({ ...doc, props: synced.props }));
   return files;
 }
 function unzipBundle(zip) {
@@ -902,8 +952,13 @@ function resolvePath(doc, path) {
   const p = path.trim();
   if (p === "" || p === "document" || p === "/") return { kind: "document" };
   const whole = doc.groups.filter((g2) => nameOf(g2).toLowerCase() === p.toLowerCase());
-  if (whole.length === 1) return { kind: "group", id: whole[0].id };
   const [gp, lp, ...rest] = p.split("/");
+  if (whole.length === 1) {
+    const g2 = lp !== void 0 && !rest.length ? doc.groups.find((x) => nameOf(x).toLowerCase() === gp.trim().toLowerCase()) : void 0;
+    if (g2?.layers.some((l2) => nameOf(l2).toLowerCase() === lp.trim().toLowerCase()))
+      throw new OpError(`"${path}" matches both a group and a layer; use #index (e.g. "#${doc.groups.indexOf(whole[0])}")`);
+    return { kind: "group", id: whole[0].id };
+  }
   if (rest.length) throw new OpError(`Invalid target "${path}". Use "Group" or "Group/Layer".`);
   const pick = (list, key, what) => {
     const k = key.trim();
@@ -940,9 +995,10 @@ function cleanName(name) {
 }
 function uniqueName(existing, wanted0) {
   const wanted = cleanName(wanted0) || "Untitled";
-  if (!existing.includes(wanted)) return wanted;
+  const taken = new Set(existing.map((n2) => n2.toLowerCase()));
+  if (!taken.has(wanted.toLowerCase())) return wanted;
   let i = 2;
-  while (existing.includes(`${wanted} ${i}`)) i++;
+  while (taken.has(`${wanted} ${i}`.toLowerCase())) i++;
   return `${wanted} ${i}`;
 }
 function addGroup(doc, opts = {}) {
@@ -963,10 +1019,15 @@ function clampIndex(i, len) {
 function addAsset(doc, asset) {
   let name = asset.name.replace(/[\\/\u0000-\u001f:]/g, "_").replace(/^[.\s]+/, "").trim() || "image";
   const dot = name.lastIndexOf(".");
-  const stem = dot > 0 ? name.slice(0, dot) : name;
-  const ext = dot > 0 ? name.slice(dot) : "";
+  const ext = dot > 0 ? name.slice(dot, dot + 16) : "";
+  let stem = dot > 0 ? name.slice(0, dot) : name;
+  while (new TextEncoder().encode(stem).length > 200) stem = stem.slice(0, -1);
+  name = stem + ext;
+  const clash = (n2) => Object.values(doc.assets).find((a) => a.name.toLowerCase() === n2.toLowerCase());
   let i = 2;
-  while (doc.assets[name] && !sameBytes(doc.assets[name].bytes, asset.bytes)) name = `${stem} ${i++}${ext}`;
+  for (let c = clash(name); c && !sameBytes(c.bytes, asset.bytes); c = clash(name)) name = `${stem} ${i++}${ext}`;
+  const same = clash(name);
+  if (same) return same.name;
   doc.assets[name] = { ...asset, name };
   return name;
 }
@@ -1018,31 +1079,40 @@ function normalizeFillColors(f) {
   const o = { ...f };
   if (typeof o.solid === "string") o.solid = normalizeColorInput(o.solid);
   if (typeof o["automatic-gradient"] === "string") o["automatic-gradient"] = normalizeColorInput(o["automatic-gradient"]);
-  if (Array.isArray(o["linear-gradient"])) o["linear-gradient"] = o["linear-gradient"].map(normalizeColorInput);
+  if (Array.isArray(o["linear-gradient"])) {
+    if (!o["linear-gradient"].every((c) => typeof c === "string")) throw new OpError("linear-gradient takes a list of color strings");
+    o["linear-gradient"] = o["linear-gradient"].map(normalizeColorInput);
+  }
   return o;
 }
 function removeNode(doc, ref) {
   if (ref.kind === "document") throw new OpError("The document can't be removed");
+  let removedImages;
   if (ref.kind === "group") {
     const i = doc.groups.findIndex((g) => g.id === ref.id);
     if (i < 0) throw new OpError("Group not found");
+    removedImages = imagesOf(doc.groups[i].layers);
     doc.groups.splice(i, 1);
   } else {
     const f = findLayer(doc, ref.id);
     if (!f) throw new OpError("Layer not found");
+    removedImages = imagesOf([f.layer]);
     f.group.layers.splice(f.index, 1);
   }
-  pruneAssets(doc);
+  pruneAssets(doc, removedImages);
 }
-function pruneAssets(doc) {
+function imagesOf(layers) {
   const used = /* @__PURE__ */ new Set();
-  for (const g of doc.groups)
-    for (const l of g.layers) {
-      const p = l.props["image-name"];
-      if (p?.plain && typeof p.plain.value === "string") used.add(p.plain.value);
-      for (const s of p?.specs ?? []) if (typeof s.value === "string") used.add(s.value);
-    }
-  for (const k of Object.keys(doc.assets)) if (!used.has(k)) delete doc.assets[k];
+  for (const l of layers) {
+    const p = l.props["image-name"];
+    if (p?.plain && typeof p.plain.value === "string") used.add(p.plain.value);
+    for (const s of p?.specs ?? []) if (typeof s.value === "string") used.add(s.value);
+  }
+  return used;
+}
+function pruneAssets(doc, only) {
+  const used = imagesOf(doc.groups.flatMap((g) => g.layers));
+  for (const k of Object.keys(doc.assets)) if (!used.has(k) && (!only || only.has(k))) delete doc.assets[k];
 }
 function moveNode(doc, ref, index, toGroupId) {
   if (ref.kind === "document") throw new OpError("The document can't be moved");
@@ -1109,9 +1179,10 @@ function validate(doc) {
   let anyTinted = false;
   const scan = (props) => {
     for (const p of Object.values(props)) {
-      const o = overriddenAppearances(p);
-      if (o.includes("dark")) anyDark = true;
-      if (o.includes("tinted")) anyTinted = true;
+      for (const v of variantsOf(p)) {
+        if (v.appearance === "dark") anyDark = true;
+        if (v.appearance === "tinted") anyTinted = true;
+      }
     }
   };
   scan(doc.props);
@@ -1142,19 +1213,22 @@ function validate(doc) {
         }
         if (Math.abs(a.width - a.height) > 0.5) {
           push("V-03", `"${n2}" is ${round(a.width)}\xD7${round(a.height)}. Apple recommends square, unmasked layers.`, lName, lref);
-        } else if (a.kind !== "svg" && a.width * pos.scale < 1024) {
-          push("V-03", `"${n2}" is ${a.width}\xD7${a.height} px and may look soft at 1024. Use 1024\xD71024 or a vector.`, lName, lref);
+        } else if (a.kind !== "svg" && pos.scale > 1.01) {
+          push("V-03", `"${n2}" (${a.width}\xD7${a.height} px) is scaled up ${round(pos.scale)}\xD7 and may look soft. Use a larger image or a vector.`, lName, lref);
         }
         if (a.kind === "png" && a.width === a.height && a.width >= 256) {
           const bmp = safeDecode(a.bytes);
           if (bmp && looksPreMasked(bmp)) push("V-04", `"${n2}" seems to have rounded corners baked in. The system masks icons itself.`, lName, lref);
         }
         if (a.kind === "svg") {
-          const f = svgFacts(assetText(a));
+          const text2 = assetText(a);
+          const f = svgFacts(text2);
+          const vb = /<svg\b[^>]*\sviewBox\s*=\s*["']\s*[-\d.]+[\s,]+[-\d.]+[\s,]+([\d.]+)/i.exec(text2);
+          const unit2 = vb && Number(vb[1]) > 0 ? svgSize(text2).width / Number(vb[1]) : 1;
           if (f.hasText) push("V-07", `"${n2}" contains <text>. Convert text to outlines.`, lName, lref);
           if (f.hasFilter) push("V-07", `"${n2}" uses SVG filters (blur, glow, shadow). Let the system draw effects.`, lName, lref);
-          if (f.minStrokeWidth !== null && f.minStrokeWidth * pos.scale < 10)
-            push("V-06", `"${n2}" has strokes as thin as ${f.minStrokeWidth}. They'll be under 0.16 px at 16 px.`, lName, lref);
+          if (f.minStrokeWidth !== null && f.minStrokeWidth * unit2 * pos.scale < 10)
+            push("V-06", `"${n2}" has strokes as thin as ${round(f.minStrokeWidth * unit2)} pt. They'll be under 0.16 px at 16 px.`, lName, lref);
         }
       }
     }
@@ -1370,10 +1444,24 @@ function moveBy(doc, ref, dx, dy, ctx, variant) {
     props = f.layer.props;
     scale = resolveProp(f.group.props.position, ctx, null)?.scale ?? 1;
   }
-  const p = resolveProp(props.position, ctx, { scale: 1, "translation-in-points": [0, 0] }) ?? { scale: 1, "translation-in-points": [0, 0] };
-  const [x, y] = p["translation-in-points"] ?? [0, 0];
   const round2 = (v) => Math.round(v * 100) / 100;
-  setProp(doc, ref, "position", { ...p, "translation-in-points": [round2(x + dx / scale), round2(y + dy / scale)] }, variant);
+  const shift = (p) => {
+    const q = p ?? { scale: 1, "translation-in-points": [0, 0] };
+    const [x, y] = q["translation-in-points"] ?? [0, 0];
+    return { ...q, "translation-in-points": [round2(x + dx / scale), round2(y + dy / scale)] };
+  };
+  const vv = toVariant(variant);
+  if (vv.appearance !== void 0 || vv.idiom !== void 0) {
+    const cur = variantValue(props.position, vv) ?? resolveProp(props.position, ctx, null);
+    setProp(doc, ref, "position", shift(cur), variant);
+    return;
+  }
+  const pos = props.position;
+  setProp(doc, ref, "position", shift(baseValue(pos)), void 0);
+  for (const e of pos?.specs ?? []) {
+    if (e.appearance === void 0 && e.idiom === void 0) continue;
+    if (e.value && typeof e.value === "object") e.value = shift(e.value);
+  }
 }
 function alignNodes(doc, refs, how, ctx, opts = {}) {
   const boxes = refs.map((r) => ({ ref: r, box: boxOf(doc, r, ctx) })).filter((x) => !!x.box);
@@ -1454,6 +1542,7 @@ async function saveIcon(path, doc) {
   const assetsDir = join(root, "Assets");
   await assertNoSymlink(root, assetsDir);
   await mkdir(assetsDir, { recursive: true });
+  const written = [];
   for (const [rel, bytes] of Object.entries(files)) {
     const target = resolve(root, ...rel.split("/"));
     await assertNoSymlink(root, target);
@@ -1463,16 +1552,20 @@ async function saveIcon(path, doc) {
     await rm(tmp, { force: true });
     await writeFile(tmp, bytes, { flag: "wx" });
     await rename(tmp, target);
+    written.push(target);
   }
   const keep = new Set(Object.keys(doc.assets));
   await assertNoSymlink(root, assetsDir);
   for (const e of await readdir(assetsDir, { withFileTypes: true })) {
-    if (e.isFile() && !keep.has(e.name) && !e.name.startsWith(".")) await rm(join(assetsDir, e.name));
+    if (!e.isFile() || keep.has(e.name)) continue;
+    if (e.name.endsWith(".fresnel-tmp") || isSafeBundlePath(`Assets/${e.name}`) && !e.name.startsWith(".")) await rm(join(assetsDir, e.name));
   }
+  return written;
 }
 async function writeFiles(dir, files) {
   const written = [];
   const root = resolve(dir);
+  if ((await lstat(root).catch(() => null))?.isSymbolicLink()) throw new Error(`Refusing to write through a symbolic link: ${dir}`);
   for (const [rel, bytes] of Object.entries(files)) {
     const target = resolve(root, ...rel.split("/"));
     const r = relative(root, target);
@@ -1523,7 +1616,7 @@ function contentBoxOf(asset) {
 }
 function svgAssetsNeedingBounds(doc) {
   const out = /* @__PURE__ */ new Set();
-  const hasGradient = (p) => [p?.plain?.value, ...(p?.specs ?? []).map((s) => s.value)].some((v) => !!v && typeof v === "object" && "linear-gradient" in v);
+  const hasGradient = (p) => [p?.plain?.value, ...(p?.specs ?? []).map((s) => s.value)].some((v) => !!v && typeof v === "object" && ("linear-gradient" in v || "automatic-gradient" in v));
   for (const g of doc.groups)
     for (const l of g.layers) {
       if (!hasGradient(l.props.fill)) continue;
@@ -1552,12 +1645,12 @@ function squirclePath(size = CANVAS, exponent = 4.4, steps = 192) {
 }
 var SQUIRCLE = squirclePath();
 var C = CANVAS;
-function maskPath(shape) {
+function maskPath(shape, pad2 = 0) {
   if (shape === "circle") {
     const r = C / 2 + 32;
     return `M${C / 2},${C / 2 - r} A${r},${r} 0 1 1 ${C / 2},${C / 2 + r} A${r},${r} 0 1 1 ${C / 2},${C / 2 - r}Z`;
   }
-  if (shape === "none") return `M0,0 H${C} V${C} H0Z`;
+  if (shape === "none") return `M${-pad2},${-pad2} H${C + pad2} V${C + pad2} H${-pad2}Z`;
   return SQUIRCLE;
 }
 
@@ -1583,6 +1676,17 @@ function hexLuma(hex) {
   const v = (i) => parseInt(h.slice(i, i + 2), 16) / 255;
   return luminance({ r: v(0), g: v(2), b: v(4), a: 1 });
 }
+var NAMED = { white: 1, black: 0 };
+function paintLuma(v) {
+  if (v.startsWith("#")) return hexLuma(v);
+  const m = /^rgba?\(\s*([\d.]+%?)[\s,]+([\d.]+%?)[\s,]+([\d.]+%?)/i.exec(v);
+  if (m) {
+    const ch = (x) => Math.min(1, Math.max(0, x.endsWith("%") ? Number(x.slice(0, -1)) / 100 : Number(x) / 255));
+    return luminance({ r: ch(m[1]), g: ch(m[2]), b: ch(m[3]), a: 1 });
+  }
+  const named = NAMED[v.toLowerCase()];
+  return named ?? null;
+}
 function assetLuma(a) {
   const hit = cache2.get(a.bytes);
   if (hit !== void 0) return hit;
@@ -1603,10 +1707,11 @@ function assetLuma(a) {
     }
   } else if (a.kind === "svg") {
     const text2 = new TextDecoder().decode(a.display ?? a.bytes);
-    const found = [...text2.matchAll(/(?:fill|stop-color)\s*[:=]\s*["']?\s*(#[0-9a-f]{3,8})\b/gi)].map((m) => hexLuma(m[1])).filter((x) => x !== null);
-    const named = [...text2.matchAll(/(?:fill|stop-color)\s*[:=]\s*["']?\s*(white|black)\b/gi)].map((m) => m[1].toLowerCase() === "white" ? 1 : 0);
-    const all = [...found, ...named];
-    if (all.length) l = all.reduce((x, y) => x + y, 0) / all.length;
+    const paint = /(?:fill|stop-color)\s*[:=]\s*["']?\s*(rgba?\([^)]*\)|[^"';>\s]+)/gi;
+    const values = [...text2.matchAll(paint)].map((m) => m[1].trim()).filter((v) => !/^(none|transparent|inherit|currentcolor|url\()/i.test(v));
+    const ls = values.map(paintLuma).filter((x) => x !== null);
+    if (ls.length) l = ls.reduce((x, y) => x + y, 0) / ls.length;
+    else l = values.length ? 0.5 : 0;
   }
   cache2.set(a.bytes, l);
   return l;
@@ -1624,6 +1729,7 @@ function rasterRenderOptions(ro) {
   };
 }
 var C2 = CANVAS;
+var PAD = C2 / 4;
 var H2 = C2 / 2;
 var b64Cache = /* @__PURE__ */ new WeakMap();
 var b64 = (bytes) => {
@@ -1642,11 +1748,32 @@ var b64 = (bytes) => {
 };
 var esc = (s) => s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/"/g, "&quot;");
 var n = (x) => +x.toFixed(3);
-function hexToRGBA(hex) {
-  const m = /^#?([0-9a-f]{6})$/i.exec(hex.trim());
-  if (!m) return { r: 0.25, g: 0.65, b: 0.63, a: 1 };
-  const v = parseInt(m[1], 16);
-  return { r: (v >> 16 & 255) / 255, g: (v >> 8 & 255) / 255, b: (v & 255) / 255, a: 1 };
+var DEFAULT_TINT = { r: 0.25, g: 0.65, b: 0.63, a: 1 };
+function tintToRGBA(input) {
+  try {
+    const c = parseColor(normalizeColorInput(input));
+    return c ? { ...toRGBA(c), a: 1 } : DEFAULT_TINT;
+  } catch {
+    return DEFAULT_TINT;
+  }
+}
+var num2 = (v, fallback) => typeof v === "number" && Number.isFinite(v) ? v : fallback;
+function safePosition(p) {
+  if (!p || typeof p !== "object") return null;
+  const o = p;
+  const t = Array.isArray(o["translation-in-points"]) ? o["translation-in-points"] : [];
+  const scale = num2(o.scale, 1);
+  return { scale: scale > 0 ? scale : 1, tx: num2(t[0], 0), ty: num2(t[1], 0) };
+}
+function safeOrientation(o) {
+  const pt = (v) => {
+    const q = v;
+    return q && typeof q === "object" && Number.isFinite(q.x) && Number.isFinite(q.y) ? { x: q.x, y: q.y } : null;
+  };
+  const r = o;
+  const start = r && typeof r === "object" ? pt(r.start) : null;
+  const stop = r && typeof r === "object" ? pt(r.stop) : null;
+  return start && stop ? { start, stop } : void 0;
 }
 var colorOf = (s) => {
   const c = typeof s === "string" ? parseColor(s) : null;
@@ -1693,10 +1820,10 @@ function paintFor(fill, defs, box, darkSystem) {
     const c = colorOf(f["automatic-gradient"]);
     return lin(shade(c, 0.22), shade(c, -0.08));
   }
-  if (Array.isArray(f["linear-gradient"])) {
+  if (Array.isArray(f["linear-gradient"]) && f["linear-gradient"].length) {
     const [a, b] = f["linear-gradient"];
-    const o = f.orientation;
-    return lin(colorOf(a), colorOf(b), o?.start, o?.stop);
+    const o = safeOrientation(f.orientation);
+    return lin(colorOf(a), colorOf(b ?? a), o?.start, o?.stop);
   }
   return null;
 }
@@ -1709,22 +1836,25 @@ function renderSvg(doc, opts = {}) {
   const dark = isDarkAppearance(appearance);
   const isClear = appearance === "clear-light" || appearance === "clear-dark";
   const isTinted = appearance === "tinted-light" || appearance === "tinted-dark";
-  const tint = hexToRGBA(opts.tint ?? "#3FA7A0");
+  const tint = opts.tint ? tintToRGBA(opts.tint) : DEFAULT_TINT;
+  const idioms = idiomsFor(ctx.idiom);
+  const forPlatform = (s) => s.idiom === void 0 || idioms.includes(s.idiom);
   const angle = (opts.lightAngle ?? 0) * Math.PI / 180;
   const toLight = { x: Math.sin(angle), y: -Math.cos(angle) };
   const defs = new Defs(opts.idPrefix ?? "");
   const body = [];
   const fillProp = doc.props.fill;
   let bgFill = resolveProp(fillProp, ctx, "automatic");
-  const darkOverridden = !!fillProp?.specs?.some((s) => s.appearance === "dark");
+  const darkOverridden = !!fillProp?.specs?.some((s) => s.appearance === "dark" && forPlatform(s));
   let darken = 0;
   if (dark && !darkOverridden && bgFill !== "automatic" && bgFill !== "system-dark" && bgFill !== "none") darken = 0.62;
   let bgPaint;
-  const P = mask === "circle" ? 32 : 0;
+  const P = mask === "circle" || ctx.idiom === "watchOS" ? 32 : 0;
   const full = { x: -P, y: -P, w: C2 + 2 * P, h: C2 + 2 * P };
-  const monoOverride = (isClear || isTinted) && !!fillProp?.specs?.some((s) => s.appearance === "tinted" || s.appearance === appearance);
+  const monoOverride = (isClear || isTinted) && !!fillProp?.specs?.some((s) => s.appearance === "tinted" && forPlatform(s));
   if (monoOverride) {
-    bgPaint = paintFor(bgFill ?? "automatic", defs, full, dark);
+    const mono = resolveProp(fillProp, { appearance: dark ? "tinted-dark" : "tinted-light", idiom: ctx.idiom }, "automatic");
+    bgPaint = paintFor(mono ?? "automatic", defs, full, dark);
   } else if (isClear) {
     bgPaint = dark ? paintFor({ "linear-gradient": ["srgb:0.24,0.25,0.28,0.92", "srgb:0.11,0.12,0.13,0.92"] }, defs, full, true) : paintFor({ "linear-gradient": ["srgb:0.97,0.98,0.99,0.86", "srgb:0.84,0.87,0.91,0.86"] }, defs, full, false);
   } else if (isTinted) {
@@ -1765,7 +1895,10 @@ function renderSvg(doc, opts = {}) {
     plainId = plain;
   }
   function drawGroup(g, backdropId) {
-    const gpos = resolveProp(g.props.position, ctx, null);
+    const gp = safePosition(resolveProp(g.props.position, ctx, null));
+    const gs = gp?.scale ?? 1;
+    const gtx = gp?.tx ?? 0;
+    const gty = gp?.ty ?? 0;
     const layers = FRONT_FIRST ? [...g.layers].reverse() : [...g.layers];
     const placed = [];
     for (const l of layers) {
@@ -1773,14 +1906,23 @@ function renderSvg(doc, opts = {}) {
       const name = resolveProp(l.props["image-name"], ctx, "");
       const asset = doc.assets[name];
       if (!asset || asset.kind === "pdf" || asset.kind === "other") continue;
-      const pos = resolveProp(l.props.position, ctx, null);
+      if (!(asset.width > 0 && asset.height > 0 && Number.isFinite(asset.width) && Number.isFinite(asset.height))) continue;
+      const pos = safePosition(resolveProp(l.props.position, ctx, null));
       const s = pos?.scale ?? 1;
-      const [tx, ty] = pos?.["translation-in-points"] ?? [0, 0];
       const w = asset.width * s;
       const h = asset.height * s;
-      placed.push({ layer: l, asset, x: H2 + tx - w / 2, y: H2 + ty - h / 2, w, h });
+      const x = H2 + (pos?.tx ?? 0) - w / 2;
+      const y = H2 + (pos?.ty ?? 0) - h / 2;
+      const cx0 = H2 + gtx + (x - H2) * gs;
+      const cy0 = H2 + gty + (y - H2) * gs;
+      const cx1 = cx0 + w * gs;
+      const cy1 = cy0 + h * gs;
+      if (cx1 < -P || cy1 < -P || cx0 > C2 + P || cy0 > C2 + P) continue;
+      placed.push({ layer: l, asset, x, y, w, h });
     }
     if (!placed.length) return null;
+    const groupOpacity = Math.min(1, Math.max(0, num2(resolveProp(g.props.opacity, ctx, 1), 1)));
+    if (groupOpacity <= 0) return null;
     const imgId = /* @__PURE__ */ new Map();
     const layerEls = [];
     const glassEls = [];
@@ -1797,7 +1939,7 @@ function renderSvg(doc, opts = {}) {
       const s = p.w / p.asset.width;
       const place = `transform="translate(${n(p.x)} ${n(p.y)}) scale(${n(s)})"`;
       const fill = resolveProp(p.layer.props.fill, ctx, null);
-      const opacity = resolveProp(p.layer.props.opacity, ctx, 1);
+      const opacity = Math.min(1, Math.max(0, num2(resolveProp(p.layer.props.opacity, ctx, 1), 1)));
       const blend = cssBlend(resolveProp(p.layer.props["blend-mode"], ctx, "normal"));
       const cb = contentBoxOf(p.asset);
       const fbox = cb ? { x: p.x + cb.x * p.w, y: p.y + cb.y * p.h, w: cb.w * p.w, h: cb.h * p.h } : { x: p.x, y: p.y, w: p.w, h: p.h };
@@ -1805,7 +1947,7 @@ function renderSvg(doc, opts = {}) {
       let el;
       if (paint) {
         const mid = defs.id("lm");
-        defs.add(`<mask id="${mid}" mask-type="alpha" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="-${C2}" y="-${C2}" width="${3 * C2}" height="${3 * C2}"><use href="#${iid}" ${place}/></mask>`);
+        defs.add(`<mask id="${mid}" mask-type="alpha" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="${-PAD}" y="${-PAD}" width="${C2 + 2 * PAD}" height="${C2 + 2 * PAD}"><use href="#${iid}" ${place}/></mask>`);
         el = `<rect x="${n(p.x)}" y="${n(p.y)}" width="${n(p.w)}" height="${n(p.h)}" fill="${paint}" mask="url(#${mid})"/>`;
       } else {
         el = `<use href="#${iid}" ${place}/>`;
@@ -1817,43 +1959,55 @@ function renderSvg(doc, opts = {}) {
         glassLumas.push(fill && fill !== "automatic" ? fillLuma(fill, dark) ?? assetLuma(p.asset) : assetLuma(p.asset));
       }
     }
-    const gTransform = gpos ? ` transform="translate(${n(H2 + (gpos["translation-in-points"]?.[0] ?? 0))} ${n(H2 + (gpos["translation-in-points"]?.[1] ?? 0))}) scale(${n(gpos.scale ?? 1)}) translate(${-H2} ${-H2})"` : "";
+    const gTransform = gp ? ` transform="translate(${n(H2 + gtx)} ${n(H2 + gty)}) scale(${n(gs)}) translate(${-H2} ${-H2})"` : "";
+    const canvasRegion = `filterUnits="userSpaceOnUse" x="${-PAD}" y="${-PAD}" width="${C2 + 2 * PAD}" height="${C2 + 2 * PAD}"`;
+    const gx0 = H2 + (-PAD - H2 - gtx) / gs;
+    const gy0 = H2 + (-PAD - H2 - gty) / gs;
+    const groupRegion = `filterUnits="userSpaceOnUse" x="${n(gx0)}" y="${n(gy0)}" width="${n((C2 + 2 * PAD) / gs)}" height="${n((C2 + 2 * PAD) / gs)}"`;
     const contentId = defs.id("gc");
     defs.add(`<g id="${contentId}"${gTransform}>${layerEls.join("")}</g>`);
     contentIds.push(contentId);
     const out = [];
-    const shadow = resolveProp(g.props.shadow, ctx, { kind: "neutral", opacity: 0.5 });
+    const shadow0 = resolveProp(g.props.shadow, ctx, { kind: "neutral", opacity: 0.5 });
+    const shadow = shadow0 && typeof shadow0 === "object" ? { kind: shadow0.kind, opacity: Math.min(1, Math.max(0, num2(shadow0.opacity, 0.5))) } : null;
     if (effects && shadow && shadow.kind !== "none" && shadow.opacity > 0) {
       const fid = defs.id("sh");
       if (shadow.kind === "neutral") {
         defs.add(
-          `<filter id="${fid}" x="-30%" y="-30%" width="160%" height="170%"><feGaussianBlur in="SourceAlpha" stdDeviation="16"/><feOffset dy="14" result="b"/><feFlood flood-color="#000" flood-opacity="0.45"/><feComposite in2="b" operator="in"/></filter>`
+          `<filter id="${fid}" ${canvasRegion}><feGaussianBlur in="SourceAlpha" stdDeviation="16"/><feOffset dy="14" result="b"/><feFlood flood-color="#000" flood-opacity="0.45"/><feComposite in2="b" operator="in"/></filter>`
         );
       } else {
         defs.add(
-          `<filter id="${fid}" x="-30%" y="-30%" width="160%" height="170%"><feGaussianBlur in="SourceGraphic" stdDeviation="18"/><feOffset dy="16"/><feColorMatrix type="matrix" values="0.75 0 0 0 0  0 0.75 0 0 0  0 0 0.75 0 0  0 0 0 0.8 0"/></filter>`
+          `<filter id="${fid}" ${canvasRegion}><feGaussianBlur in="SourceGraphic" stdDeviation="18"/><feOffset dy="16"/><feColorMatrix type="matrix" values="0.75 0 0 0 0  0 0.75 0 0 0  0 0 0.75 0 0  0 0 0 0.8 0"/></filter>`
         );
       }
       out.push(`<use href="#${contentId}" filter="url(#${fid})" opacity="${n(shadow.opacity)}"/>`);
     }
-    const tr = resolveProp(g.props.translucency, ctx, { enabled: true, value: 0.5 });
-    const blurMat = resolveProp(g.props["blur-material"], ctx, null);
+    const tr0 = resolveProp(g.props.translucency, ctx, { enabled: true, value: 0.5 });
+    const tr = tr0 && typeof tr0 === "object" ? { enabled: !!tr0.enabled, value: num2(tr0.value, 0.5) } : null;
+    const blurRaw = resolveProp(g.props["blur-material"], ctx, void 0);
+    const blurMat = blurRaw === null ? null : num2(blurRaw, 0.2);
     const translucent = effects && !!tr?.enabled && tr.value > 0;
-    const refr = resolveProp(g.props.refractivity, ctx, null);
+    const refr0 = resolveProp(g.props.refractivity, ctx, null);
+    const refr = refr0 && typeof refr0 === "object" ? { enabled: !!refr0.enabled, strength: num2(refr0.strength, 0), depth: num2(refr0.depth, 0) } : null;
     const refracts = effects && !!refr?.enabled && glassEls.length > 0;
     if (translucent || refracts) {
       const maskSrc = translucent ? `<use href="#${contentId}"/>` : `<g${gTransform}>${glassEls.join("")}</g>`;
       const mid = defs.id("gm");
-      defs.add(`<mask id="${mid}" mask-type="alpha" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="${C2}" height="${C2}">${maskSrc}</mask>`);
-      const fid = defs.id("bk");
-      const blurPx = 4 + (blurMat ?? 0.2) * 40 + (refracts ? (refr.depth ?? 0) * 10 : 0);
-      defs.add(`<filter id="${fid}" x="-10%" y="-10%" width="120%" height="120%"><feGaussianBlur stdDeviation="${n(blurPx)}"/></filter>`);
-      const zoom = 1.02 + (refracts ? (refr.strength ?? 0) * 0.12 : 0.015);
+      defs.add(`<mask id="${mid}" mask-type="alpha" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="${-PAD}" y="${-PAD}" width="${C2 + 2 * PAD}" height="${C2 + 2 * PAD}">${maskSrc}</mask>`);
+      const blurPx = Math.max(0, (blurMat === null ? 0 : 4 + blurMat * 40) + (refracts ? refr.depth * 10 : 0));
+      let filterAttr = "";
+      if (blurPx > 0) {
+        const fid = defs.id("bk");
+        defs.add(`<filter id="${fid}" ${canvasRegion}><feGaussianBlur stdDeviation="${n(blurPx)}"/></filter>`);
+        filterAttr = ` filter="url(#${fid})"`;
+      }
+      const zoom = 1.02 + (refracts ? refr.strength * 0.12 : 0.015);
       out.push(
-        `<g mask="url(#${mid})"><use href="#${backdropId}" filter="url(#${fid})" transform="translate(${H2} ${H2}) scale(${n(zoom)}) translate(${-H2} ${-H2})"/></g>`
+        `<g mask="url(#${mid})"><use href="#${backdropId}"${filterAttr} transform="translate(${H2} ${H2}) scale(${n(zoom)}) translate(${-H2} ${-H2})"/></g>`
       );
     }
-    const gOpacity = resolveProp(g.props.opacity, ctx, 1) * (refracts && !translucent ? 1 - (refr.strength ?? 0) * 0.3 : 1);
+    const gOpacity = refracts && !translucent ? 1 - Math.min(1, Math.max(0, refr.strength)) * 0.3 : 1;
     let fadeMask = "";
     if (translucent) {
       const v = Math.min(1, Math.max(0, tr.value));
@@ -1879,15 +2033,15 @@ function renderSvg(doc, opts = {}) {
       const fid = defs.id("sp");
       if (specular === "outside") {
         defs.add(
-          `<filter id="${fid}" x="-8%" y="-8%" width="116%" height="116%"><feMorphology in="SourceAlpha" operator="dilate" radius="6" result="d"/><feComposite in="d" in2="SourceAlpha" operator="out" result="band"/><feOffset in="SourceAlpha" dx="${n(-dx * 1.6)}" dy="${n(-dy * 1.6)}" result="lit"/><feComposite in="band" in2="lit" operator="in" result="edge"/><feGaussianBlur in="edge" stdDeviation="1.6" result="soft"/><feFlood flood-color="#fff" flood-opacity="0.8"/><feComposite in2="soft" operator="in"/></filter>`
+          `<filter id="${fid}" ${groupRegion}><feMorphology in="SourceAlpha" operator="dilate" radius="6" result="d"/><feComposite in="d" in2="SourceAlpha" operator="out" result="band"/><feOffset in="SourceAlpha" dx="${n(-dx * 1.6)}" dy="${n(-dy * 1.6)}" result="lit"/><feComposite in="band" in2="lit" operator="in" result="edge"/><feGaussianBlur in="edge" stdDeviation="1.6" result="soft"/><feFlood flood-color="#fff" flood-opacity="0.8"/><feComposite in2="soft" operator="in"/></filter>`
         );
       } else defs.add(
-        `<filter id="${fid}" x="-5%" y="-5%" width="110%" height="110%"><feOffset in="SourceAlpha" dx="${dx}" dy="${dy}" result="sh"/><feComposite in="SourceAlpha" in2="sh" operator="out" result="edge"/><feGaussianBlur in="edge" stdDeviation="1.6" result="soft"/><feFlood flood-color="#fff" flood-opacity="0.85"/><feComposite in2="soft" operator="in" result="hi"/><feOffset in="SourceAlpha" dx="${n(-dx)}" dy="${n(-dy)}" result="sh2"/><feComposite in="SourceAlpha" in2="sh2" operator="out" result="edge2"/><feGaussianBlur in="edge2" stdDeviation="2" result="soft2"/><feFlood flood-color="#fff" flood-opacity="0.28"/><feComposite in2="soft2" operator="in" result="lo"/><feMerge><feMergeNode in="hi"/><feMergeNode in="lo"/></feMerge></filter>`
+        `<filter id="${fid}" ${groupRegion}><feOffset in="SourceAlpha" dx="${dx}" dy="${dy}" result="sh"/><feComposite in="SourceAlpha" in2="sh" operator="out" result="edge"/><feGaussianBlur in="edge" stdDeviation="1.6" result="soft"/><feFlood flood-color="#fff" flood-opacity="0.85"/><feComposite in2="soft" operator="in" result="hi"/><feOffset in="SourceAlpha" dx="${n(-dx)}" dy="${n(-dy)}" result="sh2"/><feComposite in="SourceAlpha" in2="sh2" operator="out" result="edge2"/><feGaussianBlur in="edge2" stdDeviation="2" result="soft2"/><feFlood flood-color="#fff" flood-opacity="0.28"/><feComposite in2="soft2" operator="in" result="lo"/><feMerge><feMergeNode in="hi"/><feMergeNode in="lo"/></feMerge></filter>`
       );
       const glass = individual ? glassEls.map((e) => `<g filter="url(#${fid})">${e}</g>`).join("") : `<g filter="url(#${fid})">${glassEls.join("")}</g>`;
       out.push(`<g${gTransform}>${glass}</g>`);
     }
-    return out.join("");
+    return groupOpacity < 1 ? `<g opacity="${n(groupOpacity)}">${out.join("")}</g>` : out.join("");
   }
   let top = `<use href="#${stackId}"/>`;
   if ((isClear || isTinted) && contentIds.length) {
@@ -1909,18 +2063,19 @@ function renderSvg(doc, opts = {}) {
     }
     const mid = defs.id("fm");
     defs.add(
-      `<mask id="${mid}" mask-type="alpha" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="${C2}" height="${C2}">` + contentIds.map((id) => `<use href="#${id}"/>`).join("") + `</mask>`
+      `<mask id="${mid}" mask-type="alpha" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="${-PAD}" y="${-PAD}" width="${C2 + 2 * PAD}" height="${C2 + 2 * PAD}">` + contentIds.map((id) => `<use href="#${id}"/>`).join("") + `</mask>`
     );
     top = `<use href="#${bgStackId}"/><g filter="url(#${fid})"><use href="#${stackId}" mask="url(#${mid})"/></g>`;
   }
   const clipId = defs.id("clip");
-  const shape = maskPath(mask);
+  const shape = maskPath(mask, P);
   defs.add(`<clipPath id="${clipId}"><path d="${shape}"/></clipPath>`);
-  const M = Math.max(0, opts.inset ?? 0);
+  const inset = Math.min(C2 / 2 - 1, Math.max(0, num2(opts.inset, 0)));
+  const M = inset > 0 ? inset * C2 / (C2 - 2 * inset) : 0;
   if (M > 0) {
     const sid = defs.id("ish");
     defs.add(
-      `<filter id="${sid}" x="-20%" y="-20%" width="140%" height="150%"><feGaussianBlur in="SourceAlpha" stdDeviation="${n(C2 * 0.012)}"/><feOffset dy="${n(C2 * 0.012)}" result="b"/><feFlood flood-color="#000" flood-opacity="0.3"/><feComposite in2="b" operator="in" result="s"/><feMerge><feMergeNode in="s"/><feMergeNode in="SourceGraphic"/></feMerge></filter>`
+      `<filter id="${sid}" ${'filterUnits="userSpaceOnUse"'} x="${-PAD}" y="${-PAD}" width="${C2 + 2 * PAD}" height="${C2 + 2 * PAD}"><feGaussianBlur in="SourceAlpha" stdDeviation="${n(C2 * 0.012)}"/><feOffset dy="${n(C2 * 0.012)}" result="b"/><feFlood flood-color="#000" flood-opacity="0.3"/><feComposite in2="b" operator="in" result="s"/><feMerge><feMergeNode in="s"/><feMergeNode in="SourceGraphic"/></feMerge></filter>`
     );
     body.push(`<g filter="url(#${sid})"><g clip-path="url(#${clipId})">${top}</g></g>`);
   } else body.push(`<g clip-path="url(#${clipId})">${top}</g>`);
@@ -1935,8 +2090,9 @@ function renderSvg(doc, opts = {}) {
   }
   return `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="${size}" height="${size}" viewBox="${-(P + M)} ${-(P + M)} ${C2 + 2 * (P + M)} ${C2 + 2 * (P + M)}"><title>${esc(appearance)}</title><defs>${defs.toString()}</defs>${body.join("")}</svg>`;
 }
+var KNOWN_BLEND = new Set(BLEND_MODES);
 function cssBlend(mode) {
-  if (!mode || mode === "normal") return null;
+  if (typeof mode !== "string" || !KNOWN_BLEND.has(mode) || mode === "normal") return null;
   if (mode === "plus-lighter") return "screen";
   if (mode === "plus-darker") return "multiply";
   return mode;
@@ -1979,6 +2135,7 @@ async function resvg() {
   }
 }
 async function svgToPng(svg, width) {
+  if (!(width >= 2)) throw new Error(`Image size must be at least 2 px (got ${width})`);
   const { Resvg } = await resvg();
   const r = new Resvg(svg, { fitTo: { mode: "width", value: Math.round(width) }, font: { loadSystemFonts: true } });
   return new Uint8Array(r.render().asPng());
@@ -2107,7 +2264,7 @@ function convert(k, raw, flag) {
   switch (k.type) {
     case "number": {
       const n2 = Number(raw);
-      if (raw.trim() === "" || Number.isNaN(n2)) throw new Error(`${flag} expects a number, got "${raw}"`);
+      if (!/^\s*[-+]?(\d+\.?\d*|\.\d+)(e[-+]?\d+)?\s*$/i.test(raw) || Number.isNaN(n2)) throw new Error(`${flag} expects a number, got "${raw}"`);
       return n2;
     }
     case "array":
@@ -2122,59 +2279,89 @@ function convert(k, raw, flag) {
       return raw;
   }
 }
+var BOOL_TRUE = /^(true|1|yes|on)$/i;
+var BOOL_FALSE = /^(false|0|no|off)$/i;
 function parseToolArgv(t, argv) {
   const infos = argsOf(t);
   const byFlag = new Map(infos.map((a) => [a.flag, a]));
   const out = {};
   let base = {};
+  const roots = [];
+  let help = false;
   const positionals = [];
+  let optionsDone = false;
   for (let i = 0; i < argv.length; i++) {
     const tok = argv[i];
-    if (!tok.startsWith("--") || tok === "--") {
+    if (optionsDone || tok === "-" || !tok.startsWith("-")) {
       positionals.push(tok);
       continue;
     }
+    if (tok === "--") {
+      optionsDone = true;
+      continue;
+    }
+    if (tok === "--help" || tok === "-h") {
+      help = true;
+      continue;
+    }
+    if (tok === "-r") {
+      const v2 = argv[++i];
+      if (v2 === void 0) throw new Error("-r needs a directory");
+      roots.push(v2);
+      continue;
+    }
+    if (!tok.startsWith("--")) throw new Error(`Unknown option ${tok}. Run "fresnel ${cliCommand(t)} --help".`);
     const eq = tok.indexOf("=");
     const flag = eq > 0 ? tok.slice(0, eq) : tok;
     const inline = eq > 0 ? tok.slice(eq + 1) : void 0;
+    const value = () => {
+      const raw = inline ?? argv[++i];
+      if (raw === void 0) throw new Error(`${flag} needs a value`);
+      return raw;
+    };
+    if (flag === "--root") {
+      roots.push(value());
+      continue;
+    }
     if (flag === "--args") {
-      const raw2 = inline ?? argv[++i];
-      if (raw2 === void 0) throw new Error("--args needs a JSON object");
-      const v = convert({ type: "json" }, raw2, "--args");
-      if (!v || typeof v !== "object" || Array.isArray(v)) throw new Error("--args must be a JSON object");
-      base = v;
+      const v2 = convert({ type: "json" }, value(), "--args");
+      if (!v2 || typeof v2 !== "object" || Array.isArray(v2)) throw new Error("--args must be a JSON object");
+      base = { ...base, ...v2 };
       continue;
     }
     const neg = flag.startsWith("--no-") ? byFlag.get(`--${flag.slice(5)}`) : void 0;
-    if (neg && neg.kind.type === "boolean") {
+    if (neg && neg.kind.type === "boolean" && inline === void 0) {
       out[neg.name] = false;
       continue;
     }
     const info = byFlag.get(flag);
     if (!info) throw new Error(`Unknown option ${flag} for ${t.id}. Run "fresnel ${cliCommand(t)} --help".`);
     if (info.kind.type === "boolean") {
-      out[info.name] = inline === void 0 ? true : !/^(false|0|no)$/i.test(inline);
+      if (inline === void 0) out[info.name] = true;
+      else if (BOOL_TRUE.test(inline)) out[info.name] = true;
+      else if (BOOL_FALSE.test(inline)) out[info.name] = false;
+      else throw new Error(`${flag} expects true or false, got "${inline}"`);
       continue;
     }
-    const raw = inline ?? argv[++i];
-    if (raw === void 0) throw new Error(`${flag} needs a value`);
-    out[info.name] = convert(info.kind, raw, flag);
+    const v = convert(info.kind, value(), flag);
+    out[info.name] = info.kind.type === "array" && Array.isArray(out[info.name]) ? [...out[info.name], ...v] : v;
   }
   const pos = t.positional ?? [];
   if (positionals.length > pos.length) throw new Error(`Unexpected argument "${positionals[pos.length]}". Run "fresnel ${cliCommand(t)} --help".`);
   positionals.forEach((v, i) => {
     const info = infos.find((a) => a.name === pos[i]);
-    if (out[info.name] === void 0) out[info.name] = convert(info.kind, v, `<${info.name}>`);
+    if (out[info.name] !== void 0) throw new Error(`<${info.name}> was given twice (as an argument and as ${info.flag})`);
+    out[info.name] = convert(info.kind, v, `<${info.name}>`);
   });
-  return { ...base, ...out };
+  return { args: { ...base, ...out }, roots, help };
 }
 
 // ../mcp/src/contract.ts
 import { z as z3 } from "zod";
 
 // ../mcp/src/spec.ts
-import { mkdir as mkdir2, readFile as readFile2, stat as stat2, writeFile as writeFile2 } from "fs/promises";
-import { basename, dirname as dirname2, join as join2 } from "path";
+import { readFile as readFile2, stat as stat2 } from "fs/promises";
+import { basename, dirname as dirname2, isAbsolute as isAbsolute2, join as join2, relative as relative2, sep as sep2 } from "path";
 import { z as z2 } from "zod";
 var CONTRACT_VERSION = "1.0";
 var tool = (def) => def;
@@ -2189,6 +2376,7 @@ var groupsOutline = z2.array(z2.looseObject({ group: z2.string(), layers: z2.arr
 function describeProps(props) {
   const base = {};
   const overrides = {};
+  const variants = /* @__PURE__ */ new Map();
   for (const [k, p] of Object.entries(props)) {
     const b = p.specs?.find((s) => s.appearance === void 0 && s.idiom === void 0);
     if (b) base[k] = b.value;
@@ -2197,21 +2385,32 @@ function describeProps(props) {
       const s = p.specs.find((e) => e.appearance === a && e.idiom === void 0);
       (overrides[a] ??= {})[k] = s.value;
     }
+    for (const s of p.specs ?? []) {
+      if (s.idiom === void 0) continue;
+      const key = `${s.appearance ?? ""}|${s.idiom}`;
+      if (!variants.has(key)) variants.set(key, { ...s.appearance ? { appearance: s.appearance } : {}, platform: s.idiom, values: {} });
+      variants.get(key).values[k] = s.value;
+    }
   }
-  return Object.keys(overrides).length ? { ...base, overrides } : base;
+  return {
+    ...base,
+    ...Object.keys(overrides).length ? { overrides } : {},
+    ...variants.size ? { variants: [...variants.values()] } : {}
+  };
 }
 function inspect(doc) {
   return {
     order: "groups and layers are listed front to back (index 0 = frontmost)",
     document: describeProps(doc.props),
+    // attributes first, so an unknown key in the file (e.g. "target") can't replace these fields
     groups: doc.groups.map((g, gi) => ({
+      ...describeProps(g.props),
       target: nameOf(g) || `#${gi}`,
       index: gi,
-      ...describeProps(g.props),
       layers: g.layers.map((l, li) => ({
+        ...describeProps(l.props),
         target: `${nameOf(g) || `#${gi}`}/${nameOf(l) || `#${li}`}`,
-        index: li,
-        ...describeProps(l.props)
+        index: li
       }))
     })),
     assets: Object.values(doc.assets).map((a) => ({ name: a.name, kind: a.kind, width: a.width, height: a.height }))
@@ -2229,9 +2428,7 @@ function targetLabel(doc, ref) {
 }
 async function saveFile(ws, out, bytes) {
   const p = await ws.resolve(out);
-  await mkdir2(dirname2(p), { recursive: true });
-  await writeFile2(p, bytes);
-  return p;
+  return (await writeFiles(dirname2(p), { [basename(p)]: bytes }))[0];
 }
 var inspectOutput = loose({ order: z2.string(), document: z2.record(z2.string(), z2.unknown()), groups: z2.array(z2.looseObject({ target: z2.string(), index: z2.number() })), assets: z2.array(z2.looseObject({ name: z2.string() })) });
 var EX_STAR = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"><path d="M512 212 L594 420 L812 430 L640 566 L700 780 L512 660 L324 780 L384 566 L212 430 L430 420 Z" fill="#ffffff"/></svg>';
@@ -2256,7 +2453,9 @@ var TOOLS = [
     },
     output: loose({ created: z2.string(), dry_run: z2.boolean().optional(), groups: z2.array(z2.unknown()) }),
     mutates_input: true,
+    writes_files: true,
     idempotency_hint: "not-idempotent",
+    destructive: true,
     supports_dry_run: true,
     verification: ["icon_inspect shows the document fill", "icon_render_sheet shows the background in all appearances"],
     requires_visual_verification: false,
@@ -2264,14 +2463,16 @@ var TOOLS = [
     async run(ws, { path, background, dark_background, watch, overwrite, dry_run }) {
       if (/\.zip$/i.test(path.trim())) throw new Error("icon_create writes an .icon folder; pass a path without .zip (use icon_export to make a zip)");
       const full = await ws.iconPath(path);
-      const exists = await stat2(full).then(() => true, () => false);
-      if (exists && !overwrite) throw new Error(`${path} already exists. Pass overwrite: true to replace it.`);
       const doc = createDocument({
         ...background ? { background } : {},
         platforms: watch === false ? { squares: "shared" } : { circles: ["watchOS"], squares: "shared" }
       });
       if (dark_background) setProp(doc, { kind: "document" }, "fill", dark_background, "dark");
-      if (!dry_run) await ws.withLock(full, () => saveIcon(full, doc));
+      await ws.withLock(full, async () => {
+        const exists = await stat2(full).then(() => true, () => false);
+        if (exists && !overwrite) throw new Error(`${path} already exists. Pass overwrite: true to replace it.`);
+        if (!dry_run) await saveIcon(full, doc);
+      });
       return { data: { created: full, ...dry_run ? { dry_run: true } : {}, ...inspect(doc) } };
     }
   }),
@@ -2287,6 +2488,7 @@ var TOOLS = [
     input: { path: pathArg },
     output: inspectOutput,
     mutates_input: false,
+    writes_files: false,
     idempotency_hint: "idempotent",
     supports_dry_run: false,
     verification: [],
@@ -2315,6 +2517,7 @@ var TOOLS = [
     },
     output: loose({ added: z2.string(), groups: z2.array(z2.string()) }),
     mutates_input: true,
+    writes_files: false,
     idempotency_hint: "not-idempotent",
     supports_dry_run: true,
     verification: ["icon_inspect lists the new group"],
@@ -2357,6 +2560,7 @@ var TOOLS = [
     },
     output: loose({ added: z2.string(), size: z2.string(), warnings: z2.array(z2.string()) }),
     mutates_input: true,
+    writes_files: false,
     idempotency_hint: "not-idempotent",
     supports_dry_run: true,
     verification: ["Check `warnings` (V-01\u2026V-10)", "icon_render_sheet to see the layer in every appearance"],
@@ -2432,6 +2636,7 @@ var TOOLS = [
     },
     output: loose({ target: z2.string(), now: z2.record(z2.string(), z2.unknown()) }),
     mutates_input: true,
+    writes_files: false,
     idempotency_hint: "idempotent",
     supports_dry_run: true,
     verification: ["`now` shows the stored values", "icon_render_sheet for the appearances you changed"],
@@ -2467,6 +2672,7 @@ var TOOLS = [
     input: { path: pathArg, target: z2.string(), index: z2.number().int().min(0), to_group: z2.string().optional(), dry_run: dryRunArg },
     output: loose({ groups: groupsOutline }),
     mutates_input: true,
+    writes_files: false,
     idempotency_hint: "idempotent",
     supports_dry_run: true,
     verification: ["`groups` lists the new order (front to back)"],
@@ -2480,6 +2686,7 @@ var TOOLS = [
           const ref = resolvePath(doc, target);
           let gid;
           if (to_group) {
+            if (ref.kind !== "layer") throw new Error("to_group only applies to layers; groups are reordered with index");
             const g = resolvePath(doc, to_group);
             if (g.kind !== "group") throw new Error("to_group must be a group");
             gid = g.id;
@@ -2511,6 +2718,7 @@ var TOOLS = [
     },
     output: loose({ moved: z2.number(), positions: z2.array(z2.looseObject({ target: z2.string() })) }),
     mutates_input: true,
+    writes_files: false,
     idempotency_hint: "idempotent",
     supports_dry_run: true,
     verification: ["`positions` gives each bounding box in canvas points", "icon_render to look at the result"],
@@ -2546,6 +2754,7 @@ var TOOLS = [
     input: { path: pathArg, target: z2.string(), dry_run: dryRunArg },
     output: loose({ removed: z2.string(), groups: groupsOutline }),
     mutates_input: true,
+    writes_files: false,
     idempotency_hint: "not-idempotent",
     destructive: true,
     supports_dry_run: true,
@@ -2582,6 +2791,7 @@ var TOOLS = [
       issues: z2.array(z2.looseObject({ id: z2.string(), severity: z2.enum(["error", "warning", "info"]), message: z2.string() }))
     }),
     mutates_input: false,
+    writes_files: false,
     idempotency_hint: "idempotent",
     supports_dry_run: false,
     verification: ['No issue with severity "error"'],
@@ -2608,12 +2818,13 @@ var TOOLS = [
       platform: z2.enum(["iOS", "macOS", "watchOS"]).optional().describe("Default: iOS. watchOS renders a circle"),
       size: z2.number().int().min(16).max(2048).optional().describe("Pixels, default 512"),
       mask: maskEnum.optional(),
-      tint: z2.string().optional().describe('Tint color for tinted appearances, "#RRGGBB"'),
+      tint: z2.string().regex(/^#(?:[0-9a-f]{3}|[0-9a-f]{6}|[0-9a-f]{8})$/i, 'tint must be a color like "#33AAFF"').optional().describe('Tint color for tinted appearances, "#RRGGBB"'),
       light_angle: z2.number().min(-180).max(180).optional().describe("Light direction in degrees, 0 = top (default), -45 = top-left"),
       out: z2.string().optional().describe("Save the PNG to this path")
     },
     output: loose({ appearance: z2.string(), saved: z2.string().optional() }),
     mutates_input: false,
+    writes_files: true,
     idempotency_hint: "idempotent",
     supports_dry_run: false,
     verification: ["Look at the returned image"],
@@ -2646,11 +2857,12 @@ var TOOLS = [
     input: {
       path: pathArg,
       cell: z2.number().int().min(96).max(600).optional().describe("Cell size in pixels, default 240"),
-      tint: z2.string().optional(),
+      tint: z2.string().regex(/^#(?:[0-9a-f]{3}|[0-9a-f]{6}|[0-9a-f]{8})$/i, 'tint must be a color like "#33AAFF"').optional().describe('Tint color for tinted appearances, "#RRGGBB"'),
       out: z2.string().optional()
     },
     output: loose({ appearances: z2.array(z2.string()), saved: z2.string().optional() }),
     mutates_input: false,
+    writes_files: true,
     idempotency_hint: "idempotent",
     supports_dry_run: false,
     verification: ["Look at the returned image: every appearance should stay legible"],
@@ -2676,12 +2888,14 @@ var TOOLS = [
       path: pathArg,
       out_dir: z2.string(),
       formats: z2.array(z2.enum(["icon", "icns", "appiconset", "png"])).min(1),
-      sizes: z2.array(z2.number().int().min(16).max(2048)).optional().describe("PNG sizes, default [1024, 512, 256, 128, 64, 32, 16]"),
-      appearances: z2.array(appearanceEnum).optional().describe("PNG appearances, default all six")
+      sizes: z2.array(z2.number().int().min(16).max(2048)).min(1).optional().describe("PNG sizes, default [1024, 512, 256, 128, 64, 32, 16]"),
+      appearances: z2.array(appearanceEnum).min(1).optional().describe("PNG appearances, default all six")
     },
     output: loose({ out_dir: z2.string(), files: z2.number(), written: z2.array(z2.string()) }),
     mutates_input: false,
+    writes_files: true,
     idempotency_hint: "idempotent",
+    destructive: true,
     supports_dry_run: false,
     verification: ["`written` lists every file", "Open the .icon in Icon Composer / Xcode 26 on a Mac for the final check"],
     requires_visual_verification: false,
@@ -2689,6 +2903,9 @@ var TOOLS = [
     async run(ws, { path, out_dir, formats, sizes, appearances }) {
       const full = await ws.iconPath(path, { mustExist: true });
       const outDir = await ws.resolve(out_dir);
+      const inside = relative2(full, outDir);
+      if (inside === "" || !inside.startsWith(`..${sep2}`) && inside !== ".." && !isAbsolute2(inside))
+        throw new Error("out_dir is inside the icon bundle; choose a folder outside it");
       const doc = await ws.read(full);
       const name = basename(full).replace(/\.icon(\.zip)?$/, "");
       const raster = nodeRasterizer(doc);
@@ -2697,16 +2914,9 @@ var TOOLS = [
         throw new Error(`These visible layers can't be rendered and would be missing from the images: ${missing.join(", ")}. Fix them first (icon_validate).`);
       const written = [];
       if (formats.includes("icon")) {
-        const dest = join2(outDir, `${name}.icon`);
-        await saveIcon(dest, doc);
-        written.push(join2(dest, "icon.json"), ...Object.keys(doc.assets).map((a) => join2(dest, "Assets", a)));
-      }
-      if (formats.includes("icns")) {
-        const p = join2(outDir, `${name}.icns`);
-        await mkdir2(dirname2(p), { recursive: true });
-        await writeFile2(p, await buildIcns(raster));
-        written.push(p);
+        written.push(...await saveIcon(join2(outDir, `${name}.icon`), doc));
       }
+      if (formats.includes("icns")) written.push(...await writeFiles(outDir, { [`${name}.icns`]: await buildIcns(raster) }));
       if (formats.includes("appiconset")) written.push(...await writeFiles(join2(outDir, "AppIcon.appiconset"), await buildAppIconSet(raster, { watch: targetsWatch(doc) })));
       if (formats.includes("png"))
         written.push(
@@ -2725,7 +2935,7 @@ async function runTool(ws, t, args) {
 }
 
 // ../mcp/src/version.ts
-var VERSION = "0.2.0";
+var VERSION = "0.2.1";
 
 // ../mcp/src/contract.ts
 var RESOURCES = [
@@ -2762,6 +2972,7 @@ function toolSpec(t) {
     input_schema: jsonSchema(z3.object(t.input).strict(), "input"),
     output_schema: jsonSchema(t.output, "output"),
     mutates_input: t.mutates_input,
+    writes_files: t.writes_files,
     idempotency_hint: t.idempotency_hint,
     destructive: !!t.destructive,
     supports_dry_run: t.supports_dry_run,
@@ -2794,7 +3005,7 @@ function buildContract() {
       rule: "Breaking changes bump contract_version to the next major. The frozen surface (packages/mcp/spec/surface.json) makes CI fail otherwise."
     },
     tools: TOOLS.map(toolSpec),
-    capability_map: Object.fromEntries(Object.entries(capability_map).sort(([a], [b]) => a.localeCompare(b))),
+    capability_map: Object.fromEntries(Object.entries(capability_map).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0)),
     resources: RESOURCES,
     prompts: PROMPTS,
     icon_json: { document: attrTable(DOCUMENT_ATTRS), group: attrTable(GROUP_ATTRS), layer: attrTable(LAYER_ATTRS) },
@@ -2892,10 +3103,11 @@ function createServer(ws) {
       {
         title: t.title,
         description: t.description,
-        inputSchema: t.input,
+        // strict: a misspelt argument (dryRun for dry_run) is an error, not silently dropped
+        inputSchema: z4.object(t.input).strict(),
         outputSchema: t.output,
         annotations: {
-          readOnlyHint: !t.mutates_input,
+          readOnlyHint: !t.mutates_input && !t.writes_files,
           destructiveHint: !!t.destructive,
           idempotentHint: t.idempotency_hint === "idempotent",
           openWorldHint: false
@@ -2969,8 +3181,8 @@ Use the fresnel tools:
 }
 
 // ../mcp/src/workspace.ts
-import { realpath, stat as stat3 } from "fs/promises";
-import { dirname as dirname3, isAbsolute as isAbsolute2, relative as relative2, resolve as resolve2, sep as sep2 } from "path";
+import { lstat as lstat2, realpath, stat as stat3 } from "fs/promises";
+import { dirname as dirname3, isAbsolute as isAbsolute3, relative as relative3, resolve as resolve2, sep as sep3 } from "path";
 var Workspace = class {
   roots;
   locks = /* @__PURE__ */ new Map();
@@ -2983,13 +3195,17 @@ var Workspace = class {
   /** Resolves a user path (relative paths are relative to the first root) and checks it's allowed. */
   async resolve(p, opts = {}) {
     if (!p || typeof p !== "string") throw new Error("A path is required");
-    const abs = isAbsolute2(p) ? resolve2(p) : resolve2(this.roots[0], p);
+    const abs = isAbsolute3(p) ? resolve2(p) : resolve2(this.roots[0], p);
     let probe = abs;
     let suffix = "";
     for (; ; ) {
       try {
         const real = await realpath(probe);
         const full = suffix ? resolve2(real, suffix) : real;
+        if (suffix) {
+          const first = resolve2(real, suffix.split(sep3)[0]);
+          if (await lstat2(first).then(() => true, () => false)) throw new Error(`Access denied: ${p} goes through a symbolic link that points nowhere`);
+        }
         if (!await this.allowed(full)) throw new Error(`Access denied: ${p} is outside the allowed roots (${this.roots.join(", ")})`);
         if (opts.mustExist && full !== real) throw new Error(`Not found: ${p}`);
         return full;
@@ -2998,7 +3214,7 @@ var Workspace = class {
         if (opts.mustExist) throw new Error(`Not found: ${p}`);
         const parent = dirname3(probe);
         if (parent === probe) throw new Error(`Invalid path: ${p}`);
-        suffix = suffix ? `${probe.slice(parent.length + 1)}${sep2}${suffix}` : probe.slice(parent.length + 1);
+        suffix = suffix ? `${probe.slice(parent.length + 1)}${sep3}${suffix}` : probe.slice(parent.length + 1);
         probe = parent;
       }
     }
@@ -3011,15 +3227,17 @@ var Workspace = class {
         root = await realpath(r);
       } catch {
       }
-      const rel = relative2(root, full);
-      if (rel === "" || !rel.startsWith("..") && !isAbsolute2(rel)) return true;
+      const rel = relative3(root, full);
+      if (rel === "" || rel !== ".." && !rel.startsWith(`..${sep3}`) && !isAbsolute3(rel)) return true;
     }
     return false;
   }
   /** Normalizes an icon path: accepts "Foo", "Foo.icon", ".../Foo.icon/icon.json". */
   async iconPath(p, opts = {}) {
-    let q = p.trim();
+    let q = (typeof p === "string" ? p : "").trim().replace(/[\\/]+$/, "");
     if (q.endsWith("/icon.json") || q.endsWith("\\icon.json")) q = q.slice(0, -"/icon.json".length);
+    const base = q.split(/[\\/]/).pop() ?? "";
+    if (!base || base === ".icon" || base === ".icon.zip" || base === "." || base === "..") throw new Error(`Invalid icon path "${p}": give a name such as "MyApp.icon"`);
     if (!q.endsWith(".icon") && !q.endsWith(".icon.zip")) q = `${q}.icon`;
     const full = await this.resolve(q, opts);
     if (opts.mustExist) {
@@ -3081,23 +3299,13 @@ Appearances: ${APPEARANCES.join(", ")}
 Docs: https://github.com/kajisho5/fresnel
 `;
 async function callTool(t, argv) {
-  if (argv.includes("--help") || argv.includes("-h")) {
+  const { args, roots, help } = parseToolArgv(t, argv);
+  if (help) {
     process.stdout.write(toolHelp(t));
     return;
   }
-  const roots = [];
-  const rest = [];
-  for (let i = 0; i < argv.length; i++) {
-    const a = argv[i];
-    if (a === "--root" || a === "-r") {
-      const v = argv[++i];
-      if (!v) throw new Error("--root needs a directory");
-      roots.push(v);
-    } else if (a.startsWith("--root=")) roots.push(a.slice(7));
-    else rest.push(a);
-  }
   const ws = new Workspace(roots, { unrestricted: roots.length === 0 });
-  const { data, image } = await runTool(ws, t, parseToolArgv(t, rest));
+  const { data, image } = await runTool(ws, t, args);
   if (image && !data.saved) process.stderr.write("fresnel: the PNG was not saved; pass --out <file.png> to keep it\n");
   process.stdout.write(`${JSON.stringify(data, null, 2)}
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fresnel-icon",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "fresnel CLI: build, validate, render and export Liquid Glass app icons (.icon bundles) from the command line or CI",
   "license": "MIT",
   "type": "module",
@@ -38,8 +38,8 @@
   "devDependencies": {
     "tsup": "9.0.0",
     "tsx": "4.23.15",
-    "@fresnel/core": "0.2.0",
-    "@fresnel/render": "0.2.0"
+    "@fresnel/core": "0.2.1",
+    "@fresnel/render": "0.2.1"
   },
   "scripts": {
     "build": "tsup",