[ehnruiz]

Stacked on #618. This branch contains #618's commit (fd241f70) plus one commit for #619 (cec37f2b). Review only the last commit: cec37f2b. Once #618 merges, this PR's diff shrinks to that commit.

Summary

Fixes #619. Site Import normalised a root --font-* variable at extraction (normalizeFontTokenVariable: --font-Heading → font-heading), and the store emits that form, but the imported var(--font-Heading) references kept the authored name and no longer resolved. Two authored names that normalise to the same variable (--font-Heading / --font-heading) were deduplicated into one token, so one font was lost.

What changed:

• Extraction keeps the authored variable (fontTokens.ts). planCss now deduplicates on it, so two names that normalise alike both reach the plan.
• One naming pass for both kinds. normalizeImportedTokens (new siteImport/tokenNames.ts) settles the emitted name of every imported colour and font token at plan time, as fix(siteImport): rewrite var() references to the slug a colour token is emitted under #618 does for colours:
  • a name already in emitted form keeps it;
  • any other name takes its normalised form, or a -2, -3, ... suffix when that is taken.
  • Colours and fonts share one CSS namespace, so both are settled against one set of claimed names. A colour never takes a font's name or the reverse (--font--accent: #fff next to --font-accent: "Inter", serif).
  • A suffixed font token gets a matching display name ("Heading 2").
• Same rewrite path. The authored → emitted renames go through fix(siteImport): rewrite var() references to the slug a colour token is emitted under #618's rewriteImportVarRefs, so references, overrides in other rules (.dark { --font-Heading: … }), priorities and @keyframes follow, before conflict detection.
• API change. normalizeImportedColorTokens (added in fix(siteImport): rewrite var() references to the slug a colour token is emitted under #618) is replaced by normalizeImportedTokens; no shim.

Verification

• bun run build (exit 0)
• bun test: 7070 pass, 1 fail. The failure is no-circular-dependencies, whose madge call hit the test's 15 s limit at load average ~20. Run on its own, it passes in 6.6 s. bun x madge --circular --ts-config tsconfig.json --extensions ts,tsx src server exits 0 with "No circular dependency found!" across 2781 files. An earlier full run of this branch before the review fixes had 7068 pass, 0 fail.
• bun run lint (exit 0); tsc -p tsconfig.app.json --noEmit (exit 0)
• Docker/deployment check, if relevant (not relevant)

New tests fail without the fix and pass with it:

• End to end (buildImportPlan): the issue's repro with a .dark override; two font names normalising alike both kept; a font name never taking a colour slug.
• Unit (normalizeImportedTokens): a colour never takes a font's name and a font never takes a colour's; fix(siteImport): rewrite var() references to the slug a colour token is emitted under #618's colour cases carried over.
• Conflict pipeline: an authored --font-Primary against an existing font-primary token is detected as font-primary, auto-renamed to font-primary-2, and its references follow.

Checklist

• Tests cover behavior changes.
• Docs were updated when behavior, config, deployment, or public surfaces changed (docs/features/site-import.md).
• No compatibility shim was added for old pre-release behavior.
• No secrets, local databases, uploads, or generated artifacts are included.