@@ -8,6 +8,7 @@ import removeFPTFromPath from '@/versions/lib/remove-fpt-from-path'
 import { getDataByLanguage } from '@/data-directory/lib/get-data'
 import getRedirect from '@/redirects/lib/get-redirect'
 import { isArchivedVersionByPath } from '@/archives/lib/is-archived-version'
+import { getFeaturesByVersion } from '@/versions/middleware/features'
 import type { Context, Page } from '@/types'
 
 const logger = createLogger(import.meta.url)
@@ -264,13 +265,16 @@ export function createLiquidContext(
     currentVersion: version,
     currentLanguage: language,
     currentVersionObj: versionObj,
+    // ifversion evaluates bare plan and feature names as context variables.
+    [versionObj.shortName]: true,
     enterpriseServerVersions: Object.values(allVersions)
       .filter((v) => v.plan === 'enterprise-server')
       .map((v) => v.currentRelease),
     site: siteData,
     // Link extraction only renders Liquid here, so redirects and pages can stay empty.
     pages: {},
     redirects: {},
+    ...getFeaturesByVersion(version),
   } as Context
 }
 
 
@@ -6,8 +6,11 @@ import {
   resolveInternalLinkKey,
   checkAssetLink,
   isAssetLink,
+  createLiquidContext,
+  extractLinksWithLiquid,
 } from '../lib/extract-links'
 import { latestStable } from '@/versions/lib/enterprise-server-releases'
+import { getFeaturesByVersion } from '@/versions/middleware/features'
 import type { Page } from '@/types'
 
 describe('extractLinksFromMarkdown', () => {
@@ -796,3 +799,29 @@ describe('resolveInternalLinkKey version precedence', () => {
     )
   })
 })
+
+describe('extractLinksWithLiquid with createLiquidContext', () => {
+  const fptFeatures = getFeaturesByVersion('free-pro-team@latest')
+  const fptFeature = Object.keys(fptFeatures).find((name) => fptFeatures[name])
+
+  test('renders version short names and feature flags for the version', async () => {
+    expect(fptFeature).toBeDefined()
+    const content = `
+{% ifversion fpt %}[a](/x/fpt){% endif %}
+{% ifversion fpt or ghec %}[b](/x/b){% else %}[c](/x/c){% endif %}
+{% ifversion ${fptFeature} %}[d](/x/feature){% endif %}
+`
+    const result = await extractLinksWithLiquid(content, createLiquidContext())
+    const hrefs = result.internalLinks.map((link) => link.href)
+
+    expect(hrefs).toEqual(['/x/fpt', '/x/b', '/x/feature'])
+  })
+
+  test('renders the matching branch for GHES', async () => {
+    const content = `{% ifversion ghes %}[a](/x/ghes){% else %}[b](/x/other){% endif %}`
+    const context = createLiquidContext(`enterprise-server@${latestStable}`)
+    const result = await extractLinksWithLiquid(content, context)
+
+    expect(result.internalLinks.map((link) => link.href)).toEqual(['/x/ghes'])
+  })
+})