feat: enhance token entry structure and improve resolved value handling

Author: Justineo

mcp-server/src/tools.ts

@@ -68,7 +68,7 @@ export type GetTokenDefsParametersInput = z.input<typeof GetTokenDefsParametersS
 export type TokenEntry = {
   kind: 'color' | 'number' | 'string' | 'boolean'
   value: string | Record<string, string> // single mode -> string; multi-mode -> map (mode name -> literal or alias)
-  resolvedValue: string // value for the active mode (or the single mode)
+  resolvedValue?: string // value for the active mode when multi-mode
   activeMode?: string // only present when multi-mode map is returned
 }
 

mcp/tools/code/index.ts

@@ -60,6 +60,16 @@ function filterTokensByNames(input: GetTokenDefsResult, names: Set<string>): Get
   return { tokens }
 }
 
+function primaryTokenValue(entry: GetTokenDefsResult['tokens'][string]): string | undefined {
+  if (typeof entry.value === 'string') return entry.value
+  if (typeof entry.resolvedValue === 'string') return entry.resolvedValue
+  if (entry.activeMode && typeof entry.value[entry.activeMode] === 'string') {
+    return entry.value[entry.activeMode]
+  }
+  const first = Object.values(entry.value)[0]
+  return typeof first === 'string' ? first : undefined
+}
+
 export async function handleGetCode(
   nodes: SceneNode[],
   preferredLang?: CodeLanguage,
@@ -140,7 +150,7 @@ export async function handleGetCode(
 
   if (resolveTokens) {
     const tokenMap = new Map(
-      Object.entries(usedTokens.tokens).map(([name, entry]) => [name, entry.resolvedValue])
+      Object.entries(usedTokens.tokens).map(([name, entry]) => [name, primaryTokenValue(entry)])
     )
     const resolvedMarkup = markup.replace(/var\((--[a-zA-Z0-9-_]+)\)/g, (match, name) => {
       const val = tokenMap.get(name)

mcp/tools/token-defs.ts

@@ -136,12 +136,17 @@ async function buildTokenEntries(
 
     const value: string | Record<string, string> = modeIds.length <= 1 ? resolvedValue : valueMap
 
-    tokens[canonicalName] = {
+    const entry: TokenEntry = {
       kind: mapResolvedType(variable.resolvedType),
-      value,
-      resolvedValue,
-      ...(modeIds.length > 1 && primaryModeName ? { activeMode: primaryModeName } : {})
+      value
     }
+
+    if (modeIds.length > 1 && primaryModeName) {
+      entry.resolvedValue = resolvedValue
+      entry.activeMode = primaryModeName
+    }
+
+    tokens[canonicalName] = entry
   }
 
   return { tokens }