@atomixstudio/mcp 1.0.27 → 1.0.29

package/dist/index.js

@@ -1289,6 +1289,9 @@ function getTokenStats(data) {
 }
 
 // src/index.ts
+import {
+  buildFigmaPayloadsFromDS
+} from "@atomix/figma_tools";
 import * as path2 from "path";
 import * as fs2 from "fs";
 import { execSync } from "child_process";
@@ -1300,8 +1303,8 @@ var FIGMA_BRIDGE_TIMEOUT_MS = 15e3;
 var FIGMA_BRIDGE_TOKEN = process.env.FIGMA_BRIDGE_TOKEN || null;
 var FIGMA_CONNECTION_INSTRUCTIONS = {
   installAndRun: "In Figma: Open Plugins and run the Atomix plugin (Atomix Token Extractor). If it's not installed yet, install it from the Figma Community or your team's plugin library, then run it.",
-  connect: 'In the plugin UI, tap **Connect to Cursor** and wait until the status shows "Connected".',
-  startBridge: "The Figma bridge runs with this MCP server. Ensure Cursor has started this MCP server (e.g. in Cursor settings), then in Figma run the Atomix plugin and click Connect to Cursor."
+  connect: 'In the plugin UI, tap **Connect** and wait until the status shows "Connected".',
+  startBridge: "The Figma bridge runs with this MCP server. Ensure your AI environment has this MCP server running (e.g. in MCP settings), then in Figma run the Atomix plugin and tap Connect."
 };
 var bridgeWss = null;
 var pluginWs = null;
@@ -1445,7 +1448,7 @@ function sendBridgeRequest(method, params, timeoutMs = FIGMA_BRIDGE_TIMEOUT_MS)
   const ws = pluginWs;
   if (!ws || ws.readyState !== WebSocket.OPEN) {
     return Promise.reject(
-      new Error("Figma plugin not connected. Open Figma, run Atomix plugin, and click Connect to Cursor.")
+      new Error("Figma plugin not connected. Open Figma, run Atomix plugin, and tap Connect.")
     );
   }
   const id = `mcp-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`;
@@ -1465,373 +1468,6 @@ function sendBridgeRequest(method, params, timeoutMs = FIGMA_BRIDGE_TIMEOUT_MS)
     }
   });
 }
-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 buildFigmaPayloadsFromDS(data) {
-  const tokens = data.tokens;
-  const colors = tokens?.colors;
-  const typography = tokens?.typography;
-  const modes = [];
-  const variables = [];
-  const paintStyles = [];
-  const hexRe = /^#?[0-9A-Fa-f]{6}([0-9A-Fa-f]{2})?$/;
-  const addedNames = /* @__PURE__ */ new Set();
-  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 orderedKeys = [...Object.keys(light)];
-    for (const k of Object.keys(dark)) {
-      if (!orderedKeys.includes(k)) orderedKeys.push(k);
-    }
-    for (const key of orderedKeys) {
-      const lightHex = light[key];
-      const darkHex = dark[key];
-      if (typeof lightHex === "string" && hexRe.test(lightHex)) {
-        const figmaName = figmaColorNameWithGroup(key);
-        if (addedNames.has(figmaName)) continue;
-        addedNames.add(figmaName);
-        const values = {};
-        if (modes.includes("Light")) values.Light = lightHex;
-        if (modes.includes("Dark")) values.Dark = typeof darkHex === "string" && hexRe.test(darkHex) ? darkHex : lightHex;
-        variables.push({ name: figmaName, values });
-        paintStyles.push({ name: figmaName, color: lightHex });
-      }
-    }
-  }
-  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 (addedNames.has(figmaName)) continue;
-      addedNames.add(figmaName);
-      paintStyles.push({ name: figmaName, color: hex });
-      if (modes.length === 0) modes.push("Light");
-      const values = {};
-      for (const m of modes) values[m] = hex;
-      variables.push({ name: figmaName, values });
-    }
-  }
-  if (variables.length === 0 && modes.length === 0) modes.push("Light");
-  const dsName = data.meta?.name;
-  const collectionPrefix = dsName ? `${dsName} ` : "";
-  const colorCollectionName = `${collectionPrefix}Colors`;
-  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 variables2 = [];
-    for (const [key, val] of Object.entries(spacing.scale)) {
-      const n = tokenValueToNumber(val);
-      if (n >= 0) variables2.push({ name: `Spacing / ${key}`, value: n });
-    }
-    variables2.sort((a, b) => a.value - b.value);
-    if (variables2.length > 0) numberVariableCollections.push({ collectionName: `${collectionPrefix}Spacing`, categoryKey: "Spacing", variables: variables2, scopes: ["GAP"] });
-  }
-  const radius = tokens?.radius;
-  if (radius?.scale && typeof radius.scale === "object") {
-    const variables2 = [];
-    for (const [key, val] of Object.entries(radius.scale)) {
-      const n = tokenValueToNumber(val);
-      if (n >= 0) variables2.push({ name: `Radius / ${key}`, value: n });
-    }
-    variables2.sort((a, b) => a.value - b.value);
-    if (variables2.length > 0) numberVariableCollections.push({ collectionName: `${collectionPrefix}Radius`, categoryKey: "Radius", variables: variables2, scopes: ["CORNER_RADIUS"] });
-  }
-  const borders = tokens?.borders;
-  if (borders?.width && typeof borders.width === "object") {
-    const variables2 = [];
-    for (const [key, val] of Object.entries(borders.width)) {
-      const n = tokenValueToNumber(val);
-      if (n >= 0) variables2.push({ name: `Borders / ${key}`, value: n });
-    }
-    variables2.sort((a, b) => a.value - b.value);
-    if (variables2.length > 0) numberVariableCollections.push({ collectionName: `${collectionPrefix}Borders`, categoryKey: "Borders", variables: variables2, 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 variables2 = [];
-    for (const [key, val] of Object.entries(layout.breakpoint)) {
-      const n = tokenValueToNumber(val);
-      if (n >= 0) variables2.push({ name: `Breakpoint / ${key}`, value: n });
-    }
-    variables2.sort((a, b) => a.value - b.value);
-    if (variables2.length > 0) numberVariableCollections.push({ collectionName: `${collectionPrefix}Layout`, categoryKey: "Layout", variables: variables2, 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 {
-    colorVariables: { collectionName: colorCollectionName, modes, variables },
-    paintStyles,
-    textStyles,
-    numberVariableCollections,
-    effectStyles
-  };
-}
-function getExpectedFigmaNamesFromDS(data) {
-  const payloads = buildFigmaPayloadsFromDS(data);
-  const numberVariableNames = payloads.numberVariableCollections.flatMap(
-    (c) => c.variables.map((v) => v.name)
-  );
-  return {
-    colorVariableNames: payloads.colorVariables.variables.map((v) => v.name),
-    paintStyleNames: payloads.paintStyles.map((s) => s.name),
-    textStyleNames: payloads.textStyles.map((s) => s.name),
-    effectStyleNames: payloads.effectStyles.map((s) => s.name),
-    numberVariableNames
-  };
-}
 function parseArgs() {
   const args = process.argv.slice(2);
   let dsId2 = null;
@@ -1865,23 +1501,8 @@ var authFailedNoTools = false;
 function hasValidAuthConfig() {
   return !!(dsId && accessToken);
 }
-var AUTH_REQUIRED_MESSAGE = "Atomix MCP requires authentication. Add both --ds-id and --atomix-token to your MCP config (Settings \u2192 MCP), then restart Cursor. Get your token from Atomix Studio: Export modal or Settings \u2192 Regenerate Atomix access token.";
+var AUTH_REQUIRED_MESSAGE = "Atomix MCP requires authentication. Add both --ds-id and --atomix-token to your MCP config (Settings \u2192 MCP), then restart your AI tool. Get your token from Atomix Studio: Export modal or Settings \u2192 Regenerate Atomix access token.";
 var lastChangeSummary = null;
-var FIGMA_SYNC_TOOL_NAME = "syncToFigma";
-var FIGMA_DESIGN_TOOL_NAMES = /* @__PURE__ */ new Set([
-  "getFigmaVariablesAndStyles",
-  "createDesignPlaceholder",
-  "resolveFigmaIdsForTokens",
-  "designCreateFrame",
-  "designCreateText",
-  "designCreateRectangle",
-  "designSetAutoLayout",
-  "designSetLayoutConstraints",
-  "designAppendChild",
-  "getDesignScreenshot",
-  "finalizeDesignFrame"
-]);
-var FIGMA_TOOL_NAMES = /* @__PURE__ */ new Set([FIGMA_SYNC_TOOL_NAME, ...FIGMA_DESIGN_TOOL_NAMES]);
 var lastSyncAffectedTokens = null;
 function getLastChangeSummary() {
   return lastChangeSummary;
@@ -1998,7 +1619,7 @@ function buildTypesetsList(typography, cssPrefix = "atmx") {
 var server = new Server(
   {
     name: "atomix-mcp-user",
-    version: "1.0.26"
+    version: "1.0.28"
   },
   {
     capabilities: {
@@ -2018,18 +1639,16 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
     try {
       await fetchDesignSystemForMCP(true);
       if (cachedMcpTier === "pro") {
-        console.error("[Atomix MCP] Resolved tier = pro. Figma sync/design tools are available.");
+        console.error("[Atomix MCP] Resolved tier = pro.");
       } else if (cachedMcpTier === "free") {
-        console.error(
-          "[Atomix MCP] Resolved tier = free. Figma design tools and --design-in-figma are hidden. syncToFigma and /--sync-to-figma are available. Pro design tools appear when the DS owner has Pro and the pro_figma_export flag is enabled."
-        );
+        console.error("[Atomix MCP] Resolved tier = free. syncToFigma and /--sync-to-figma are available.");
       }
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       authFailedNoTools = true;
       console.error(
         "[Atomix MCP] Design system not loaded: ds-id or token invalid or API error. No tools will be shown.",
-        msg.includes("401") ? " Token invalid or expired. Regenerate in Atomix Studio (Settings \u2192 Regenerate Atomix access token), update your MCP config, then restart Cursor." : msg.includes("403") ? " You do not have access to this design system (owner or invited guest)." : msg.includes("404") ? " Design system not found (invalid ds-id)." : msg
+        msg.includes("401") ? " Token invalid or expired. Regenerate in Atomix Studio (Settings \u2192 Regenerate Atomix access token), update your MCP config, then restart your AI tool." : msg.includes("403") ? " You do not have access to this design system (owner or invited guest)." : msg.includes("404") ? " Design system not found (invalid ds-id)." : msg
       );
     }
   }
@@ -2164,7 +1783,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
     },
     {
       name: "syncAll",
-      description: "Sync tokens, AI rules, skills (SKILL.md, FIGMA-SKILL.md), and atomix-dependencies.json. Use dryRun: true first to report what would change without writing; then dryRun: false to apply. Response includes a VALIDATION section\u2014agent must check it to confirm success. Optional: output (default ./tokens.css), format (default css), skipTokens (if true, only skills and manifest), dryRun (if true, report only; no files written).",
+      description: "Sync tokens, AI rules, skills (.cursor/skills/atomix-ds/SKILL.md), and atomix-dependencies.json. Use dryRun: true first to report what would change without writing; then dryRun: false to apply. Response includes a VALIDATION section\u2014agent must check it to confirm success. Optional: output (default ./tokens.css), format (default css), skipTokens (if true, only skills and manifest), dryRun (if true, report only; no files written).",
       inputSchema: {
         type: "object",
         properties: {
@@ -2216,160 +1835,9 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
         properties: {},
         required: []
       }
-    },
-    {
-      name: "getFigmaVariablesAndStyles",
-      description: "Get all local variable collections (with variable names and ids) and local paint, text, and effect styles from the open Figma file. Call after syncToFigma when designing in Figma; use with resolveFigmaIdsForTokens to get ids for granular design commands. Requires Atomix Figma plugin connected.",
-      inputSchema: {
-        type: "object",
-        properties: {},
-        required: []
-      }
-    },
-    {
-      name: "createDesignPlaceholder",
-      description: "Create a placeholder frame in Figma with name 'Atomix: Preparing the design..', temporary background, and 'Design in progress...' text. Call this first when designing in Figma so the user sees the placeholder. Returns frameId; use that as parentId for designCreateFrame and other design commands. Optional width and height (default 400); use dimensions inferred from the request (e.g. mobile 390x844, card 400x300).",
-      inputSchema: {
-        type: "object",
-        properties: {
-          width: { type: "number", description: "Frame width in px (optional, default 400)" },
-          height: { type: "number", description: "Frame height in px (optional, default 400)" }
-        }
-      }
-    },
-    {
-      name: "resolveFigmaIdsForTokens",
-      description: "Resolve design system token names to Figma variable and style ids in the open file. Call after syncToFigma and getFigmaVariablesAndStyles. Returns a map keyed by Figma name (e.g. 'Spacing / lg', 'Background / surface') to { variableId?, paintStyleId?, textStyleId?, effectStyleId? }. Use these ids in designCreateFrame, designCreateText, designSetAutoLayout, etc. No arguments.",
-      inputSchema: {
-        type: "object",
-        properties: {},
-        required: []
-      }
-    },
-    {
-      name: "designCreateFrame",
-      description: "Create a frame in Figma under the given parent. Use fillVariableId or fillPaintStyleId from resolveFigmaIdsForTokens for background. Returns nodeId.",
-      inputSchema: {
-        type: "object",
-        properties: {
-          parentId: { type: "string", description: "Parent frame/node id (e.g. from createDesignPlaceholder)" },
-          name: { type: "string", description: "Layer name" },
-          width: { type: "number", description: "Width in px (optional)" },
-          height: { type: "number", description: "Height in px (optional)" },
-          fillVariableId: { type: "string", description: "Color variable id from resolveFigmaIdsForTokens" },
-          fillPaintStyleId: { type: "string", description: "Paint style id from resolveFigmaIdsForTokens" }
-        },
-        required: ["parentId", "name"]
-      }
-    },
-    {
-      name: "designCreateText",
-      description: "Create a text node in Figma. Bind to a text style via textStyleId from resolveFigmaIdsForTokens.",
-      inputSchema: {
-        type: "object",
-        properties: {
-          parentId: { type: "string", description: "Parent frame id" },
-          characters: { type: "string", description: "Text content" },
-          textStyleId: { type: "string", description: "Text style id from resolveFigmaIdsForTokens (required)" },
-          name: { type: "string", description: "Layer name (optional)" }
-        },
-        required: ["parentId", "characters", "textStyleId"]
-      }
-    },
-    {
-      name: "designCreateRectangle",
-      description: "Create a rectangle in Figma. Use fillVariableId or fillPaintStyleId from resolveFigmaIdsForTokens.",
-      inputSchema: {
-        type: "object",
-        properties: {
-          parentId: { type: "string", description: "Parent frame id" },
-          width: { type: "number", description: "Width in px" },
-          height: { type: "number", description: "Height in px" },
-          fillVariableId: { type: "string", description: "Color variable id" },
-          fillPaintStyleId: { type: "string", description: "Paint style id" },
-          name: { type: "string", description: "Layer name (optional)" }
-        },
-        required: ["parentId", "width", "height"]
-      }
-    },
-    {
-      name: "designSetAutoLayout",
-      description: "Set auto-layout on a frame. Use variable ids from resolveFigmaIdsForTokens for padding and itemSpacing (e.g. Spacing / lg).",
-      inputSchema: {
-        type: "object",
-        properties: {
-          nodeId: { type: "string", description: "Frame node id" },
-          direction: { type: "string", description: "HORIZONTAL or VERTICAL" },
-          paddingVariableId: { type: "string", description: "Number variable id for all padding" },
-          paddingTopVariableId: { type: "string" },
-          paddingRightVariableId: { type: "string" },
-          paddingBottomVariableId: { type: "string" },
-          paddingLeftVariableId: { type: "string" },
-          itemSpacingVariableId: { type: "string", description: "Number variable id for gap between children" },
-          primaryAxisAlignItems: { type: "string", description: "MIN, CENTER, MAX, SPACE_BETWEEN" },
-          counterAxisAlignItems: { type: "string", description: "MIN, CENTER, MAX, BASELINE" },
-          layoutSizingHorizontal: { type: "string", description: "HUG or FILL" },
-          layoutSizingVertical: { type: "string", description: "HUG or FILL" }
-        },
-        required: ["nodeId", "direction"]
-      }
-    },
-    {
-      name: "designSetLayoutConstraints",
-      description: "Set min/max width and height on a frame (e.g. breakpoint variables). Use number variable ids from resolveFigmaIdsForTokens.",
-      inputSchema: {
-        type: "object",
-        properties: {
-          nodeId: { type: "string", description: "Frame node id" },
-          minWidthVariableId: { type: "string" },
-          maxWidthVariableId: { type: "string" },
-          minHeightVariableId: { type: "string" },
-          maxHeightVariableId: { type: "string" }
-        },
-        required: ["nodeId"]
-      }
-    },
-    {
-      name: "designAppendChild",
-      description: "Move a node under a new parent (reparent). Use to reorder or nest nodes.",
-      inputSchema: {
-        type: "object",
-        properties: {
-          parentId: { type: "string", description: "New parent frame id" },
-          childId: { type: "string", description: "Node id to move" }
-        },
-        required: ["parentId", "childId"]
-      }
-    },
-    {
-      name: "getDesignScreenshot",
-      description: "Export a frame as PNG and return it as base64 so you can verify layout, content fill, and hug. Call after each design pass to check your work against the user's intent. Use the returned image to decide if another pass is needed.",
-      inputSchema: {
-        type: "object",
-        properties: {
-          frameId: { type: "string", description: "Frame node id (e.g. from createDesignPlaceholder)" },
-          scale: { type: "number", description: "Export scale 1\u20134 (optional, default 1)" }
-        },
-        required: ["frameId"]
-      }
-    },
-    {
-      name: "finalizeDesignFrame",
-      description: "Rename the design frame and remove the placeholder background. Call after the final design pass. Set name to a short description of the design plus ' \u2705'. Use fillVariableId or fillPaintStyleId from resolveFigmaIdsForTokens (e.g. Background / surface) so the gray placeholder is replaced.",
-      inputSchema: {
-        type: "object",
-        properties: {
-          frameId: { type: "string", description: "Frame node id to finalize" },
-          name: { type: "string", description: "New frame name (e.g. 'Login card \u2705')" },
-          fillVariableId: { type: "string", description: "Variable id for frame fill (removes placeholder bg)" },
-          fillPaintStyleId: { type: "string", description: "Paint style id for frame fill" }
-        },
-        required: ["frameId", "name"]
-      }
     }
   ];
-  const tools = cachedMcpTier === "pro" ? toolsList : toolsList.filter((t) => !FIGMA_DESIGN_TOOL_NAMES.has(t.name));
-  return { tools };
+  return { tools: toolsList };
 });
 server.setRequestHandler(CallToolRequestSchema, async (request) => {
   const { name, arguments: args } = request.params;
@@ -2377,7 +1845,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
     return {
       content: [{
         type: "text",
-        text: "MCP access requires valid --ds-id and --atomix-token. Add both to your MCP config and restart Cursor. No tools are available until then."
+        text: "MCP access requires valid --ds-id and --atomix-token. Add both to your MCP config and restart your AI tool. No tools are available until then."
       }],
       isError: true
     };
@@ -2385,17 +1853,6 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
   try {
     const shouldForceRefresh = name === "syncAll";
     const data = await fetchDesignSystemForMCP(shouldForceRefresh);
-    if (FIGMA_DESIGN_TOOL_NAMES.has(name) && cachedMcpTier !== "pro") {
-      return {
-        content: [
-          {
-            type: "text",
-            text: "This design system does not have Pro Figma access. Figma design tools (design-in-Figma, createDesignPlaceholder, resolveFigmaIdsForTokens, etc.) are available when the design system owner has a Pro subscription. Sync to Figma (syncToFigma) is available on all tiers."
-          }
-        ],
-        isError: true
-      };
-    }
     async function performTokenSyncAndRules(designSystemData, tokenOutput, tokenFormat, dryRun) {
       const output = tokenOutput;
       const format = tokenFormat;
@@ -2814,11 +2271,11 @@ Version: ${designSystemData.meta.version}`,
       case "getSetupInstructions": {
         const tool = args?.tool;
         const instructions = {
-          cursor: `# Cursor MCP Setup
+          cursor: `# MCP Setup
 
-1. Create \`.cursor/mcp.json\` in your project root
+1. Create your MCP config file in the project (e.g. \`.cursor/mcp.json\` for Cursor)
 2. Add the MCP configuration (use exportMCPConfig to get it)
-3. Restart Cursor IDE
+3. Restart your IDE
 4. Verify by asking: "What design tokens are available?"
 
 ## File Structure
@@ -2972,12 +2429,9 @@ Version: ${designSystemData.meta.version}`,
         const dsExportedAt = data.meta.exportedAt;
         const skillsDir = path2.resolve(process.cwd(), ".cursor/skills/atomix-ds");
         const skillPath1 = path2.join(skillsDir, "SKILL.md");
-        const skillPath2 = path2.join(skillsDir, "FIGMA-SKILL.md");
         const manifestPath = path2.resolve(process.cwd(), "atomix-dependencies.json");
         if (dryRun) {
-          parts.push(
-            cachedMcpTier === "pro" ? "Would write skills: .cursor/skills/atomix-ds/SKILL.md, .cursor/skills/atomix-ds/FIGMA-SKILL.md" : "Would write skills: .cursor/skills/atomix-ds/SKILL.md"
-          );
+          parts.push("Would write skills: .cursor/skills/atomix-ds/SKILL.md");
           parts.push("Would write manifest: atomix-dependencies.json");
           const reportText = [parts.join("\n"), tokenResponseText].filter(Boolean).join("\n\n---\n\n");
           return {
@@ -2990,14 +2444,7 @@ ${reportText}` }]
         const genericWithVersion = injectSkillVersion(GENERIC_SKILL_MD, dsVersion, dsExportedAt);
         fs2.writeFileSync(skillPath1, genericWithVersion);
         allValidation.push({ path: skillPath1, status: fs2.existsSync(skillPath1) ? "OK" : "FAIL", detail: "Written." });
-        if (cachedMcpTier === "pro") {
-          const figmaWithVersion = injectSkillVersion(FIGMA_DESIGN_SKILL_MD, dsVersion, dsExportedAt);
-          fs2.writeFileSync(skillPath2, figmaWithVersion);
-          allValidation.push({ path: skillPath2, status: fs2.existsSync(skillPath2) ? "OK" : "FAIL", detail: "Written." });
-        }
-        parts.push(
-          cachedMcpTier === "pro" ? "Skills: .cursor/skills/atomix-ds/SKILL.md, .cursor/skills/atomix-ds/FIGMA-SKILL.md (synced at DS v" + dsVersion + ")" : "Skills: .cursor/skills/atomix-ds/SKILL.md (synced at DS v" + dsVersion + ")"
-        );
+        parts.push("Skills: .cursor/skills/atomix-ds/SKILL.md (synced at DS v" + dsVersion + ")");
         const tokens = data.tokens;
         const typography = tokens?.typography;
         const fontFamily = typography?.fontFamily;
@@ -3028,7 +2475,6 @@ ${reportText}` }]
           fonts: { families: fontNames },
           skills: {
             skill: ".cursor/skills/atomix-ds/SKILL.md",
-            ...cachedMcpTier === "pro" ? { skillFigmaDesign: ".cursor/skills/atomix-ds/FIGMA-SKILL.md" } : {},
             syncedAtVersion: data.meta.version ?? "1.0.0"
           }
         };
@@ -3085,12 +2531,6 @@ ${tokenResponseText}${validationBlock}` : `${summary}${validationBlock}`);
             path: ".cursor/skills/atomix-ds/SKILL.md",
             content: GENERIC_SKILL_MD
           },
-          ...cachedMcpTier === "pro" ? {
-            skillFigmaDesign: {
-              path: ".cursor/skills/atomix-ds/FIGMA-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."
@@ -3118,7 +2558,7 @@ ${tokenResponseText}${validationBlock}` : `${summary}${validationBlock}`);
       case "syncToFigma": {
         const payloads = buildFigmaPayloadsFromDS(data);
         const out = {};
-        const agentStartBridge = `The Figma bridge runs with this MCP server. Ensure Cursor has this MCP configured and running, then in Figma run the Atomix plugin and click Connect to Cursor. Then call **syncToFigma** again.`;
+        const agentStartBridge = `The Figma bridge runs with this MCP server. Ensure your AI environment has this MCP server configured and running, then in Figma run the Atomix plugin and tap Connect. Then call **syncToFigma** again.`;
         const userSteps = [
           FIGMA_CONNECTION_INSTRUCTIONS.startBridge,
           FIGMA_CONNECTION_INSTRUCTIONS.installAndRun,
@@ -3148,11 +2588,15 @@ ${tokenResponseText}${validationBlock}` : `${summary}${validationBlock}`);
             out.colorVariables = await sendBridgeRequest("create_color_variables", {
               collectionName: payloads.colorVariables.collectionName,
               modes: payloads.colorVariables.modes,
-              variables: payloads.colorVariables.variables
+              variables: payloads.colorVariables.variables,
+              removeVariablesNotInPayload: true
             });
           }
           if (payloads.paintStyles.length > 0) {
-            out.paintStyles = await sendBridgeRequest("create_paint_styles", { styles: payloads.paintStyles });
+            out.paintStyles = await sendBridgeRequest("create_paint_styles", {
+              styles: payloads.paintStyles,
+              removePaintStylesNotInPayload: true
+            });
           }
           if (payloads.numberVariableCollections.length > 0) {
             const numberResults = [];
@@ -3161,7 +2605,8 @@ ${tokenResponseText}${validationBlock}` : `${summary}${validationBlock}`);
                 const result = await sendBridgeRequest("create_number_variables", {
                   collectionName: coll.collectionName,
                   variables: coll.variables.map((v) => ({ name: v.name, value: v.value })),
-                  scopes: coll.scopes
+                  scopes: coll.scopes,
+                  removeVariablesNotInPayload: true
                 });
                 numberResults.push({ categoryKey: coll.categoryKey, result });
               }
@@ -3175,10 +2620,16 @@ ${tokenResponseText}${validationBlock}` : `${summary}${validationBlock}`);
             }
           }
           if (payloads.textStyles.length > 0) {
-            out.textStyles = await sendBridgeRequest("create_text_styles", { styles: payloads.textStyles });
+            out.textStyles = await sendBridgeRequest("create_text_styles", {
+              styles: payloads.textStyles,
+              removeTextStylesNotInPayload: true
+            });
           }
           if (payloads.effectStyles.length > 0) {
-            out.effectStyles = await sendBridgeRequest("create_effect_styles", { styles: payloads.effectStyles });
+            out.effectStyles = await sendBridgeRequest("create_effect_styles", {
+              styles: payloads.effectStyles,
+              removeShadowStylesNotInPayload: true
+            });
           }
           out.figmaPayload = {
             collectionName: payloads.colorVariables.collectionName,
@@ -3218,269 +2669,79 @@ ${tokenResponseText}${validationBlock}` : `${summary}${validationBlock}`);
         if (out.numberVariablesHint) {
           out.summary = [out.summary, out.numberVariablesHint].filter(Boolean).join(" ");
         }
-        out.motionEasingNote = "Motion easing tokens are not synced as Figma styles; Figma has no reusable easing style. Easing is only used in prototype transitions (e.g. smart animate). Duration/easing remain available as number variables (duration) or in export JSON.";
-        return {
-          content: [{
-            type: "text",
-            text: JSON.stringify(out, null, 2)
-          }],
-          ...out.error ? { isError: true } : {}
-        };
-      }
-      case "getFigmaVariablesAndStyles": {
-        try {
-          const reachable = await isBridgeReachable();
-          if (!reachable) {
-            return {
-              content: [{
-                type: "text",
-                text: JSON.stringify({
-                  error: "Figma bridge not reachable.",
-                  bridgeNotRunning: true,
-                  agentInstruction: "The Figma bridge runs with this MCP server. Ensure Cursor has this MCP running, then in Figma run the Atomix plugin and click Connect to Cursor. Then call getFigmaVariablesAndStyles again."
-                }, null, 2)
-              }],
-              isError: true
-            };
-          }
-          const result = await sendBridgeRequest("get_figma_variables_and_styles");
-          return {
-            content: [{ type: "text", text: JSON.stringify(result, null, 2) }]
-          };
-        } catch (e) {
-          const message = e instanceof Error ? e.message : String(e);
-          return {
-            content: [{
-              type: "text",
-              text: JSON.stringify({ error: message, hint: "Ensure the bridge is running and the Atomix plugin is connected." }, null, 2)
-            }],
-            isError: true
-          };
+        const summaryParts = [];
+        const colorResult = out.colorVariables;
+        if (colorResult && (colorResult.variableNames?.length || (colorResult.removed ?? 0) > 0)) {
+          const parts = [];
+          if (colorResult.variableNames?.length) parts.push(`${colorResult.variableNames.length} synced`);
+          if ((colorResult.removed ?? 0) > 0) parts.push(`${colorResult.removed} removed`);
+          summaryParts.push(`Colors: ${parts.join(", ")}.`);
         }
-      }
-      case "createDesignPlaceholder": {
-        try {
-          const reachable = await isBridgeReachable();
-          if (!reachable) {
-            return {
-              content: [{
-                type: "text",
-                text: JSON.stringify({
-                  error: "Figma bridge not reachable.",
-                  hint: "The bridge runs with this MCP server. Ensure Cursor has this MCP running, then run the Atomix plugin and click Connect to Cursor."
-                }, null, 2)
-              }],
-              isError: true
-            };
+        const paintResult = out.paintStyles;
+        if (paintResult) {
+          const c = paintResult.created ?? 0;
+          const u = paintResult.updated ?? 0;
+          const r = paintResult.removed ?? 0;
+          if (c + u + r > 0) {
+            const parts = [];
+            if (c > 0) parts.push(`${c} created`);
+            if (u > 0) parts.push(`${u} updated`);
+            if (r > 0) parts.push(`${r} removed`);
+            summaryParts.push(`Paint styles: ${parts.join(", ")}.`);
           }
-          const w = args?.width;
-          const h = args?.height;
-          const placeholderParams = {};
-          if (typeof w === "number" && w > 0) placeholderParams.width = Math.round(w);
-          if (typeof h === "number" && h > 0) placeholderParams.height = Math.round(h);
-          const result = await sendBridgeRequest("create_design_placeholder", placeholderParams);
-          return {
-            content: [{ type: "text", text: JSON.stringify(result, null, 2) }]
-          };
-        } catch (e) {
-          const message = e instanceof Error ? e.message : String(e);
-          return {
-            content: [{
-              type: "text",
-              text: JSON.stringify({ error: message }, null, 2)
-            }],
-            isError: true
-          };
         }
-      }
-      case "resolveFigmaIdsForTokens": {
-        try {
-          const reachable = await isBridgeReachable();
-          if (!reachable) {
-            return {
-              content: [{
-                type: "text",
-                text: JSON.stringify({
-                  error: "Figma bridge not reachable.",
-                  hint: "Run syncToFigma first, then ensure the plugin is connected. Then call resolveFigmaIdsForTokens again."
-                }, null, 2)
-              }],
-              isError: true
-            };
-          }
-          const raw = await sendBridgeRequest("get_figma_variables_and_styles");
-          const response = raw;
-          const variableByName = /* @__PURE__ */ new Map();
-          if (response.variableCollections) {
-            const numberCategorySuffixes = [" Spacing", " Radius", " Borders", " Height", " Icon", " Breakpoint"];
-            for (const coll of response.variableCollections) {
-              if (coll.name.endsWith(" Colors")) {
-                for (const v of coll.variables || []) {
-                  variableByName.set(v.name, v.id);
-                }
-                continue;
-              }
-              const numberSuffix = numberCategorySuffixes.find((s) => coll.name.endsWith(s));
-              if (numberSuffix) {
-                const category = numberSuffix.slice(1);
-                for (const v of coll.variables || []) {
-                  variableByName.set(`${category} / ${v.name}`, v.id);
-                }
-              }
+        const effectResult = out.effectStyles;
+        if (effectResult) {
+          const c = effectResult.created ?? 0;
+          const u = effectResult.updated ?? 0;
+          const r = effectResult.removed ?? 0;
+          if (c + u + r > 0) {
+            const parts = [];
+            if (c > 0) parts.push(`${c} created`);
+            if (u > 0) parts.push(`${u} updated`);
+            if (r > 0) parts.push(`${r} removed`);
+            summaryParts.push(`Effect styles (shadows): ${parts.join(", ")}.`);
+            if (effectResult.removedNames?.length) {
+              summaryParts.push(`Removed: ${effectResult.removedNames.join(", ")}.`);
             }
           }
-          const paintByName = /* @__PURE__ */ new Map();
-          for (const s of response.paintStyles || []) {
-            paintByName.set(s.name, s.id);
-          }
-          const textByName = /* @__PURE__ */ new Map();
-          for (const s of response.textStyles || []) {
-            textByName.set(s.name, s.id);
-          }
-          const effectByName = /* @__PURE__ */ new Map();
-          for (const s of response.effectStyles || []) {
-            effectByName.set(s.name, s.id);
-          }
-          const expected = getExpectedFigmaNamesFromDS(data);
-          const resolved = {};
-          const allNames = /* @__PURE__ */ new Set([
-            ...expected.colorVariableNames,
-            ...expected.paintStyleNames,
-            ...expected.textStyleNames,
-            ...expected.effectStyleNames,
-            ...expected.numberVariableNames
-          ]);
-          for (const name2 of allNames) {
-            const entry = {};
-            const vId = variableByName.get(name2);
-            if (vId) entry.variableId = vId;
-            const pId = paintByName.get(name2);
-            if (pId) entry.paintStyleId = pId;
-            const tId = textByName.get(name2);
-            if (tId) entry.textStyleId = tId;
-            const eId = effectByName.get(name2);
-            if (eId) entry.effectStyleId = eId;
-            if (vId || pId || tId || eId) resolved[name2] = entry;
-          }
-          return {
-            content: [{ type: "text", text: JSON.stringify({ resolved }, null, 2) }]
-          };
-        } catch (e) {
-          const message = e instanceof Error ? e.message : String(e);
-          return {
-            content: [{
-              type: "text",
-              text: JSON.stringify({ error: message }, null, 2)
-            }],
-            isError: true
-          };
         }
-      }
-      case "getDesignScreenshot": {
-        try {
-          const reachable = await isBridgeReachable();
-          if (!reachable) {
-            return {
-              content: [{
-                type: "text",
-                text: JSON.stringify({
-                  error: "Figma bridge not reachable.",
-                  hint: "Run the Atomix plugin in Figma and click Connect to Cursor, then retry."
-                }, null, 2)
-              }],
-              isError: true
-            };
-          }
-          const frameId = args?.frameId;
-          const scale = args?.scale;
-          const params = { frameId };
-          if (typeof scale === "number" && scale >= 1 && scale <= 4) params.scale = scale;
-          const result = await sendBridgeRequest("get_design_screenshot", params);
-          if (result.error) {
-            return {
-              content: [{ type: "text", text: JSON.stringify(result, null, 2) }],
-              isError: true
-            };
-          }
-          const content = [
-            { type: "text", text: `Screenshot captured (format: ${result.format ?? "PNG"}, scale: ${result.scale ?? 1}). Use the image below to verify layout, fill, and content hug.` }
-          ];
-          if (result.imageBase64) {
-            content.push({ type: "image", data: result.imageBase64, mimeType: "image/png" });
+        const numResult = out.numberVariables;
+        if (Array.isArray(numResult)) {
+          const total = numResult.reduce((acc, r) => acc + (r.result?.variableNames?.length ?? 0), 0);
+          const totalRemoved = numResult.reduce((acc, r) => acc + (r.result?.removed ?? 0), 0);
+          if (total > 0 || totalRemoved > 0) {
+            const parts = [];
+            if (total > 0) parts.push(`${total} synced`);
+            if (totalRemoved > 0) parts.push(`${totalRemoved} removed`);
+            summaryParts.push(`Number variables: ${parts.join(", ")}.`);
           }
-          return { content };
-        } catch (e) {
-          const message = e instanceof Error ? e.message : String(e);
-          return {
-            content: [{ type: "text", text: JSON.stringify({ error: message }, null, 2) }],
-            isError: true
-          };
         }
-      }
-      case "finalizeDesignFrame": {
-        try {
-          const reachable = await isBridgeReachable();
-          if (!reachable) {
-            return {
-              content: [{
-                type: "text",
-                text: JSON.stringify({
-                  error: "Figma bridge not reachable.",
-                  hint: "Run the Atomix plugin in Figma and click Connect to Cursor, then retry."
-                }, null, 2)
-              }],
-              isError: true
-            };
-          }
-          const params = args && typeof args === "object" ? args : {};
-          const result = await sendBridgeRequest("finalize_design_frame", params);
-          return {
-            content: [{ type: "text", text: JSON.stringify(result, null, 2) }]
-          };
-        } catch (e) {
-          const message = e instanceof Error ? e.message : String(e);
-          return {
-            content: [{ type: "text", text: JSON.stringify({ error: message }, null, 2) }],
-            isError: true
-          };
+        const textStylesWithRemoved = out.textStyles;
+        if (textStylesWithRemoved && (textStylesWithRemoved.created ?? 0) + (textStylesWithRemoved.updated ?? 0) + (textStylesWithRemoved.removed ?? 0) > 0) {
+          const c = textStylesWithRemoved.created ?? 0;
+          const u = textStylesWithRemoved.updated ?? 0;
+          const r = textStylesWithRemoved.removed ?? 0;
+          const parts = [];
+          if (c > 0) parts.push(`${c} created`);
+          if (u > 0) parts.push(`${u} updated`);
+          if (r > 0) parts.push(`${r} removed`);
+          summaryParts.push(`Text styles: ${parts.join(", ")}.`);
         }
-      }
-      case "designCreateFrame":
-      case "designCreateText":
-      case "designCreateRectangle":
-      case "designSetAutoLayout":
-      case "designSetLayoutConstraints":
-      case "designAppendChild": {
-        try {
-          const reachable = await isBridgeReachable();
-          if (!reachable) {
-            return {
-              content: [{
-                type: "text",
-                text: JSON.stringify({
-                  error: "Figma bridge not reachable.",
-                  hint: "Run the Atomix plugin in Figma and click Connect to Cursor, then retry."
-                }, null, 2)
-              }],
-              isError: true
-            };
-          }
-          const method = normalizeBridgeMethod(name);
-          const params = args && typeof args === "object" ? args : {};
-          const result = await sendBridgeRequest(method, params);
-          return {
-            content: [{ type: "text", text: JSON.stringify(result, null, 2) }]
-          };
-        } catch (e) {
-          const message = e instanceof Error ? e.message : String(e);
-          return {
-            content: [{
-              type: "text",
-              text: JSON.stringify({ error: message }, null, 2)
-            }],
-            isError: true
-          };
+        if (summaryParts.length > 0 && !out.error) {
+          out.summary = [out.summary, summaryParts.join(" ")].filter(Boolean).join(" ");
         }
+        out.motionEasingNote = "Motion easing tokens are not synced as Figma styles; Figma has no reusable easing style. Easing is only used in prototype transitions (e.g. smart animate). Duration/easing remain available as number variables (duration) or in export JSON.";
+        const responseText = out.summary ? `${out.summary}
+
+${JSON.stringify(out, null, 2)}` : JSON.stringify(out, null, 2);
+        return {
+          content: [{
+            type: "text",
+            text: responseText
+          }],
+          ...out.error ? { isError: true } : {}
+        };
       }
       default:
         return {
@@ -3488,7 +2749,7 @@ ${tokenResponseText}${validationBlock}` : `${summary}${validationBlock}`);
             type: "text",
             text: JSON.stringify({
               error: `Unknown tool: ${name}`,
-              availableTools: ["getToken", "listTokens", "listTypesets", "searchTokens", "validateUsage", "getAIToolRules", "exportMCPConfig", "getSetupInstructions", "syncAll", "getDependencies", "syncToFigma", "getFigmaVariablesAndStyles", "createDesignPlaceholder", "resolveFigmaIdsForTokens", "designCreateFrame", "designCreateText", "designCreateRectangle", "designSetAutoLayout", "designSetLayoutConstraints", "designAppendChild", "getDesignScreenshot", "finalizeDesignFrame"]
+              availableTools: ["getToken", "listTokens", "listTypesets", "searchTokens", "validateUsage", "getAIToolRules", "exportMCPConfig", "getSetupInstructions", "syncAll", "getDependencies", "syncToFigma"]
             }, null, 2)
           }]
         };
@@ -3588,49 +2849,6 @@ Use the returned rules and token paths/values when generating or editing code. P
 - **No guessing:** If a value is not in the rules or token list, use searchTokens or listTokens to find the closest match rather than inventing a value.
 - **Version check:** If this skill file has frontmatter \`atomixDsVersion\`, compare it to the design system version from **getDependencies** (\`meta.designSystemVersion\`). If the design system is newer, suggest the user run **syncAll** to update skills and tokens.
 `;
-var FIGMA_DESIGN_SKILL_MD = `---
-name: atomix-design-in-figma
-description: Design in Figma using granular MCP commands. Three passes: wireframe, then tokens/rules, then audit. Use getDesignScreenshot to verify; finalizeDesignFrame to rename and remove placeholder.
----
-
-# Design in Figma (principal product designer)
-
-Use this skill when the user asks to **design in Figma** (e.g. /--design-in-figma). Design by calling a **sequence of MCP tools**\u2014no script generation. All values come from the owner's Figma variables and styles (via **syncToFigma** and **resolveFigmaIdsForTokens**).
-
-## Mandatory: no hardcoding
-
-- **Only variable and style ids.** Use **resolveFigmaIdsForTokens** to get \`variableId\`, \`paintStyleId\`, \`textStyleId\`, \`effectStyleId\` keyed by Figma name (e.g. "Spacing / lg", "Background / surface"). Pass these ids into designCreateFrame, designCreateText, designSetAutoLayout, designSetLayoutConstraints. Never pass raw px, hex, or font sizes.
-
-## Mandatory: user AI rules (colors, typography, buttons)
-
-- **Colors:** Only variable/paint style ids from resolveFigmaIdsForTokens and getAIToolRules; no hex or raw values.
-- **Typography:** Only text style ids from resolved + rules; no raw font size/weight/family.
-- **Buttons:** Use token-based sizing and hierarchy from getAIToolRules; primary/secondary/ghost from resolved styles.
-
-## Mandatory: set up variables first
-
-- **Call syncToFigma first.** Then getAIToolRules, listTokens, and resolveFigmaIdsForTokens. Use the \`resolved\` map for every fill, text style, and spacing.
-
-## Mandatory: auto-layout and breakpoints
-
-- **Every frame with children:** Call **designSetAutoLayout** with \`nodeId\`, \`direction\`, \`paddingVariableId\`, \`itemSpacingVariableId\` from resolved. Use \`layoutSizingHorizontal\` / \`layoutSizingVertical\` (HUG or FILL) so content hugs or fills as intended.
-- **Breakpoints (non-mobile):** Use **designSetLayoutConstraints** with \`maxWidthVariableId\` from resolved for container frames.
-
-## Three-pass flow (strict order)
-
-**Setup (once):** syncToFigma \u2192 createDesignPlaceholder (save \`frameId\`) \u2192 getAIToolRules + listTokens \u2192 resolveFigmaIdsForTokens. Keep \`resolved\` and \`frameId\` for all passes.
-
-**Pass 1 \u2014 Layout and contents (wireframe)**  
-Build structure only: frames, text nodes, rectangles, auto-layout, layout constraints. Focus on hierarchy, spacing, and content placement; temporary or neutral fills are acceptable. Then call **getDesignScreenshot** with \`frameId\`. Check the image: layout correct? Content and frames hugging/filling as intended? If not, fix with design commands and take another screenshot until satisfied.
-
-**Pass 2 \u2014 Apply design tokens and AI rules**  
-Apply the owner's design system: set all fills to variable/paint ids from \`resolved\` (e.g. Background / surface, Brand / primary). Set all text to text style ids from \`resolved\`. Apply button and component tokens from getAIToolRules (colors, typography, buttons). Then call **getDesignScreenshot**. Check: do colors, typography, and buttons match the design system and rules? If not, fix and re-check.
-
-**Pass 3 \u2014 Confirm no hardcoded values and follow AI rules**  
-Audit: ensure no raw px, hex, or font values were introduced. Verify every fill, text style, and spacing uses an id from \`resolved\`. Check getAIToolRules again for colors, typography, buttons. Then call **getDesignScreenshot** one last time. If all good: call **finalizeDesignFrame** with \`frameId\`, \`name\` = short description of the design + " \u2705", and \`fillVariableId\` (or \`fillPaintStyleId\`) for the surface/background so the placeholder gray is removed. Then **summarise** what was built and any fixes made across passes.
-
-Do not generate or run any JavaScript code. Use only the MCP tools listed above.
-`;
 var SHOWCASE_HTML_TEMPLATE = `<!DOCTYPE html>
 <html lang="en">
 <head>
@@ -3731,7 +2949,7 @@ Get your DS ID and token from the Export modal or Settings \u2192 Regenerate Ato
     };
   }
   if (!hasValidAuthConfig() || authFailedNoTools) {
-    throw new Error("MCP access requires valid --ds-id and --atomix-token. Add both to your MCP config and restart Cursor. See atomix://setup for instructions.");
+    throw new Error("MCP access requires valid --ds-id and --atomix-token. Add both to your MCP config and restart your AI tool. See atomix://setup for instructions.");
   }
   const data = await fetchDesignSystemForMCP();
   const stats = getTokenStats(data);
@@ -3769,7 +2987,6 @@ Get your DS ID and token from the Export modal or Settings \u2192 Regenerate Ato
   }
   throw new Error(`Unknown resource: ${uri}`);
 });
-var FIGMA_DESIGN_PROMPT_NAMES = /* @__PURE__ */ new Set(["--design-in-figma"]);
 server.setRequestHandler(ListPromptsRequestSchema, async () => {
   if (!hasValidAuthConfig()) {
     authFailedNoTools = true;
@@ -3785,16 +3002,14 @@ server.setRequestHandler(ListPromptsRequestSchema, async () => {
   if (authFailedNoTools) {
     throw new Error(AUTH_REQUIRED_MESSAGE);
   }
-  const allPrompts = [
+  const prompts = [
     { name: "--hello", description: "Get started with this design system - overview, tokens, and tools. Run this first!" },
     { name: "--get-started", description: "Get started with design system in project. Three phases: scan, report and ask, then create only after you approve." },
     { name: "--rules", description: "Get the design system governance rules for your AI coding tool (default: cursor)." },
     { name: "--sync", description: "Sync tokens, AI rules, skills files, and dependencies manifest (icons, fonts). Use /--refactor to migrate deprecated tokens." },
     { 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." },
-    { name: "--design-in-figma", description: "Design UI in Figma: 3 passes (wireframe \u2192 tokens/rules \u2192 audit), getDesignScreenshot after each pass, then finalizeDesignFrame (rename + \u2705, remove placeholder) and summarise." }
+    { name: "--sync-to-figma", description: "Push this design system to Figma (variables, color + typography styles). Uses local bridge + plugin; no Figma token." }
   ];
-  const prompts = cachedMcpTier === "pro" ? allPrompts : allPrompts.filter((p) => !FIGMA_DESIGN_PROMPT_NAMES.has(p.name));
   return { prompts };
 });
 server.setRequestHandler(GetPromptRequestSchema, async (request) => {
@@ -3806,12 +3021,12 @@ server.setRequestHandler(GetPromptRequestSchema, async (request) => {
         role: "user",
         content: {
           type: "text",
-          text: "MCP access requires valid --ds-id and --atomix-token. Add both to your MCP config and restart Cursor. No tools or prompts are available until then."
+          text: "MCP access requires valid --ds-id and --atomix-token. Add both to your MCP config and restart your AI tool. No tools or prompts are available until then."
         }
       }]
     };
   }
-  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" ? "design-in-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;
   const shouldForceRefresh = canonicalName === "sync";
   let data = null;
   let stats = null;
@@ -3832,7 +3047,7 @@ server.setRequestHandler(GetPromptRequestSchema, async (request) => {
 - \`--ds-id\`: Your design system ID (get it from https://atomixstudio.eu/ds/[your-ds-id])
 - \`--atomix-token\`: Your access token (get it from the Export modal or Settings \u2192 Regenerate Atomix access token)
 
-Both are required. Configure the MCP server in your Cursor settings, then restart Cursor.`
+Both are required. Configure the MCP server in your AI tool's MCP settings, then restart your AI tool.`
             }
           }
         ]
@@ -3896,20 +3111,6 @@ Both are required. Configure the MCP server in your Cursor settings, then restar
     }
     throw error;
   }
-  if (FIGMA_DESIGN_PROMPT_NAMES.has(name) && cachedMcpTier !== "pro") {
-    return {
-      description: "Pro Figma required",
-      messages: [
-        {
-          role: "user",
-          content: {
-            type: "text",
-            text: "This design system does not have Pro Figma access. The design-in-Figma prompt is available when the design system owner has a Pro subscription. Sync to Figma (/--sync-to-figma) is available on all tiers."
-          }
-        }
-      ]
-    };
-  }
   const buildCategoryPrompt = (category, instructions) => {
     const lines = [];
     lines.push(`## Design System Information`);
@@ -4150,36 +3351,7 @@ Format the response as a markdown table with columns: Token Name | Value | CSS V
             role: "user",
             content: {
               type: "text",
-              text: `Call the MCP tool **syncToFigma** now (no arguments). It pushes the design system into the open Figma file via the built-in bridge and Atomix plugin. Do not use the Figma REST API or external scripts. If the response includes \`bridgeNotRunning\` and \`agentInstruction\`, ensure Cursor has this MCP server running, then in Figma run the Atomix plugin and click Connect to Cursor, then call syncToFigma again. Only if that fails, tell the user: (1) Ensure Cursor has this MCP configured and running. (2) In Figma, open and run the Atomix plugin, then tap **Connect to Cursor**. (3) Run Sync to Figma again.`
-            }
-          }
-        ]
-      };
-    }
-    case "design-in-figma": {
-      return {
-        description: "Design in Figma using granular MCP commands: 3 passes (wireframe \u2192 tokens \u2192 audit), screenshot checks, then finalize and summarise",
-        messages: [
-          {
-            role: "user",
-            content: {
-              type: "text",
-              text: `You must **design in Figma** by calling a **sequence of MCP tools**\u2014do not generate or run any JavaScript code. Follow the design-in-Figma skill if present; otherwise follow this **three-pass flow**.
-
-Prerequisites: Figma bridge runs inside this MCP server. In Figma, run the Atomix plugin and click "Connect to Cursor"; leave the plugin open.
-
-**Setup (once):** syncToFigma \u2192 createDesignPlaceholder (save \`frameId\`) \u2192 getAIToolRules + listTokens \u2192 resolveFigmaIdsForTokens. Use the returned \`resolved\` map and \`frameId\` for all passes.
-
-**Pass 1 \u2014 Layout and contents (wireframe)**  
-Build the structure: designCreateFrame, designCreateText, designCreateRectangle, designSetAutoLayout (use paddingVariableId, itemSpacingVariableId, and layoutSizingHorizontal/layoutSizingVertical HUG or FILL from resolved), designSetLayoutConstraints, designAppendChild. Focus on hierarchy, spacing, and content placement. Then call **getDesignScreenshot** with \`frameId\`. Check the returned image: is layout correct? Do elements hug or fill as intended? If not, fix and take another screenshot until satisfied.
-
-**Pass 2 \u2014 Apply design tokens and AI rules**  
-Apply the owner's design system: set all fills and text styles using only ids from \`resolved\` (no raw px/hex). Strictly follow getAIToolRules for **colors, typography, and buttons**. Then call **getDesignScreenshot**. Check: do colors, typography, and buttons match the design system? If not, fix and re-check.
-
-**Pass 3 \u2014 Confirm no hardcoded values**  
-Audit: ensure no raw px, hex, or font values remain; every fill and text style must use an id from \`resolved\`. Call **getDesignScreenshot** once more. If everything is correct: call **finalizeDesignFrame** with \`frameId\`, \`name\` = a short description of the design + " \u2705", and \`fillVariableId\` (or \`fillPaintStyleId\`) from resolved for the surface/background so the placeholder gray is removed. Then **summarise** what was built and any fixes made across the three passes.
-
-If the bridge is not reachable: tell the user to run the Atomix plugin in Figma and click Connect to Cursor, then retry.`
+              text: `Call the MCP tool **syncToFigma** now (no arguments). It pushes the design system into the open Figma file via the built-in bridge and Atomix plugin. Do not use the Figma REST API or external scripts. If the response includes \`bridgeNotRunning\` and \`agentInstruction\`, ensure your AI environment has this MCP server running, then in Figma run the Atomix plugin and tap Connect, then call syncToFigma again. Only if that fails, tell the user: (1) Ensure this MCP server is configured and running in your AI tool. (2) In Figma, open and run the Atomix plugin, then tap **Connect**. (3) Run Sync to Figma again. After a successful sync, report the **summary** from the response (what was created, updated, or removed)\u2014do not say "we added the whole design system" when only some items changed.`
             }
           }
         ]
@@ -4309,8 +3481,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. If getDependencies returned \`skillFigmaDesign\`, also scan for .cursor/skills/atomix-ds/FIGMA-SKILL.md. **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). Include **Figma design skill** (.cursor/skills/atomix-ds/FIGMA-SKILL.md) in Suggested/Already present only if getDependencies returned a \`skillFigmaDesign\` object; otherwise omit it. Include 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, 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.
 - Do not write, create, or add anything in Phase 1.
 
 ## Phase 2 \u2013 Report and ask
@@ -4324,7 +3496,6 @@ Use \`/color\`, \`/spacing\`, \`/radius\`, \`/typography\`, \`/shadow\`, \`/bord
 - Run only when the user has said yes (all or specific items).
 - For each approved item:
   - **Skill:** Write the skill content from getDependencies \`skill.content\` to \`skill.path\` (.cursor/skills/atomix-ds/SKILL.md).
-  - **Figma design skill:** Only if getDependencies returned \`skillFigmaDesign\`, write \`skillFigmaDesign.content\` to \`skillFigmaDesign.path\` (.cursor/skills/atomix-ds/FIGMA-SKILL.md). Use this when designing in Figma so the agent follows principal-product-designer rules and prefers existing Figma variables. If \`skillFigmaDesign\` was not in the response, do not add this file.
   - **Token file:** Call **syncAll** with \`output\` set to the path (e.g. "./src/tokens.css" or "./tokens.css"). syncAll also writes skills and atomix-dependencies.json. 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.
@@ -4408,8 +3579,9 @@ ${tokenSummary}
 |---------|----------------|
 | **/--hello** | Get started - overview, tokens, and tools. Run this first! |
 | **/--get-started** | Get started with design system in project. Three phases; creates files only after you approve. |
-| **/--rules** | Governance rules for your AI tool (Cursor, Copilot, Windsurf, etc.). |
+| **/--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. |
 | **/--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.
@@ -4440,7 +3612,7 @@ async function startServer() {
   console.error(`Atomix MCP Server started for design system: ${dsId}`);
   console.error(`Atomix MCP API base: ${apiBase}`);
   console.error(
-    "If you switched MCP config (e.g. free vs pro DS), restart Cursor so this process uses the new --ds-id and --atomix-token."
+    "If you switched MCP config (e.g. free vs pro DS), restart your AI tool so this process uses the new --ds-id and --atomix-token."
   );
 }
 function onShutdown() {