@vectoriox/iox-ui 5.22.0 → 5.24.0

package/design-core/index.d.ts

@@ -8758,7 +8758,12 @@ interface FlavorRevertSnapshot {
         brandSeed: string | null;
     };
     tokens: Array<Pick<DesignTokenRow, 'name' | 'type' | 'value' | 'values' | 'source' | 'group' | 'tier'>>;
+    /** What the apply left in every row it wrote (`flavorSeedWrites`). A row holding something else
+     *  since, as the author's (`source: user`), was edited AFTER the apply — the revert keeps it. */
+    wrote?: FlavorRevertWrite[];
 }
+/** One row as an apply left it — the value and dark half the revert compares a live row against. */
+type FlavorRevertWrite = Pick<DesignTokenRow, 'name' | 'value' | 'values'>;
 interface FlavorRevertPlan {
     create: DesignTokenRow[];
     update: Array<{
@@ -8767,27 +8772,51 @@ interface FlavorRevertPlan {
     }>;
     /** Rows the apply created (flavor-stamped, absent from the snapshot) — removed on revert. */
     remove: string[];
+    /** The author's edits made after the apply, left as they are (names) — what the Revert hint counts. */
+    kept: string[];
 }
 declare const REVERT_WINDOW_MS: number;
 /** Board F7's footer promise, as a boundary: available through the 7th day, not beyond. */
 declare function revertAvailable(appliedAt: number | null | undefined, now: number): boolean;
 /**
- * Restore the snapshot EXACTLY: snapshot rows come back to their stored value/dark/source
- * (update when present, recreate when deleted); rows the apply CREATED (flavor-stamped and
- * absent from the snapshot) are removed. Hand-made rows born after the apply are not ours
- * to touch — a revert undoes the FLAVOR, not the author's week.
+ * Restore the snapshot: snapshot rows come back to their stored value/dark/source (update when
+ * present, recreate when deleted); rows the apply CREATED (flavor-stamped and absent from the
+ * snapshot) are removed. A revert undoes the FLAVOR, not the author's week: hand-made rows born after
+ * the apply are not touched, and a row the author EDITED after the apply is kept (DS8: an edit makes
+ * the row the author's, and a pack switch keeps it — so does going back). Edited-after = `source: user`,
+ * differing from the snapshot, and holding something other than what the apply wrote (`wrote` — the
+ * apply's own author rows, a chosen font or an Element-styles edit, still go back with it). With no
+ * `wrote` at all, every author row that differs from the snapshot is judged edited after.
  */
-declare function planFlavorRevert(current: ReadonlyArray<StoredDesignTokenRow>, snapshot: FlavorRevertSnapshot['tokens']): FlavorRevertPlan;
+declare function planFlavorRevert(current: ReadonlyArray<StoredDesignTokenRow>, snapshot: FlavorRevertSnapshot['tokens'], wrote?: ReadonlyArray<FlavorRevertWrite> | null): FlavorRevertPlan;
+/** What a seed plan leaves in each row it writes, by name — the snapshot's `wrote`. */
+declare function flavorSeedWrites(plan: FlavorSeedPlan, existing: ReadonlyArray<StoredDesignTokenRow>): FlavorRevertWrite[];
 /** What a previous seed wrote for one row — the "untouched" comparison base. */
 interface SeedExpectation {
     value: string;
     dark?: string;
 }
 /**
- * What the PREVIOUS seed wrote, per row: a map by name, or a function of the stored row (a baseline
- * that depends on WHICH seed stamped the row — the Swiss → Crisp migration's case).
+ * What a previous seed wrote, per row: a map by name, or a function of the stored row (a baseline that
+ * depends on WHICH seed stamped the row — the Swiss → Crisp migration's case). The function may name
+ * several values: a machine row is untouched when it holds ANY of them (`designBaseline`: what the
+ * previous design wrote, and what the row's own pack writes at its defaults).
  */
-type SeedBaseline = ReadonlyMap<string, SeedExpectation> | ((row: StoredDesignTokenRow) => SeedExpectation | undefined);
+type SeedBaseline = ReadonlyMap<string, SeedExpectation> | ((row: StoredDesignTokenRow) => SeedExpectation | ReadonlyArray<SeedExpectation> | undefined);
+/** Options of a seed pass. */
+interface FlavorSeedOptions {
+    /** Rows the author asked to take the look's values too ("Use the look's values for these too"):
+     *  written like an untouched row instead of being kept. */
+    reclaim?: Iterable<string> | null;
+}
+/**
+ * A machine-stamped row is untouched when it holds what a seed wrote — or that seed's LIGHT value with no
+ * dark half at all: iox-cms dropped every `values.dark` from F0 to DS4.1, and no author edit produces that
+ * shape (the Tokens panel edited the light value only, and since DS8 an edit makes the row `source: user`).
+ * Judging it edited kept the six brand rows of every studio seeded before DS4.1 on the default blue for
+ * good — a later brand never reached them.
+ */
+declare function untouchedSeedRow(row: StoredDesignTokenRow, expected: ReadonlyArray<SeedExpectation>): boolean;
 /**
  * The seeding MERGE: desired tokens vs existing rows, deciding create / update / keep. The §10 C2
  * rule — "an upgrade only rewrites untouched rows" — is a comparison against what the PREVIOUS
@@ -8798,11 +8827,12 @@ type SeedBaseline = ReadonlyMap<string, SeedExpectation> | ((row: StoredDesignTo
  * choice, so a new choice may replace it. `group`/`tier` ride every write; a desired row's own
  * `source` (a chosen font's `user`) wins over the pack stamp. A machine-owned row that already holds
  * the desired value but another pack's stamp is RE-STAMPED (§10 C2 provenance: the stamp names the
- * design that owns the row, so the next switch judges it against the right baseline).
+ * design that owns the row, so the next switch judges it against the right baseline). A row named in
+ * `options.reclaim` is written whatever it holds — the author chose the look's value over their own.
  */
 declare function planFlavorSeed(desired: ReadonlyArray<FlavorTokenDef & {
     source?: string;
-}>, existing: ReadonlyArray<StoredDesignTokenRow>, stamp: string, baseline: SeedBaseline | null): FlavorSeedPlan;
+}>, existing: ReadonlyArray<StoredDesignTokenRow>, stamp: string, baseline: SeedBaseline | null, options?: FlavorSeedOptions): FlavorSeedPlan;
 
 interface LinearSpring {
     easing: string;
@@ -9113,21 +9143,50 @@ declare function designTokenRows(choices: DesignChoices): DesignTokenRow[];
  * (for an org with no design row, Crisp's defaults — exactly what DS2's interim seed wrote). In a
  * Swiss org the only v2 rows are that interim seed's, so they are judged against Crisp's DEFAULTS,
  * never against the brand-seeded Crisp the migration is about to write.
+ *
+ * A row a v2 pack stamped is ALSO untouched while it holds what that pack writes at its own defaults —
+ * what DS2's interim seed, a first run and every pack card at its defaults wrote. Without it, one row
+ * kept for any reason (a dark half iox-cms dropped, `untouchedSeedRow`) was judged against a design that
+ * had moved on, apply after apply, and stayed on the old value for good: the studio's brand colour
+ * reached the design row and never its accent.
  */
 declare function designBaseline(previous: StoredDesign): SeedBaseline;
-/** Apply `next` over the org's rows, judged against `previous` — the plan FlavorApplyService runs. */
-declare function planDesignApply(existing: ReadonlyArray<StoredDesignTokenRow>, previous: StoredDesign, next: DesignChoices): FlavorSeedPlan;
+/** Options of an apply. */
+interface DesignApplyOptions {
+    /** The kept rows the author asked to take the look's values too (`FlavorSeedOptions.reclaim`). */
+    reclaim?: FlavorSeedOptions['reclaim'];
+}
+/**
+ * Apply `next` over the org's rows, judged against `previous` — the plan FlavorApplyService runs. The
+ * plan's `kept` names the author's rows the look leaves alone; the Design card lists them before Apply,
+ * and `options.reclaim` writes the look's value into the ones the author hands back.
+ */
+declare function planDesignApply(existing: ReadonlyArray<StoredDesignTokenRow>, previous: StoredDesign, next: DesignChoices, options?: DesignApplyOptions): FlavorSeedPlan;
+/**
+ * "Revert to previous look" over the org's rows — the ONE plan the Revert executes and its hint counts
+ * (`kept`: the author's edits since the apply, left as they are). The apply's record of what it wrote
+ * decides what an edit since is; a snapshot stored before that record existed (DS8.1) is judged against
+ * the rows the applied design writes — the look's own author rows (a chosen font) still go back.
+ * `null` when the design holds no snapshot.
+ */
+declare function planDesignRevert(current: ReadonlyArray<StoredDesignTokenRow>, design: StoredDesign): FlavorRevertPlan | null;
 /** The rows a design is missing by name — the builder-load top-up (never touches an existing row). */
 declare function missingDesignRows(existing: ReadonlyArray<{
     name: string;
 }>, choices: DesignChoices): DesignTokenRow[];
 /**
- * The builder-load REPAIR (DS4.1): rows the design owns and nobody touched — stamped by the current
- * pack, light value exactly the pack's — whose dark override differs from the pack's are rewritten.
- * iox-cms dropped `values.dark` on every write from F0 to DS4 (`values` was an implicit relation),
- * and a revert could leave the previous apply's dark behind; both leave a row whose light half is the
- * design's and whose dark half is not. No author edit can produce that shape — the Tokens panel edits
- * the light value only — so rewriting it heals existing orgs without the author doing anything.
+ * The builder-load REPAIR (DS4.1): rows the design writes that are the machine's and nobody touched,
+ * yet hold something other than the design's value, are rewritten — so an org heals on its next load
+ * with no author action. Two shapes:
+ * - stamped by the current pack, light value exactly the pack's, dark half not: iox-cms dropped
+ *   `values.dark` on every write from F0 to DS4 (`values` was an implicit relation), and a revert could
+ *   leave the previous apply's dark behind;
+ * - stamped by a v2 pack and still holding what THAT pack writes at its own defaults (its dark half
+ *   possibly lost the same way) while the stored design says otherwise: an apply that judged the row
+ *   edited (before 5.24.0, a lost dark half did) left it on the default — the six brand rows of a studio
+ *   whose brand colour never reached its accent.
+ * No author edit produces either shape — the Tokens panel edited the light value only, and since DS8 an
+ * edit makes the row `source: user`, which this never touches.
  */
 declare function designTokenRepairs(existing: ReadonlyArray<StoredDesignTokenRow>, choices: DesignChoices): FlavorSeedPlan['update'];
 interface SwissMigration {
@@ -9172,5 +9231,5 @@ interface FontFamilyRemoval {
  */
 declare function planFontFamilyRemoval(existing: ReadonlyArray<StoredDesignTokenRow>, previous: StoredDesign, family: string): FontFamilyRemoval;
 
-export { ACCENT_TOKEN_NAMES, AdoptOutcome, AdoptSkipReason, BUTTON_VARIANT_TO_STYLE, COLOR_SCHEMES, COLOR_SCHEME_TRAIT, COLOR_SCHEME_TYPES, ColorScheme, DEFAULT_FLAVOR_ID, DESIGN_TOKEN_GROUPS, DESIGN_TOKEN_TIERS, DESIGN_TOKEN_TYPES, DesignConfigKey, ELEMENT_STYLES, ELEMENT_STYLE_MARKER_CLASS, ELEMENT_STYLE_STATES, EMPTY_IMAGE_ATTRIBUTE, EMPTY_IMAGE_SRC, ElementStyleState, FLAVOR_SPEC_VERSION, FONT_CATALOG, FONT_FAMILY_TOKENS, FONT_FILE_ACCEPT, FONT_FILE_EXTENSIONS, FONT_FILE_FORMATS, FONT_STYLES, FONT_WEIGHTS, FontUploadError, GOOGLE_FONTS_CSS_ORIGIN, GOOGLE_FONTS_FILE_ORIGIN, MAX_FONT_FILE_BYTES, NEW_NODE_STYLE_DEFAULTS, OwnedTraitLink, PALETTE_PRESETS, PRE_DS2_FLAVOR_DEFAULTS, REDUCED_MOTION_OVERRIDES, REDUCED_TRANSPARENCY_OVERRIDES, REVERT_WINDOW_MS, SPEC_A11Y, SPEC_AXES, SPEC_BUTTON_VARIANT_TO_STYLE, SPEC_CONTRAST, SPEC_DEFAULT_ELEMENT_STYLE, SPEC_ELEMENT_STYLES, SPEC_FIELD_CLASS_BASELINE, SPEC_FLAVORS, SPEC_FLAVOR_PACKS, SPEC_FONTS, SPEC_FONT_ROLES, SPEC_LEGACY_ALIASES, SPEC_PALETTE_PRESETS, SPEC_SCHEMES, SPEC_SPRINGS, SPEC_TIERS, SPEC_TIER_IDS, SPEC_TOKEN_TYPES, SUPERSEDED_STYLE_VALUES, SWISS_FLAVOR, USER_TOKEN_SOURCE, WCAG_AA_TEXT, adoptElementStyles, adoptionStyleFor, apcaLc, applyElementStyle, applyHeadingLevelRule, buildFlavorTokens, buildFontFaceCss, catalogFontId, checkFontWeight, choicesForPack, colorSchemeClass, colorSchemeOf, compareFontWeights, compileSchemeCss, compileTokenCss, compileTokenCssBlocks, cssString, defaultDesignChoices, defaultElementStyleFor, deriveAccentTokens, deriveBrandTokens, designBaseline, designConfigEntries, designModeOf, designTokenRepairs, designTokenRows, elementStyleById, elementStyleClass, elementStylesFor, emptyImageLabelSrc, emptyImagePlaceholder, emptyImageSrc, flavorPackById, flavorSourceStamp, fontFamilyKey, fontFileName, fontFileStem, fontFormatOf, fontPreloads, fontRoleReferences, fontStackWithout, fontWeightCovers, fontWeightRange, fontWeightValue, fontsForTokens, formatFontFamilies, formatFontFamily, formatFontWeight, googleFontHref, groupFontFamilies, hasElementStyleMarker, isDesignTokenGroup, isDesignTokenTier, isDesignTokenType, isFontWeightRange, isRetiredFlavorId, legacyRuleTokenReferences, matchFontWeight, missingDesignRows, missingFontRoles, nodeDesignClasses, normalizeFontStyle, normalizeFontWeight, normalizeFontWeightValue, oklabToRgb, ownedTraitStatus, ownedTraitsOf, packDesignChoices, parseFontFamilies, parseFontWeight, parseHexColor, planDesignApply, planFlavorRevert, planFlavorSeed, planFontFamilyRemoval, planSwissMigration, previewElementStyleAdoption, previewFontWeight, readDesignConfig, readOwnedTrait, relativeLuminance, resolveDesignChoices, resolveTokenReferences, resolveTokenValues, revertAvailable, rgbToOklab, sameDesignChoices, specTokenNames, springToLinear, stackNamesFamily, styleKeyToKebab, switchElementStyle, syncNodeDesignClasses, toHexColor, tokenReferences, tokensToDarkVarMap, tokensToVarMap, unknownTokenReferences, userFontStack, validateFlavorPack, wcagContrastRatio, writeOwnedTrait };
-export type { AccentBackgrounds, AccentTokenName, AdoptContext, AdoptReport, AdoptableNode, AdoptedNode, ApplyElementStyleResult, DensityId, DesignChoices, DesignClassSource, DesignConfigEntry, DesignMode, DesignTokenGroup, DesignTokenLike, DesignTokenRow, DesignTokenTier, DesignTokenType, ElementStyle, ElementStyleTarget, ElementStyleTraitLike, FlavorPack, FlavorPackV2, FlavorRevertPlan, FlavorRevertSnapshot, FlavorSeedPlan, FlavorSpecToken, FlavorTokenDef, FontDescriptor, FontFamilyGroup, FontFamilyRemoval, FontFamilyToken, FontFormat, FontPair, FontRoleToken, FontStyle, FontWeight, FontWeightRange, FontsForTokensOptions, KeptEdit, LinearSpring, MissingFontRole, MotionId, OkLab, OwnedTrait, OwnedTraitStatus, PalettePreset, ResolvedMode, Rgb, SchemeId, SeedBaseline, SeedExpectation, ShapeId, SkippedNode, StoredDesign, StoredDesignTokenRow, SupersededStyleValue, SwissMigration, SwitchElementStyleResult, TokenCssBlocks, TokenCssOptions };
+export { ACCENT_TOKEN_NAMES, AdoptOutcome, AdoptSkipReason, BUTTON_VARIANT_TO_STYLE, COLOR_SCHEMES, COLOR_SCHEME_TRAIT, COLOR_SCHEME_TYPES, ColorScheme, DEFAULT_FLAVOR_ID, DESIGN_TOKEN_GROUPS, DESIGN_TOKEN_TIERS, DESIGN_TOKEN_TYPES, DesignConfigKey, ELEMENT_STYLES, ELEMENT_STYLE_MARKER_CLASS, ELEMENT_STYLE_STATES, EMPTY_IMAGE_ATTRIBUTE, EMPTY_IMAGE_SRC, ElementStyleState, FLAVOR_SPEC_VERSION, FONT_CATALOG, FONT_FAMILY_TOKENS, FONT_FILE_ACCEPT, FONT_FILE_EXTENSIONS, FONT_FILE_FORMATS, FONT_STYLES, FONT_WEIGHTS, FontUploadError, GOOGLE_FONTS_CSS_ORIGIN, GOOGLE_FONTS_FILE_ORIGIN, MAX_FONT_FILE_BYTES, NEW_NODE_STYLE_DEFAULTS, OwnedTraitLink, PALETTE_PRESETS, PRE_DS2_FLAVOR_DEFAULTS, REDUCED_MOTION_OVERRIDES, REDUCED_TRANSPARENCY_OVERRIDES, REVERT_WINDOW_MS, SPEC_A11Y, SPEC_AXES, SPEC_BUTTON_VARIANT_TO_STYLE, SPEC_CONTRAST, SPEC_DEFAULT_ELEMENT_STYLE, SPEC_ELEMENT_STYLES, SPEC_FIELD_CLASS_BASELINE, SPEC_FLAVORS, SPEC_FLAVOR_PACKS, SPEC_FONTS, SPEC_FONT_ROLES, SPEC_LEGACY_ALIASES, SPEC_PALETTE_PRESETS, SPEC_SCHEMES, SPEC_SPRINGS, SPEC_TIERS, SPEC_TIER_IDS, SPEC_TOKEN_TYPES, SUPERSEDED_STYLE_VALUES, SWISS_FLAVOR, USER_TOKEN_SOURCE, WCAG_AA_TEXT, adoptElementStyles, adoptionStyleFor, apcaLc, applyElementStyle, applyHeadingLevelRule, buildFlavorTokens, buildFontFaceCss, catalogFontId, checkFontWeight, choicesForPack, colorSchemeClass, colorSchemeOf, compareFontWeights, compileSchemeCss, compileTokenCss, compileTokenCssBlocks, cssString, defaultDesignChoices, defaultElementStyleFor, deriveAccentTokens, deriveBrandTokens, designBaseline, designConfigEntries, designModeOf, designTokenRepairs, designTokenRows, elementStyleById, elementStyleClass, elementStylesFor, emptyImageLabelSrc, emptyImagePlaceholder, emptyImageSrc, flavorPackById, flavorSeedWrites, flavorSourceStamp, fontFamilyKey, fontFileName, fontFileStem, fontFormatOf, fontPreloads, fontRoleReferences, fontStackWithout, fontWeightCovers, fontWeightRange, fontWeightValue, fontsForTokens, formatFontFamilies, formatFontFamily, formatFontWeight, googleFontHref, groupFontFamilies, hasElementStyleMarker, isDesignTokenGroup, isDesignTokenTier, isDesignTokenType, isFontWeightRange, isRetiredFlavorId, legacyRuleTokenReferences, matchFontWeight, missingDesignRows, missingFontRoles, nodeDesignClasses, normalizeFontStyle, normalizeFontWeight, normalizeFontWeightValue, oklabToRgb, ownedTraitStatus, ownedTraitsOf, packDesignChoices, parseFontFamilies, parseFontWeight, parseHexColor, planDesignApply, planDesignRevert, planFlavorRevert, planFlavorSeed, planFontFamilyRemoval, planSwissMigration, previewElementStyleAdoption, previewFontWeight, readDesignConfig, readOwnedTrait, relativeLuminance, resolveDesignChoices, resolveTokenReferences, resolveTokenValues, revertAvailable, rgbToOklab, sameDesignChoices, specTokenNames, springToLinear, stackNamesFamily, styleKeyToKebab, switchElementStyle, syncNodeDesignClasses, toHexColor, tokenReferences, tokensToDarkVarMap, tokensToVarMap, unknownTokenReferences, untouchedSeedRow, userFontStack, validateFlavorPack, wcagContrastRatio, writeOwnedTrait };
+export type { AccentBackgrounds, AccentTokenName, AdoptContext, AdoptReport, AdoptableNode, AdoptedNode, ApplyElementStyleResult, DensityId, DesignApplyOptions, DesignChoices, DesignClassSource, DesignConfigEntry, DesignMode, DesignTokenGroup, DesignTokenLike, DesignTokenRow, DesignTokenTier, DesignTokenType, ElementStyle, ElementStyleTarget, ElementStyleTraitLike, FlavorPack, FlavorPackV2, FlavorRevertPlan, FlavorRevertSnapshot, FlavorRevertWrite, FlavorSeedOptions, FlavorSeedPlan, FlavorSpecToken, FlavorTokenDef, FontDescriptor, FontFamilyGroup, FontFamilyRemoval, FontFamilyToken, FontFormat, FontPair, FontRoleToken, FontStyle, FontWeight, FontWeightRange, FontsForTokensOptions, KeptEdit, LinearSpring, MissingFontRole, MotionId, OkLab, OwnedTrait, OwnedTraitStatus, PalettePreset, ResolvedMode, Rgb, SchemeId, SeedBaseline, SeedExpectation, ShapeId, SkippedNode, StoredDesign, StoredDesignTokenRow, SupersededStyleValue, SwissMigration, SwitchElementStyleResult, TokenCssBlocks, TokenCssOptions };

package/fesm2022/vectoriox-iox-ui-design-core.mjs

@@ -11269,17 +11269,28 @@ function revertAvailable(appliedAt, now) {
     return typeof appliedAt === 'number' && appliedAt > 0 && now - appliedAt <= REVERT_WINDOW_MS;
 }
 /**
- * Restore the snapshot EXACTLY: snapshot rows come back to their stored value/dark/source
- * (update when present, recreate when deleted); rows the apply CREATED (flavor-stamped and
- * absent from the snapshot) are removed. Hand-made rows born after the apply are not ours
- * to touch — a revert undoes the FLAVOR, not the author's week.
+ * Restore the snapshot: snapshot rows come back to their stored value/dark/source (update when
+ * present, recreate when deleted); rows the apply CREATED (flavor-stamped and absent from the
+ * snapshot) are removed. A revert undoes the FLAVOR, not the author's week: hand-made rows born after
+ * the apply are not touched, and a row the author EDITED after the apply is kept (DS8: an edit makes
+ * the row the author's, and a pack switch keeps it — so does going back). Edited-after = `source: user`,
+ * differing from the snapshot, and holding something other than what the apply wrote (`wrote` — the
+ * apply's own author rows, a chosen font or an Element-styles edit, still go back with it). With no
+ * `wrote` at all, every author row that differs from the snapshot is judged edited after.
  */
-function planFlavorRevert(current, snapshot) {
+function planFlavorRevert(current, snapshot, wrote) {
     const byName = new Map();
     for (const row of current ?? [])
         byName.set(row.name, row);
+    const written = new Map((wrote ?? []).map(w => [w.name, w]));
+    const editedAfter = (live) => {
+        if (live.source !== USER_TOKEN_SOURCE)
+            return false;
+        const w = written.get(live.name);
+        return !w || !sameValue(live, { value: w.value, dark: w.values?.dark });
+    };
     const snapNames = new Set();
-    const plan = { create: [], update: [], remove: [] };
+    const plan = { create: [], update: [], remove: [], kept: [] };
     for (const snap of snapshot ?? []) {
         snapNames.add(snap.name);
         const live = byName.get(snap.name);
@@ -11290,20 +11301,59 @@ function planFlavorRevert(current, snapshot) {
         const differs = live.value !== snap.value
             || (live.values?.dark ?? null) !== (snap.values?.dark ?? null)
             || (live.source ?? null) !== (snap.source ?? null);
+        if (!differs || !live._id)
+            continue;
+        if (editedAfter(live)) {
+            plan.kept.push(live.name);
+            continue;
+        }
         // `values` is ALWAYS sent: an absent key is dropped by JSON and a `$set` then keeps the
         // apply's dark override — a snapshot row with no dark must clear it, so it sends `{}`.
-        if (differs && live._id) {
-            plan.update.push({ id: live._id, data: { value: snap.value, values: snap.values ?? {}, source: snap.source } });
-        }
+        plan.update.push({ id: live._id, data: { value: snap.value, values: snap.values ?? {}, source: snap.source } });
     }
     for (const row of current ?? []) {
-        if (!snapNames.has(row.name) && row._id && isSeeded(row))
+        if (snapNames.has(row.name) || !row._id)
+            continue;
+        if (isSeeded(row))
             plan.remove.push(row._id);
+        else if (written.has(row.name) && editedAfter(row))
+            plan.kept.push(row.name);
     }
     return plan;
 }
-const expectationFor = (baseline, row) => !baseline ? undefined : typeof baseline === 'function' ? baseline(row) : baseline.get(row.name);
+/** What a seed plan leaves in each row it writes, by name — the snapshot's `wrote`. */
+function flavorSeedWrites(plan, existing) {
+    const byId = new Map((existing ?? []).filter(r => r._id).map(r => [r._id, r]));
+    const out = (plan?.create ?? []).map(r => ({ name: r.name, value: r.value, ...(r.values ? { values: r.values } : {}) }));
+    for (const u of plan?.update ?? []) {
+        const row = byId.get(u.id);
+        if (!row)
+            continue;
+        const values = u.data.values ?? row.values;
+        out.push({ name: row.name, value: u.data.value ?? row.value, ...(values ? { values } : {}) });
+    }
+    return out;
+}
+function expectationsFor(baseline, row) {
+    if (!baseline)
+        return [];
+    const found = typeof baseline === 'function' ? baseline(row) : baseline.get(row.name);
+    if (!found)
+        return [];
+    return (Array.isArray(found) ? found : [found]).filter(Boolean);
+}
 const sameValue = (row, e) => row.value === e.value && (row.values?.dark ?? '') === (e.dark ?? '');
+/**
+ * A machine-stamped row is untouched when it holds what a seed wrote — or that seed's LIGHT value with no
+ * dark half at all: iox-cms dropped every `values.dark` from F0 to DS4.1, and no author edit produces that
+ * shape (the Tokens panel edited the light value only, and since DS8 an edit makes the row `source: user`).
+ * Judging it edited kept the six brand rows of every studio seeded before DS4.1 on the default blue for
+ * good — a later brand never reached them.
+ */
+function untouchedSeedRow(row, expected) {
+    const darkLost = isSeeded(row) && !row.values?.dark;
+    return expected.some(e => sameValue(row, e) || (darkLost && row.value === e.value));
+}
 /**
  * The seeding MERGE: desired tokens vs existing rows, deciding create / update / keep. The §10 C2
  * rule — "an upgrade only rewrites untouched rows" — is a comparison against what the PREVIOUS
@@ -11314,10 +11364,12 @@ const sameValue = (row, e) => row.value === e.value && (row.values?.dark ?? '')
  * choice, so a new choice may replace it. `group`/`tier` ride every write; a desired row's own
  * `source` (a chosen font's `user`) wins over the pack stamp. A machine-owned row that already holds
  * the desired value but another pack's stamp is RE-STAMPED (§10 C2 provenance: the stamp names the
- * design that owns the row, so the next switch judges it against the right baseline).
+ * design that owns the row, so the next switch judges it against the right baseline). A row named in
+ * `options.reclaim` is written whatever it holds — the author chose the look's value over their own.
  */
-function planFlavorSeed(desired, existing, stamp, baseline) {
+function planFlavorSeed(desired, existing, stamp, baseline, options = {}) {
     const byName = new Map((existing ?? []).map(r => [r.name, r]));
+    const reclaim = new Set(options.reclaim ?? []);
     const plan = { create: [], update: [], kept: [] };
     for (const def of desired ?? []) {
         if (!def?.name)
@@ -11335,17 +11387,18 @@ function planFlavorSeed(desired, existing, stamp, baseline) {
             });
             continue;
         }
-        const old = expectationFor(baseline, row);
-        const designOwned = isSeeded(row) || (row.source === USER_TOKEN_SOURCE && !!old && sameValue(row, old));
-        if (!designOwned) {
+        const olds = expectationsFor(baseline, row);
+        const reclaimed = reclaim.has(def.name);
+        const designOwned = isSeeded(row) || (row.source === USER_TOKEN_SOURCE && olds.some(o => sameValue(row, o)));
+        if (!designOwned && !reclaimed) {
             plan.kept.push(def.name);
             continue;
         }
         const sameAsDesired = row.value === def.value && (row.values?.dark ?? '') === (def.values?.dark ?? '');
         if (sameAsDesired && (row.source ?? '') === source)
             continue; // already exactly this
-        const untouched = !!old && sameValue(row, old);
-        if ((untouched || sameAsDesired) && row._id) {
+        const untouched = untouchedSeedRow(row, olds);
+        if ((untouched || sameAsDesired || reclaimed) && row._id) {
             plan.update.push({ id: row._id, data: { value: def.value, values: def.values ?? {}, source, ...classification(def) } });
         }
         else {
@@ -11597,28 +11650,66 @@ function swissExpectations(seed) {
     }
     return expectations(rows);
 }
+/** What a v2 pack writes at its OWN defaults, by pack id — computed once per id per caller. */
+function packDefaultsLookup() {
+    const cache = new Map();
+    return packId => {
+        if (!cache.has(packId)) {
+            const pack = isRetiredFlavorId(packId) ? undefined : flavorPackById(packId);
+            cache.set(packId, pack && pack.id === packId ? expectations(designTokenRows(packDesignChoices(pack.id))) : undefined);
+        }
+        return cache.get(packId);
+    };
+}
 /**
  * What the PREVIOUS design wrote, as a baseline keyed by the row's own stamp: a row Swiss stamped is
  * judged against what Swiss wrote, every other row against `buildFlavorTokens` of the stored choices
  * (for an org with no design row, Crisp's defaults — exactly what DS2's interim seed wrote). In a
  * Swiss org the only v2 rows are that interim seed's, so they are judged against Crisp's DEFAULTS,
  * never against the brand-seeded Crisp the migration is about to write.
+ *
+ * A row a v2 pack stamped is ALSO untouched while it holds what that pack writes at its own defaults —
+ * what DS2's interim seed, a first run and every pack card at its defaults wrote. Without it, one row
+ * kept for any reason (a dark half iox-cms dropped, `untouchedSeedRow`) was judged against a design that
+ * had moved on, apply after apply, and stayed on the old value for good: the studio's brand colour
+ * reached the design row and never its accent.
  */
 function designBaseline(previous) {
     const retired = isRetiredFlavorId(previous.storedFlavorId);
     const current = expectations(designTokenRows(retired ? packDesignChoices(previous.choices.flavorId) : previous.choices));
     const swiss = swissExpectations(retired ? previous.storedSeed : null);
+    const packDefaults = packDefaultsLookup();
     return (row) => {
         const stampedBy = SEED_STAMP.exec(row.source ?? '')?.[1];
-        return stampedBy === SWISS_FLAVOR.id ? swiss.get(row.name) : current.get(row.name);
+        if (stampedBy === SWISS_FLAVOR.id)
+            return swiss.get(row.name);
+        const ownDefault = stampedBy ? packDefaults(stampedBy)?.get(row.name) : undefined;
+        return [current.get(row.name), ownDefault].filter((e) => !!e);
     };
 }
-/** Apply `next` over the org's rows, judged against `previous` — the plan FlavorApplyService runs. */
-function planDesignApply(existing, previous, next) {
+/**
+ * Apply `next` over the org's rows, judged against `previous` — the plan FlavorApplyService runs. The
+ * plan's `kept` names the author's rows the look leaves alone; the Design card lists them before Apply,
+ * and `options.reclaim` writes the look's value into the ones the author hands back.
+ */
+function planDesignApply(existing, previous, next, options = {}) {
     const pack = flavorPackById(next.flavorId);
     if (!pack)
         return { create: [], update: [], kept: [] };
-    return planFlavorSeed(designTokenRows(next), existing, flavorSourceStamp(pack.id), designBaseline(previous));
+    return planFlavorSeed(designTokenRows(next), existing, flavorSourceStamp(pack.id), designBaseline(previous), { reclaim: options.reclaim });
+}
+/**
+ * "Revert to previous look" over the org's rows — the ONE plan the Revert executes and its hint counts
+ * (`kept`: the author's edits since the apply, left as they are). The apply's record of what it wrote
+ * decides what an edit since is; a snapshot stored before that record existed (DS8.1) is judged against
+ * the rows the applied design writes — the look's own author rows (a chosen font) still go back.
+ * `null` when the design holds no snapshot.
+ */
+function planDesignRevert(current, design) {
+    const snapshot = design?.revert;
+    if (!snapshot)
+        return null;
+    return planFlavorRevert(current, snapshot.tokens, snapshot.wrote ?? designTokenRows(design.choices));
 }
 /** The rows a design is missing by name — the builder-load top-up (never touches an existing row). */
 function missingDesignRows(existing, choices) {
@@ -11626,12 +11717,18 @@ function missingDesignRows(existing, choices) {
     return designTokenRows(choices).filter(r => !have.has(r.name));
 }
 /**
- * The builder-load REPAIR (DS4.1): rows the design owns and nobody touched — stamped by the current
- * pack, light value exactly the pack's — whose dark override differs from the pack's are rewritten.
- * iox-cms dropped `values.dark` on every write from F0 to DS4 (`values` was an implicit relation),
- * and a revert could leave the previous apply's dark behind; both leave a row whose light half is the
- * design's and whose dark half is not. No author edit can produce that shape — the Tokens panel edits
- * the light value only — so rewriting it heals existing orgs without the author doing anything.
+ * The builder-load REPAIR (DS4.1): rows the design writes that are the machine's and nobody touched,
+ * yet hold something other than the design's value, are rewritten — so an org heals on its next load
+ * with no author action. Two shapes:
+ * - stamped by the current pack, light value exactly the pack's, dark half not: iox-cms dropped
+ *   `values.dark` on every write from F0 to DS4 (`values` was an implicit relation), and a revert could
+ *   leave the previous apply's dark behind;
+ * - stamped by a v2 pack and still holding what THAT pack writes at its own defaults (its dark half
+ *   possibly lost the same way) while the stored design says otherwise: an apply that judged the row
+ *   edited (before 5.24.0, a lost dark half did) left it on the default — the six brand rows of a studio
+ *   whose brand colour never reached its accent.
+ * No author edit produces either shape — the Tokens panel edited the light value only, and since DS8 an
+ * edit makes the row `source: user`, which this never touches.
  */
 function designTokenRepairs(existing, choices) {
     const pack = flavorPackById(choices.flavorId);
@@ -11639,12 +11736,18 @@ function designTokenRepairs(existing, choices) {
         return [];
     const stamp = flavorSourceStamp(pack.id);
     const desired = new Map(designTokenRows(choices).map(r => [r.name, r]));
+    const packDefaults = packDefaultsLookup();
     const out = [];
     for (const row of existing ?? []) {
         const want = desired.get(row.name);
-        if (!want || !row._id || row.source !== stamp || want.source !== stamp || row.value !== want.value)
+        if (!want || !row._id || want.source !== stamp)
+            continue;
+        if (row.value === want.value && (row.values?.dark ?? '') === (want.values?.dark ?? '') && row.source === stamp)
             continue;
-        if ((row.values?.dark ?? '') === (want.values?.dark ?? ''))
+        const stampedBy = SEED_STAMP.exec(row.source ?? '')?.[1];
+        const darkOnly = row.source === stamp && row.value === want.value;
+        const ownDefault = stampedBy ? packDefaults(stampedBy)?.get(row.name) : undefined;
+        if (!darkOnly && !(ownDefault && untouchedSeedRow(row, [ownDefault])))
             continue;
         out.push({ id: row._id, data: { value: want.value, values: want.values ?? {}, source: stamp, ...(want.group ? { group: want.group } : {}), ...(want.tier ? { tier: want.tier } : {}) } });
     }
@@ -11734,5 +11837,5 @@ function planFontFamilyRemoval(existing, previous, family) {
  * Generated bundle index. Do not edit.
  */
 
-export { ACCENT_TOKEN_NAMES, AdoptOutcome, AdoptSkipReason, BUTTON_VARIANT_TO_STYLE, COLOR_SCHEMES, COLOR_SCHEME_TRAIT, COLOR_SCHEME_TYPES, ColorScheme, DEFAULT_FLAVOR_ID, DESIGN_TOKEN_GROUPS, DESIGN_TOKEN_TIERS, DESIGN_TOKEN_TYPES, DesignConfigKey, ELEMENT_STYLES, ELEMENT_STYLE_MARKER_CLASS, ELEMENT_STYLE_STATES, EMPTY_IMAGE_ATTRIBUTE, EMPTY_IMAGE_SRC, ElementStyleState, FLAVOR_SPEC_VERSION, FONT_CATALOG, FONT_FAMILY_TOKENS, FONT_FILE_ACCEPT, FONT_FILE_EXTENSIONS, FONT_FILE_FORMATS, FONT_STYLES, FONT_WEIGHTS, FontUploadError, GOOGLE_FONTS_CSS_ORIGIN, GOOGLE_FONTS_FILE_ORIGIN, MAX_FONT_FILE_BYTES, NEW_NODE_STYLE_DEFAULTS, OwnedTraitLink, PALETTE_PRESETS, PRE_DS2_FLAVOR_DEFAULTS, REDUCED_MOTION_OVERRIDES, REDUCED_TRANSPARENCY_OVERRIDES, REVERT_WINDOW_MS, SPEC_A11Y, SPEC_AXES, SPEC_BUTTON_VARIANT_TO_STYLE, SPEC_CONTRAST, SPEC_DEFAULT_ELEMENT_STYLE, SPEC_ELEMENT_STYLES, SPEC_FIELD_CLASS_BASELINE, SPEC_FLAVORS, SPEC_FLAVOR_PACKS, SPEC_FONTS, SPEC_FONT_ROLES, SPEC_LEGACY_ALIASES, SPEC_PALETTE_PRESETS, SPEC_SCHEMES, SPEC_SPRINGS, SPEC_TIERS, SPEC_TIER_IDS, SPEC_TOKEN_TYPES, SUPERSEDED_STYLE_VALUES, SWISS_FLAVOR, USER_TOKEN_SOURCE, WCAG_AA_TEXT, adoptElementStyles, adoptionStyleFor, apcaLc, applyElementStyle, applyHeadingLevelRule, buildFlavorTokens, buildFontFaceCss, catalogFontId, checkFontWeight, choicesForPack, colorSchemeClass, colorSchemeOf, compareFontWeights, compileSchemeCss, compileTokenCss, compileTokenCssBlocks, cssString, defaultDesignChoices, defaultElementStyleFor, deriveAccentTokens, deriveBrandTokens, designBaseline, designConfigEntries, designModeOf, designTokenRepairs, designTokenRows, elementStyleById, elementStyleClass, elementStylesFor, emptyImageLabelSrc, emptyImagePlaceholder, emptyImageSrc, flavorPackById, flavorSourceStamp, fontFamilyKey, fontFileName, fontFileStem, fontFormatOf, fontPreloads, fontRoleReferences, fontStackWithout, fontWeightCovers, fontWeightRange, fontWeightValue, fontsForTokens, formatFontFamilies, formatFontFamily, formatFontWeight, googleFontHref, groupFontFamilies, hasElementStyleMarker, isDesignTokenGroup, isDesignTokenTier, isDesignTokenType, isFontWeightRange, isRetiredFlavorId, legacyRuleTokenReferences, matchFontWeight, missingDesignRows, missingFontRoles, nodeDesignClasses, normalizeFontStyle, normalizeFontWeight, normalizeFontWeightValue, oklabToRgb, ownedTraitStatus, ownedTraitsOf, packDesignChoices, parseFontFamilies, parseFontWeight, parseHexColor, planDesignApply, planFlavorRevert, planFlavorSeed, planFontFamilyRemoval, planSwissMigration, previewElementStyleAdoption, previewFontWeight, readDesignConfig, readOwnedTrait, relativeLuminance, resolveDesignChoices, resolveTokenReferences, resolveTokenValues, revertAvailable, rgbToOklab, sameDesignChoices, specTokenNames, springToLinear, stackNamesFamily, styleKeyToKebab, switchElementStyle, syncNodeDesignClasses, toHexColor, tokenReferences, tokensToDarkVarMap, tokensToVarMap, unknownTokenReferences, userFontStack, validateFlavorPack, wcagContrastRatio, writeOwnedTrait };
+export { ACCENT_TOKEN_NAMES, AdoptOutcome, AdoptSkipReason, BUTTON_VARIANT_TO_STYLE, COLOR_SCHEMES, COLOR_SCHEME_TRAIT, COLOR_SCHEME_TYPES, ColorScheme, DEFAULT_FLAVOR_ID, DESIGN_TOKEN_GROUPS, DESIGN_TOKEN_TIERS, DESIGN_TOKEN_TYPES, DesignConfigKey, ELEMENT_STYLES, ELEMENT_STYLE_MARKER_CLASS, ELEMENT_STYLE_STATES, EMPTY_IMAGE_ATTRIBUTE, EMPTY_IMAGE_SRC, ElementStyleState, FLAVOR_SPEC_VERSION, FONT_CATALOG, FONT_FAMILY_TOKENS, FONT_FILE_ACCEPT, FONT_FILE_EXTENSIONS, FONT_FILE_FORMATS, FONT_STYLES, FONT_WEIGHTS, FontUploadError, GOOGLE_FONTS_CSS_ORIGIN, GOOGLE_FONTS_FILE_ORIGIN, MAX_FONT_FILE_BYTES, NEW_NODE_STYLE_DEFAULTS, OwnedTraitLink, PALETTE_PRESETS, PRE_DS2_FLAVOR_DEFAULTS, REDUCED_MOTION_OVERRIDES, REDUCED_TRANSPARENCY_OVERRIDES, REVERT_WINDOW_MS, SPEC_A11Y, SPEC_AXES, SPEC_BUTTON_VARIANT_TO_STYLE, SPEC_CONTRAST, SPEC_DEFAULT_ELEMENT_STYLE, SPEC_ELEMENT_STYLES, SPEC_FIELD_CLASS_BASELINE, SPEC_FLAVORS, SPEC_FLAVOR_PACKS, SPEC_FONTS, SPEC_FONT_ROLES, SPEC_LEGACY_ALIASES, SPEC_PALETTE_PRESETS, SPEC_SCHEMES, SPEC_SPRINGS, SPEC_TIERS, SPEC_TIER_IDS, SPEC_TOKEN_TYPES, SUPERSEDED_STYLE_VALUES, SWISS_FLAVOR, USER_TOKEN_SOURCE, WCAG_AA_TEXT, adoptElementStyles, adoptionStyleFor, apcaLc, applyElementStyle, applyHeadingLevelRule, buildFlavorTokens, buildFontFaceCss, catalogFontId, checkFontWeight, choicesForPack, colorSchemeClass, colorSchemeOf, compareFontWeights, compileSchemeCss, compileTokenCss, compileTokenCssBlocks, cssString, defaultDesignChoices, defaultElementStyleFor, deriveAccentTokens, deriveBrandTokens, designBaseline, designConfigEntries, designModeOf, designTokenRepairs, designTokenRows, elementStyleById, elementStyleClass, elementStylesFor, emptyImageLabelSrc, emptyImagePlaceholder, emptyImageSrc, flavorPackById, flavorSeedWrites, flavorSourceStamp, fontFamilyKey, fontFileName, fontFileStem, fontFormatOf, fontPreloads, fontRoleReferences, fontStackWithout, fontWeightCovers, fontWeightRange, fontWeightValue, fontsForTokens, formatFontFamilies, formatFontFamily, formatFontWeight, googleFontHref, groupFontFamilies, hasElementStyleMarker, isDesignTokenGroup, isDesignTokenTier, isDesignTokenType, isFontWeightRange, isRetiredFlavorId, legacyRuleTokenReferences, matchFontWeight, missingDesignRows, missingFontRoles, nodeDesignClasses, normalizeFontStyle, normalizeFontWeight, normalizeFontWeightValue, oklabToRgb, ownedTraitStatus, ownedTraitsOf, packDesignChoices, parseFontFamilies, parseFontWeight, parseHexColor, planDesignApply, planDesignRevert, planFlavorRevert, planFlavorSeed, planFontFamilyRemoval, planSwissMigration, previewElementStyleAdoption, previewFontWeight, readDesignConfig, readOwnedTrait, relativeLuminance, resolveDesignChoices, resolveTokenReferences, resolveTokenValues, revertAvailable, rgbToOklab, sameDesignChoices, specTokenNames, springToLinear, stackNamesFamily, styleKeyToKebab, switchElementStyle, syncNodeDesignClasses, toHexColor, tokenReferences, tokensToDarkVarMap, tokensToVarMap, unknownTokenReferences, untouchedSeedRow, userFontStack, validateFlavorPack, wcagContrastRatio, writeOwnedTrait };
 //# sourceMappingURL=vectoriox-iox-ui-design-core.mjs.map