@atomixstudio/mcp 1.0.34 → 1.0.35

package/dist/index.js

@@ -1,8 +1,16 @@
 #!/usr/bin/env node
 import {
+  FIGMA_DESIGN_CATALOG,
+  FIGMA_DESIGN_SKILL_MD,
+  buildFigmaPayloadsFromDS,
+  buildResolvers,
+  formatCatalogForMCP,
+  getDesignMethodNames,
+  getQueryMethodNames,
   isAllowedMethod,
-  normalizeBridgeMethod
-} from "./chunk-CE6J5MJX.js";
+  normalizeBridgeMethod,
+  resolveStepParams
+} from "./chunk-426RNS3G.js";
 
 // src/index.ts
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
@@ -222,7 +230,7 @@ function detectGovernanceChangesByFoundation(cached, fresh) {
   return changes;
 }
 async function fetchDesignSystem(options) {
-  const { dsId: dsId2, apiKey: apiKey2, accessToken: accessToken2, apiBase: apiBase2 = "https://atomixstudio.eu", etag, forceRefresh = false } = options;
+  const { dsId: dsId2, apiKey: apiKey2, accessToken: accessToken2, apiBase: apiBase2 = "https://atomix.studio", etag, forceRefresh = false } = options;
   if (!dsId2) {
     throw new Error("Missing dsId. Usage: fetchDesignSystem({ dsId: '...' })");
   }
@@ -1093,9 +1101,7 @@ function formatSyncResponse(options) {
 `;
     });
     response += `
-These changes are reflected in your AI tool rules files (e.g., .cursorrules).
-`;
-    response += `Review the updated rules files to see the new guidance.
+These changes are reflected in the design system governance; run /--sync to update the skill and call getRules for the latest rules.
 `;
   }
   if (diff) {
@@ -1218,709 +1224,6 @@ function getTokenStats(data) {
   };
 }
 
-// ../figma-tools/dist/index.js
-var LEGACY_GROUP_PREFIX = {
-  background: "bg",
-  text: "text",
-  icon: "icon",
-  border: "border",
-  brand: "brand",
-  action: "action",
-  feedback: "feedback"
-};
-var RESERVED_COLOR_KEYS = /* @__PURE__ */ new Set(["customScales", "neutral"]);
-function getColorGroupOrder(storedColors) {
-  if (Array.isArray(storedColors._groupOrder) && storedColors._groupOrder.length > 0) {
-    return storedColors._groupOrder;
-  }
-  return Object.keys(storedColors).filter(
-    (k) => !k.startsWith("_") && !RESERVED_COLOR_KEYS.has(k) && typeof storedColors[k] === "object"
-  );
-}
-function getGroupPrefix(storedColors, groupName) {
-  const custom = storedColors._groupPrefix;
-  if (custom && typeof custom[groupName] === "string") return custom[groupName];
-  return LEGACY_GROUP_PREFIX[groupName] ?? groupName;
-}
-function refScaleToFigmaDisplayName(scaleFromRef) {
-  const s = scaleFromRef.trim();
-  if (!s) return s;
-  return s.charAt(0).toUpperCase() + s.slice(1);
-}
-function referenceToFigmaPrimitiveName(ref, primitiveNames) {
-  if (!ref || typeof ref !== "string") return null;
-  const r = ref.trim();
-  const scaleStep = /^([a-zA-Z]+)\.(\d+|[a-z]+)$/.exec(r);
-  if (scaleStep) {
-    const [, scale, step] = scaleStep;
-    const scaleDisplay = refScaleToFigmaDisplayName(scale);
-    const name = `${scaleDisplay} / ${step}`;
-    return primitiveNames.has(name) ? name : null;
-  }
-  const radixMatch = /^radix\.([a-zA-Z]+)\.(\d+)$/.exec(r);
-  if (radixMatch) {
-    const [, family, step] = radixMatch;
-    const scaleName = refScaleToFigmaDisplayName(family);
-    const name = `${scaleName} / ${step}`;
-    return primitiveNames.has(name) ? name : null;
-  }
-  const oneOffMatch = /^(?:new|oneOff)\.(.+)$/.exec(r);
-  if (oneOffMatch) {
-    const name = `One-off / ${oneOffMatch[1]}`;
-    return primitiveNames.has(name) ? name : null;
-  }
-  const whiteAlpha = /^whiteAlpha\.(.+)$/.exec(r);
-  if (whiteAlpha) {
-    const name = `WhiteAlpha / ${whiteAlpha[1]}`;
-    return primitiveNames.has(name) ? name : null;
-  }
-  const blackAlpha = /^blackAlpha\.(.+)$/.exec(r);
-  if (blackAlpha) {
-    const name = `BlackAlpha / ${blackAlpha[1]}`;
-    return primitiveNames.has(name) ? name : null;
-  }
-  return null;
-}
-function referenceToScaleName(ref) {
-  if (!ref || typeof ref !== "string") return null;
-  const r = ref.trim();
-  const scaleStep = /^([a-zA-Z]+)\.(\d+|[a-z]+)$/.exec(r);
-  if (scaleStep) return refScaleToFigmaDisplayName(scaleStep[1]);
-  const radixMatch = /^radix\.([a-zA-Z]+)\.(\d+)$/.exec(r);
-  if (radixMatch) return refScaleToFigmaDisplayName(radixMatch[1]);
-  return null;
-}
-function getReferencedScaleNames(storedColors) {
-  const names = /* @__PURE__ */ new Set();
-  const groupOrder = getColorGroupOrder(storedColors);
-  for (const groupName of groupOrder) {
-    const group = storedColors[groupName];
-    if (!group || typeof group !== "object") continue;
-    const keys = Object.keys(group).filter((k) => !k.startsWith("_") && k !== "governance");
-    for (const key of keys) {
-      const value = group[key];
-      if (value === void 0 || typeof value !== "object" || value === null) continue;
-      const theme = value;
-      const lightScale = theme.light?.reference ? referenceToScaleName(theme.light.reference) : null;
-      const darkScale = theme.dark?.reference ? referenceToScaleName(theme.dark.reference) : null;
-      if (lightScale) names.add(lightScale);
-      if (darkScale) names.add(darkScale);
-    }
-  }
-  return names;
-}
-function getFullScaleFromStored(storedColors, scaleName) {
-  const key = scaleName.toLowerCase();
-  if (key === "neutral" || key === "gray") {
-    const neutral = storedColors.neutral;
-    if (!neutral?.steps || typeof neutral.steps !== "object") return null;
-    const out = {};
-    for (const [step, stepValue] of Object.entries(neutral.steps)) {
-      const hex = stepValue?.hex;
-      if (typeof hex === "string" && /^#?[0-9A-Fa-f]{6}([0-9A-Fa-f]{2})?$/i.test(hex)) {
-        out[step] = hex.startsWith("#") ? hex : `#${hex}`;
-      }
-    }
-    return Object.keys(out).length > 0 ? out : null;
-  }
-  const customScales = storedColors.customScales;
-  if (Array.isArray(customScales)) {
-    const keyNorm = key.replace(/\s+/g, "");
-    const scale = customScales.find(
-      (s) => s.name?.toLowerCase() === key || s.name?.toLowerCase().replace(/\s+/g, "") === keyNorm
-    );
-    if (scale?.steps && typeof scale.steps === "object") {
-      const out = {};
-      for (const [step, stepValue] of Object.entries(scale.steps)) {
-        const hex = stepValue?.hex;
-        if (typeof hex === "string" && /^#?[0-9A-Fa-f]{6}([0-9A-Fa-f]{2})?$/i.test(hex)) {
-          out[step] = hex.startsWith("#") ? hex : `#${hex}`;
-        }
-      }
-      if (Object.keys(out).length > 0) return out;
-    }
-  }
-  return null;
-}
-function buildSemanticRefMap(storedColors, primitiveNames) {
-  const out = {};
-  const groupOrder = getColorGroupOrder(storedColors);
-  for (const groupName of groupOrder) {
-    const group = storedColors[groupName];
-    if (!group || typeof group !== "object") continue;
-    const prefix = getGroupPrefix(storedColors, groupName);
-    const rowOrder = Array.isArray(group._rowOrder) ? group._rowOrder : void 0;
-    const keys = Array.isArray(rowOrder) ? rowOrder : Object.keys(group).filter((k) => !k.startsWith("_") && k !== "governance");
-    const toKebab = prefix === "action" || prefix === "brand" || prefix === "feedback";
-    for (const key of keys) {
-      const value = group[key];
-      if (value === void 0 || typeof value !== "object" || value === null) continue;
-      const theme = value;
-      let cssKey = key === "app" ? "page" : key;
-      if (toKebab) {
-        cssKey = String(key).replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
-      }
-      const fullKey = `${prefix}-${cssKey}`;
-      const lightRef = theme.light?.reference ? referenceToFigmaPrimitiveName(theme.light.reference, primitiveNames) : null;
-      const darkRef = theme.dark?.reference ? referenceToFigmaPrimitiveName(theme.dark.reference, primitiveNames) : null;
-      if (lightRef || darkRef) {
-        out[fullKey] = {};
-        if (lightRef) out[fullKey].Light = lightRef;
-        if (darkRef) out[fullKey].Dark = darkRef;
-      }
-    }
-  }
-  return out;
-}
-function figmaColorNameWithGroup(key) {
-  if (key.includes("/")) {
-    const [group2, ...rest] = key.split("/");
-    const name2 = rest.join("/").trim();
-    if (!name2) return key;
-    const groupDisplay2 = group2.charAt(0).toUpperCase() + group2.slice(1).toLowerCase();
-    return `${groupDisplay2} / ${name2}`;
-  }
-  const firstDash = key.indexOf("-");
-  if (firstDash <= 0) return key;
-  const group = key.slice(0, firstDash);
-  const name = key.slice(firstDash + 1);
-  const groupDisplay = group.charAt(0).toUpperCase() + group.slice(1).toLowerCase();
-  return `${groupDisplay} / ${name}`;
-}
-var FIGMA_SHADOW_ORDER = {
-  none: 0,
-  xs: 1,
-  sm: 2,
-  md: 3,
-  lg: 4,
-  xl: 5,
-  "2xl": 6,
-  focus: 7
-};
-function tokenValueToNumber(s) {
-  if (typeof s !== "string" || !s.trim()) return 0;
-  const t = s.trim();
-  if (t.endsWith("rem")) {
-    const n2 = parseFloat(t.replace(/rem$/, ""));
-    return Number.isFinite(n2) ? Math.round(n2 * 16) : 0;
-  }
-  if (t.endsWith("px")) {
-    const n2 = parseFloat(t.replace(/px$/, ""));
-    return Number.isFinite(n2) ? Math.round(n2) : 0;
-  }
-  const n = parseFloat(t);
-  return Number.isFinite(n) ? n : 0;
-}
-function parseBoxShadowToFigmaEffect(shadowStr) {
-  const s = shadowStr.trim();
-  if (!s || s.toLowerCase() === "none") return null;
-  const parsePx = (x) => typeof x === "string" ? parseFloat(x.replace(/px$/i, "")) : NaN;
-  const colorMatch = s.match(/(rgba?\s*\([^)]+\)|#[0-9A-Fa-f]{3,8})\s*$/i);
-  const colorStr = colorMatch ? colorMatch[1].trim() : void 0;
-  const rest = (colorMatch ? s.slice(0, colorMatch.index) : s).trim();
-  const parts = rest ? rest.split(/\s+/) : [];
-  if (parts.length < 3) return null;
-  const offsetX = parsePx(parts[0]);
-  const offsetY = parsePx(parts[1]);
-  const blur = parsePx(parts[2]);
-  let spread = 0;
-  if (parts.length >= 4) spread = parsePx(parts[3]);
-  let r = 0, g = 0, b = 0, a = 0.1;
-  if (colorStr) {
-    const rgbaMatch = colorStr.match(/rgba?\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*(?:,\s*([\d.]+)\s*)?\)/i);
-    if (rgbaMatch) {
-      r = Number(rgbaMatch[1]) / 255;
-      g = Number(rgbaMatch[2]) / 255;
-      b = Number(rgbaMatch[3]) / 255;
-      a = rgbaMatch[4] != null ? parseFloat(rgbaMatch[4]) : 1;
-    } else {
-      const hexMatch = colorStr.match(/^#?([0-9A-Fa-f]{6})([0-9A-Fa-f]{2})?$/);
-      if (hexMatch) {
-        r = parseInt(hexMatch[1].slice(0, 2), 16) / 255;
-        g = parseInt(hexMatch[1].slice(2, 4), 16) / 255;
-        b = parseInt(hexMatch[1].slice(4, 6), 16) / 255;
-        a = hexMatch[2] ? parseInt(hexMatch[2], 16) / 255 : 0.1;
-      }
-    }
-  }
-  if (!Number.isFinite(offsetX) || !Number.isFinite(offsetY) || !Number.isFinite(blur)) return null;
-  return {
-    type: "DROP_SHADOW",
-    offset: { x: offsetX, y: offsetY },
-    radius: Math.max(0, blur),
-    spread: Number.isFinite(spread) ? spread : 0,
-    color: { r, g, b, a },
-    visible: true,
-    blendMode: "NORMAL"
-  };
-}
-function parseBoxShadowToFigmaEffects(shadowStr) {
-  const s = (shadowStr || "").trim();
-  if (!s || s.toLowerCase() === "none") return [];
-  const out = [];
-  const segments = s.split(/\s*,\s*/);
-  for (const seg of segments) {
-    const effect = parseBoxShadowToFigmaEffect(seg.trim());
-    if (effect) out.push(effect);
-  }
-  return out;
-}
-function colorTo8DigitHex(color) {
-  if (!color || typeof color !== "string") return null;
-  const s = color.trim();
-  const rgbaMatch = s.match(/rgba?\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*(?:,\s*([\d.]+)\s*)?\)/i);
-  if (rgbaMatch) {
-    const r = Math.max(0, Math.min(255, parseInt(rgbaMatch[1], 10)));
-    const g = Math.max(0, Math.min(255, parseInt(rgbaMatch[2], 10)));
-    const b = Math.max(0, Math.min(255, parseInt(rgbaMatch[3], 10)));
-    const a = rgbaMatch[4] != null ? Math.max(0, Math.min(1, parseFloat(rgbaMatch[4]))) : 1;
-    const aByte = Math.round(a * 255);
-    const hex = "#" + [r, g, b, aByte].map((n) => n.toString(16).padStart(2, "0")).join("").toUpperCase();
-    return hex;
-  }
-  const hexMatch = s.match(/^#?([0-9A-Fa-f]{6})([0-9A-Fa-f]{2})?$/i);
-  if (hexMatch) {
-    const rgb = hexMatch[1];
-    const aa = hexMatch[2] ?? "FF";
-    return `#${rgb}${aa}`.toUpperCase();
-  }
-  return null;
-}
-function typesetKeyToFontFamilyRole(key) {
-  const prefix = (key.split("-")[0] ?? key).toLowerCase();
-  if (prefix === "display" || prefix.startsWith("display")) return "display";
-  if (prefix === "heading" || prefix.startsWith("heading")) return "heading";
-  if (prefix === "mono" || prefix.startsWith("mono")) return "mono";
-  if (prefix.startsWith("body")) return "body";
-  return "body";
-}
-function buildFigmaPayloadsFromDS(data) {
-  const tokens = data.tokens;
-  const colors = tokens?.colors;
-  const typography = tokens?.typography;
-  const hexRe = /^#?[0-9A-Fa-f]{6}([0-9A-Fa-f]{2})?$/;
-  const modes = [];
-  if (colors?.modes) {
-    const light = colors.modes.light ?? {};
-    const dark = colors.modes.dark ?? {};
-    if (Object.keys(light).length > 0) modes.push("Light");
-    if (Object.keys(dark).length > 0 && !modes.includes("Dark")) modes.push("Dark");
-  }
-  if (modes.length === 0) modes.push("Light");
-  const primitiveModes = ["Value"];
-  const dsName = data.meta?.name;
-  const collectionPrefix = dsName ? `${dsName} ` : "";
-  const referencedScaleNames = data.storedColors ? getReferencedScaleNames(data.storedColors) : /* @__PURE__ */ new Set();
-  const primitiveVariables = [];
-  const primitiveNames = /* @__PURE__ */ new Set();
-  const oneOffHexToFigmaName = /* @__PURE__ */ new Map();
-  const alphaScales = colors?.alphaScales;
-  if (alphaScales?.whiteAlpha && typeof alphaScales.whiteAlpha === "object") {
-    for (const [step, value] of Object.entries(alphaScales.whiteAlpha)) {
-      if (typeof value !== "string") continue;
-      const hex = colorTo8DigitHex(value);
-      if (!hex || !hexRe.test(hex)) continue;
-      const figmaName = `WhiteAlpha / ${step}`;
-      if (primitiveNames.has(figmaName)) continue;
-      primitiveNames.add(figmaName);
-      const values = {};
-      for (const m of primitiveModes) values[m] = hex;
-      primitiveVariables.push({ name: figmaName, values });
-    }
-  }
-  if (alphaScales?.blackAlpha && typeof alphaScales.blackAlpha === "object") {
-    for (const [step, value] of Object.entries(alphaScales.blackAlpha)) {
-      if (typeof value !== "string") continue;
-      const hex = colorTo8DigitHex(value);
-      if (!hex || !hexRe.test(hex)) continue;
-      const figmaName = `BlackAlpha / ${step}`;
-      if (primitiveNames.has(figmaName)) continue;
-      primitiveNames.add(figmaName);
-      const values = {};
-      for (const m of primitiveModes) values[m] = hex;
-      primitiveVariables.push({ name: figmaName, values });
-    }
-  }
-  if (colors?.scales && typeof colors.scales === "object") {
-    for (const [scaleName, steps] of Object.entries(colors.scales)) {
-      if (!steps || typeof steps !== "object") continue;
-      let groupDisplay = scaleName.charAt(0).toUpperCase() + scaleName.slice(1);
-      if (scaleName.toLowerCase() === "neutral" && data.storedColors) {
-        const neutral = data.storedColors.neutral;
-        if (neutral?.baseHueFamily) {
-          groupDisplay = refScaleToFigmaDisplayName(neutral.baseHueFamily);
-        }
-      }
-      for (const [step, hexVal] of Object.entries(steps)) {
-        if (typeof hexVal !== "string") continue;
-        const hex = colorTo8DigitHex(hexVal) ?? (hexRe.test(hexVal) ? hexVal : null);
-        if (!hex || !hexRe.test(hex)) continue;
-        const figmaName = `${groupDisplay} / ${step}`;
-        if (primitiveNames.has(figmaName)) continue;
-        primitiveNames.add(figmaName);
-        const values = {};
-        for (const m of primitiveModes) values[m] = hex;
-        primitiveVariables.push({ name: figmaName, values });
-      }
-    }
-  }
-  const radixVariables = [];
-  const radixCollectionName = `${collectionPrefix}Colors Radix`;
-  for (const scaleName of referencedScaleNames) {
-    if (primitiveNames.has(`${scaleName} / 50`) || primitiveNames.has(`${scaleName} / 100`)) continue;
-    const fromStored = data.storedColors ? getFullScaleFromStored(data.storedColors, scaleName) : null;
-    const scaleData = fromStored ?? data.getRadixScale?.(scaleName) ?? null;
-    if (!scaleData) continue;
-    for (const [step, hexVal] of Object.entries(scaleData)) {
-      const figmaName = `${scaleName} / ${step}`;
-      if (primitiveNames.has(figmaName)) continue;
-      const hex = colorTo8DigitHex(hexVal) ?? (hexRe.test(hexVal) ? hexVal : null);
-      if (!hex || !hexRe.test(hex)) continue;
-      primitiveNames.add(figmaName);
-      const values = {};
-      for (const m of primitiveModes) values[m] = hex;
-      primitiveVariables.push({ name: figmaName, values });
-    }
-  }
-  if (colors?.oneOffs && Array.isArray(colors.oneOffs)) {
-    for (const oneOff of colors.oneOffs) {
-      if (!oneOff || typeof oneOff !== "object" || typeof oneOff.hex !== "string") continue;
-      const hex = colorTo8DigitHex(oneOff.hex) ?? (hexRe.test(oneOff.hex) ? oneOff.hex : null);
-      if (!hex || !hexRe.test(hex)) continue;
-      const name = typeof oneOff.name === "string" && oneOff.name ? oneOff.name : oneOff.id ?? "unnamed";
-      const figmaName = `One-off / ${name}`;
-      if (primitiveNames.has(figmaName)) continue;
-      primitiveNames.add(figmaName);
-      const values = {};
-      for (const m of primitiveModes) values[m] = hex;
-      primitiveVariables.push({ name: figmaName, values });
-      const normalizedHex = hex.replace(/^#/, "").toUpperCase();
-      const key8 = normalizedHex.length === 6 ? normalizedHex + "FF" : normalizedHex;
-      oneOffHexToFigmaName.set(key8, figmaName);
-    }
-  }
-  const semanticRefMap = data.storedColors && primitiveNames.size > 0 ? buildSemanticRefMap(data.storedColors, primitiveNames) : {};
-  const semanticVariables = [];
-  const semanticNames = /* @__PURE__ */ new Set();
-  const primitivesCollectionName = `${collectionPrefix}Colors Primitives`;
-  if (colors?.modes) {
-    const light = colors.modes.light ?? {};
-    const dark = colors.modes.dark ?? {};
-    const orderedKeys = [...Object.keys(light)];
-    for (const k of Object.keys(dark)) {
-      if (!orderedKeys.includes(k)) orderedKeys.push(k);
-    }
-    for (const key of orderedKeys) {
-      const lightVal = light[key];
-      const darkVal = dark[key];
-      const lightHex = typeof lightVal === "string" ? colorTo8DigitHex(lightVal) ?? (hexRe.test(lightVal) ? lightVal : null) : null;
-      if (lightHex && hexRe.test(lightHex)) {
-        const figmaName = figmaColorNameWithGroup(key);
-        if (semanticNames.has(figmaName)) continue;
-        semanticNames.add(figmaName);
-        const darkHex = typeof darkVal === "string" ? colorTo8DigitHex(darkVal) ?? (hexRe.test(darkVal) ? darkVal : null) : null;
-        const refs = semanticRefMap[key];
-        const values = {
-          ...modes.includes("Light") && { Light: lightHex },
-          ...modes.includes("Dark") && { Dark: darkHex && hexRe.test(darkHex) ? darkHex : lightHex }
-        };
-        const aliasByMode = {};
-        for (const m of modes) {
-          const aliasFromRef = m === "Light" ? refs?.Light : refs?.Dark;
-          if (aliasFromRef && primitiveNames.has(aliasFromRef)) {
-            aliasByMode[m] = aliasFromRef;
-            continue;
-          }
-          const hexForMode = m === "Light" ? lightHex : darkHex && hexRe.test(darkHex) ? darkHex : lightHex;
-          const norm = hexForMode.replace(/^#/, "").toUpperCase();
-          const key8 = norm.length === 6 ? norm + "FF" : norm;
-          const oneOffAlias = oneOffHexToFigmaName.get(key8);
-          if (oneOffAlias) {
-            aliasByMode[m] = oneOffAlias;
-          }
-        }
-        semanticVariables.push({
-          name: figmaName,
-          values,
-          ...Object.keys(aliasByMode).length > 0 ? { aliasByMode } : {}
-        });
-      }
-    }
-  }
-  if (colors?.static?.brand && typeof colors.static.brand === "object") {
-    for (const [key, hex] of Object.entries(colors.static.brand)) {
-      if (typeof hex !== "string" || !hexRe.test(hex)) continue;
-      const figmaName = figmaColorNameWithGroup(`brand/${key}`);
-      if (semanticNames.has(figmaName)) continue;
-      semanticNames.add(figmaName);
-      const values = {};
-      for (const m of modes) values[m] = hex;
-      semanticVariables.push({ name: figmaName, values });
-    }
-  }
-  const colorVariableCollections = [];
-  if (primitiveVariables.length > 0) {
-    colorVariableCollections.push({
-      collectionName: primitivesCollectionName,
-      modes: primitiveModes,
-      variables: primitiveVariables,
-      applyScopes: false
-    });
-  }
-  if (radixVariables.length > 0) {
-    colorVariableCollections.push({
-      collectionName: radixCollectionName,
-      modes,
-      variables: radixVariables,
-      applyScopes: false
-    });
-  }
-  if (semanticVariables.length > 0) {
-    const primitiveCollections = [];
-    if (primitiveVariables.length > 0) primitiveCollections.push(primitivesCollectionName);
-    if (radixVariables.length > 0) primitiveCollections.push(radixCollectionName);
-    colorVariableCollections.push({
-      collectionName: `${collectionPrefix}Colors Semantic`,
-      modes,
-      variables: semanticVariables,
-      applyScopes: true,
-      ...primitiveCollections.length > 1 ? { primitiveCollectionNames: primitiveCollections } : primitiveCollections.length === 1 ? { primitiveCollectionName: primitiveCollections[0] } : {}
-    });
-  }
-  const paintStyles = [];
-  const textStyles = [];
-  const sizeToPx = (val, basePx = 16) => {
-    if (typeof val === "number") return Math.round(val);
-    const s = String(val).trim();
-    const pxMatch = s.match(/^([\d.]+)\s*px$/i);
-    if (pxMatch) return Math.round(parseFloat(pxMatch[1]));
-    const remMatch = s.match(/^([\d.]+)\s*rem$/i);
-    if (remMatch) return Math.round(parseFloat(remMatch[1]) * basePx);
-    const n = parseFloat(s);
-    if (Number.isFinite(n)) return n <= 0 ? basePx : n < 50 ? Math.round(n * basePx) : Math.round(n);
-    return basePx;
-  };
-  const letterSpacingToPx = (val, fontSizePx) => {
-    if (val === void 0 || val === null) return void 0;
-    if (typeof val === "number") return Math.round(val);
-    const s = String(val).trim();
-    const pxMatch = s.match(/^([-\d.]+)\s*px$/i);
-    if (pxMatch) return Math.round(parseFloat(pxMatch[1]));
-    const emMatch = s.match(/^([-\d.]+)\s*em$/i);
-    if (emMatch) return Math.round(parseFloat(emMatch[1]) * fontSizePx);
-    const n = parseFloat(s);
-    return Number.isFinite(n) ? Math.round(n) : void 0;
-  };
-  const firstFont = (obj) => {
-    if (typeof obj === "string") {
-      const primary = obj.split(",")[0].trim().replace(/^['"]|['"]$/g, "");
-      return primary || "Inter";
-    }
-    if (obj && typeof obj === "object" && !Array.isArray(obj)) {
-      const v = obj.body ?? obj.heading ?? obj.display ?? Object.values(obj)[0];
-      return firstFont(v);
-    }
-    return "Inter";
-  };
-  const toFontFamilyString = (val) => {
-    if (typeof val === "string") {
-      const s = val.trim().replace(/^["']|["']$/g, "");
-      return s || "Inter";
-    }
-    return firstFont(val);
-  };
-  const fontFamilyMap = typography?.fontFamily ?? {};
-  const defaultFontFamily = typography ? firstFont(typography.fontFamily ?? "Inter") : "Inter";
-  const fontSizeMap = typography?.fontSize;
-  const fontWeightMap = typography?.fontWeight;
-  const lineHeightMap = typography?.lineHeight;
-  const letterSpacingMap = typography?.letterSpacing;
-  const textTransformMap = typography?.textTransform;
-  const textDecorationMap = typography?.textDecoration;
-  if (fontSizeMap && typeof fontSizeMap === "object" && Object.keys(fontSizeMap).length > 0) {
-    for (const [key, sizeVal] of Object.entries(fontSizeMap)) {
-      const fontSize = sizeToPx(sizeVal);
-      if (fontSize <= 0) continue;
-      const role = typesetKeyToFontFamilyRole(key);
-      const fontFamily = toFontFamilyString(
-        fontFamilyMap[role] ?? fontFamilyMap.body ?? fontFamilyMap.heading ?? fontFamilyMap.display ?? defaultFontFamily
-      );
-      const lh = lineHeightMap && typeof lineHeightMap === "object" ? lineHeightMap[key] : void 0;
-      const weight = fontWeightMap && typeof fontWeightMap === "object" ? fontWeightMap[key] : void 0;
-      const fontWeight = weight != null ? String(weight) : "400";
-      const letterSpacingPx = letterSpacingToPx(
-        letterSpacingMap && typeof letterSpacingMap === "object" ? letterSpacingMap[key] : void 0,
-        fontSize
-      );
-      const textTransform = textTransformMap && typeof textTransformMap === "object" ? textTransformMap[key] : void 0;
-      const textDecoration = textDecorationMap && typeof textDecorationMap === "object" ? textDecorationMap[key] : void 0;
-      const namePart = key.replace(/-/g, " / ");
-      const style = {
-        name: namePart.startsWith("Typography") ? namePart : `Typography / ${namePart}`,
-        fontFamily,
-        fontWeight,
-        fontSize,
-        lineHeightUnit: "PERCENT",
-        letterSpacingUnit: "PIXELS",
-        ...letterSpacingPx !== void 0 && letterSpacingPx !== 0 ? { letterSpacingValue: letterSpacingPx } : {}
-      };
-      if (lh != null && typeof lh === "number" && lh > 0) {
-        style.lineHeightValue = lh >= 10 ? Math.round(lh / fontSize * 100) : Math.round(lh * 100);
-      } else {
-        style.lineHeightValue = 150;
-      }
-      if (textTransform === "uppercase") style.textCase = "UPPER";
-      else if (textTransform === "lowercase") style.textCase = "LOWER";
-      else if (textTransform === "capitalize") style.textCase = "TITLE";
-      else style.textCase = "ORIGINAL";
-      if (textDecoration === "underline") style.textDecoration = "UNDERLINE";
-      else style.textDecoration = "NONE";
-      textStyles.push(style);
-    }
-  }
-  const textStylesMap = typography?.textStyles;
-  if (textStyles.length === 0 && textStylesMap && typeof textStylesMap === "object") {
-    for (const [styleName, style] of Object.entries(textStylesMap)) {
-      if (!style || typeof style !== "object") continue;
-      const fontSize = sizeToPx(style.fontSize ?? "1rem");
-      const lhStr = style.lineHeight;
-      const lineHeightUnitless = lhStr != null ? lhStr.endsWith("%") ? parseFloat(lhStr) / 100 : sizeToPx(lhStr) / fontSize : 1.5;
-      const payload = {
-        name: styleName.startsWith("Typography") ? styleName : `Typography / ${styleName.replace(/\//g, " / ")}`,
-        fontFamily: defaultFontFamily,
-        fontWeight: String(style.fontWeight ?? "400"),
-        fontSize,
-        lineHeightUnit: "PERCENT",
-        lineHeightValue: Math.round((Number.isFinite(lineHeightUnitless) ? lineHeightUnitless : 1.5) * 100),
-        letterSpacingUnit: "PIXELS",
-        textCase: "ORIGINAL",
-        textDecoration: "NONE"
-      };
-      textStyles.push(payload);
-    }
-  }
-  textStyles.sort((a, b) => {
-    if (a.fontSize !== b.fontSize) return a.fontSize - b.fontSize;
-    return (a.name || "").localeCompare(b.name || "");
-  });
-  const numberVariableCollections = [];
-  const spacing = tokens?.spacing;
-  if (spacing?.scale && typeof spacing.scale === "object") {
-    const vars = [];
-    for (const [key, val] of Object.entries(spacing.scale)) {
-      const n = tokenValueToNumber(val);
-      if (n >= 0) vars.push({ name: `Spacing / ${key}`, value: n });
-    }
-    vars.sort((a, b) => a.value - b.value);
-    if (vars.length > 0)
-      numberVariableCollections.push({
-        collectionName: `${collectionPrefix}Spacing`,
-        categoryKey: "Spacing",
-        variables: vars,
-        scopes: ["GAP"]
-      });
-  }
-  const radius = tokens?.radius;
-  if (radius?.scale && typeof radius.scale === "object") {
-    const vars = [];
-    for (const [key, val] of Object.entries(radius.scale)) {
-      const n = tokenValueToNumber(val);
-      if (n >= 0) vars.push({ name: `Radius / ${key}`, value: n });
-    }
-    vars.sort((a, b) => a.value - b.value);
-    if (vars.length > 0)
-      numberVariableCollections.push({
-        collectionName: `${collectionPrefix}Radius`,
-        categoryKey: "Radius",
-        variables: vars,
-        scopes: ["CORNER_RADIUS"]
-      });
-  }
-  const borders = tokens?.borders;
-  if (borders?.width && typeof borders.width === "object") {
-    const vars = [];
-    for (const [key, val] of Object.entries(borders.width)) {
-      const n = tokenValueToNumber(val);
-      if (n >= 0) vars.push({ name: `Borders / ${key}`, value: n });
-    }
-    vars.sort((a, b) => a.value - b.value);
-    if (vars.length > 0)
-      numberVariableCollections.push({
-        collectionName: `${collectionPrefix}Borders`,
-        categoryKey: "Borders",
-        variables: vars,
-        scopes: ["STROKE_FLOAT"]
-      });
-  }
-  const sizing = tokens?.sizing;
-  const sizingVariables = [];
-  if (sizing?.height && typeof sizing.height === "object") {
-    for (const [key, val] of Object.entries(sizing.height)) {
-      const n = tokenValueToNumber(val);
-      if (n >= 0) sizingVariables.push({ name: `Height / ${key}`, value: n });
-    }
-  }
-  if (sizing?.icon && typeof sizing.icon === "object") {
-    for (const [key, val] of Object.entries(sizing.icon)) {
-      const n = tokenValueToNumber(val);
-      if (n >= 0) sizingVariables.push({ name: `Icon / ${key}`, value: n });
-    }
-  }
-  sizingVariables.sort((a, b) => a.value - b.value);
-  if (sizingVariables.length > 0) {
-    numberVariableCollections.push({
-      collectionName: `${collectionPrefix}Sizing`,
-      categoryKey: "Sizing",
-      variables: sizingVariables,
-      scopes: ["WIDTH_HEIGHT"]
-    });
-  }
-  const layout = tokens?.layout;
-  if (layout?.breakpoint && typeof layout.breakpoint === "object") {
-    const vars = [];
-    for (const [key, val] of Object.entries(layout.breakpoint)) {
-      const n = tokenValueToNumber(val);
-      if (n >= 0) vars.push({ name: `Breakpoint / ${key}`, value: n });
-    }
-    vars.sort((a, b) => a.value - b.value);
-    if (vars.length > 0)
-      numberVariableCollections.push({
-        collectionName: `${collectionPrefix}Layout`,
-        categoryKey: "Layout",
-        variables: vars,
-        scopes: ["WIDTH_HEIGHT"]
-      });
-  }
-  const effectStyles = [];
-  const shadows = tokens?.shadows;
-  if (shadows?.elevation && typeof shadows.elevation === "object") {
-    for (const [key, val] of Object.entries(shadows.elevation)) {
-      if (typeof val !== "string") continue;
-      const effects = parseBoxShadowToFigmaEffects(val);
-      if (effects.length > 0) effectStyles.push({ name: `Shadow / ${key}`, effects });
-    }
-  }
-  if (shadows?.focus && typeof shadows.focus === "string") {
-    const effects = parseBoxShadowToFigmaEffects(shadows.focus);
-    if (effects.length > 0) effectStyles.push({ name: "Shadow / focus", effects });
-  }
-  effectStyles.sort((a, b) => {
-    const nameA = a.name.startsWith("Shadow / ") ? a.name.slice(9) : a.name;
-    const nameB = b.name.startsWith("Shadow / ") ? b.name.slice(9) : b.name;
-    const orderA = FIGMA_SHADOW_ORDER[nameA] ?? 100;
-    const orderB = FIGMA_SHADOW_ORDER[nameB] ?? 100;
-    if (orderA !== orderB) return orderA - orderB;
-    return nameA.localeCompare(nameB);
-  });
-  return {
-    colorVariableCollections,
-    paintStyles,
-    textStyles,
-    numberVariableCollections,
-    effectStyles
-  };
-}
-
 // src/index.ts
 import * as path from "path";
 import * as fs from "fs";
@@ -2124,7 +1427,7 @@ function parseArgs() {
 var cliArgs = parseArgs();
 var { dsId, apiKey, accessToken } = cliArgs;
 var apiBase = cliArgs.apiBase || "https://atomix.studio";
-var MCP_VERSION = "1.0.33";
+var MCP_VERSION = "1.0.34";
 var cachedData = null;
 var cachedETag = null;
 var cachedMcpTier = null;
@@ -2230,7 +1533,7 @@ async function fetchDesignSystemForMCP(forceRefresh = false) {
   return result.data;
 }
 var TOKEN_CATEGORIES = ["colors", "typography", "spacing", "sizing", "shadows", "radius", "borders", "motion", "zIndex"];
-function typesetKeyToFontFamilyRole2(key) {
+function typesetKeyToFontFamilyRole(key) {
   const prefix = (key.split("-")[0] ?? key).toLowerCase();
   if (prefix === "display" || prefix.startsWith("display")) return "display";
   if (prefix === "heading" || prefix.startsWith("heading")) return "heading";
@@ -2250,7 +1553,7 @@ function buildTypesetsList(typography, cssPrefix = "atmx") {
   const p = cssPrefix ? `${cssPrefix}-` : "";
   const typesets = [];
   for (const key of Object.keys(fontSize)) {
-    const role = typesetKeyToFontFamilyRole2(key);
+    const role = typesetKeyToFontFamilyRole(key);
     const familyName = fontFamily[role] ?? fontFamily.body;
     const fontFamilyVarName = familyName ? `--${p}typography-font-family-${role}` : void 0;
     const fontFamilyVar = familyName ? `var(${fontFamilyVarName})` : "";
@@ -2439,7 +1742,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
     },
     {
       name: "syncAll",
-      description: "Sync tokens, AI rules, skills (.cursor/skills/atomix-ds/SKILL.md), and atomix-dependencies.json. All paths are resolved under workspaceRoot so files are written inside the project repo (committable). Use dryRun: true first to report what would change without writing; then dryRun: false to apply. Optional: workspaceRoot (project root; default: ATOMIX_PROJECT_ROOT env or process.cwd()), output (default ./tokens.css), format (default css), skipTokens, dryRun.",
+      description: "Sync tokens, AI rules, skills (.cursor/skills/atomix-ds/SKILL.md and figma-design-SKILL.md), and atomix-dependencies.json. All paths are resolved under workspaceRoot so files are written inside the project repo (committable). Use dryRun: true first to report what would change without writing; then dryRun: false to apply. Optional: workspaceRoot (project root; default: ATOMIX_PROJECT_ROOT env or process.cwd()), output (default ./tokens.css), format (default css), skipTokens, dryRun.",
       inputSchema: {
         type: "object",
         properties: {
@@ -2506,6 +1809,43 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
       }
     }
   ];
+  if (cachedMcpTier === "pro") {
+    toolsList.push({
+      name: "designInFigma",
+      description: "Design UI in the connected Figma file using the design system tokens. Call with action:'catalog' to discover available bridge methods, their parameters, and the file's variables/styles. Call with action:'query' to read from Figma: get_selection (current selection), get_node_info (nodeId), get_design_screenshot (frameId; returns PNG image for review). Call with action:'execute' and an array of steps to create the design on canvas. Requires the Atomix Figma plugin to be connected.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          action: {
+            type: "string",
+            enum: ["catalog", "query", "execute"],
+            description: "catalog = discover methods + file context; query = read selection/node/screenshot; execute = run design steps"
+          },
+          queryMethod: {
+            type: "string",
+            description: "Required when action is 'query'. One of: get_selection, get_node_info, get_document_info, get_design_screenshot, get_figma_variables_and_styles, list_local_components, get_component_catalog, get_variable_collection_modes, get_frame_variable_mode."
+          },
+          queryParams: {
+            type: "object",
+            description: "Optional params for query. get_node_info needs { nodeId }. get_design_screenshot needs { frameId } and optional { scale }."
+          },
+          steps: {
+            type: "array",
+            description: "Required when action is 'execute'. Array of { method, params } design commands.",
+            items: {
+              type: "object",
+              properties: {
+                method: { type: "string" },
+                params: { type: "object" }
+              },
+              required: ["method"]
+            }
+          }
+        },
+        required: ["action"]
+      }
+    });
+  }
   return { tools: toolsList };
 });
 server.setRequestHandler(CallToolRequestSchema, async (request) => {
@@ -2648,7 +1988,7 @@ Version: ${designSystemData.meta.version}`,
           `  Tokens: ${tokenCount} (${deprecatedCount} deprecated preserved)`,
           changeLine,
           "",
-          "Would write skills: .cursor/skills/atomix-ds/SKILL.md",
+          "Would write skills: .cursor/skills/atomix-ds/SKILL.md, .cursor/skills/atomix-ds/figma-design-SKILL.md",
           "",
           "Call syncAll again with dryRun: false to apply."
         ].filter(Boolean).join("\n");
@@ -2681,7 +2021,8 @@ Version: ${designSystemData.meta.version}`,
         hasRefactorRecommendation: !!lastSyncAffectedTokens?.removed.length,
         deprecatedTokenCount: lastSyncAffectedTokens?.removed.length || 0
       });
-      return { responseText: response, rulesResults, validation };
+      const tokenSyncChangeSummary = fileExists && ["css", "scss", "less"].includes(format) ? { fileExisted: true, previousVarCount: existingTokens.size, currentVarCount: tokenCount } : { fileExisted: false, previousVarCount: void 0, currentVarCount: tokenCount };
+      return { responseText: response, rulesResults, validation, tokenSyncChangeSummary };
     }
     switch (name) {
       case "getToken": {
@@ -3113,10 +2454,12 @@ Version: ${designSystemData.meta.version}`,
         const parts = [dryRun ? "[DRY RUN] syncAll report (no files written)." : "\u2713 syncAll complete."];
         let tokenResponseText = "";
         const allValidation = [];
+        let tokenSyncChangeSummary;
         if (!skipTokens) {
           const result = await performTokenSyncAndRules(data, output, format, dryRun, projectRoot);
           tokenResponseText = result.responseText;
           allValidation.push(...result.validation);
+          tokenSyncChangeSummary = result.tokenSyncChangeSummary;
           if (dryRun) {
             parts.push(`Would write tokens: ${output} (${format})`);
           } else {
@@ -3126,10 +2469,11 @@ Version: ${designSystemData.meta.version}`,
         const dsVersion = String(data.meta.version ?? "1.0.0");
         const dsExportedAt = data.meta.exportedAt;
         const skillsDir = path.resolve(projectRoot, ".cursor/skills/atomix-ds");
-        const skillPath1 = path.join(skillsDir, "SKILL.md");
         const manifestPath = path.resolve(projectRoot, "atomix-dependencies.json");
+        const dependencySkills = getSyncDependencySkills(data, dsVersion, dsExportedAt);
         if (dryRun) {
-          parts.push("Would write skills: .cursor/skills/atomix-ds/SKILL.md");
+          const skillList = dependencySkills.map((s) => s.path).join(", ");
+          parts.push(`Would write skills: ${skillList}`);
           parts.push("Would write manifest: atomix-dependencies.json");
           const reportText = [parts.join("\n"), tokenResponseText].filter(Boolean).join("\n\n---\n\n");
           return {
@@ -3139,10 +2483,18 @@ ${reportText}` }]
           };
         }
         if (!fs.existsSync(skillsDir)) fs.mkdirSync(skillsDir, { recursive: true });
-        const genericWithVersion = injectSkillVersion(GENERIC_SKILL_MD, dsVersion, dsExportedAt);
-        fs.writeFileSync(skillPath1, genericWithVersion);
-        allValidation.push({ path: skillPath1, status: fs.existsSync(skillPath1) ? "OK" : "FAIL", detail: "Written." });
-        parts.push("Skills: .cursor/skills/atomix-ds/SKILL.md (synced at DS v" + dsVersion + ")");
+        const skillsWritten = [];
+        for (const sk of dependencySkills) {
+          const absPath = path.resolve(projectRoot, sk.path);
+          const existed = fs.existsSync(absPath);
+          const prevVersion = existed ? readSkillVersionFromFile(absPath) : null;
+          const fromLabel = existed ? prevVersion ? `DS v${prevVersion}` : "existing" : "missing";
+          fs.writeFileSync(absPath, sk.content);
+          allValidation.push({ path: absPath, status: fs.existsSync(absPath) ? "OK" : "FAIL", detail: "Written." });
+          skillsWritten.push({ path: sk.path, shortName: sk.shortName, from: fromLabel });
+        }
+        const skillShortNames = skillsWritten.map((s) => s.shortName).join(" + ");
+        parts.push(`Skills: ${skillShortNames} (DS v${dsVersion})`);
         const tokens = data.tokens;
         const typography = tokens?.typography;
         const fontFamily = typography?.fontFamily;
@@ -3161,6 +2513,10 @@ ${reportText}` }]
         };
         const lib = icons?.library || "lucide";
         const iconPkgs = ICON_PACKAGES[lib] || ICON_PACKAGES.lucide;
+        const skillsManifestEntry = { skill: ".cursor/skills/atomix-ds/SKILL.md", syncedAtVersion: String(data.meta.version ?? "1.0.0") };
+        if (dependencySkills.some((s) => s.shortName === "figma-design-SKILL.md")) {
+          skillsManifestEntry.figmaDesignSkill = ".cursor/skills/atomix-ds/figma-design-SKILL.md";
+        }
         const manifest = {
           designSystem: { name: data.meta.name, version: data.meta.version },
           tokenFile: skipTokens ? void 0 : output,
@@ -3171,23 +2527,67 @@ ${reportText}` }]
             strokeWidthValue: icons?.strokeWidth
           },
           fonts: { families: fontNames },
-          skills: {
-            skill: ".cursor/skills/atomix-ds/SKILL.md",
-            syncedAtVersion: data.meta.version ?? "1.0.0"
-          }
+          skills: skillsManifestEntry
         };
+        const manifestExisted = fs.existsSync(manifestPath);
         fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
         allValidation.push({ path: manifestPath, status: fs.existsSync(manifestPath) ? "OK" : "FAIL", detail: "Written." });
         parts.push("Manifest: atomix-dependencies.json (icons, fonts, skill paths)");
+        const changeRows = [];
+        if (!skipTokens && tokenSyncChangeSummary) {
+          const fromStr = tokenSyncChangeSummary.fileExisted && tokenSyncChangeSummary.previousVarCount != null ? `${tokenSyncChangeSummary.previousVarCount} tokens in ${output}` : "missing";
+          changeRows.push({
+            what: "Tokens",
+            from: fromStr,
+            to: `${tokenSyncChangeSummary.currentVarCount} tokens in ${output} (${format})`
+          });
+        }
+        const skillsFrom = skillsWritten.length ? skillsWritten.every((s) => s.from === "missing") ? "missing" : "updated" : "";
+        if (skillsWritten.length > 0) {
+          changeRows.push({
+            what: "Skills",
+            from: skillsFrom,
+            to: `${skillShortNames} (DS v${dsVersion})`
+          });
+        }
+        changeRows.push({
+          what: "Manifest",
+          from: manifestExisted ? "existing" : "missing",
+          to: "atomix-dependencies.json"
+        });
+        if (lastSyncAffectedTokens && (lastSyncAffectedTokens.modified.length > 0 || lastSyncAffectedTokens.added.length > 0 || lastSyncAffectedTokens.removed.length > 0)) {
+          const mod = lastSyncAffectedTokens.modified;
+          const add = lastSyncAffectedTokens.added;
+          const rem = lastSyncAffectedTokens.removed;
+          const tokenNames = [
+            ...mod.map((m) => m.token),
+            ...add,
+            ...rem.map((r) => r.token)
+          ];
+          const fromParts = [];
+          if (mod.length) fromParts.push(`${mod.length} modified`);
+          if (add.length) fromParts.push(`${add.length} added`);
+          if (rem.length) fromParts.push(`${rem.length} removed`);
+          const toDetail = tokenNames.length <= 8 ? tokenNames.join(", ") : `${tokenNames.length} tokens (${tokenNames.slice(0, 4).join(", ")}...)`;
+          changeRows.push({
+            what: "Token changes (this run)",
+            from: fromParts.join(", ") || "\u2014",
+            to: toDetail
+          });
+          if (mod.length > 0 && mod.length <= 15) {
+            mod.forEach((m) => {
+              changeRows.push({ what: `  ${m.token}`, from: m.oldValue, to: m.newValue });
+            });
+          }
+        }
+        const changesList = "Report the following changes to the user (From \u2192 To). Do not mention what did not change.\n\n**Changes applied**\n\n" + changeRows.map((r) => `\u2022 **${r.what}:** ${r.from} \u2192 ${r.to}`).join("\n");
         const summary = parts.join("\n");
         const validationBlock = formatValidationBlock(allValidation);
         const hasFailure = allValidation.some((e) => e.status === "FAIL");
         const resultLine = hasFailure ? "syncAllResult: FAIL \u2014 Check VALIDATION section below. Do not report success to the user.\n\n" : "syncAllResult: OK\n\n";
-        const fullText = resultLine + (tokenResponseText ? `${summary}
-
----
+        const fullText = resultLine + changesList + "\n\n" + (tokenResponseText ? `---
 
-${tokenResponseText}${validationBlock}` : `${summary}${validationBlock}`);
+${tokenResponseText}` : "") + validationBlock;
         return {
           content: [{ type: "text", text: fullText }]
         };
@@ -3225,10 +2625,17 @@ ${tokenResponseText}${validationBlock}` : `${summary}${validationBlock}`);
             families: fontNames,
             performanceHint: "Link fonts via URL (e.g. Google Fonts <link> or CSS @import); no need to download font files or add them to the repo. Prefer font-display: swap when possible. You must also build a complete typeset CSS: call listTypesets to get every typeset from the design system, then emit one CSS class per typeset (do not skip any). For each class set font-family, font-size, font-weight, line-height, letter-spacing; when the typeset has text-transform or text-decoration, set those too so the result is 1:1 with the DS. Use the CSS variable names returned by listTypesets. Do not create a file that only contains a font import."
           },
-          skill: {
-            path: ".cursor/skills/atomix-ds/SKILL.md",
-            content: GENERIC_SKILL_MD
-          },
+          skill: (() => {
+            const list = getSyncDependencySkills(data, String(data.meta.version ?? "1.0.0"), data.meta.exportedAt);
+            const generic = list.find((s) => s.shortName === "SKILL.md");
+            return generic ? { path: generic.path, content: GENERIC_SKILL_MD } : { path: ".cursor/skills/atomix-ds/SKILL.md", content: GENERIC_SKILL_MD };
+          })(),
+          ...getEffectiveTier() === "pro" ? {
+            skillFigmaDesign: {
+              path: ".cursor/skills/atomix-ds/figma-design-SKILL.md",
+              content: FIGMA_DESIGN_SKILL_MD
+            }
+          } : {},
           tokenFiles: {
             files: ["tokens.css", "tokens.json"],
             copyInstructions: "Call the syncAll MCP tool to create the token file, skills, and atomix-dependencies.json; do not only suggest the user run sync later."
@@ -3453,13 +2860,282 @@ ${JSON.stringify(out, null, 2)}` : JSON.stringify(out, null, 2);
           ...out.error ? { isError: true } : {}
         };
       }
+      case "designInFigma": {
+        if (cachedMcpTier !== "pro") {
+          return {
+            content: [{ type: "text", text: JSON.stringify({ error: "designInFigma requires a Pro subscription. Upgrade at https://atomix.studio" }, null, 2) }],
+            isError: true
+          };
+        }
+        const action = args?.action;
+        if (action === "catalog") {
+          try {
+            const reachable = await isBridgeReachable();
+            let fileCtx;
+            if (reachable) {
+              try {
+                const raw = await sendBridgeRequest("get_figma_variables_and_styles", {});
+                fileCtx = raw;
+              } catch {
+              }
+            }
+            const localVars = [];
+            const libVars = [];
+            const textStyleNames = [];
+            const effectStyleNames = [];
+            if (fileCtx) {
+              for (const coll of fileCtx.variableCollections ?? []) {
+                for (const v of coll.variables) localVars.push(v.name);
+              }
+              for (const coll of fileCtx.variableCollectionsLibrary ?? []) {
+                for (const v of coll.variables) libVars.push(v.name);
+              }
+              for (const s of fileCtx.textStyles ?? []) textStyleNames.push(s.name);
+              for (const s of fileCtx.effectStyles ?? []) effectStyleNames.push(s.name);
+            }
+            const catalogPayload = formatCatalogForMCP(FIGMA_DESIGN_CATALOG, {
+              localVariables: localVars,
+              libraryVariables: libVars,
+              textStyles: textStyleNames,
+              effectStyles: effectStyleNames
+            });
+            let designAssets = void 0;
+            if (reachable) {
+              try {
+                const raw = await sendBridgeRequest("get_component_catalog", {});
+                if (raw && typeof raw === "object") {
+                  designAssets = raw;
+                }
+              } catch {
+              }
+            }
+            return {
+              content: [{
+                type: "text",
+                text: JSON.stringify({
+                  ...catalogPayload,
+                  pluginConnected: reachable,
+                  ...designAssets ? { designAssets } : {},
+                  ...reachable ? {
+                    queryMethods: getQueryMethodNames(),
+                    queryHint: "Use action:'query' with queryMethod (e.g. get_selection, get_node_info, get_design_screenshot) and optional queryParams to read selection, node details, or a frame screenshot for review."
+                  } : {},
+                  ...reachable ? {} : { hint: "Figma plugin not connected. Open Figma, run Atomix plugin, and tap Connect." }
+                }, null, 2)
+              }]
+            };
+          } catch (e) {
+            const msg = e instanceof Error ? e.message : String(e);
+            return { content: [{ type: "text", text: JSON.stringify({ error: msg }, null, 2) }], isError: true };
+          }
+        }
+        if (action === "query") {
+          const queryMethodRaw = args?.queryMethod;
+          const queryParams = args?.queryParams ?? {};
+          if (!queryMethodRaw || typeof queryMethodRaw !== "string") {
+            return {
+              content: [{ type: "text", text: JSON.stringify({ error: "query requires queryMethod (e.g. get_selection, get_node_info, get_design_screenshot)" }, null, 2) }],
+              isError: true
+            };
+          }
+          const queryMethod = queryMethodRaw.replace(/[A-Z]/g, (c) => `_${c.toLowerCase()}`);
+          const allowedQueryMethods = new Set(getQueryMethodNames());
+          if (!allowedQueryMethods.has(queryMethod)) {
+            return {
+              content: [{ type: "text", text: JSON.stringify({ error: `Unknown query method "${queryMethod}". Allowed: ${[...allowedQueryMethods].join(", ")}` }, null, 2) }],
+              isError: true
+            };
+          }
+          try {
+            const reachable = await isBridgeReachable();
+            if (!reachable) {
+              return {
+                content: [{
+                  type: "text",
+                  text: JSON.stringify({
+                    error: "Figma plugin not connected.",
+                    bridgeNotRunning: true,
+                    agentInstruction: "Run the Atomix plugin in Figma and tap Connect, then call designInFigma with action:'query' again."
+                  }, null, 2)
+                }],
+                isError: true
+              };
+            }
+            const result = await sendBridgeRequest(queryMethod, queryParams);
+            const content = [];
+            const summary = { method: queryMethod, success: true };
+            if (result && typeof result === "object" && "imageBase64" in result && typeof result.imageBase64 === "string") {
+              summary.screenshot = "included below (base64 PNG)";
+              summary.format = result.format ?? "PNG";
+              summary.scale = result.scale;
+              content.push({ type: "text", text: JSON.stringify(summary, null, 2) });
+              content.push({
+                type: "image",
+                data: result.imageBase64,
+                mimeType: "image/png"
+              });
+            } else {
+              summary.result = result;
+              content.push({ type: "text", text: JSON.stringify(summary, null, 2) });
+            }
+            return { content };
+          } catch (e) {
+            const msg = e instanceof Error ? e.message : String(e);
+            return { content: [{ type: "text", text: JSON.stringify({ method: queryMethod, success: false, error: msg }, null, 2) }], isError: true };
+          }
+        }
+        if (action === "execute") {
+          const rawSteps = args?.steps;
+          if (!rawSteps || !Array.isArray(rawSteps) || rawSteps.length === 0) {
+            return {
+              content: [{ type: "text", text: JSON.stringify({ error: "steps array is required for action:'execute'" }, null, 2) }],
+              isError: true
+            };
+          }
+          try {
+            const reachable = await isBridgeReachable();
+            if (!reachable) {
+              return {
+                content: [{
+                  type: "text",
+                  text: JSON.stringify({
+                    error: "Figma plugin not connected.",
+                    bridgeNotRunning: true,
+                    agentInstruction: "Run the Atomix plugin in Figma and tap Connect, then call designInFigma again."
+                  }, null, 2)
+                }],
+                isError: true
+              };
+            }
+            const designMethods = /* @__PURE__ */ new Set([
+              ...getDesignMethodNames(),
+              "list_local_components",
+              "get_component_catalog",
+              "get_design_screenshot",
+              "get_variable_collection_modes",
+              "get_frame_variable_mode"
+            ]);
+            const warnings = [];
+            let fileCtx;
+            try {
+              const raw = await sendBridgeRequest("get_figma_variables_and_styles", {});
+              fileCtx = raw;
+            } catch {
+            }
+            const resolvers = fileCtx ? buildResolvers(fileCtx) : null;
+            const isFigmaNodeId = (s) => /^\d+:\d+$/.test(s);
+            let rootFrameId = null;
+            let lastCreatedFrameNodeId = null;
+            const namedNodeIds = /* @__PURE__ */ new Map();
+            const results = [];
+            for (let i = 0; i < rawSteps.length; i++) {
+              const step = rawSteps[i];
+              const method = (step.method ?? "").replace(/[A-Z]/g, (c) => `_${c.toLowerCase()}`);
+              if (!designMethods.has(method)) {
+                warnings.push({ step: i, method, issue: `Unknown method "${method}" \u2014 skipped` });
+                continue;
+              }
+              let params = { ...step.params ?? {} };
+              if (resolvers) {
+                params = resolveStepParams(params, resolvers);
+              }
+              if (rootFrameId) {
+                const parentId = params.parentId;
+                const frameId = params.frameId;
+                if (typeof parentId === "string" && !isFigmaNodeId(parentId)) {
+                  params.parentId = namedNodeIds.get(parentId) ?? rootFrameId;
+                }
+                if (typeof frameId === "string" && !isFigmaNodeId(frameId)) {
+                  params.frameId = namedNodeIds.get(frameId) ?? rootFrameId;
+                }
+                if (method === "finalize_design_frame" && !params.frameId) {
+                  params.frameId = rootFrameId;
+                }
+                const needsParent = method.startsWith("design_create_") || method === "design_create_component";
+                if (needsParent && !params.parentId) {
+                  params.parentId = rootFrameId;
+                }
+              }
+              const nodeId = params.nodeId;
+              if (typeof nodeId === "string" && nodeId && !isFigmaNodeId(nodeId)) {
+                const resolved = namedNodeIds.get(nodeId) ?? lastCreatedFrameNodeId ?? rootFrameId;
+                params.nodeId = resolved ?? nodeId;
+              }
+              const needsNode = [
+                "design_set_auto_layout",
+                "design_set_layout_sizing",
+                "design_set_effects",
+                "design_set_strokes",
+                "design_resize_node",
+                "design_set_resize_constraints",
+                "design_set_layout_constraints",
+                "design_set_node_position",
+                "design_set_text_properties"
+              ].includes(method);
+              if (needsNode && !params.nodeId) {
+                params.nodeId = lastCreatedFrameNodeId ?? rootFrameId;
+              }
+              const childId = params.childId;
+              if (typeof childId === "string" && childId && !isFigmaNodeId(childId)) {
+                params.childId = namedNodeIds.get(childId) ?? childId;
+              }
+              try {
+                const response = await sendBridgeRequest(method, params);
+                const res = response;
+                if (method === "create_design_placeholder" && typeof res?.frameId === "string") {
+                  rootFrameId = res.frameId;
+                }
+                const isCreateMethod = method.startsWith("design_create_") || method === "design_convert_to_component" || method === "design_combine_as_variants" || method === "design_create_frame_from_preset" || method === "design_group_nodes";
+                if (isCreateMethod && typeof res?.nodeId === "string") {
+                  const createdNodeId = res.nodeId;
+                  if (method === "design_create_frame" || method === "design_create_frame_from_preset") {
+                    lastCreatedFrameNodeId = createdNodeId;
+                    if (!rootFrameId && res?.isRoot === true) {
+                      rootFrameId = createdNodeId;
+                    }
+                  }
+                  const stepName = step.params?.name ?? "";
+                  if (stepName) namedNodeIds.set(stepName, createdNodeId);
+                }
+                results.push({ step: i, method, result: response });
+              } catch (e) {
+                const errMsg = e instanceof Error ? e.message : String(e);
+                results.push({ step: i, method, error: errMsg });
+                if (!rootFrameId && (method === "design_create_frame" || method === "create_design_placeholder")) break;
+              }
+            }
+            const errorCount = results.filter((r) => r.error).length;
+            const success = errorCount === 0;
+            return {
+              content: [{
+                type: "text",
+                text: JSON.stringify({
+                  success,
+                  stepsExecuted: results.length,
+                  errors: errorCount,
+                  warnings,
+                  results
+                }, null, 2)
+              }],
+              ...errorCount > 0 ? { isError: true } : {}
+            };
+          } catch (e) {
+            const msg = e instanceof Error ? e.message : String(e);
+            return { content: [{ type: "text", text: JSON.stringify({ error: msg }, null, 2) }], isError: true };
+          }
+        }
+        return {
+          content: [{ type: "text", text: JSON.stringify({ error: "action must be 'catalog', 'query', or 'execute'" }, null, 2) }],
+          isError: true
+        };
+      }
       default:
         return {
           content: [{
             type: "text",
             text: JSON.stringify({
               error: `Unknown tool: ${name}`,
-              availableTools: ["getToken", "listTokens", "listTypesets", "searchTokens", "validateUsage", "getRules", "exportMCPConfig", "getSetupInstructions", "syncAll", "getDependencies", "getMcpVersion", "syncToFigma"]
+              availableTools: ["getToken", "listTokens", "listTypesets", "searchTokens", "validateUsage", "getRules", "exportMCPConfig", "getSetupInstructions", "syncAll", "getDependencies", "getMcpVersion", "syncToFigma", "designInFigma"]
             }, null, 2)
           }]
         };
@@ -3501,6 +3177,43 @@ ${JSON.stringify(out, null, 2)}` : JSON.stringify(out, null, 2);
     };
   }
 });
+function getEffectiveTier() {
+  return cachedMcpTier;
+}
+function getSyncDependencySkills(data, dsVersion, dsExportedAt) {
+  const tier = getEffectiveTier();
+  const skills = [];
+  const genericWithVersion = injectSkillVersion(GENERIC_SKILL_MD, dsVersion, dsExportedAt);
+  skills.push({
+    path: ".cursor/skills/atomix-ds/SKILL.md",
+    content: genericWithVersion,
+    shortName: "SKILL.md"
+  });
+  if (tier === "pro") {
+    const figmaSkillWithFrontmatter = `---
+name: atomix-figma-design
+description: Figma design skill \u2014 create high-quality, token-bound designs in Figma from any reference (screenshots, images, code snippets, URLs). Covers mobile, web, token application, and component/variant creation. Use with syncToFigma and designInFigma MCP tools when the Atomix plugin is connected.
+---
+${FIGMA_DESIGN_SKILL_MD}`;
+    const figmaSkillWithVersion = injectSkillVersion(figmaSkillWithFrontmatter, dsVersion, dsExportedAt);
+    skills.push({
+      path: ".cursor/skills/atomix-ds/figma-design-SKILL.md",
+      content: figmaSkillWithVersion,
+      shortName: "figma-design-SKILL.md"
+    });
+  }
+  return skills;
+}
+function readSkillVersionFromFile(filePath) {
+  if (!fs.existsSync(filePath)) return null;
+  try {
+    const raw = fs.readFileSync(filePath, "utf-8");
+    const match = raw.match(/atomixDsVersion:\s*["']([^"']+)["']/);
+    return match ? match[1] : null;
+  } catch {
+    return null;
+  }
+}
 function injectSkillVersion(content, version, exportedAt) {
   const endOfFrontmatter = content.indexOf("\n---\n", 3);
   if (endOfFrontmatter === -1) return content;
@@ -3593,7 +3306,7 @@ When a semantic token doesn't exist for your use case, use the closest primitive
 
 ### 4. Syncing tokens to a file
 
-\`syncAll({ output?, format?, skipTokens? })\` \u2014 writes tokens to a file (default \`./tokens.css\`), skills (.cursor/skills/atomix-ds/SKILL.md), and manifest. Use \`skipTokens: true\` to only write skills and manifest.
+\`syncAll({ output?, format?, skipTokens? })\` \u2014 writes tokens to a file (default \`./tokens.css\`), skills (.cursor/skills/atomix-ds/SKILL.md and figma-design-SKILL.md), and manifest. Use \`skipTokens: true\` to only write skills and manifest.
 
 ## Workflow
 
@@ -3620,7 +3333,7 @@ If no token matches, call \`searchTokens\` to find the closest option. Never inv
 - **Fetch first:** Always call getRules and/or listTokens before writing any styles, regardless of platform or framework.
 - **Semantic over primitive:** Prefer tokens that describe purpose (\`text-primary\`, \`bg-surface\`) over tokens that describe appearance (\`neutral.900\`, \`white\`).
 - **Icons:** Size via \`getToken("sizing.icon.sm")\`; stroke width via \`getToken("icons.strokeWidth")\` when the DS defines it.
-- **Typography:** Use typography tokens for all text. For global typeset output, call **listTypesets** and emit every entry; include text-transform and text-decoration for 1:1 match.
+- **Typography:** Use **typeset classes** (e.g. from \`typesets.css\` or \`listTypesets()\` output \u2014 \`typeset-heading-h1\`, \`typeset-body-md-regular\`, etc.) for all text; do not re-declare font-family, font-size, font-weight, line-height, or letter-spacing in component CSS, which duplicates the design system. For global typeset output, call **listTypesets** and emit every entry; include text-transform and text-decoration for 1:1 match.
 - **No guessing:** If a value is not in the rules or token list, call searchTokens or listTokens to find the closest match.
 - **Platform agnostic:** Token values work across CSS, Tailwind, React Native, SwiftUI, Compose, Flutter, and any style system. Use the output format appropriate to your platform.
 - **Version check:** If this file has frontmatter \`atomixDsVersion\`, compare to the version from **getDependencies** (\`meta.designSystemVersion\`). If the DS is newer, suggest running **syncAll** to update.
@@ -3912,6 +3625,9 @@ server.setRequestHandler(ListPromptsRequestSchema, async () => {
     { name: "--refactor", description: "Migrate deprecated tokens in codebase. Run after /--sync." },
     { name: "--sync-to-figma", description: "Push this design system to Figma (variables, color + typography styles). Uses local bridge + plugin; no Figma token." }
   ];
+  if (cachedMcpTier === "pro") {
+    prompts.push({ name: "--design-in-figma", description: "Load Figma design skill and use designInFigma tool to design UI in the connected Figma file. Pro only." });
+  }
   return { prompts };
 });
 server.setRequestHandler(GetPromptRequestSchema, async (request) => {
@@ -3928,7 +3644,7 @@ server.setRequestHandler(GetPromptRequestSchema, async (request) => {
       }]
     };
   }
-  const canonicalName = name === "--hello" ? "hello" : name === "--get-started" ? "atomix-setup" : name === "--rules" ? "design-system-rules" : name === "--sync" ? "sync" : name === "--refactor" ? "refactor" : name === "--sync-to-figma" || name === "syncToFigma" ? "sync-to-figma" : name;
+  const canonicalName = name === "--hello" ? "hello" : name === "--get-started" ? "atomix-setup" : name === "--rules" ? "design-system-rules" : name === "--sync" ? "sync" : name === "--refactor" ? "refactor" : name === "--sync-to-figma" || name === "syncToFigma" ? "sync-to-figma" : name === "--design-in-figma" || name === "designInFigma" ? "design-in-figma" : name;
   const shouldForceRefresh = [
     "hello",
     "atomix-setup",
@@ -3937,7 +3653,8 @@ server.setRequestHandler(GetPromptRequestSchema, async (request) => {
     // --rules
     "sync",
     "refactor",
-    "sync-to-figma"
+    "sync-to-figma",
+    "design-in-figma"
   ].includes(canonicalName);
   let data = null;
   let stats = null;
@@ -4297,6 +4014,80 @@ Format the response as a markdown table with columns: Token Name | Value | CSS V
         ]
       });
     }
+    case "design-in-figma": {
+      if (getEffectiveTier() !== "pro") {
+        return withMcpNotice({
+          description: "Design in Figma (Pro required)",
+          messages: [
+            {
+              role: "user",
+              content: {
+                type: "text",
+                text: "designInFigma requires a Pro subscription. Upgrade at https://atomix.studio to use Design in Figma."
+              }
+            }
+          ]
+        });
+      }
+      if (!data) {
+        return withMcpNotice({
+          description: "Design in Figma",
+          messages: [
+            {
+              role: "user",
+              content: {
+                type: "text",
+                text: "Failed to fetch design system. Check your --ds-id and --atomix-token configuration, then try /--design-in-figma again."
+              }
+            }
+          ]
+        });
+      }
+      const figmaSkillPath = path.resolve(process.cwd(), ".cursor/skills/atomix-ds/figma-design-SKILL.md");
+      const skillExists = fs.existsSync(figmaSkillPath);
+      const currentVersion = String(data.meta.version ?? "1.0.0");
+      const fileVersion = skillExists ? readSkillVersionFromFile(figmaSkillPath) : null;
+      const isOutdated = !skillExists || fileVersion === null || fileVersion !== currentVersion;
+      if (isOutdated) {
+        return withMcpNotice({
+          description: "Figma design skill missing or outdated",
+          messages: [
+            {
+              role: "user",
+              content: {
+                type: "text",
+                text: skillExists ? `The Figma design skill at \`.cursor/skills/atomix-ds/figma-design-SKILL.md\` is outdated (design system version ${currentVersion}). Run **/--sync** to update the skill and other design system files, then run **/--design-in-figma** again.` : `The Figma design skill is missing. Run **/--sync** to write \`.cursor/skills/atomix-ds/figma-design-SKILL.md\` (and other design system files), then run **/--design-in-figma** again.`
+              }
+            }
+          ]
+        });
+      }
+      return withMcpNotice({
+        description: "Load Figma design skill and use designInFigma tool",
+        messages: [
+          {
+            role: "user",
+            content: {
+              type: "text",
+              text: `You are using **/--design-in-figma**: load the Figma design skill below and use the **designInFigma** MCP tool to design UI in the connected Figma file.
+
+**Instructions:**
+1. Treat the following as the Figma design skill (advisory and generative UI on the Figma canvas). Follow it when creating or editing designs.
+2. Call **designInFigma** with \`action: "catalog"\` first to discover available bridge methods, file variables/styles, and query/execute capabilities.
+3. Use \`action: "query"\` to read from Figma (e.g. get_selection, get_node_info, get_design_screenshot).
+4. Use \`action: "execute"\` with an array of steps to create or modify the design on the canvas.
+5. If the response includes \`bridgeNotRunning\` or \`pluginConnected: false\`, tell the user to run the Atomix plugin in Figma and tap Connect, then try again.
+
+---
+
+## Figma design skill
+
+${FIGMA_DESIGN_SKILL_MD}`
+            }
+          }
+        ]
+      });
+    }
     case "refactor": {
       const refactorOutput = args?.output || "./tokens.css";
       const refactorFormat = args?.format || "css";
@@ -4443,8 +4234,8 @@ Use \`/color\`, \`/spacing\`, \`/radius\`, \`/typography\`, \`/shadow\`, \`/bord
 
 - Resolve platform/stack: infer from the project (e.g. package.json, build.gradle, Xcode) or ask once: "Which platform? (e.g. web, Android, iOS)" and if relevant "Which stack? (e.g. React, Vue, Next, Swift, Kotlin)." Do not assume a default.
 - Call **getDependencies** with \`platform\` and optional \`stack\`. If it fails, tell the user the design system could not be reached and stop.
-- Scan the repo for: .cursor/skills/atomix-ds/SKILL.md, a tokens file (e.g. tokens.css or src/tokens.css), icon package from getDependencies, font links. **Web:** note any existing CSS (globals.css, main.css, Tailwind, etc.). **Native:** note any theme/style files (SwiftUI, Android themes, Compose).
-- Build two lists: **Suggested** (from getDependencies minus what exists) and **Already present**. Include: icon package, font links, skill (.cursor/skills/atomix-ds/SKILL.md), token files; for web, also include the **showcase page** (atomix-setup-showcase.html) if getDependencies returned a \`showcase\` object.
+- Scan the repo for: .cursor/skills/atomix-ds/SKILL.md, .cursor/skills/atomix-ds/figma-design-SKILL.md, a tokens file (e.g. tokens.css or src/tokens.css), icon package from getDependencies, font links. **Web:** note any existing CSS (globals.css, main.css, Tailwind, etc.). **Native:** note any theme/style files (SwiftUI, Android themes, Compose).
+- Build two lists: **Suggested** (from getDependencies minus what exists) and **Already present**. Include: icon package, font links, skills (SKILL.md and figma-design-SKILL.md), token files; for web, also include the **showcase page** (atomix-setup-showcase.html) if getDependencies returned a \`showcase\` object.
 - Do not write, create, or add anything in Phase 1.
 
 ## Phase 2 \u2013 Report and ask
@@ -4457,8 +4248,8 @@ Use \`/color\`, \`/spacing\`, \`/radius\`, \`/typography\`, \`/shadow\`, \`/bord
 
 - Run only when the user has said yes (all or specific items).
 - For each approved item:
-  - **Skill:** Prefer calling **syncAll** (it writes the skill into the repo). If writing the skill manually, write getDependencies \`skill.content\` to \`skill.path\` (.cursor/skills/atomix-ds/SKILL.md) under the project root.
-  - **Token file and skills in repo:** Call **syncAll** with \`output\` set to the path (e.g. "./src/tokens.css" or "./tokens.css") and **workspaceRoot** set to the absolute path of the current project/workspace root. This ensures .cursor/skills/atomix-ds/SKILL.md and atomix-dependencies.json are written inside the repo so they can be committed. You must call syncAll; do not only suggest the user run it later.
+  - **Skills:** Prefer calling **syncAll** (it writes both skills into the repo). If writing manually, write getDependencies \`skill.content\` to \`skill.path\` and \`skillFigmaDesign.content\` to \`skillFigmaDesign.path\` under the project root.
+  - **Token file and skills in repo:** Call **syncAll** with \`output\` set to the path (e.g. "./src/tokens.css" or "./tokens.css") and **workspaceRoot** set to the absolute path of the current project/workspace root. This ensures .cursor/skills/atomix-ds/SKILL.md, .cursor/skills/atomix-ds/figma-design-SKILL.md, and atomix-dependencies.json are written inside the repo so they can be committed. You must call syncAll; do not only suggest the user run it later.
   - **Icon package:** Install per getDependencies. When rendering icons, apply the design system's icon tokens: use getToken(\`sizing.icon.*\`) or listTokens(\`sizing\`) for size, and getToken(\`icons.strokeWidth\`) for stroke width when the DS defines it; do not use hardcoded sizes or stroke widths.
   - **Fonts and typeset:** Add font links (e.g. \`<link>\` or \`@import\` from Google Fonts). Then build a **complete typeset CSS**: call **listTypesets** to get every typeset from the owner's design system (do not skip any). Emit **one CSS rule per typeset** using the \`cssClass\` and the \`fontFamilyVar\`, \`fontSizeVar\`, \`fontWeightVar\`, \`lineHeightVar\` (and \`letterSpacingVar\`, \`textTransformVar\`, \`textDecorationVar\` when present) returned by listTypesets. Include text-transform and text-decoration when the typeset has them so the result is **1:1** with the design system. The typeset file must define the full type scale\u2014not only a font import. Do not create a CSS file that contains only a font import.
   - **Showcase page (web only):** If platform is web and getDependencies returned a \`showcase\` object, create the file at \`showcase.path\` using \`showcase.template\`. Replace every placeholder per \`showcase.substitutionInstructions\`: TOKENS_CSS_PATH, TYPESETS_LINK, DS_NAME, HEADING_FONT_VAR, FONT_FAMILY_VAR, LARGEST_DISPLAY_TYPESET_CLASS, LARGEST_BODY_TYPESET_CLASS, BODY_TYPESET_CLASS, FONT_LINK_TAG, BRAND_PRIMARY_VAR, BUTTON_PADDING_VAR, BUTTON_HEIGHT_VAR, BUTTON_RADIUS_VAR, CIRCLE_PADDING_VAR, ICON_SIZE_VAR, CHECK_ICON_SVG (inline SVG from the design system icon library). The page uses semantic colors (mode-aware) and a Dark/Light toggle. Use only CSS variable names that exist in the synced token file. Do not change the HTML structure. After creating the file, launch it in the default browser (e.g. \`open atomix-setup-showcase.html\` on macOS, \`xdg-open atomix-setup-showcase.html\` on Linux, or the equivalent on Windows).
@@ -4544,6 +4335,7 @@ ${tokenSummary}
 | **/--rules** | Governance rules for your AI tool (e.g. Cursor, Copilot, Windsurf). |
 | **/--sync** | Sync tokens, rules, skills, and dependencies manifest (icons, fonts). Safe: adds new, updates existing, marks deprecated. |
 | **/--sync-to-figma** | Push design system to Figma (variables, paint/text/effect styles). Uses built-in bridge + Atomix plugin; connect plugin in Figma then run. Available on all tiers. |
+| **/--design-in-figma** | Design in Figma: loads Figma design skill and use designInFigma tool (catalog, query, execute). Pro only. |
 | **/--refactor** | Migrate deprecated tokens in codebase. Run after /--sync. |
 
 **Suggested next step:** Run **/--get-started** to set up global styles, icons, fonts, and token files; the AI will list options and ask before adding anything.