@atomixstudio/mcp 1.0.30 → 1.0.32

package/dist/index.js

@@ -2,7 +2,7 @@
 import {
   isAllowedMethod,
   normalizeBridgeMethod
-} from "./chunk-BXWOCXYT.js";
+} from "./chunk-CE6J5MJX.js";
 
 // src/index.ts
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
@@ -1289,6 +1289,159 @@ 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("/");
@@ -1415,17 +1568,114 @@ 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();
+  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");
+  }
+  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);
@@ -1436,14 +1686,34 @@ function buildFigmaPayloadsFromDS(data) {
       const lightHex = typeof lightVal === "string" ? colorTo8DigitHex(lightVal) ?? (hexRe.test(lightVal) ? lightVal : null) : null;
       if (lightHex && hexRe.test(lightHex)) {
         const figmaName = figmaColorNameWithGroup(key);
-        if (addedNames.has(figmaName)) continue;
-        addedNames.add(figmaName);
+        if (semanticNames.has(figmaName)) continue;
+        semanticNames.add(figmaName);
         const darkHex = typeof darkVal === "string" ? colorTo8DigitHex(darkVal) ?? (hexRe.test(darkVal) ? darkVal : null) : null;
-        const values = {};
-        if (modes.includes("Light")) values.Light = lightHex;
-        if (modes.includes("Dark")) values.Dark = darkHex && hexRe.test(darkHex) ? darkHex : lightHex;
-        variables.push({ name: figmaName, values });
-        paintStyles.push({ name: figmaName, color: lightHex });
+        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 } : {}
+        });
       }
     }
   }
@@ -1451,50 +1721,43 @@ function buildFigmaPayloadsFromDS(data) {
     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");
+      if (semanticNames.has(figmaName)) continue;
+      semanticNames.add(figmaName);
       const values = {};
       for (const m of modes) values[m] = hex;
-      variables.push({ name: figmaName, values });
+      semanticVariables.push({ name: figmaName, values });
     }
   }
-  const alphaScales = colors?.alphaScales;
-  if (alphaScales?.whiteAlpha && typeof alphaScales.whiteAlpha === "object") {
-    if (modes.length === 0) modes.push("Light");
-    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 (addedNames.has(figmaName)) continue;
-      addedNames.add(figmaName);
-      const values = {};
-      for (const m of modes) values[m] = hex;
-      variables.push({ name: figmaName, values });
-      paintStyles.push({ name: figmaName, color: hex });
-    }
+  const colorVariableCollections = [];
+  if (primitiveVariables.length > 0) {
+    colorVariableCollections.push({
+      collectionName: primitivesCollectionName,
+      modes: primitiveModes,
+      variables: primitiveVariables,
+      applyScopes: false
+    });
   }
-  if (alphaScales?.blackAlpha && typeof alphaScales.blackAlpha === "object") {
-    if (modes.length === 0) modes.push("Light");
-    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 (addedNames.has(figmaName)) continue;
-      addedNames.add(figmaName);
-      const values = {};
-      for (const m of modes) values[m] = hex;
-      variables.push({ name: figmaName, values });
-      paintStyles.push({ name: figmaName, color: hex });
-    }
+  if (radixVariables.length > 0) {
+    colorVariableCollections.push({
+      collectionName: radixCollectionName,
+      modes,
+      variables: radixVariables,
+      applyScopes: false
+    });
   }
-  if (variables.length === 0 && modes.length === 0) modes.push("Light");
-  const dsName = data.meta?.name;
-  const collectionPrefix = dsName ? `${dsName} ` : "";
-  const colorCollectionName = `${collectionPrefix}Colors`;
+  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);
@@ -1720,7 +1983,7 @@ function buildFigmaPayloadsFromDS(data) {
     return nameA.localeCompare(nameB);
   });
   return {
-    colorVariables: { collectionName: colorCollectionName, modes, variables },
+    colorVariableCollections,
     paintStyles,
     textStyles,
     numberVariableCollections,
@@ -1930,7 +2193,7 @@ function parseArgs() {
 }
 var cliArgs = parseArgs();
 var { dsId, apiKey, accessToken } = cliArgs;
-var apiBase = cliArgs.apiBase || "https://atomixstudio.eu";
+var apiBase = cliArgs.apiBase || "https://atomix.studio";
 var cachedData = null;
 var cachedETag = null;
 var cachedMcpTier = null;
@@ -1994,6 +2257,10 @@ function formatValidationBlock(entries) {
 async function fetchDesignSystemForMCP(forceRefresh = false) {
   if (!dsId) throw new Error("Missing --ds-id. Usage: npx @atomixstudio/mcp --ds-id <id> --atomix-token <token>");
   if (!accessToken) throw new Error("Missing --atomix-token. Get your token from the Export modal or Settings.");
+  if (forceRefresh) {
+    cachedData = null;
+    cachedETag = null;
+  }
   const result = await fetchDesignSystem({
     dsId,
     accessToken,
@@ -2056,7 +2323,7 @@ function buildTypesetsList(typography, cssPrefix = "atmx") {
 var server = new Server(
   {
     name: "atomix-mcp-user",
-    version: "1.0.29"
+    version: "1.0.30"
   },
   {
     capabilities: {
@@ -2355,8 +2622,9 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         const totalChanges = lightChanges + darkChanges + deprecatedCount;
         if (totalChanges === 0 && !dryRun) {
           const lastUpdated = designSystemData.meta.exportedAt ? new Date(designSystemData.meta.exportedAt).toLocaleString() : "N/A";
+          lastSyncAffectedTokens = { modified: [], removed: [], added: [], format, timestamp: (/* @__PURE__ */ new Date()).toISOString() };
           return {
-            responseText: `\u2713 Already up to date!
+            responseText: `\u2713 Already up to date (checked DB v${designSystemData.meta.version}, exported ${lastUpdated}).
 
 File: ${output}
 Tokens: ${tokenCount}
@@ -2367,8 +2635,9 @@ Last updated: ${lastUpdated}`,
           };
         }
         if (totalChanges === 0 && dryRun) {
+          lastSyncAffectedTokens = { modified: [], removed: [], added: [], format, timestamp: (/* @__PURE__ */ new Date()).toISOString() };
           return {
-            responseText: `[DRY RUN] Already up to date. No changes would be written.
+            responseText: `[DRY RUN] Already up to date (checked DB v${designSystemData.meta.version}). No changes would be written.
 
 File: ${output}
 Tokens: ${tokenCount}
@@ -3009,9 +3278,7 @@ ${tokenResponseText}${validationBlock}` : `${summary}${validationBlock}`);
             out.agentInstruction = agentStartBridge;
             out.userInstruction = `If the bridge still does not connect: ${userSteps}`;
             out.figmaPayload = {
-              collectionName: payloads.colorVariables.collectionName,
-              modes: payloads.colorVariables.modes,
-              variables: payloads.colorVariables.variables,
+              colorVariableCollections: payloads.colorVariableCollections,
               paintStyles: payloads.paintStyles,
               textStyles: payloads.textStyles,
               numberVariableCollections: payloads.numberVariableCollections,
@@ -3021,13 +3288,21 @@ ${tokenResponseText}${validationBlock}` : `${summary}${validationBlock}`);
               content: [{ type: "text", text: JSON.stringify(out, null, 2) }]
             };
           }
-          if (payloads.colorVariables.variables.length > 0) {
-            out.colorVariables = await sendBridgeRequest("create_color_variables", {
-              collectionName: payloads.colorVariables.collectionName,
-              modes: payloads.colorVariables.modes,
-              variables: payloads.colorVariables.variables,
-              removeVariablesNotInPayload: true
-            });
+          const colorResults = [];
+          for (const coll of payloads.colorVariableCollections) {
+            if (coll.variables.length > 0) {
+              const result = await sendBridgeRequest("create_color_variables", {
+                collectionName: coll.collectionName,
+                modes: coll.modes,
+                variables: coll.variables,
+                removeVariablesNotInPayload: true,
+                applyScopes: coll.applyScopes
+              });
+              colorResults.push({ collectionName: coll.collectionName, result });
+            }
+          }
+          if (colorResults.length > 0) {
+            out.colorVariables = colorResults.length === 1 ? colorResults[0].result : colorResults;
           }
           if (payloads.paintStyles.length > 0) {
             out.paintStyles = await sendBridgeRequest("create_paint_styles", {
@@ -3069,9 +3344,7 @@ ${tokenResponseText}${validationBlock}` : `${summary}${validationBlock}`);
             });
           }
           out.figmaPayload = {
-            collectionName: payloads.colorVariables.collectionName,
-            modes: payloads.colorVariables.modes,
-            variables: payloads.colorVariables.variables,
+            colorVariableCollections: payloads.colorVariableCollections,
             paintStyles: payloads.paintStyles,
             textStyles: payloads.textStyles,
             numberVariableCollections: payloads.numberVariableCollections,
@@ -3080,9 +3353,7 @@ ${tokenResponseText}${validationBlock}` : `${summary}${validationBlock}`);
         } catch (e) {
           out.error = e instanceof Error ? e.message : String(e);
           out.figmaPayload = {
-            collectionName: payloads.colorVariables.collectionName,
-            modes: payloads.colorVariables.modes,
-            variables: payloads.colorVariables.variables,
+            colorVariableCollections: payloads.colorVariableCollections,
             paintStyles: payloads.paintStyles,
             textStyles: payloads.textStyles,
             numberVariableCollections: payloads.numberVariableCollections,
@@ -3108,11 +3379,21 @@ ${tokenResponseText}${validationBlock}` : `${summary}${validationBlock}`);
         }
         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(", ")}.`);
+        if (colorResult) {
+          const results = Array.isArray(colorResult) ? colorResult : [{ result: colorResult }];
+          let totalSynced = 0;
+          let totalRemoved = 0;
+          for (const r of results) {
+            const res = r.result;
+            if (res?.variableNames?.length) totalSynced += res.variableNames.length;
+            if ((res?.removed ?? 0) > 0) totalRemoved += res.removed ?? 0;
+          }
+          if (totalSynced > 0 || totalRemoved > 0) {
+            const parts = [];
+            if (totalSynced > 0) parts.push(`${totalSynced} synced`);
+            if (totalRemoved > 0) parts.push(`${totalRemoved} removed`);
+            summaryParts.push(`Colors: ${parts.join(", ")}.`);
+          }
         }
         const paintResult = out.paintStyles;
         if (paintResult) {
@@ -3340,7 +3621,7 @@ var SHOWCASE_HTML_TEMPLATE = `<!DOCTYPE html>
         <li>Run <code>/--rules</code> to load governance rules; run <code>/--sync</code> and <code>/--refactor</code> after you change tokens in Atomix Studio</li>
       </ul>
     </div>
-    <p class="tips">Keep the source of truth at <a href="https://atomixstudio.eu" target="_blank" rel="noopener">atomixstudio.eu</a> \u2014 avoid editing token values in this repo.</p>
+    <p class="tips">Keep the source of truth at <a href="https://atomix.studio" target="_blank" rel="noopener">atomix.studio</a> \u2014 avoid editing token values in this repo.</p>
   </div>
 </body>
 </html>
@@ -3464,7 +3745,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 shouldForceRefresh = canonicalName === "sync";
+  const shouldForceRefresh = canonicalName === "sync" || canonicalName === "refactor";
   let data = null;
   let stats = null;
   try {
@@ -3481,7 +3762,7 @@ server.setRequestHandler(GetPromptRequestSchema, async (request) => {
             content: {
               type: "text",
               text: `The MCP server isn't configured. To use design system prompts, you need to configure the server with:
-- \`--ds-id\`: Your design system ID (get it from https://atomixstudio.eu/ds/[your-ds-id])
+- \`--ds-id\`: Your design system ID (get it from https://atomix.studio/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 AI tool's MCP settings, then restart your AI tool.`
@@ -3795,42 +4076,59 @@ Format the response as a markdown table with columns: Token Name | Value | CSS V
       };
     }
     case "refactor": {
-      if (!lastSyncAffectedTokens) {
+      const refactorOutput = args?.output || "./tokens.css";
+      const refactorFormat = args?.format || "css";
+      const refactorOutputPath = path2.resolve(process.cwd(), refactorOutput);
+      const refactorFileExists = fs2.existsSync(refactorOutputPath);
+      if (!data) {
         return {
           description: "Refactor codebase for deprecated tokens",
-          messages: [
-            {
-              role: "user",
-              content: {
-                type: "text",
-                text: `No recent sync data available. Please run \`/sync\` first to update your token file, then run \`/refactor\` to scan your codebase for deprecated token usage.`
-              }
-            }
-          ]
+          messages: [{
+            role: "user",
+            content: { type: "text", text: `Failed to fetch design system from DB. Check your --ds-id and --atomix-token configuration.` }
+          }]
         };
       }
-      if (lastSyncAffectedTokens.removed.length === 0) {
+      if (!refactorFileExists) {
         return {
           description: "Refactor codebase for deprecated tokens",
-          messages: [
-            {
-              role: "user",
-              content: {
-                type: "text",
-                text: `\u2713 No deprecated tokens found in last sync.
-
-Your codebase is up to date! The last sync on ${new Date(lastSyncAffectedTokens.timestamp).toLocaleString()} did not remove any tokens.`
-              }
-            }
-          ]
+          messages: [{
+            role: "user",
+            content: { type: "text", text: `No token file found at \`${refactorOutput}\`. Please run \`/--sync\` first to create your token file, then run \`/--refactor\` to scan your codebase for deprecated token usage.` }
+          }]
         };
       }
-      const format = lastSyncAffectedTokens.format;
+      const deprecatedTokens = /* @__PURE__ */ new Map();
+      if (["css", "scss", "less"].includes(refactorFormat)) {
+        const oldContent = fs2.readFileSync(refactorOutputPath, "utf-8");
+        const oldVarPattern = /(?:^|\n)\s*(?:\/\*[^*]*\*+(?:[^/*][^*]*\*+)*\/\s*)?(--[a-zA-Z0-9-]+):\s*([^;]+);/gm;
+        let match;
+        while ((match = oldVarPattern.exec(oldContent)) !== null) {
+          const varName = match[1];
+          const varValue = match[2].trim();
+          if (!(varName in data.cssVariables)) deprecatedTokens.set(varName, varValue);
+        }
+      }
+      const dsVersion = data.meta.version ?? "?";
+      const dsExportedAt = data.meta.exportedAt ? new Date(data.meta.exportedAt).toLocaleString() : "N/A";
+      if (deprecatedTokens.size === 0) {
+        return {
+          description: "Refactor codebase for deprecated tokens",
+          messages: [{
+            role: "user",
+            content: { type: "text", text: `\u2713 No deprecated tokens found.
+
+Your token file \`${refactorOutput}\` is aligned with the design system (v${dsVersion}, exported ${dsExportedAt}). No tokens need migration.` }
+          }]
+        };
+      }
+      const format = refactorFormat;
       const isNativeFormat = ["swift", "kotlin", "dart"].includes(format);
+      const removed = Array.from(deprecatedTokens.entries()).map(([token, lastValue]) => ({ token, lastValue }));
       let searchPatterns = "";
       let fileExtensions = "";
       if (isNativeFormat) {
-        const nativeTokens = lastSyncAffectedTokens.removed.map((r) => {
+        const nativeTokens = removed.map((r) => {
           const withoutPrefix = r.token.replace(/^--atmx-/, "");
           const camelCase = withoutPrefix.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
           const pascalCase = camelCase.charAt(0).toUpperCase() + camelCase.slice(1);
@@ -3848,15 +4146,20 @@ Your codebase is up to date! The last sync on ${new Date(lastSyncAffectedTokens.
         }
       } else {
         fileExtensions = ".tsx, .ts, .jsx, .js, .css, .scss, .less, .vue, .svelte files";
-        searchPatterns = lastSyncAffectedTokens.removed.map(
+        searchPatterns = removed.map(
           (r) => `  \u2022 \`var(${r.token})\` or \`"${r.token}"\` (was: ${r.lastValue})`
         ).join("\n");
       }
       const instructions = `Scan the codebase for deprecated design tokens and help update them.
 
-## Deprecated Tokens (${lastSyncAffectedTokens.removed.length})
+## Design System (fresh from DB)
+- **Version:** ${dsVersion}
+- **Last exported:** ${dsExportedAt}
+- **Token file:** ${refactorOutput}
+
+## Deprecated Tokens (${removed.length})
 
-The following tokens have been removed from the design system:
+The following tokens exist in your local token file but have been removed from the design system:
 
 ${searchPatterns}
 
@@ -4025,7 +4328,7 @@ ${tokenSummary}
 
 ---
 
-*Atomix Studio \u2014 https://atomixstudio.eu | DS: https://atomixstudio.eu/ds/${dsId}*
+*Atomix Studio \u2014 https://atomix.studio | DS: https://atomix.studio/ds/${dsId}*
 `;
 }
 async function startServer() {