@contentful/experience-design-system-cli 2.27.5-dev-build-67ce1cd.0 → 2.27.5-dev-build-99d3b1b.0

package/dist/src/index.js

@@ -9798,8 +9798,8 @@ function storeCDFComponents(db, sessionId2, components) {
             deleteAllowedValues.run(sessionId2, componentId, propName);
             prop.$values.forEach((v, i) => insertAllowedValue.run(sessionId2, componentId, propName, v, i));
           }
-          if (prop["$token.allowed"] !== void 0) {
-            writeTokenPaths(componentId, propName, prop["$token.allowed"]);
+          if (prop.$type === "token" && prop.$category === "design") {
+            writeTokenPaths(componentId, propName, prop["$token.allowed"] ?? []);
           }
         }
         const existingDefaults = new Map(
@@ -9852,8 +9852,8 @@ function storeCDFComponents(db, sessionId2, components) {
           if (prop.$values && prop.$values.length > 0) {
             prop.$values.forEach((v, i) => insertAllowedValue.run(sessionId2, componentId, propName, v, i));
           }
-          if (prop["$token.allowed"] !== void 0) {
-            writeTokenPaths(componentId, propName, prop["$token.allowed"]);
+          if (prop.$type === "token" && prop.$category === "design") {
+            writeTokenPaths(componentId, propName, prop["$token.allowed"] ?? []);
           }
         }
         let slotPos = 0;
@@ -10018,6 +10018,29 @@ function applyScopeDecisions(db, sessionId2, decisions) {
   }
   db.prepare("UPDATE sessions SET updated_at = ? WHERE id = ?").run(now, sessionId2);
 }
+function storeDTCGTokens(db, sessionId2, groups, tokens) {
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  db.exec("BEGIN");
+  try {
+    db.prepare("DELETE FROM raw_token_groups WHERE session_id = ?").run(sessionId2);
+    db.prepare("DELETE FROM raw_tokens WHERE session_id = ?").run(sessionId2);
+    const insertGroup = db.prepare(`INSERT INTO raw_token_groups (session_id, path, description) VALUES (?, ?, ?)`);
+    for (const group of groups) {
+      insertGroup.run(sessionId2, group.path, group.$description ?? null);
+    }
+    const insertToken = db.prepare(
+      `INSERT INTO raw_tokens (session_id, path, type, value, description) VALUES (?, ?, ?, ?, ?)`
+    );
+    for (const token of tokens) {
+      insertToken.run(sessionId2, token.path, token.$type, JSON.stringify(token.$value), token.$description ?? null);
+    }
+    db.prepare("UPDATE sessions SET updated_at = ? WHERE id = ?").run(now, sessionId2);
+    db.exec("COMMIT");
+  } catch (e) {
+    db.exec("ROLLBACK");
+    throw e;
+  }
+}
 function applyTokenToolCalls(db, sessionId2, calls, incomingWarnings) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const warnings = [...incomingWarnings];
@@ -22301,6 +22324,7 @@ function parseToState(json) {
       description: typeof p.$description === "string" ? p.$description : "",
       values: Array.isArray(p.$values) ? p.$values.filter((v) => typeof v === "string") : [],
       tokenKind: typeof p["$token.kind"] === "string" ? p["$token.kind"] : "",
+      allowed: Array.isArray(p["$token.allowed"]) ? p["$token.allowed"].filter((v) => typeof v === "string") : [],
       default: defaultValue
     };
   });
@@ -22339,6 +22363,7 @@ function serializeState(state, originalJson) {
     if (p.description) def.$description = p.description;
     if (p.type === "enum" && p.values.length > 0) def.$values = p.values;
     if (p.type === "token" && p.tokenKind) def["$token.kind"] = p.tokenKind;
+    if (p.type === "token" && p.allowed.length > 0) def["$token.allowed"] = p.allowed;
     if (p.default !== null) {
       if (p.type === "boolean" && typeof p.default === "boolean") {
         def.$default = p.default;
@@ -22490,6 +22515,10 @@ function PropRow({
       /* @__PURE__ */ jsx45(Text44, { dimColor: true, children: "desc:" }),
       /* @__PURE__ */ jsx45(Text44, { color: PALETTE.success, children: prop.description || "\u2014" })
     ] }),
+    selected && prop.type === "token" && prop.category === "design" && /* @__PURE__ */ jsxs44(Box42, { paddingLeft: 2, flexDirection: "row", gap: 1, children: [
+      /* @__PURE__ */ jsx45(Text44, { dimColor: true, children: "allowed:" }),
+      activeField === "allowed" ? /* @__PURE__ */ jsx45(Box42, { flexGrow: 1, borderStyle: "round", borderColor: PALETTE.info, paddingX: 1, children: /* @__PURE__ */ jsx45(Text44, { dimColor: true, children: "press [t] to edit allowed tokens" }) }) : /* @__PURE__ */ jsx45(Text44, { color: prop.allowed.length > 0 ? PALETTE.info : void 0, dimColor: prop.allowed.length === 0, children: prop.allowed.length > 0 ? prop.allowed.join(", ") : "(any)" })
+    ] }),
     selected && rationale && rationale.trim().length > 0 && /* @__PURE__ */ jsx45(Box42, { paddingLeft: 2, children: /* @__PURE__ */ jsx45(Text44, { dimColor: true, children: (() => {
       const max = Math.max(8, width - 8);
       const text = `~ ${rationale}`;
@@ -22609,12 +22638,15 @@ function SlotRow({
 }
 function propFields(prop) {
   const fields = ["type", "category", "required"];
-  if (prop.type === "token") fields.push("tokenKind");
+  if (prop.type === "token") {
+    fields.push("tokenKind");
+  }
   if (prop.type === "enum") fields.push("values");
   if (prop.type !== "richtext" && prop.type !== "media" && prop.type !== "link") {
     fields.push("default");
   }
   fields.push("description");
+  if (prop.type === "token" && prop.category === "design") fields.push("allowed");
   return fields;
 }
 function simulateGraphWithCandidate(projectSlotGraph, selfName, currentSlots, targetSlotName, candidate) {
@@ -23173,7 +23205,12 @@ function FieldEditor({
         const idx = options.indexOf(currentProp.type);
         const next = key.leftArrow ? options[(idx - 1 + options.length) % options.length] : options[(idx + 1) % options.length];
         const updated = { ...currentProp, type: next };
-        if (next !== "token") updated.tokenKind = "";
+        if (next === "token") {
+          updated.category = "design";
+          updated.tokenKind ||= DESIGN_TOKEN_TYPES2[0] ?? "";
+        } else {
+          updated.tokenKind = "";
+        }
         if (next !== "enum") updated.values = [];
         const nextProps = props.map((p, i) => i === propIdx ? updated : p);
         commit({ ...editorState, props: nextProps });
@@ -23914,6 +23951,100 @@ var init_ComponentRationalePanel = __esm({
   }
 });
 
+// packages/experience-design-system-cli/src/analyze/select/tui/components/TokenReviewPanel.tsx
+import { Box as Box45, Text as Text47 } from "ink";
+import { jsx as jsx48, jsxs as jsxs47 } from "react/jsx-runtime";
+function collectTokenSuggestions(entry, availableTokens = []) {
+  return Object.entries(entry.$properties).filter(([, def]) => {
+    const rawKind = def["$token.kind"];
+    return def.$type === "token" && def.$category === "design" && (typeof rawKind === "string" || Array.isArray(rawKind));
+  }).map(([propName, def]) => {
+    const persistedAllowed = [...def["$token.allowed"] ?? []];
+    const rawKind = def["$token.kind"];
+    const kinds = Array.isArray(rawKind) ? rawKind.filter((kind) => typeof kind === "string") : typeof rawKind === "string" ? rawKind.split(",").map((kind) => kind.trim()).filter(Boolean) : [];
+    const compatible = availableTokens.filter((token) => kinds.includes(token.kind)).map((token) => token.path);
+    const compatiblePaths = new Set(compatible);
+    const allowed = availableTokens.length > 0 ? persistedAllowed.filter((path) => compatiblePaths.has(path)) : persistedAllowed;
+    const paths = availableTokens.length > 0 ? compatible : allowed;
+    return { propName, paths, suggested: [...allowed], allowed };
+  });
+}
+function TokenReviewPanel({
+  componentName,
+  suggestions,
+  selectedRow,
+  editing,
+  editCursor,
+  editSelection,
+  width,
+  height,
+  active
+}) {
+  const current = suggestions[selectedRow];
+  if (editing && current) {
+    const visibleCount = Math.max(1, height - 6);
+    const maxStart = Math.max(0, current.paths.length - visibleCount);
+    const scrollStart = Math.max(0, Math.min(editCursor - Math.floor(visibleCount / 2), maxStart));
+    const visiblePaths = current.paths.slice(scrollStart, scrollStart + visibleCount);
+    const rangeLabel = current.paths.length === 0 ? "no compatible tokens" : `${scrollStart + 1}-${scrollStart + visiblePaths.length} of ${current.paths.length}`;
+    return /* @__PURE__ */ jsxs47(
+      Box45,
+      {
+        flexDirection: "column",
+        width,
+        height: height + 2,
+        borderStyle: "single",
+        borderColor: active ? PALETTE.inverse : void 0,
+        children: [
+          /* @__PURE__ */ jsx48(Text47, { bold: true, dimColor: !active, wrap: "truncate", children: `TOKEN REVIEW \u2014 ${componentName} \xB7 ${current.propName} (edit allowed)` }),
+          /* @__PURE__ */ jsx48(Text47, { dimColor: true, wrap: "truncate", children: `select which tokens are allowed (${rangeLabel})` }),
+          /* @__PURE__ */ jsx48(Text47, { children: " " }),
+          current.paths.length === 0 && /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: "(no compatible tokens found for this token kind)" }),
+          visiblePaths.map((path, i) => {
+            const pathIndex = scrollStart + i;
+            const checked = editSelection.has(path);
+            const focused = pathIndex === editCursor;
+            return /* @__PURE__ */ jsx48(Box45, { children: /* @__PURE__ */ jsx48(Text47, { color: focused ? PALETTE.info : void 0, bold: focused, dimColor: !active, wrap: "truncate", children: `  [${checked ? "x" : " "}] ${path}` }) }, path);
+          }),
+          /* @__PURE__ */ jsx48(Text47, { children: " " }),
+          /* @__PURE__ */ jsx48(Text47, { dimColor: true, wrap: "truncate", children: "[\u2191/\u2193] move  [Space] toggle" }),
+          /* @__PURE__ */ jsx48(Text47, { dimColor: true, wrap: "truncate", children: "[Ctrl+S] save  [Esc] cancel" })
+        ]
+      }
+    );
+  }
+  return /* @__PURE__ */ jsxs47(
+    Box45,
+    {
+      flexDirection: "column",
+      width,
+      height: height + 2,
+      borderStyle: "single",
+      borderColor: active ? PALETTE.inverse : void 0,
+      children: [
+        /* @__PURE__ */ jsx48(Text47, { bold: true, dimColor: !active, children: `TOKEN REVIEW \u2014 ${componentName}` }),
+        suggestions.length === 0 && /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: "(no token suggestions for this component)" }),
+        suggestions.map((s, i) => {
+          const focused = i === selectedRow;
+          return /* @__PURE__ */ jsxs47(Box45, { flexDirection: "column", children: [
+            /* @__PURE__ */ jsx48(Box45, { children: /* @__PURE__ */ jsx48(Text47, { color: focused ? PALETTE.info : void 0, bold: focused, dimColor: !active, children: `${focused ? "\u25B6" : " "} ${s.propName}` }) }),
+            /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: `  suggested: ${s.suggested.join(", ")}` }),
+            /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: `  allowed: ${s.allowed.join(", ")}` })
+          ] }, s.propName);
+        }),
+        /* @__PURE__ */ jsx48(Text47, { children: " " }),
+        /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: "[\u2191/\u2193] move  [Enter] edit allowed  [Esc] close" })
+      ]
+    }
+  );
+}
+var init_TokenReviewPanel = __esm({
+  "packages/experience-design-system-cli/src/analyze/select/tui/components/TokenReviewPanel.tsx"() {
+    "use strict";
+    init_theme();
+  }
+});
+
 // packages/experience-design-system-cli/src/analyze/select/preview-annotations.ts
 function applyPreviewAnnotations(preview, localNames) {
   const out = /* @__PURE__ */ new Map();
@@ -24366,8 +24497,8 @@ var init_history = __esm({
 
 // packages/experience-design-system-cli/src/import/tui/steps/GenerateReviewStep.tsx
 import { useEffect as useEffect13, useMemo as useMemo7, useRef as useRef7, useState as useState26 } from "react";
-import { Box as Box45, Text as Text47, useStdout as useStdout6 } from "ink";
-import { Fragment as Fragment14, jsx as jsx48, jsxs as jsxs47 } from "react/jsx-runtime";
+import { Box as Box46, Text as Text48, useStdout as useStdout6 } from "ink";
+import { Fragment as Fragment14, jsx as jsx49, jsxs as jsxs48 } from "react/jsx-runtime";
 function sortComponentsForSidebar2(components, cycleParticipants) {
   const isEmpty2 = (entry) => Object.keys(entry.$properties ?? {}).length === 0 && Object.keys(entry.$slots ?? {}).length === 0;
   const tier = (c2) => {
@@ -24425,6 +24556,7 @@ function deriveBreakingChanges(response) {
 }
 function GenerateReviewStep({
   extractSessionId,
+  tokenSessionId,
   onFinalize,
   onQuit,
   livePreview = true,
@@ -24465,6 +24597,12 @@ function GenerateReviewStep({
   const [panelScrollOffset, setPanelScrollOffset] = useState26(0);
   const [textEntryActive, setTextEntryActive] = useState26(false);
   const [componentRationale, setComponentRationale] = useState26(null);
+  const [tokenReviewRow, setTokenReviewRow] = useState26(0);
+  const [tokenReviewEditing, setTokenReviewEditing] = useState26(false);
+  const [tokenReviewEditCursor, setTokenReviewEditCursor] = useState26(0);
+  const [tokenReviewEditSelection, setTokenReviewEditSelection] = useState26(/* @__PURE__ */ new Set());
+  const [availableTokens, setAvailableTokens] = useState26([]);
+  const tokenReviewSuggestedRef = useRef7(/* @__PURE__ */ new Map());
   const pendingGRef = useRef7(false);
   const [slotCycles, setSlotCycles] = useState26([]);
   const [cyclePanelScroll, setCyclePanelScroll] = useState26(0);
@@ -24552,9 +24690,14 @@ function GenerateReviewStep({
     const db = openPipelineDb();
     let cdfComponents = [];
     let cycles = [];
+    let tokens = [];
     try {
       cdfComponents = loadCDFComponents(db, extractSessionId);
       cycles = loadSlotCycles(db, extractSessionId);
+      tokens = loadDTCGTokens(db, tokenSessionId ?? extractSessionId).tokens.map((token) => ({
+        path: token.path,
+        kind: token.$type
+      }));
     } finally {
       db.close();
     }
@@ -24562,6 +24705,7 @@ function GenerateReviewStep({
       return {
         entries: [],
         cycles: [],
+        tokens: [],
         error: "No generated definitions found for this session. Try re-running generate."
       };
     }
@@ -24575,25 +24719,34 @@ function GenerateReviewStep({
     return {
       entries: sortComponentsForSidebar2(reviewEntries, cycleParticipants),
       cycles,
+      tokens,
       error: null
     };
   };
   useEffect13(() => {
-    try {
-      const { entries, cycles, error } = loadSessionState();
-      if (error) {
-        setLoadError(error);
-        setLoading(false);
-        return;
+    let disposed = false;
+    void (async () => {
+      try {
+        const { entries, cycles, tokens, error } = loadSessionState();
+        if (error) {
+          if (!disposed) setLoadError(error);
+          return;
+        }
+        const catalog = tokensPath ? (await readTokensFromPath("tokens", tokensPath)).map((token) => ({ path: token.path, kind: token.$type })) : tokens;
+        if (disposed) return;
+        setSlotCycles(cycles);
+        setAvailableTokens(catalog);
+        setComponents(entries);
+      } catch (e) {
+        if (!disposed) setLoadError(String(e));
+      } finally {
+        if (!disposed) setLoading(false);
       }
-      setSlotCycles(cycles);
-      setComponents(entries);
-      setLoading(false);
-    } catch (e) {
-      setLoadError(String(e));
-      setLoading(false);
-    }
-  }, []);
+    })();
+    return () => {
+      disposed = true;
+    };
+  }, [extractSessionId, tokenSessionId, tokensPath]);
   useEffect13(() => {
     if (loading) return;
     if (!livePreview) return;
@@ -24759,12 +24912,13 @@ function GenerateReviewStep({
   };
   const reloadFromSave = () => {
     try {
-      const { entries, cycles, error } = loadSessionState();
+      const { entries, cycles, tokens, error } = loadSessionState();
       if (error) {
         setLoadError(error);
         return;
       }
       setSlotCycles(cycles);
+      setAvailableTokens(tokens);
       setComponents(entries);
       const reloadGraph = buildComponentGraph(entries);
       const reloadClosures = computeAllClosures(reloadGraph);
@@ -24874,6 +25028,12 @@ function GenerateReviewStep({
       db.close();
     }
   }, [selectedIdx, components, extractSessionId]);
+  useEffect13(() => {
+    setTokenReviewRow(0);
+    setTokenReviewEditing(false);
+    setTokenReviewEditCursor(0);
+    setTokenReviewEditSelection(/* @__PURE__ */ new Set());
+  }, [selectedIdx]);
   useEffect13(() => {
     const current = components[selectedIdx];
     if (!current) {
@@ -25045,6 +25205,44 @@ function GenerateReviewStep({
     recomputeCycles(next);
     pushHistorySnapshot(next, autoRejected, undoSnapshot, "reject-cascade");
   };
+  const currentTokenSuggestions = () => {
+    const current = components[selectedIdx];
+    if (!current) return [];
+    return collectTokenSuggestions(current.entry, availableTokens).map((suggestion) => {
+      const snapshotKey = `${current.key}::${suggestion.propName}`;
+      const suggested = tokenReviewSuggestedRef.current.get(snapshotKey) ?? [...suggestion.suggested];
+      tokenReviewSuggestedRef.current.set(snapshotKey, suggested);
+      return { ...suggestion, suggested };
+    });
+  };
+  const persistTokenFields = (propName, allowed) => {
+    const current = components[selectedIdx];
+    if (!current) return;
+    const prop = current.entry.$properties[propName];
+    if (!prop) return;
+    const nextProp = { ...prop };
+    nextProp["$token.allowed"] = allowed;
+    const nextEntry = {
+      ...current.entry,
+      $properties: { ...current.entry.$properties, [propName]: nextProp }
+    };
+    const next = components.map((c2, i) => i === selectedIdx ? { ...c2, entry: nextEntry } : c2);
+    setComponents(next);
+    const db = openPipelineDb();
+    try {
+      storeCDFComponents(db, extractSessionId, [{ key: current.key, entry: nextEntry }]);
+    } finally {
+      db.close();
+    }
+    livePreviewHook.trigger();
+    pushHistorySnapshot(next, autoRejected, undoSnapshot, `token-review:${propName}`);
+  };
+  const handleTokenEditSave = (s) => {
+    const allowed = s.paths.filter((p) => tokenReviewEditSelection.has(p));
+    if (allowed.length === 0) return;
+    persistTokenFields(s.propName, allowed);
+    setTokenReviewEditing(false);
+  };
   const dialogOpen = showFinalize || showQuit;
   useImmediateInput((input, key) => {
     if (loading) return;
@@ -25315,6 +25513,65 @@ function GenerateReviewStep({
       setJumpFilterTarget((prev) => prev === t ? null : t);
       return;
     }
+    if (panelOpen === "token-review") {
+      const suggestions = currentTokenSuggestions();
+      const row = suggestions[tokenReviewRow];
+      if (tokenReviewEditing) {
+        if (row && row.paths.length > 0) {
+          if (key.upArrow || input === "k") {
+            setTokenReviewEditCursor((c2) => Math.max(0, c2 - 1));
+            return;
+          }
+          if (key.downArrow || input === "j") {
+            setTokenReviewEditCursor((c2) => Math.min(row.paths.length - 1, c2 + 1));
+            return;
+          }
+          if (input === " " || key.return) {
+            const path = row.paths[tokenReviewEditCursor];
+            setTokenReviewEditSelection((prev) => {
+              const next = new Set(prev);
+              if (next.has(path) && next.size === 1) return next;
+              if (next.has(path)) next.delete(path);
+              else next.add(path);
+              return next;
+            });
+            return;
+          }
+          if (key.ctrl && input === "s") {
+            handleTokenEditSave(row);
+            return;
+          }
+        }
+        if (key.escape) {
+          setTokenReviewEditing(false);
+          return;
+        }
+        return;
+      }
+      if (key.upArrow || input === "k") {
+        setTokenReviewRow((r) => Math.max(0, r - 1));
+        return;
+      }
+      if (key.downArrow || input === "j") {
+        setTokenReviewRow((r) => Math.min(Math.max(0, suggestions.length - 1), r + 1));
+        return;
+      }
+      if (key.return && row) {
+        setTokenReviewEditCursor(0);
+        setTokenReviewEditSelection(new Set(row.allowed));
+        setTokenReviewEditing(true);
+        return;
+      }
+      if (key.escape) {
+        setPanelOpen("none");
+        return;
+      }
+      if (input === "t") {
+        setPanelOpen("none");
+        return;
+      }
+      return;
+    }
     if (panelOpen !== "none") {
       const PANEL_HEIGHT_LOCAL = 12;
       const next = computeNextScrollOffset(panelScrollOffset, input, key, 9999, PANEL_HEIGHT_LOCAL);
@@ -25377,6 +25634,11 @@ function GenerateReviewStep({
         setPanelScrollOffset(() => 0);
         return;
       }
+      if (input === "t" && currentTokenSuggestions().length > 0) {
+        setPanelOpen("token-review");
+        setTokenReviewRow(0);
+        return;
+      }
     }
     if (key.tab) {
       if (!sidebarFocused && editorDirty) {
@@ -25598,42 +25860,42 @@ function GenerateReviewStep({
     }
   });
   if (loading) {
-    return /* @__PURE__ */ jsx48(Box45, { paddingX: 2, paddingY: 1, children: /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: "Loading generated definitions..." }) });
+    return /* @__PURE__ */ jsx49(Box46, { paddingX: 2, paddingY: 1, children: /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "Loading generated definitions..." }) });
   }
   if (loadError) {
-    return /* @__PURE__ */ jsxs47(Box45, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-      /* @__PURE__ */ jsx48(Text47, { color: PALETTE.error, children: loadError }),
-      /* @__PURE__ */ jsx48(Text47, { children: " " }),
-      /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: "[q / Enter / Esc] Quit" })
+    return /* @__PURE__ */ jsxs48(Box46, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
+      /* @__PURE__ */ jsx49(Text48, { color: PALETTE.error, children: loadError }),
+      /* @__PURE__ */ jsx49(Text48, { children: " " }),
+      /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "[q / Enter / Esc] Quit" })
     ] });
   }
   if (showHelp) {
-    return /* @__PURE__ */ jsx48(HelpOverlay, { sections: HELP_SECTIONS2, onClose: () => setShowHelp(false) });
+    return /* @__PURE__ */ jsx49(HelpOverlay, { sections: HELP_SECTIONS2, onClose: () => setShowHelp(false) });
   }
   const renderBreakOverlay = (width) => {
     const highlightedCycle = slotCycles[cyclesCursor];
-    return /* @__PURE__ */ jsxs47(Box45, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.warning, paddingX: 1, width, children: [
-      /* @__PURE__ */ jsx48(Text47, { bold: true, color: PALETTE.warning, children: `BREAK CYCLE ${cyclesCursor + 1} \u2014 remove a slot edge or reject a member` }),
+    return /* @__PURE__ */ jsxs48(Box46, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.warning, paddingX: 1, width, children: [
+      /* @__PURE__ */ jsx49(Text48, { bold: true, color: PALETTE.warning, children: `BREAK CYCLE ${cyclesCursor + 1} \u2014 remove a slot edge or reject a member` }),
       highlightedCycle && (() => {
         const segs = formatCyclePathSegments(highlightedCycle);
-        return /* @__PURE__ */ jsxs47(Text47, { children: [
+        return /* @__PURE__ */ jsxs48(Text48, { children: [
           "  ",
           segs.map(
-            (seg, si) => seg.kind === "slot" ? /* @__PURE__ */ jsx48(Text47, { color: PALETTE.info, children: seg.text }, si) : seg.kind === "arrow" ? /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: seg.text }, si) : /* @__PURE__ */ jsx48(Text47, { color: PALETTE.warning, children: seg.text }, si)
+            (seg, si) => seg.kind === "slot" ? /* @__PURE__ */ jsx49(Text48, { color: PALETTE.info, children: seg.text }, si) : seg.kind === "arrow" ? /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: seg.text }, si) : /* @__PURE__ */ jsx49(Text48, { color: PALETTE.warning, children: seg.text }, si)
           )
         ] });
       })(),
-      /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: highlightedCycle ? "Deleting an edge removes it from $allowedComponents (undo with Ctrl+Z)." : "No cycle highlighted." }),
-      /* @__PURE__ */ jsx48(Text47, { children: " " }),
-      breakEdges.length > 0 && /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: "remove slot edge:" }),
+      /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: highlightedCycle ? "Deleting an edge removes it from $allowedComponents (undo with Ctrl+Z)." : "No cycle highlighted." }),
+      /* @__PURE__ */ jsx49(Text48, { children: " " }),
+      breakEdges.length > 0 && /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "remove slot edge:" }),
       breakEdges.map((edge, idx) => {
         const isCursor = idx === breakCursor;
-        return /* @__PURE__ */ jsx48(Text47, { inverse: isCursor, children: `${isCursor ? "\u25B6" : " "} remove '${edge.toComponent}' from ${edge.fromComponent}.$slots.${edge.slotName}.$allowedComponents` }, `break-${idx}`);
+        return /* @__PURE__ */ jsx49(Text48, { inverse: isCursor, children: `${isCursor ? "\u25B6" : " "} remove '${edge.toComponent}' from ${edge.fromComponent}.$slots.${edge.slotName}.$allowedComponents` }, `break-${idx}`);
       }),
-      breakConfirm ? /* @__PURE__ */ jsxs47(Fragment14, { children: [
-        /* @__PURE__ */ jsx48(Text47, { children: " " }),
-        /* @__PURE__ */ jsx48(Text47, { bold: true, color: PALETTE.warning, children: "Delete this slot edge? [y] confirm  [n] cancel" })
-      ] }) : /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: "[\u2191\u2193/j/k] move  [Enter] delete  [x/Esc] close" })
+      breakConfirm ? /* @__PURE__ */ jsxs48(Fragment14, { children: [
+        /* @__PURE__ */ jsx49(Text48, { children: " " }),
+        /* @__PURE__ */ jsx49(Text48, { bold: true, color: PALETTE.warning, children: "Delete this slot edge? [y] confirm  [n] cancel" })
+      ] }) : /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "[\u2191\u2193/j/k] move  [Enter] delete  [x/Esc] close" })
     ] });
   };
   const breakOverlayFullScreen = breakPanel.isOpen && shouldBreakOverlayGoFullScreen({
@@ -25680,8 +25942,8 @@ function GenerateReviewStep({
   const needsReview = components.filter((c2) => c2.status === "needs-review").length;
   const propCount = selected ? Object.keys(selected.entry.$properties).length : 0;
   const slotCount = selected?.entry.$slots ? Object.keys(selected.entry.$slots).length : 0;
-  return /* @__PURE__ */ jsxs47(Box45, { flexDirection: "column", children: [
-    showFinalize && /* @__PURE__ */ jsx48(
+  return /* @__PURE__ */ jsxs48(Box46, { flexDirection: "column", children: [
+    showFinalize && /* @__PURE__ */ jsx49(
       FinalizeDialog,
       {
         accepted,
@@ -25694,31 +25956,31 @@ function GenerateReviewStep({
         onCancel: () => setShowFinalize(false)
       }
     ),
-    showQuit && /* @__PURE__ */ jsx48(QuitDialog, { hasUnsavedDrafts: false, onConfirm: onQuit, onCancel: () => setShowQuit(false) }),
-    showUnsavedWarning && !dialogOpen && /* @__PURE__ */ jsxs47(Box45, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.warning, paddingX: 1, children: [
-      /* @__PURE__ */ jsx48(Text47, { bold: true, color: PALETTE.warning, children: "Unsaved changes" }),
-      /* @__PURE__ */ jsx48(Text47, { children: "You have unsaved edits in the current field editor." }),
-      /* @__PURE__ */ jsx48(Text47, { children: " " }),
-      /* @__PURE__ */ jsx48(Text47, { children: "  [Enter]  Save and continue" }),
-      /* @__PURE__ */ jsx48(Text47, { children: "  [Esc]    Discard changes and continue" }),
-      /* @__PURE__ */ jsx48(Text47, { children: "  [Tab]    Stay in the panel" })
+    showQuit && /* @__PURE__ */ jsx49(QuitDialog, { hasUnsavedDrafts: false, onConfirm: onQuit, onCancel: () => setShowQuit(false) }),
+    showUnsavedWarning && !dialogOpen && /* @__PURE__ */ jsxs48(Box46, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.warning, paddingX: 1, children: [
+      /* @__PURE__ */ jsx49(Text48, { bold: true, color: PALETTE.warning, children: "Unsaved changes" }),
+      /* @__PURE__ */ jsx49(Text48, { children: "You have unsaved edits in the current field editor." }),
+      /* @__PURE__ */ jsx49(Text48, { children: " " }),
+      /* @__PURE__ */ jsx49(Text48, { children: "  [Enter]  Save and continue" }),
+      /* @__PURE__ */ jsx49(Text48, { children: "  [Esc]    Discard changes and continue" }),
+      /* @__PURE__ */ jsx49(Text48, { children: "  [Tab]    Stay in the panel" })
     ] }),
-    showReloadDialog && !dialogOpen && /* @__PURE__ */ jsxs47(Box45, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.warning, paddingX: 1, children: [
-      /* @__PURE__ */ jsx48(Text47, { bold: true, color: PALETTE.warning, children: "Reload from saved state?" }),
-      /* @__PURE__ */ jsx48(Text47, { children: "Unsaved in-memory changes will be lost." }),
-      /* @__PURE__ */ jsx48(Text47, { children: " " }),
-      /* @__PURE__ */ jsx48(Text47, { children: "  [Enter]  Confirm" }),
-      /* @__PURE__ */ jsx48(Text47, { children: "  [Esc]    Cancel" })
+    showReloadDialog && !dialogOpen && /* @__PURE__ */ jsxs48(Box46, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.warning, paddingX: 1, children: [
+      /* @__PURE__ */ jsx49(Text48, { bold: true, color: PALETTE.warning, children: "Reload from saved state?" }),
+      /* @__PURE__ */ jsx49(Text48, { children: "Unsaved in-memory changes will be lost." }),
+      /* @__PURE__ */ jsx49(Text48, { children: " " }),
+      /* @__PURE__ */ jsx49(Text48, { children: "  [Enter]  Confirm" }),
+      /* @__PURE__ */ jsx49(Text48, { children: "  [Esc]    Cancel" })
     ] }),
-    removedComponents.length > 0 && !dialogOpen && /* @__PURE__ */ jsxs47(Box45, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.error, paddingX: 1, children: [
-      /* @__PURE__ */ jsx48(Text47, { bold: true, color: PALETTE.error, children: removedComponentsHeader(removedComponents.length, true) }),
-      !removedBannerCollapsed && /* @__PURE__ */ jsxs47(Fragment14, { children: [
-        /* @__PURE__ */ jsx48(Text47, { children: " " }),
-        removedComponents.map((rc) => /* @__PURE__ */ jsx48(Text47, { children: removedComponentLine(rc) }, rc.id))
+    removedComponents.length > 0 && !dialogOpen && /* @__PURE__ */ jsxs48(Box46, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.error, paddingX: 1, children: [
+      /* @__PURE__ */ jsx49(Text48, { bold: true, color: PALETTE.error, children: removedComponentsHeader(removedComponents.length, true) }),
+      !removedBannerCollapsed && /* @__PURE__ */ jsxs48(Fragment14, { children: [
+        /* @__PURE__ */ jsx49(Text48, { children: " " }),
+        removedComponents.map((rc) => /* @__PURE__ */ jsx49(Text48, { children: removedComponentLine(rc) }, rc.id))
       ] })
     ] }),
-    breakingChanges.length > 0 && !dialogOpen && /* @__PURE__ */ jsx48(Box45, { paddingX: 1, children: /* @__PURE__ */ jsx48(
-      Text47,
+    breakingChanges.length > 0 && !dialogOpen && /* @__PURE__ */ jsx49(Box46, { paddingX: 1, children: /* @__PURE__ */ jsx49(
+      Text48,
       {
         color: PALETTE.warning,
         children: `[b] ${breakingChanges.length} breaking change${breakingChanges.length === 1 ? "" : "s"}`
@@ -25728,32 +25990,32 @@ function GenerateReviewStep({
       const row = breakingRows[breakingCursor];
       const comp = row ? breakingChanges.find((b) => b.componentName === row.componentName) : void 0;
       if (!comp) return null;
-      return /* @__PURE__ */ jsxs47(Box45, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.warning, paddingX: 1, children: [
-        /* @__PURE__ */ jsx48(Text47, { bold: true, color: PALETTE.warning, children: `Breaking changes \u2014 ${comp.componentName}` }),
-        comp.impact && /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: `  affects ${comp.impact.affectedExperiences} experience${comp.impact.affectedExperiences === 1 ? "" : "s"}, ${comp.impact.affectedFragments} fragment${comp.impact.affectedFragments === 1 ? "" : "s"}` }),
-        comp.changes.length === 0 ? /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: "  (no enumerated changes)" }) : comp.changes.map((change, ci) => /* @__PURE__ */ jsx48(Text47, { children: `  \u2022 ${formatBreakingChange(change, comp.current)}` }, `bd-detail-${ci}`)),
-        /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: "[D/Esc] close detail" })
+      return /* @__PURE__ */ jsxs48(Box46, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.warning, paddingX: 1, children: [
+        /* @__PURE__ */ jsx49(Text48, { bold: true, color: PALETTE.warning, children: `Breaking changes \u2014 ${comp.componentName}` }),
+        comp.impact && /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: `  affects ${comp.impact.affectedExperiences} experience${comp.impact.affectedExperiences === 1 ? "" : "s"}, ${comp.impact.affectedFragments} fragment${comp.impact.affectedFragments === 1 ? "" : "s"}` }),
+        comp.changes.length === 0 ? /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "  (no enumerated changes)" }) : comp.changes.map((change, ci) => /* @__PURE__ */ jsx49(Text48, { children: `  \u2022 ${formatBreakingChange(change, comp.current)}` }, `bd-detail-${ci}`)),
+        /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "[D/Esc] close detail" })
       ] });
     })(),
     cyclePanel.isOpen && !dialogOpen && (() => {
       const PANEL_H = 20;
       const lines = [];
       lines.push(
-        /* @__PURE__ */ jsx48(Text47, { bold: true, color: PALETTE.warning, children: `SLOT DEPENDENCY CYCLES (${slotCycles.length})` }, "cyc-title")
+        /* @__PURE__ */ jsx49(Text48, { bold: true, color: PALETTE.warning, children: `SLOT DEPENDENCY CYCLES (${slotCycles.length})` }, "cyc-title")
       );
       lines.push(
-        /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: "push will fail until these are resolved" }, "cyc-sub")
+        /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "push will fail until these are resolved" }, "cyc-sub")
       );
       lines.push(
-        /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: "To fix: reject a cycle member, or break the cycle by removing a slot edge." }, "cyc-guide")
+        /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "To fix: reject a cycle member, or break the cycle by removing a slot edge." }, "cyc-guide")
       );
-      lines.push(/* @__PURE__ */ jsx48(Text47, { children: " " }, "cyc-space"));
+      lines.push(/* @__PURE__ */ jsx49(Text48, { children: " " }, "cyc-space"));
       slotCycles.forEach((cycle, idx) => {
         const nodeCount = new Set(cycle.path).size;
         const isCursor = idx === cyclesCursor;
         lines.push(
-          /* @__PURE__ */ jsx48(
-            Text47,
+          /* @__PURE__ */ jsx49(
+            Text48,
             {
               bold: true,
               inverse: isCursor,
@@ -25764,25 +26026,25 @@ function GenerateReviewStep({
         );
         const segs = formatCyclePathSegments(cycle, 16);
         lines.push(
-          /* @__PURE__ */ jsxs47(Text47, { children: [
+          /* @__PURE__ */ jsxs48(Text48, { children: [
             "    ",
             segs.map(
-              (seg, si) => seg.kind === "slot" ? /* @__PURE__ */ jsx48(Text47, { color: PALETTE.info, children: seg.text }, si) : seg.kind === "arrow" ? /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: seg.text }, si) : /* @__PURE__ */ jsx48(Text47, { children: seg.text }, si)
+              (seg, si) => seg.kind === "slot" ? /* @__PURE__ */ jsx49(Text48, { color: PALETTE.info, children: seg.text }, si) : seg.kind === "arrow" ? /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: seg.text }, si) : /* @__PURE__ */ jsx49(Text48, { children: seg.text }, si)
             )
           ] }, `cyc-p-${idx}`)
         );
         if (cycle.suggestedBreak) {
           const b = cycle.suggestedBreak;
           lines.push(
-            /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: `    Suggested fix: remove '${b.toComponent}' from ${b.fromComponent}.$slots.${b.slotName}.$allowedComponents` }, `cyc-f-${idx}`)
+            /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: `    Suggested fix: remove '${b.toComponent}' from ${b.fromComponent}.$slots.${b.slotName}.$allowedComponents` }, `cyc-f-${idx}`)
           );
         }
-        lines.push(/* @__PURE__ */ jsx48(Text47, { children: " " }, `cyc-s-${idx}`));
+        lines.push(/* @__PURE__ */ jsx49(Text48, { children: " " }, `cyc-s-${idx}`));
       });
       const visible = lines.slice(cyclePanelScroll, cyclePanelScroll + PANEL_H);
-      return /* @__PURE__ */ jsxs47(Box45, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.warning, paddingX: 1, children: [
+      return /* @__PURE__ */ jsxs48(Box46, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.warning, paddingX: 1, children: [
         visible,
-        /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: "[\u2191\u2193/j/k] move  [Enter] jump  [x] break cycle  [c/q/Esc] close" })
+        /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "[\u2191\u2193/j/k] move  [Enter] jump  [x] break cycle  [c/q/Esc] close" })
       ] });
     })(),
     !dialogOpen && livePreview && (() => {
@@ -25792,21 +26054,21 @@ function GenerateReviewStep({
       }
       const hasCounts = counts.new + counts.changed + counts.removed + counts.breaking > 0;
       if (livePreviewHook.disabled) {
-        return /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: "Preview: disabled (creds rejected)" });
+        return /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "Preview: disabled (creds rejected)" });
       }
       if (livePreviewHook.status === "running" && !hasCounts) {
-        return /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: `Preview: ${livePreviewSpinner} running...` });
+        return /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: `Preview: ${livePreviewSpinner} running...` });
       }
       if (!hasCounts) return null;
-      return /* @__PURE__ */ jsxs47(Box45, { children: [
-        /* @__PURE__ */ jsx48(Text47, { children: "Preview: " }),
-        /* @__PURE__ */ jsx48(Text47, { color: PALETTE.success, children: `${counts.new} new` }),
-        /* @__PURE__ */ jsx48(Text47, { children: " \xB7 " }),
-        /* @__PURE__ */ jsx48(Text47, { color: PALETTE.warning, children: `${counts.changed} changed` }),
-        /* @__PURE__ */ jsx48(Text47, { children: " \xB7 " }),
-        /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: `${counts.removed} removed` }),
-        /* @__PURE__ */ jsx48(Text47, { children: " \xB7 " }),
-        /* @__PURE__ */ jsx48(Text47, { color: PALETTE.error, bold: true, children: `${counts.breaking} breaking` })
+      return /* @__PURE__ */ jsxs48(Box46, { children: [
+        /* @__PURE__ */ jsx49(Text48, { children: "Preview: " }),
+        /* @__PURE__ */ jsx49(Text48, { color: PALETTE.success, children: `${counts.new} new` }),
+        /* @__PURE__ */ jsx49(Text48, { children: " \xB7 " }),
+        /* @__PURE__ */ jsx49(Text48, { color: PALETTE.warning, children: `${counts.changed} changed` }),
+        /* @__PURE__ */ jsx49(Text48, { children: " \xB7 " }),
+        /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: `${counts.removed} removed` }),
+        /* @__PURE__ */ jsx49(Text48, { children: " \xB7 " }),
+        /* @__PURE__ */ jsx49(Text48, { color: PALETTE.error, bold: true, children: `${counts.breaking} breaking` })
       ] });
     })(),
     !dialogOpen && autoRejected.length > 0 && (() => {
@@ -25818,17 +26080,17 @@ function GenerateReviewStep({
       const participantSet = cycleView.structural;
       const members = stillRejected.filter((n) => participantSet.has(n)).sort();
       const ancestors = stillRejected.filter((n) => !participantSet.has(n)).sort();
-      return /* @__PURE__ */ jsxs47(Box45, { flexDirection: "column", borderStyle: "single", borderColor: PALETTE.error, paddingX: 1, children: [
-        /* @__PURE__ */ jsx48(Text47, { color: PALETTE.error, bold: true, children: `Cyclic manifest \u2014 auto-rejected ${stillRejected.length} component${stillRejected.length === 1 ? "" : "s"}:` }),
-        members.length > 0 && /* @__PURE__ */ jsx48(Text47, { color: PALETTE.error, children: `  Cycle members: ${members.join(", ")}` }),
-        ancestors.length > 0 && /* @__PURE__ */ jsx48(Text47, { color: PALETTE.error, children: `  Ancestors: ${ancestors.join(", ")}` }),
-        /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: undoSnapshot ? "  [Ctrl+Z] undo \xB7 [r]/[a] manually toggle \xB7 [F] continue" : "  [r]/[a] manually toggle \xB7 [F] continue" })
+      return /* @__PURE__ */ jsxs48(Box46, { flexDirection: "column", borderStyle: "single", borderColor: PALETTE.error, paddingX: 1, children: [
+        /* @__PURE__ */ jsx49(Text48, { color: PALETTE.error, bold: true, children: `Cyclic manifest \u2014 auto-rejected ${stillRejected.length} component${stillRejected.length === 1 ? "" : "s"}:` }),
+        members.length > 0 && /* @__PURE__ */ jsx49(Text48, { color: PALETTE.error, children: `  Cycle members: ${members.join(", ")}` }),
+        ancestors.length > 0 && /* @__PURE__ */ jsx49(Text48, { color: PALETTE.error, children: `  Ancestors: ${ancestors.join(", ")}` }),
+        /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: undoSnapshot ? "  [Ctrl+Z] undo \xB7 [r]/[a] manually toggle \xB7 [F] continue" : "  [r]/[a] manually toggle \xB7 [F] continue" })
       ] });
     })(),
-    !dialogOpen && emptyCount > 0 && /* @__PURE__ */ jsx48(Text47, { color: PALETTE.warning, children: `\u26A0 ${emptyCount} component${emptyCount === 1 ? "" : "s"} had no classifiable props \u2014 review with care` }),
-    !dialogOpen && finalizeError && /* @__PURE__ */ jsx48(Text47, { color: PALETTE.error, children: `\u26A0 ${finalizeError}` }),
-    !dialogOpen && /* @__PURE__ */ jsxs47(Box45, { children: [
-      breakingPanel.isOpen ? /* @__PURE__ */ jsx48(
+    !dialogOpen && emptyCount > 0 && /* @__PURE__ */ jsx49(Text48, { color: PALETTE.warning, children: `\u26A0 ${emptyCount} component${emptyCount === 1 ? "" : "s"} had no classifiable props \u2014 review with care` }),
+    !dialogOpen && finalizeError && /* @__PURE__ */ jsx49(Text48, { color: PALETTE.error, children: `\u26A0 ${finalizeError}` }),
+    !dialogOpen && /* @__PURE__ */ jsxs48(Box46, { children: [
+      breakingPanel.isOpen ? /* @__PURE__ */ jsx49(
         GotoBanner,
         {
           title: "Breaking changes",
@@ -25841,7 +26103,7 @@ function GenerateReviewStep({
           width: sidebarWidth,
           footerHint: "[\u2191/\u2193] move \xB7 [Enter] jump \xB7 [D] detail \xB7 [Esc] close"
         }
-      ) : lineagePanel.isOpen && focusedComponentKey ? /* @__PURE__ */ jsx48(
+      ) : lineagePanel.isOpen && focusedComponentKey ? /* @__PURE__ */ jsx49(
         LineagePanel,
         {
           focusedComponentKey,
@@ -25851,7 +26113,7 @@ function GenerateReviewStep({
           maxRows: panelMaxRows,
           width: sidebarWidth
         }
-      ) : /* @__PURE__ */ jsx48(
+      ) : /* @__PURE__ */ jsx49(
         GroupedSidebar,
         {
           items: groupedItems,
@@ -25889,11 +26151,11 @@ function GenerateReviewStep({
           graph: sidebarGraph
         }
       ),
-      /* @__PURE__ */ jsx48(Box45, { flexGrow: 1, paddingLeft: 1, flexDirection: "column", children: selected ? /* @__PURE__ */ jsxs47(Fragment14, { children: [
-        /* @__PURE__ */ jsxs47(Box45, { children: [
-          /* @__PURE__ */ jsx48(Text47, { bold: true, children: selected.key }),
-          /* @__PURE__ */ jsx48(Box45, { flexGrow: 1 }),
-          /* @__PURE__ */ jsxs47(Text47, { dimColor: true, children: [
+      /* @__PURE__ */ jsx49(Box46, { flexGrow: 1, paddingLeft: 1, flexDirection: "column", children: selected ? /* @__PURE__ */ jsxs48(Fragment14, { children: [
+        /* @__PURE__ */ jsxs48(Box46, { children: [
+          /* @__PURE__ */ jsx49(Text48, { bold: true, children: selected.key }),
+          /* @__PURE__ */ jsx49(Box46, { flexGrow: 1 }),
+          /* @__PURE__ */ jsxs48(Text48, { dimColor: true, children: [
             propCount,
             " prop",
             propCount !== 1 ? "s" : "",
@@ -25915,7 +26177,7 @@ function GenerateReviewStep({
               rationale: s.rationale ?? ""
             }))
           ];
-          return /* @__PURE__ */ jsx48(
+          return /* @__PURE__ */ jsx49(
             RationalePanel,
             {
               componentName: componentRationale?.name ?? selected.key,
@@ -25926,7 +26188,7 @@ function GenerateReviewStep({
               active: true
             }
           );
-        })() : panelOpen === "component-rationale" ? /* @__PURE__ */ jsx48(
+        })() : panelOpen === "component-rationale" ? /* @__PURE__ */ jsx49(
           ComponentRationalePanel,
           {
             data: componentRationale ?? {
@@ -25948,8 +26210,8 @@ function GenerateReviewStep({
           const src = reviewMetadata?.componentSource ?? null;
           const headerPath = path ?? "<unknown source path>";
           const lines = src ? src.split("\n").slice(panelScrollOffset, panelScrollOffset + PANEL_HEIGHT) : [];
-          return /* @__PURE__ */ jsxs47(
-            Box45,
+          return /* @__PURE__ */ jsxs48(
+            Box46,
             {
               flexDirection: "column",
               width: panelWidth,
@@ -25957,13 +26219,26 @@ function GenerateReviewStep({
               borderColor: "gray",
               paddingX: 1,
               children: [
-                /* @__PURE__ */ jsx48(Text47, { dimColor: true, bold: true, children: `source: ${headerPath}` }),
-                src ? lines.map((ln, i) => /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: ln }, `source-line-${i}`)) : /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: "(no source captured)" }),
-                /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: "[s/Esc] close" })
+                /* @__PURE__ */ jsx49(Text48, { dimColor: true, bold: true, children: `source: ${headerPath}` }),
+                src ? lines.map((ln, i) => /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: ln }, `source-line-${i}`)) : /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "(no source captured)" }),
+                /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "[s/Esc] close" })
               ]
             }
           );
-        })() : showJson ? /* @__PURE__ */ jsx48(
+        })() : panelOpen === "token-review" ? /* @__PURE__ */ jsx49(
+          TokenReviewPanel,
+          {
+            componentName: selected.key,
+            suggestions: currentTokenSuggestions(),
+            selectedRow: tokenReviewRow,
+            editing: tokenReviewEditing,
+            editCursor: tokenReviewEditCursor,
+            editSelection: tokenReviewEditSelection,
+            width: panelWidth,
+            height: PANEL_HEIGHT,
+            active: true
+          }
+        ) : showJson ? /* @__PURE__ */ jsx49(
           JsonPanel,
           {
             label: "GENERATED DEFINITION (read-only)",
@@ -25973,7 +26248,7 @@ function GenerateReviewStep({
             height: PANEL_HEIGHT,
             active: !sidebarFocused
           }
-        ) : /* @__PURE__ */ jsx48(
+        ) : /* @__PURE__ */ jsx49(
           FieldEditor,
           {
             value: draftValue || selectedJson,
@@ -26013,39 +26288,43 @@ function GenerateReviewStep({
           },
           pendingEditorFocus && pendingEditorFocus.componentName === selected.key ? `${selected.key}::${pendingEditorFocus.target.kind}:${pendingEditorFocus.target.name}` : selected.key
         ),
-        saveError && /* @__PURE__ */ jsx48(Text47, { color: PALETTE.error, children: "\u2717 " + saveError }),
-        /* @__PURE__ */ jsxs47(Text47, { dimColor: true, children: [
-          sidebarFocused ? hasGroupRoots ? "  [Space] expand/collapse group  [E/C] expand/collapse all" : "" : showJson ? "  [j/k] scroll  [Ctrl+u/d] half-page  [gg/G] top/bottom  [Tab] focus list" : "  [Tab] focus list  (edit fields)",
-          livePreviewHook.status === "running" && /* @__PURE__ */ jsx48(Text47, { children: `  ${livePreviewSpinner} live preview` }),
-          livePreviewHook.disabled && /* @__PURE__ */ jsx48(Text47, { children: "  \xB7 live preview disabled" })
+        saveError && /* @__PURE__ */ jsx49(Text48, { color: PALETTE.error, children: "\u2717 " + saveError }),
+        /* @__PURE__ */ jsxs48(Text48, { dimColor: true, children: [
+          panelOpen === "token-review" ? "  [\u2191/\u2193] move  [Enter] edit allowed  [Esc] close" : sidebarFocused ? hasGroupRoots ? "  [Space] expand/collapse group  [E/C] expand/collapse all" : "" : showJson ? "  [j/k] scroll  [Ctrl+u/d] half-page  [gg/G] top/bottom  [Tab] focus list" : "  [Tab] focus list  (edit fields)" + (currentTokenSuggestions().length > 0 ? "  [t] token review" : ""),
+          livePreviewHook.status === "running" && /* @__PURE__ */ jsx49(Text48, { children: `  ${livePreviewSpinner} live preview` }),
+          livePreviewHook.disabled && /* @__PURE__ */ jsx49(Text48, { children: "  \xB7 live preview disabled" })
         ] })
-      ] }) : /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: "No component selected" }) })
+      ] }) : /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "No component selected" }) })
     ] }),
     breakPanel.isOpen && !breakOverlayFullScreen && !dialogOpen && renderBreakOverlay(),
-    !dialogOpen && slotCycles.length > 0 && !cyclePanel.isOpen && !breakPanel.isOpen && /* @__PURE__ */ jsxs47(Box45, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx48(Text47, { color: PALETTE.warning, children: `\u26A0 ${slotCycles.length} slot dependency cycle${slotCycles.length === 1 ? "" : "s"} detected \u2014 push will fail` }),
+    !dialogOpen && slotCycles.length > 0 && !cyclePanel.isOpen && !breakPanel.isOpen && /* @__PURE__ */ jsxs48(Box46, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx49(Text48, { color: PALETTE.warning, children: `\u26A0 ${slotCycles.length} slot dependency cycle${slotCycles.length === 1 ? "" : "s"} detected \u2014 push will fail` }),
       slotCycles.slice(0, 3).map((cycle, idx) => {
         const segs = formatCyclePathSegments(cycle);
-        return /* @__PURE__ */ jsxs47(Text47, { color: PALETTE.warning, children: [
+        return /* @__PURE__ */ jsxs48(Text48, { color: PALETTE.warning, children: [
           "  Cycle: ",
           segs.map(
-            (seg, si) => seg.kind === "slot" ? /* @__PURE__ */ jsx48(Text47, { color: PALETTE.info, children: seg.text }, si) : seg.kind === "arrow" ? /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: seg.text }, si) : /* @__PURE__ */ jsx48(Text47, { color: PALETTE.warning, children: seg.text }, si)
+            (seg, si) => seg.kind === "slot" ? /* @__PURE__ */ jsx49(Text48, { color: PALETTE.info, children: seg.text }, si) : seg.kind === "arrow" ? /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: seg.text }, si) : /* @__PURE__ */ jsx49(Text48, { color: PALETTE.warning, children: seg.text }, si)
           )
         ] }, `cyc-banner-${idx}`);
       }),
-      slotCycles.length > 3 && /* @__PURE__ */ jsx48(Text47, { color: PALETTE.warning, children: `  \u2026${slotCycles.length - 3} more` }),
-      /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: "  press [c] for detail" })
+      slotCycles.length > 3 && /* @__PURE__ */ jsx49(Text48, { color: PALETTE.warning, children: `  \u2026${slotCycles.length - 3} more` }),
+      /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "  press [c] for detail" })
     ] }),
-    !dialogOpen && searchOpen && /* @__PURE__ */ jsxs47(Box45, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs47(Text47, { children: [
+    !dialogOpen && searchOpen && /* @__PURE__ */ jsxs48(Box46, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs48(Text48, { children: [
         `/${searchQuery}`,
-        /* @__PURE__ */ jsx48(Text47, { color: PALETTE.info, children: "\u258E" }),
-        searchQuery && /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: `  (${searchMatchCount}/${components.length} matches)` })
+        /* @__PURE__ */ jsx49(Text48, { color: PALETTE.info, children: "\u258E" }),
+        searchQuery && /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: `  (${searchMatchCount}/${components.length} matches)` })
       ] }),
-      autocompleteCandidates.length > 1 && /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: `  possibilities: ${autocompleteCandidates.join(" \xB7 ").slice(0, 120)}` })
+      autocompleteCandidates.length > 1 && /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: `  possibilities: ${autocompleteCandidates.join(" \xB7 ").slice(0, 120)}` })
     ] }),
-    !dialogOpen && !searchOpen && searchQuery && /* @__PURE__ */ jsx48(Box45, { children: /* @__PURE__ */ jsx48(Text47, { dimColor: true, children: `/${searchQuery}  (${searchMatchCount}/${components.length} matches) \xB7 [Esc] clear` }) }),
-    !dialogOpen && sidebarFocused && /* @__PURE__ */ jsxs47(Box45, { columnGap: 2, flexWrap: "wrap", children: [
+    !dialogOpen && !searchOpen && searchQuery && /* @__PURE__ */ jsx49(Box46, { children: /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: `/${searchQuery}  (${searchMatchCount}/${components.length} matches) \xB7 [Esc] clear` }) }),
+    !dialogOpen && sidebarFocused && /* @__PURE__ */ jsx49(Box46, { columnGap: 2, flexWrap: "wrap", children: panelOpen === "token-review" ? /* @__PURE__ */ jsxs48(Fragment14, { children: [
+      legendEntry("[\u2191/\u2193]", "move"),
+      legendEntry("[Enter]", "edit allowed"),
+      legendEntry("[Esc]", "close")
+    ] }) : /* @__PURE__ */ jsxs48(Fragment14, { children: [
       legendEntry("[j/k]", "move"),
       legendEntry("[a]", "accept"),
       legendEntry("[r]", "reject"),
@@ -26060,6 +26339,7 @@ function GenerateReviewStep({
       legendEntry("[p]", "prop rationale", panelOpen === "prop-rationale"),
       legendEntry("[P]", "component rationale", panelOpen === "component-rationale"),
       legendEntry("[s]", "source", panelOpen === "source"),
+      currentTokenSuggestions().length > 0 && legendEntry("[t]", "token review"),
       legendEntry("[J]", showJson ? "hide JSON" : "show JSON", showJson),
       legendEntry("[H]", showHiddenProps ? "hide state/unattached" : "show state/unattached", showHiddenProps),
       breakingChanges.length > 0 && legendEntry("[b]", "see breaking changes", breakingPanel.isOpen),
@@ -26071,8 +26351,8 @@ function GenerateReviewStep({
       legendEntry("[Ctrl+R]", "reload"),
       legendEntry("[?]", "help"),
       legendEntry("[q]", "quit")
-    ] }),
-    !dialogOpen && /* @__PURE__ */ jsx48(
+    ] }) }),
+    !dialogOpen && /* @__PURE__ */ jsx49(
       StatusBar,
       {
         accepted,
@@ -26105,11 +26385,13 @@ var init_GenerateReviewStep = __esm({
     init_removed_components_text();
     init_QuitDialog();
     init_useImmediateInput();
+    init_manifest();
     init_db();
     init_cycle_detection();
     init_cycle_panel_scroll();
     init_RationalePanel();
     init_ComponentRationalePanel();
+    init_TokenReviewPanel();
     init_preview_annotations();
     init_useLivePreview();
     init_useFinalizePreview();
@@ -26209,8 +26491,8 @@ var init_GenerateReviewStep = __esm({
 
 // packages/experience-design-system-cli/src/import/tui/steps/AtomicGenerateReviewStep.tsx
 import { useEffect as useEffect14, useRef as useRef8, useState as useState27 } from "react";
-import { Box as Box46, Text as Text48, useStdout as useStdout7 } from "ink";
-import { Fragment as Fragment15, jsx as jsx49, jsxs as jsxs48 } from "react/jsx-runtime";
+import { Box as Box47, Text as Text49, useStdout as useStdout7 } from "ink";
+import { Fragment as Fragment15, jsx as jsx50, jsxs as jsxs49 } from "react/jsx-runtime";
 function sortComponentsForSidebar3(components) {
   return [...components].sort((a, b) => {
     const aEmpty = Object.keys(a.entry.$properties ?? {}).length === 0;
@@ -26221,6 +26503,7 @@ function sortComponentsForSidebar3(components) {
 }
 function AtomicGenerateReviewStep({
   extractSessionId,
+  tokenSessionId,
   onFinalize,
   onQuit,
   livePreview = true,
@@ -26255,6 +26538,12 @@ function AtomicGenerateReviewStep({
   const [panelScrollOffset, setPanelScrollOffset] = useState27(0);
   const [textEntryActive, setTextEntryActive] = useState27(false);
   const [componentRationale, setComponentRationale] = useState27(null);
+  const [tokenReviewRow, setTokenReviewRow] = useState27(0);
+  const [tokenReviewEditing, setTokenReviewEditing] = useState27(false);
+  const [tokenReviewEditCursor, setTokenReviewEditCursor] = useState27(0);
+  const [tokenReviewEditSelection, setTokenReviewEditSelection] = useState27(/* @__PURE__ */ new Set());
+  const [availableTokens, setAvailableTokens] = useState27([]);
+  const tokenReviewSuggestedRef = useRef8(/* @__PURE__ */ new Map());
   const pendingGRef = useRef8(false);
   const [showReloadDialog, setShowReloadDialog] = useState27(false);
   const historyRef = useRef8(null);
@@ -26290,35 +26579,53 @@ function AtomicGenerateReviewStep({
   const loadEntries = () => {
     const db = openPipelineDb();
     let cdfComponents;
+    let tokens = [];
     try {
       cdfComponents = loadCDFComponents(db, extractSessionId);
+      tokens = loadDTCGTokens(db, tokenSessionId ?? extractSessionId).tokens.map((token) => ({
+        path: token.path,
+        kind: token.$type
+      }));
     } finally {
       db.close();
     }
     if (cdfComponents.length === 0) {
-      return { entries: [], error: "No generated definitions found for this session. Try re-running generate." };
+      return {
+        entries: [],
+        tokens: [],
+        error: "No generated definitions found for this session. Try re-running generate."
+      };
     }
     const reviewEntries = cdfComponents.map(({ key, entry }) => ({
       key,
       entry,
       status: "needs-review"
     }));
-    return { entries: sortComponentsForSidebar3(reviewEntries), error: null };
+    return { entries: sortComponentsForSidebar3(reviewEntries), tokens, error: null };
   };
   useEffect14(() => {
-    try {
-      const { entries, error } = loadEntries();
-      if (error) {
-        setLoadError(error);
-      } else {
+    let disposed = false;
+    void (async () => {
+      try {
+        const { entries, tokens, error } = loadEntries();
+        if (error) {
+          if (!disposed) setLoadError(error);
+          return;
+        }
+        const catalog = tokensPath ? (await readTokensFromPath("tokens", tokensPath)).map((token) => ({ path: token.path, kind: token.$type })) : tokens;
+        if (disposed) return;
         setComponents(entries);
+        setAvailableTokens(catalog);
+      } catch (e) {
+        if (!disposed) setLoadError(String(e));
+      } finally {
+        if (!disposed) setLoading(false);
       }
-    } catch (e) {
-      setLoadError(String(e));
-    } finally {
-      setLoading(false);
-    }
-  }, []);
+    })();
+    return () => {
+      disposed = true;
+    };
+  }, [extractSessionId, tokenSessionId, tokensPath]);
   useEffect14(() => {
     if (loading) return;
     if (historySeededRef.current) return;
@@ -26353,12 +26660,13 @@ function AtomicGenerateReviewStep({
   };
   const reloadFromSave = () => {
     try {
-      const { entries, error } = loadEntries();
+      const { entries, tokens, error } = loadEntries();
       if (error) {
         setLoadError(error);
         return;
       }
       setComponents(entries);
+      setAvailableTokens(tokens);
       historyRef.current?.reset({
         components: entries.map((c2) => ({ key: c2.key, entry: c2.entry, status: c2.status })),
         autoRejected: [],
@@ -26389,6 +26697,12 @@ function AtomicGenerateReviewStep({
       db.close();
     }
   }, [selectedIdx, components, extractSessionId]);
+  useEffect14(() => {
+    setTokenReviewRow(0);
+    setTokenReviewEditing(false);
+    setTokenReviewEditCursor(0);
+    setTokenReviewEditSelection(/* @__PURE__ */ new Set());
+  }, [selectedIdx]);
   useEffect14(() => {
     const current = components[selectedIdx];
     if (!current) {
@@ -26481,6 +26795,46 @@ function AtomicGenerateReviewStep({
     setDraftValue("");
     setSaveError(null);
   };
+  const currentTokenSuggestions = () => {
+    const current = components[selectedIdx];
+    if (!current) return [];
+    return collectTokenSuggestions(current.entry, availableTokens).map((suggestion) => {
+      const snapshotKey = `${current.key}::${suggestion.propName}`;
+      const suggested = tokenReviewSuggestedRef.current.get(snapshotKey) ?? [...suggestion.suggested];
+      tokenReviewSuggestedRef.current.set(snapshotKey, suggested);
+      return { ...suggestion, suggested };
+    });
+  };
+  const persistTokenFields = (propName, allowed) => {
+    const current = components[selectedIdx];
+    if (!current) return;
+    const prop = current.entry.$properties[propName];
+    if (!prop) return;
+    const nextProp = { ...prop };
+    nextProp["$token.allowed"] = allowed;
+    const nextEntry = {
+      ...current.entry,
+      $properties: { ...current.entry.$properties, [propName]: nextProp }
+    };
+    setComponents((prev) => {
+      const next = prev.map((c2, i) => i === selectedIdx ? { ...c2, entry: nextEntry } : c2);
+      pushHistorySnapshot(next, `token-review:${propName}`);
+      return next;
+    });
+    const db = openPipelineDb();
+    try {
+      storeCDFComponents(db, extractSessionId, [{ key: current.key, entry: nextEntry }]);
+    } finally {
+      db.close();
+    }
+    livePreviewHook.trigger();
+  };
+  const handleTokenEditSave = (s) => {
+    const allowed = s.paths.filter((p) => tokenReviewEditSelection.has(p));
+    if (allowed.length === 0) return;
+    persistTokenFields(s.propName, allowed);
+    setTokenReviewEditing(false);
+  };
   const dialogOpen = showFinalize || showQuit;
   useImmediateInput((input, key) => {
     if (loading) return;
@@ -26534,6 +26888,65 @@ function AtomicGenerateReviewStep({
       setShowRemovedPanel(true);
       return;
     }
+    if (panelOpen === "token-review") {
+      const suggestions = currentTokenSuggestions();
+      const row = suggestions[tokenReviewRow];
+      if (tokenReviewEditing) {
+        if (row && row.paths.length > 0) {
+          if (key.upArrow || input === "k") {
+            setTokenReviewEditCursor((c2) => Math.max(0, c2 - 1));
+            return;
+          }
+          if (key.downArrow || input === "j") {
+            setTokenReviewEditCursor((c2) => Math.min(row.paths.length - 1, c2 + 1));
+            return;
+          }
+          if (input === " " || key.return) {
+            const path = row.paths[tokenReviewEditCursor];
+            setTokenReviewEditSelection((prev) => {
+              const next = new Set(prev);
+              if (next.has(path) && next.size === 1) return next;
+              if (next.has(path)) next.delete(path);
+              else next.add(path);
+              return next;
+            });
+            return;
+          }
+          if (key.ctrl && input === "s") {
+            handleTokenEditSave(row);
+            return;
+          }
+        }
+        if (key.escape) {
+          setTokenReviewEditing(false);
+          return;
+        }
+        return;
+      }
+      if (key.upArrow || input === "k") {
+        setTokenReviewRow((r) => Math.max(0, r - 1));
+        return;
+      }
+      if (key.downArrow || input === "j") {
+        setTokenReviewRow((r) => Math.min(Math.max(0, suggestions.length - 1), r + 1));
+        return;
+      }
+      if (key.return && row) {
+        setTokenReviewEditCursor(0);
+        setTokenReviewEditSelection(new Set(row.allowed));
+        setTokenReviewEditing(true);
+        return;
+      }
+      if (key.escape) {
+        setPanelOpen("none");
+        return;
+      }
+      if (input === "t") {
+        setPanelOpen("none");
+        return;
+      }
+      return;
+    }
     if (panelOpen !== "none") {
       const PANEL_HEIGHT_LOCAL = 12;
       const next = computeNextScrollOffset(panelScrollOffset, input, key, 9999, PANEL_HEIGHT_LOCAL);
@@ -26596,6 +27009,11 @@ function AtomicGenerateReviewStep({
         setPanelScrollOffset(() => 0);
         return;
       }
+      if (input === "t" && currentTokenSuggestions().length > 0) {
+        setPanelOpen("token-review");
+        setTokenReviewRow(0);
+        return;
+      }
     }
     if (key.tab) {
       setSidebarFocused((prev) => !prev);
@@ -26690,13 +27108,13 @@ function AtomicGenerateReviewStep({
     }
   });
   if (loading) {
-    return /* @__PURE__ */ jsx49(Box46, { paddingX: 2, paddingY: 1, children: /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "Loading generated definitions..." }) });
+    return /* @__PURE__ */ jsx50(Box47, { paddingX: 2, paddingY: 1, children: /* @__PURE__ */ jsx50(Text49, { dimColor: true, children: "Loading generated definitions..." }) });
   }
   if (loadError) {
-    return /* @__PURE__ */ jsxs48(Box46, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-      /* @__PURE__ */ jsx49(Text48, { color: PALETTE.error, children: loadError }),
-      /* @__PURE__ */ jsx49(Text48, { children: " " }),
-      /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "[q / Enter / Esc] Quit" })
+    return /* @__PURE__ */ jsxs49(Box47, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
+      /* @__PURE__ */ jsx50(Text49, { color: PALETTE.error, children: loadError }),
+      /* @__PURE__ */ jsx50(Text49, { children: " " }),
+      /* @__PURE__ */ jsx50(Text49, { dimColor: true, children: "[q / Enter / Esc] Quit" })
     ] });
   }
   const selected = components[selectedIdx] ?? null;
@@ -26722,8 +27140,8 @@ function AtomicGenerateReviewStep({
   const needsReview = components.filter((c2) => c2.status === "needs-review").length;
   const propCount = selected ? Object.keys(selected.entry.$properties).length : 0;
   const slotCount = selected?.entry.$slots ? Object.keys(selected.entry.$slots).length : 0;
-  return /* @__PURE__ */ jsxs48(Box46, { flexDirection: "column", children: [
-    showFinalize && /* @__PURE__ */ jsx49(
+  return /* @__PURE__ */ jsxs49(Box47, { flexDirection: "column", children: [
+    showFinalize && /* @__PURE__ */ jsx50(
       FinalizeDialog,
       {
         accepted,
@@ -26736,21 +27154,21 @@ function AtomicGenerateReviewStep({
         onCancel: () => setShowFinalize(false)
       }
     ),
-    showQuit && /* @__PURE__ */ jsx49(QuitDialog, { hasUnsavedDrafts: false, onConfirm: onQuit, onCancel: () => setShowQuit(false) }),
-    showReloadDialog && !dialogOpen && /* @__PURE__ */ jsxs48(Box46, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.warning, paddingX: 1, children: [
-      /* @__PURE__ */ jsx49(Text48, { bold: true, color: PALETTE.warning, children: "Reload from saved state?" }),
-      /* @__PURE__ */ jsx49(Text48, { children: "Unsaved in-memory changes will be lost." }),
-      /* @__PURE__ */ jsx49(Text48, { children: " " }),
-      /* @__PURE__ */ jsx49(Text48, { children: "  [Enter]  Confirm" }),
-      /* @__PURE__ */ jsx49(Text48, { children: "  [Esc]    Cancel" })
+    showQuit && /* @__PURE__ */ jsx50(QuitDialog, { hasUnsavedDrafts: false, onConfirm: onQuit, onCancel: () => setShowQuit(false) }),
+    showReloadDialog && !dialogOpen && /* @__PURE__ */ jsxs49(Box47, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.warning, paddingX: 1, children: [
+      /* @__PURE__ */ jsx50(Text49, { bold: true, color: PALETTE.warning, children: "Reload from saved state?" }),
+      /* @__PURE__ */ jsx50(Text49, { children: "Unsaved in-memory changes will be lost." }),
+      /* @__PURE__ */ jsx50(Text49, { children: " " }),
+      /* @__PURE__ */ jsx50(Text49, { children: "  [Enter]  Confirm" }),
+      /* @__PURE__ */ jsx50(Text49, { children: "  [Esc]    Cancel" })
     ] }),
-    showRemovedPanel && !dialogOpen && /* @__PURE__ */ jsxs48(Box46, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.info, paddingX: 1, children: [
-      /* @__PURE__ */ jsx49(Text48, { bold: true, color: PALETTE.info, children: `Removed components (${removedComponents.length})` }),
-      /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "these will be DELETED from the target space" }),
-      /* @__PURE__ */ jsx49(Text48, { children: " " }),
-      removedComponents.map((rc) => /* @__PURE__ */ jsx49(Text48, { children: `- ${rc.name}${rc.id ? `  (${rc.id})` : ""}` }, rc.id)),
-      /* @__PURE__ */ jsx49(Text48, { children: " " }),
-      /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "press d or Esc to close" })
+    showRemovedPanel && !dialogOpen && /* @__PURE__ */ jsxs49(Box47, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.info, paddingX: 1, children: [
+      /* @__PURE__ */ jsx50(Text49, { bold: true, color: PALETTE.info, children: `Removed components (${removedComponents.length})` }),
+      /* @__PURE__ */ jsx50(Text49, { dimColor: true, children: "these will be DELETED from the target space" }),
+      /* @__PURE__ */ jsx50(Text49, { children: " " }),
+      removedComponents.map((rc) => /* @__PURE__ */ jsx50(Text49, { children: `- ${rc.name}${rc.id ? `  (${rc.id})` : ""}` }, rc.id)),
+      /* @__PURE__ */ jsx50(Text49, { children: " " }),
+      /* @__PURE__ */ jsx50(Text49, { dimColor: true, children: "press d or Esc to close" })
     ] }),
     !dialogOpen && livePreview && (() => {
       const counts = { new: 0, changed: 0, removed: 0, breaking: 0 };
@@ -26759,28 +27177,28 @@ function AtomicGenerateReviewStep({
       }
       const hasCounts = counts.new + counts.changed + counts.removed + counts.breaking > 0;
       if (livePreviewHook.disabled) {
-        return /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "Preview: disabled (creds rejected)" });
+        return /* @__PURE__ */ jsx50(Text49, { dimColor: true, children: "Preview: disabled (creds rejected)" });
       }
       if (livePreviewHook.status === "running" && !hasCounts) {
-        return /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: `Preview: ${livePreviewSpinner} running...` });
+        return /* @__PURE__ */ jsx50(Text49, { dimColor: true, children: `Preview: ${livePreviewSpinner} running...` });
       }
       if (!hasCounts) return null;
-      return /* @__PURE__ */ jsxs48(Box46, { children: [
-        /* @__PURE__ */ jsx49(Text48, { children: "Preview: " }),
-        /* @__PURE__ */ jsx49(Text48, { color: PALETTE.success, children: `${counts.new} new` }),
-        /* @__PURE__ */ jsx49(Text48, { children: " \xB7 " }),
-        /* @__PURE__ */ jsx49(Text48, { color: PALETTE.warning, children: `${counts.changed} changed` }),
-        /* @__PURE__ */ jsx49(Text48, { children: " \xB7 " }),
-        /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: `${counts.removed} removed` }),
-        removedComponents.length > 0 && /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: " ([d] removed list)" }),
-        /* @__PURE__ */ jsx49(Text48, { children: " \xB7 " }),
-        /* @__PURE__ */ jsx49(Text48, { color: PALETTE.error, bold: true, children: `${counts.breaking} breaking` })
+      return /* @__PURE__ */ jsxs49(Box47, { children: [
+        /* @__PURE__ */ jsx50(Text49, { children: "Preview: " }),
+        /* @__PURE__ */ jsx50(Text49, { color: PALETTE.success, children: `${counts.new} new` }),
+        /* @__PURE__ */ jsx50(Text49, { children: " \xB7 " }),
+        /* @__PURE__ */ jsx50(Text49, { color: PALETTE.warning, children: `${counts.changed} changed` }),
+        /* @__PURE__ */ jsx50(Text49, { children: " \xB7 " }),
+        /* @__PURE__ */ jsx50(Text49, { dimColor: true, children: `${counts.removed} removed` }),
+        removedComponents.length > 0 && /* @__PURE__ */ jsx50(Text49, { dimColor: true, children: " ([d] removed list)" }),
+        /* @__PURE__ */ jsx50(Text49, { children: " \xB7 " }),
+        /* @__PURE__ */ jsx50(Text49, { color: PALETTE.error, bold: true, children: `${counts.breaking} breaking` })
       ] });
     })(),
-    !dialogOpen && emptyCount > 0 && /* @__PURE__ */ jsx49(Text48, { color: PALETTE.warning, children: `\u26A0 ${emptyCount} component${emptyCount === 1 ? "" : "s"} had no classifiable props \u2014 review with care` }),
-    !dialogOpen && finalizeError && /* @__PURE__ */ jsx49(Text48, { color: PALETTE.error, children: `\u26A0 ${finalizeError}` }),
-    !dialogOpen && /* @__PURE__ */ jsxs48(Box46, { children: [
-      /* @__PURE__ */ jsx49(
+    !dialogOpen && emptyCount > 0 && /* @__PURE__ */ jsx50(Text49, { color: PALETTE.warning, children: `\u26A0 ${emptyCount} component${emptyCount === 1 ? "" : "s"} had no classifiable props \u2014 review with care` }),
+    !dialogOpen && finalizeError && /* @__PURE__ */ jsx50(Text49, { color: PALETTE.error, children: `\u26A0 ${finalizeError}` }),
+    !dialogOpen && /* @__PURE__ */ jsxs49(Box47, { children: [
+      /* @__PURE__ */ jsx50(
         Sidebar,
         {
           components: sidebarItems,
@@ -26799,11 +27217,11 @@ function AtomicGenerateReviewStep({
           width: sidebarWidth
         }
       ),
-      /* @__PURE__ */ jsx49(Box46, { flexGrow: 1, paddingLeft: 1, flexDirection: "column", children: selected ? /* @__PURE__ */ jsxs48(Fragment15, { children: [
-        /* @__PURE__ */ jsxs48(Box46, { children: [
-          /* @__PURE__ */ jsx49(Text48, { bold: true, children: selected.key }),
-          /* @__PURE__ */ jsx49(Box46, { flexGrow: 1 }),
-          /* @__PURE__ */ jsxs48(Text48, { dimColor: true, children: [
+      /* @__PURE__ */ jsx50(Box47, { flexGrow: 1, paddingLeft: 1, flexDirection: "column", children: selected ? /* @__PURE__ */ jsxs49(Fragment15, { children: [
+        /* @__PURE__ */ jsxs49(Box47, { children: [
+          /* @__PURE__ */ jsx50(Text49, { bold: true, children: selected.key }),
+          /* @__PURE__ */ jsx50(Box47, { flexGrow: 1 }),
+          /* @__PURE__ */ jsxs49(Text49, { dimColor: true, children: [
             propCount,
             " prop",
             propCount !== 1 ? "s" : "",
@@ -26825,7 +27243,7 @@ function AtomicGenerateReviewStep({
               rationale: s.rationale ?? ""
             }))
           ];
-          return /* @__PURE__ */ jsx49(
+          return /* @__PURE__ */ jsx50(
             RationalePanel,
             {
               componentName: componentRationale?.name ?? selected.key,
@@ -26836,7 +27254,7 @@ function AtomicGenerateReviewStep({
               active: true
             }
           );
-        })() : panelOpen === "component-rationale" ? /* @__PURE__ */ jsx49(
+        })() : panelOpen === "component-rationale" ? /* @__PURE__ */ jsx50(
           ComponentRationalePanel,
           {
             data: componentRationale ?? {
@@ -26858,8 +27276,8 @@ function AtomicGenerateReviewStep({
           const src = reviewMetadata?.componentSource ?? null;
           const headerPath = path ?? "<unknown source path>";
           const lines = src ? src.split("\n").slice(panelScrollOffset, panelScrollOffset + PANEL_HEIGHT2) : [];
-          return /* @__PURE__ */ jsxs48(
-            Box46,
+          return /* @__PURE__ */ jsxs49(
+            Box47,
             {
               flexDirection: "column",
               width: panelWidth,
@@ -26867,13 +27285,26 @@ function AtomicGenerateReviewStep({
               borderColor: PALETTE.border,
               paddingX: 1,
               children: [
-                /* @__PURE__ */ jsx49(Text48, { dimColor: true, bold: true, children: `source: ${headerPath}` }),
-                src ? lines.map((ln, i) => /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: ln }, `source-line-${i}`)) : /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "(no source captured)" }),
-                /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "[s/Esc] close" })
+                /* @__PURE__ */ jsx50(Text49, { dimColor: true, bold: true, children: `source: ${headerPath}` }),
+                src ? lines.map((ln, i) => /* @__PURE__ */ jsx50(Text49, { dimColor: true, children: ln }, `source-line-${i}`)) : /* @__PURE__ */ jsx50(Text49, { dimColor: true, children: "(no source captured)" }),
+                /* @__PURE__ */ jsx50(Text49, { dimColor: true, children: "[s/Esc] close" })
               ]
             }
           );
-        })() : showJson ? /* @__PURE__ */ jsx49(
+        })() : panelOpen === "token-review" ? /* @__PURE__ */ jsx50(
+          TokenReviewPanel,
+          {
+            componentName: selected.key,
+            suggestions: currentTokenSuggestions(),
+            selectedRow: tokenReviewRow,
+            editing: tokenReviewEditing,
+            editCursor: tokenReviewEditCursor,
+            editSelection: tokenReviewEditSelection,
+            width: panelWidth,
+            height: PANEL_HEIGHT2,
+            active: true
+          }
+        ) : showJson ? /* @__PURE__ */ jsx50(
           JsonPanel,
           {
             label: "GENERATED DEFINITION (read-only)",
@@ -26883,7 +27314,7 @@ function AtomicGenerateReviewStep({
             height: PANEL_HEIGHT2,
             active: !sidebarFocused
           }
-        ) : /* @__PURE__ */ jsx49(
+        ) : /* @__PURE__ */ jsx50(
           FieldEditor,
           {
             value: draftValue || selectedJson,
@@ -26917,15 +27348,15 @@ function AtomicGenerateReviewStep({
           },
           selected.key
         ),
-        saveError && /* @__PURE__ */ jsx49(Text48, { color: PALETTE.error, children: "\u2717 " + saveError }),
-        /* @__PURE__ */ jsxs48(Text48, { dimColor: true, children: [
-          sidebarFocused ? "  [a] accept  [r] reject  [A] accept all  [i] prop rationale  [I] component rationale  [s] source  [J] " + (showJson ? "hide JSON" : "show JSON") + "  [H] " + (showHiddenProps ? "hide state/unattached" : "show state/unattached") + "  [^z] undo  [^y] redo  [^r] reload  [F] finalize  [e/Tab] focus panel" + (livePreview && removedComponents.length > 0 ? "  [d] removed list" : "") + "  [q] quit" : showJson ? "  [j/k] scroll  [Ctrl+u/d] half-page  [gg/G] top/bottom  [Tab] focus list" : "  [Tab] focus list  (edit fields)",
-          livePreviewHook.status === "running" && /* @__PURE__ */ jsx49(Text48, { children: `  ${livePreviewSpinner} live preview` }),
-          livePreviewHook.disabled && /* @__PURE__ */ jsx49(Text48, { children: "  \xB7 live preview disabled" })
+        saveError && /* @__PURE__ */ jsx50(Text49, { color: PALETTE.error, children: "\u2717 " + saveError }),
+        /* @__PURE__ */ jsxs49(Text49, { dimColor: true, children: [
+          panelOpen === "token-review" ? "  [\u2191/\u2193] move  [Enter] edit allowed  [Esc] close" : sidebarFocused ? "  [a] accept  [r] reject  [A] accept all  [i] prop rationale  [I] component rationale  [s] source  [J] " + (showJson ? "hide JSON" : "show JSON") + "  [H] " + (showHiddenProps ? "hide state/unattached" : "show state/unattached") + (currentTokenSuggestions().length > 0 ? "  [t] token review" : "") + "  [^z] undo  [^y] redo  [^r] reload  [F] finalize  [e/Tab] focus panel" + (livePreview && removedComponents.length > 0 ? "  [d] removed list" : "") + "  [q] quit" : showJson ? "  [j/k] scroll  [Ctrl+u/d] half-page  [gg/G] top/bottom  [Tab] focus list" : "  [Tab] focus list  (edit fields)" + (currentTokenSuggestions().length > 0 ? "  [t] token review" : ""),
+          livePreviewHook.status === "running" && /* @__PURE__ */ jsx50(Text49, { children: `  ${livePreviewSpinner} live preview` }),
+          livePreviewHook.disabled && /* @__PURE__ */ jsx50(Text49, { children: "  \xB7 live preview disabled" })
         ] })
-      ] }) : /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "No component selected" }) })
+      ] }) : /* @__PURE__ */ jsx50(Text49, { dimColor: true, children: "No component selected" }) })
     ] }),
-    !dialogOpen && /* @__PURE__ */ jsx49(
+    !dialogOpen && /* @__PURE__ */ jsx50(
       StatusBar,
       {
         accepted,
@@ -26957,9 +27388,11 @@ var init_AtomicGenerateReviewStep = __esm({
     init_FinalizeDialog();
     init_QuitDialog();
     init_useImmediateInput();
+    init_manifest();
     init_db();
     init_RationalePanel();
     init_ComponentRationalePanel();
+    init_TokenReviewPanel();
     init_preview_annotations();
     init_history();
     init_useLivePreview();
@@ -26973,11 +27406,12 @@ var init_AtomicGenerateReviewStep = __esm({
 });
 
 // packages/experience-design-system-cli/src/import/tui/final-review-host.tsx
-import { Box as Box47, Text as Text49 } from "ink";
+import { Box as Box48, Text as Text50 } from "ink";
 import React27 from "react";
-import { jsx as jsx50, jsxs as jsxs49 } from "react/jsx-runtime";
+import { jsx as jsx51, jsxs as jsxs50 } from "react/jsx-runtime";
 function FinalReviewHost({
   extractSessionId,
+  tokenSessionId,
   generatedCount,
   autoAccept,
   compositionMode = "atomic",
@@ -26993,16 +27427,17 @@ function FinalReviewHost({
   allowDeletions
 }) {
   if (!extractSessionId) {
-    return /* @__PURE__ */ jsx50(Box47, { paddingX: 2, paddingY: 1, children: /* @__PURE__ */ jsx50(Text49, { color: PALETTE.error, children: "Error: no session ID \u2014 cannot load generated definitions." }) });
+    return /* @__PURE__ */ jsx51(Box48, { paddingX: 2, paddingY: 1, children: /* @__PURE__ */ jsx51(Text50, { color: PALETTE.error, children: "Error: no session ID \u2014 cannot load generated definitions." }) });
   }
   if (autoAccept) {
-    return /* @__PURE__ */ jsx50(FinalReviewAutoAccept, { generatedCount, onFinalize });
+    return /* @__PURE__ */ jsx51(FinalReviewAutoAccept, { generatedCount, onFinalize });
   }
   const StepComponent = compositionMode === "atomic" ? AtomicGenerateReviewStep : GenerateReviewStep;
-  return /* @__PURE__ */ jsx50(
+  return /* @__PURE__ */ jsx51(
     StepComponent,
     {
       extractSessionId,
+      tokenSessionId,
       onFinalize,
       onQuit,
       livePreview,
@@ -27023,7 +27458,7 @@ function FinalReviewAutoAccept({
   React27.useEffect(() => {
     onFinalize(generatedCount, 0, 0);
   }, []);
-  return /* @__PURE__ */ jsx50(Box47, { paddingX: 2, paddingY: 1, children: /* @__PURE__ */ jsxs49(Text49, { dimColor: true, children: [
+  return /* @__PURE__ */ jsx51(Box48, { paddingX: 2, paddingY: 1, children: /* @__PURE__ */ jsxs50(Text50, { dimColor: true, children: [
     "Auto-accepting ",
     generatedCount,
     " generated components..."
@@ -27128,13 +27563,15 @@ var WizardApp_exports = {};
 __export(WizardApp_exports, {
   WizardApp: () => WizardApp,
   buildGenerateComponentsArgs: () => buildGenerateComponentsArgs,
+  buildMapTokensArgs: () => buildMapTokensArgs,
   buildSelectAgentArgs: () => buildSelectAgentArgs,
   formatAcceptanceSummary: () => formatAcceptanceSummary,
   parseAutoFilterProgressLine: () => parseAutoFilterProgressLine,
-  parsePrintTokensCount: () => parsePrintTokensCount
+  parsePrintTokensCount: () => parsePrintTokensCount,
+  shouldRunMapTokens: () => shouldRunMapTokens
 });
 import { useEffect as useEffect15, useRef as useRef9, useState as useState28 } from "react";
-import { Box as Box48, Text as Text50, useStdout as useStdout8 } from "ink";
+import { Box as Box49, Text as Text51, useStdout as useStdout8 } from "ink";
 import { join as join23, resolve as resolve23 } from "node:path";
 import { appendFileSync as appendFileSync2, writeFileSync } from "node:fs";
 import { access as access9, readFile as readFile24, stat as stat6 } from "node:fs/promises";
@@ -27142,7 +27579,7 @@ import { tmpdir } from "node:os";
 import { execFile as execFile4, spawn as spawn4 } from "node:child_process";
 import { mkdir as mkdir7 } from "node:fs/promises";
 import { buildManifest as buildManifest4 } from "@contentful/experience-design-system-types";
-import { jsx as jsx51, jsxs as jsxs50 } from "react/jsx-runtime";
+import { jsx as jsx52, jsxs as jsxs51 } from "react/jsx-runtime";
 function buildSelectAgentArgs(opts) {
   const args = ["analyze", "select-agent", "--agent", opts.agent, "--session", opts.sessionId, "--exclude-invalid"];
   if (opts.model) args.push("--model", opts.model);
@@ -27185,6 +27622,16 @@ function buildGenerateComponentsArgs(opts) {
   if (opts.generatePromptPath) args.push("--generate-prompt-path", opts.generatePromptPath);
   return args;
 }
+function buildMapTokensArgs(opts) {
+  const args = ["map", "tokens", "--session", opts.sessionId, "--agent", opts.agent];
+  if (opts.model) args.push("--model", opts.model);
+  if (opts.noCache) args.push("--no-cache");
+  if (opts.skipAgent) args.push("--skip-agent");
+  return args;
+}
+function shouldRunMapTokens(opts) {
+  return opts.mappablePropCount > 0 && opts.rawTokenCount > 0;
+}
 function formatAcceptanceSummary(opts) {
   const acceptedClause = `${opts.accepted} component${opts.accepted === 1 ? "" : "s"} accepted`;
   if (opts.autoRejected === 0) return `${acceptedClause}.`;
@@ -27233,6 +27680,7 @@ function WizardApp({
   onConflictMode,
   selectPromptPath,
   generatePromptPath,
+  skipMapTokens = false,
   seedExtractSessionId,
   seedGenerateSessionId,
   seedTokenSessionId,
@@ -27318,6 +27766,7 @@ function WizardApp({
     credentialsValidating: false,
     generatePrefetchStatus: "idle",
     generatePrefetchError: null,
+    mapTokensEligible: null,
     credentialsSkipped: false,
     lastRunId: null,
     finalizeErrorBanner: null,
@@ -27463,6 +27912,60 @@ If you are using AWS Bedrock, run:
     }
     update({ step: "path-validation", tokensPath, tokenSessionId, tokenCount });
   };
+  const runMapTokens2 = async (sessionId2) => {
+    let mappablePropCount = 0;
+    let rawTokenCount = 0;
+    try {
+      const db = openPipelineDb();
+      try {
+        if (state.tokenSessionId && state.tokenSessionId !== sessionId2) {
+          copyTokensFromCache(db, state.tokenSessionId, sessionId2);
+        } else if (!state.tokenSessionId && state.tokensPath) {
+          const tokens = await readTokensFromPath("tokens", state.tokensPath);
+          storeDTCGTokens(db, sessionId2, [], tokens);
+        }
+        const cdfEntries = loadCDFComponents(db, sessionId2);
+        mappablePropCount = cdfEntries.reduce(
+          (count, { entry }) => count + Object.values(entry.$properties ?? {}).filter(
+            (prop) => prop.$type === "token" && prop.$category === "design"
+          ).length,
+          0
+        );
+        rawTokenCount = loadDTCGTokens(db, sessionId2).tokens.length;
+      } finally {
+        db.close();
+      }
+    } catch (error) {
+      update({
+        step: "error",
+        errorStep: "map tokens",
+        errorMessage: error instanceof Error ? error.message : String(error)
+      });
+      return false;
+    }
+    if (!shouldRunMapTokens({ mappablePropCount, rawTokenCount })) {
+      update({ mapTokensEligible: false });
+      return true;
+    }
+    update({ step: "mapping-tokens", mapTokensEligible: true });
+    const args = buildMapTokensArgs({
+      sessionId: sessionId2,
+      agent: state.agent,
+      ...state.agentModel ? { model: state.agentModel } : {},
+      noCache: effectiveNoCache,
+      skipAgent: skipMapTokens
+    });
+    const result = await runCli2(args);
+    if (result.exitCode !== 0) {
+      update({
+        step: "error",
+        errorStep: "map tokens",
+        errorMessage: result.stderr.trim() || "Unknown error"
+      });
+      return false;
+    }
+    return true;
+  };
   const runExtract = async (projectPath) => {
     const outDir = join23(resolve23(projectPath), ".contentful");
     update({ step: "extracting", outDir, extractProgress: null, compositionPhase: null });
@@ -27766,13 +28269,14 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
     const generatedCount = countMatch ? Number(countMatch[1]) : acceptedCount;
     const renamedMatch = /^renamed-slots:\s*(\d+)$/m.exec(result.stdout);
     const renamedSlotsCount = renamedMatch ? Number(renamedMatch[1]) : 0;
+    const mappedSessionId = generateSessionId2 ?? extractSessionId;
     update({
-      step: "final-review",
-      generateSessionId: generateSessionId2,
+      generateSessionId: mappedSessionId,
       generatedCount,
       renamedSlotsCount,
       generateProgress: null
     });
+    if (await runMapTokens2(mappedSessionId)) update({ step: "final-review" });
   };
   const advanceToPushFlow = (generatedAcceptedCount) => {
     update({ generatedAcceptedCount, step: "credentials" });
@@ -27867,7 +28371,10 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         const result = await inflight;
         generatePromiseRef.current = null;
         if (result.exitCode === 0 && result.signal !== "SIGTERM") {
-          setState((prev) => ({ ...prev, step: "final-review" }));
+          const sessionMatch = /^session=(.+)$/m.exec(result.stdout);
+          const generatedSessionId = sessionMatch ? sessionMatch[1].trim() : sid;
+          update({ generateSessionId: generatedSessionId });
+          if (await runMapTokens2(generatedSessionId)) update({ step: "final-review" });
           return;
         }
       }
@@ -28386,6 +28893,7 @@ If using a custom --host, make sure the space exists on that host.`
     "generating-tokens",
     "extracting",
     "generating",
+    "mapping-tokens",
     "printing",
     "previewing",
     "push-from-picker",
@@ -28394,11 +28902,11 @@ If using a custom --host, make sure the space exists on that host.`
   const hints = noQuitSteps.includes(state.step) ? [] : [{ key: "q", label: "quit" }];
   const hasTokens = !!state.tokensPath;
   const hasComponents = !state.skipComponents;
-  const totalSteps = 3 + (hasTokens ? 1 : 0) + (hasComponents ? 2 : 0);
+  const totalSteps = 3 + (hasTokens ? 1 : 0) + (hasComponents ? 2 : 0) + (state.mapTokensEligible === true ? 1 : 0);
   const stepContent = (() => {
     switch (state.step) {
       case "run-picker":
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           RunPicker,
           {
             runs: initialRuns ?? [],
@@ -28413,7 +28921,7 @@ If using a custom --host, make sure the space exists on that host.`
           }
         );
       case "welcome":
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           WelcomeStep,
           {
             onContinue: (path) => {
@@ -28425,7 +28933,7 @@ If using a custom --host, make sure the space exists on that host.`
           }
         );
       case "token-input":
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           TokenInputStep,
           {
             onConfirm: (rawTokensPath) => {
@@ -28436,7 +28944,7 @@ If using a custom --host, make sure the space exists on that host.`
           }
         );
       case "token-reuse-gate":
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           GateStep,
           {
             successMessage: "Existing tokens.json found",
@@ -28458,7 +28966,7 @@ If using a custom --host, make sure the space exists on that host.`
           }
         );
       case "checking-claude-auth":
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           RunningStep,
           {
             stepNumber: state.authCheckStepNumber,
@@ -28468,7 +28976,7 @@ If using a custom --host, make sure the space exists on that host.`
           }
         );
       case "generating-tokens":
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           RunningStep,
           {
             stepNumber: 1,
@@ -28478,7 +28986,7 @@ If using a custom --host, make sure the space exists on that host.`
           }
         );
       case "path-validation":
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           PathValidationStep,
           {
             projectPath: state.projectPath,
@@ -28518,7 +29026,7 @@ If using a custom --host, make sure the space exists on that host.`
           if (phase === "done") return "Composition mapping resolved \u2713";
           return `Composition: ${phase}`;
         })();
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           RunningStep,
           {
             stepNumber: hasTokens ? 2 : 1,
@@ -28532,7 +29040,7 @@ If using a custom --host, make sure the space exists on that host.`
       }
       case "scope-gate": {
         if (!state.extractSessionId) {
-          return /* @__PURE__ */ jsx51(Box48, { paddingX: 2, paddingY: 1, children: /* @__PURE__ */ jsx51(Text50, { color: PALETTE.error, children: "Error: extract session ID missing \u2014 please re-run." }) });
+          return /* @__PURE__ */ jsx52(Box49, { paddingX: 2, paddingY: 1, children: /* @__PURE__ */ jsx52(Text51, { color: PALETTE.error, children: "Error: extract session ID missing \u2014 please re-run." }) });
         }
         const sessionId2 = state.extractSessionId;
         const db = openPipelineDb();
@@ -28543,7 +29051,7 @@ If using a custom --host, make sure the space exists on that host.`
           db.close();
         }
         components = mergeAiDecisions(components, state.aiDecisions);
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           ScopeGateHost,
           {
             components,
@@ -28593,7 +29101,7 @@ If using a custom --host, make sure the space exists on that host.`
         const p = state.generateProgress;
         const stepNum = hasTokens ? 4 : 3;
         const progressDetail = p ? `[${p.done}/${p.total}] ${p.current} \u2014 this can take 10\u201330 minutes for large libraries` : `Starting up ${state.agent}... (this can take 10\u201330 minutes for large libraries \u2014 grab a coffee)`;
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           RunningStep,
           {
             stepNumber: stepNum,
@@ -28604,11 +29112,25 @@ If using a custom --host, make sure the space exists on that host.`
           }
         );
       }
+      case "mapping-tokens": {
+        const stepNum = hasTokens ? 5 : 4;
+        return /* @__PURE__ */ jsx52(
+          RunningStep,
+          {
+            stepNumber: stepNum,
+            totalSteps,
+            title: "Mapping design tokens",
+            description: "Finding the design tokens that are valid for each generated token property.",
+            detail: skipMapTokens ? "Resolving token defaults..." : `Running ${state.agent}...`
+          }
+        );
+      }
       case "final-review": {
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           FinalReviewHost,
           {
             extractSessionId: state.extractSessionId,
+            tokenSessionId: state.tokenSessionId,
             generatedCount: state.generatedCount,
             autoAccept: autoAcceptScope,
             compositionMode,
@@ -28752,7 +29274,7 @@ If using a custom --host, make sure the space exists on that host.`
         const files = [tokenDesc, compDesc].filter(Boolean).join(" and ");
         const count = state.generatedAcceptedCount > 0 ? state.generatedAcceptedCount : state.generatedCount;
         const summary = hasComponents ? `${count} component definition${count !== 1 ? "s" : ""} ready${hasTokens ? ", design tokens ready" : ""}.` : hasTokens ? "Design tokens ready." : "Ready to continue.";
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           PushDecisionGateStep,
           {
             summary,
@@ -28784,7 +29306,7 @@ If using a custom --host, make sure the space exists on that host.`
         );
       }
       case "credentials":
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           CredentialsStep,
           {
             initialSpaceId: state.spaceId,
@@ -28817,7 +29339,7 @@ If using a custom --host, make sure the space exists on that host.`
         );
       case "push-from-picker":
       case "previewing":
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           RunningStep,
           {
             stepNumber: totalSteps,
@@ -28830,7 +29352,7 @@ If using a custom --host, make sure the space exists on that host.`
         const editableComponentCount = Object.keys(state.manifest?.componentsManifest ?? {}).filter(
           (k) => k !== "$schema"
         ).length;
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           WizardPreviewStep,
           {
             preview: state.serverPreview,
@@ -28860,9 +29382,9 @@ If using a custom --host, make sure the space exists on that host.`
         );
       }
       case "pushing":
-        return /* @__PURE__ */ jsx51(PushingStep, { stepNumber: totalSteps, totalSteps, progress: state.pushProgress });
+        return /* @__PURE__ */ jsx52(PushingStep, { stepNumber: totalSteps, totalSteps, progress: state.pushProgress });
       case "path-prompt":
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           PathPrompt,
           {
             defaultPath: state.outDir,
@@ -28881,7 +29403,7 @@ If using a custom --host, make sure the space exists on that host.`
           }
         );
       case "save-conflict-gate":
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           SaveConflictGate,
           {
             path: state.outDir,
@@ -28899,7 +29421,7 @@ If using a custom --host, make sure the space exists on that host.`
           }
         );
       case "printing":
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           RunningStep,
           {
             stepNumber: totalSteps,
@@ -28910,7 +29432,7 @@ If using a custom --host, make sure the space exists on that host.`
         );
       case "print-gate": {
         const teaser = buildRunTeaserLine(state.lastRunId);
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           GateStep,
           {
             successMessage: "Files saved",
@@ -28929,7 +29451,7 @@ If using a custom --host, make sure the space exists on that host.`
       case "done": {
         const totalFailed = state.pushResult.componentTypes.failed + state.pushResult.designTokens.failed;
         const teaser = buildRunTeaserLine(state.lastRunId);
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           DoneStep,
           {
             componentTypes: state.pushResult.componentTypes,
@@ -28945,7 +29467,7 @@ If using a custom --host, make sure the space exists on that host.`
         );
       }
       case "preview-validation-error": {
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           PreviewValidationErrorStep,
           {
             errors: state.previewValidationErrors,
@@ -28961,7 +29483,7 @@ If using a custom --host, make sure the space exists on that host.`
         );
       }
       case "error":
-        return /* @__PURE__ */ jsx51(
+        return /* @__PURE__ */ jsx52(
           ErrorStep,
           {
             stepName: state.errorStep,
@@ -28974,9 +29496,9 @@ If using a custom --host, make sure the space exists on that host.`
         return null;
     }
   })();
-  return /* @__PURE__ */ jsxs50(Box48, { flexDirection: "column", width: terminalWidth, children: [
-    /* @__PURE__ */ jsx51(TopBar, { subcommand: "import", hints }),
-    /* @__PURE__ */ jsx51(CustomPromptBanner, { selectPromptPath, generatePromptPath }),
+  return /* @__PURE__ */ jsxs51(Box49, { flexDirection: "column", width: terminalWidth, children: [
+    /* @__PURE__ */ jsx52(TopBar, { subcommand: "import", hints }),
+    /* @__PURE__ */ jsx52(CustomPromptBanner, { selectPromptPath, generatePromptPath }),
     stepContent
   ] });
 }
@@ -29165,7 +29687,7 @@ __export(push_creds_prompt_exports, {
 });
 import React29 from "react";
 async function promptForPushCredentials(opts = {}) {
-  const { render: render7, Box: Box49, Text: Text51 } = await import("ink");
+  const { render: render7, Box: Box50, Text: Text52 } = await import("ink");
   const { useState: useState29 } = await import("react");
   const { CredentialsStep: CredentialsStep2 } = await Promise.resolve().then(() => (init_CredentialsStep(), CredentialsStep_exports));
   return new Promise((resolve27, reject) => {
@@ -29181,7 +29703,7 @@ async function promptForPushCredentials(opts = {}) {
         });
       };
       if (done) {
-        return React29.createElement(Box49, null, React29.createElement(Text51, null, ""));
+        return React29.createElement(Box50, null, React29.createElement(Text52, null, ""));
       }
       return React29.createElement(CredentialsStep2, {
         summary: opts.summary ?? "Enter Contentful credentials to push this run. Press Enter on each field to advance.",
@@ -33776,6 +34298,7 @@ import { resolve as resolve25, join as join25 } from "node:path";
 // packages/experience-design-system-cli/src/import/orchestrator.ts
 init_db();
 init_command();
+init_manifest();
 init_api_client();
 init_contentful_urls();
 init_debug_logger();
@@ -33892,7 +34415,7 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
   await mkdir5(outDir, { recursive: true });
   const steps = [];
   let stepNum = 0;
-  const totalSteps = 4 + (opts.print ? 1 : 0);
+  const totalSteps = 5 + (opts.print ? 1 : 0);
   function stepLabel(name) {
     stepNum++;
     return `  Step ${stepNum}/${totalSteps}  ${name}  `;
@@ -34073,6 +34596,88 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
     progressWriter(`${generateLabel}\u2713  components stored locally  (${(durationMs / 1e3).toFixed(1)}s)`);
     steps.push({ step: "generate components", status: "complete", durationMs });
   }
+  if (extractSessionId && opts.tokens) {
+    const tokens = await readTokensFromPath("--tokens", opts.tokens);
+    storeDTCGTokens(db, extractSessionId, [], tokens);
+  }
+  const mapTokensLabel = stepLabel("Mapping design tokens");
+  const hasGeneratedComponents = extractSessionId !== null && loadCDFComponents(db, extractSessionId).length > 0;
+  if (!extractSessionId || opts.skipGenerate && !hasGeneratedComponents) {
+    const reason = extractSessionId ? "no generated components" : "no extract session";
+    progressWriter(`${mapTokensLabel}\u2013  skipped (${reason})`);
+    steps.push({
+      step: "map tokens",
+      status: "skipped",
+      reason
+    });
+  } else {
+    const mapTokensArgs = ["map", "tokens", "--session", extractSessionId, "--agent", opts.agent];
+    if (opts.model) mapTokensArgs.push("--model", opts.model);
+    if (opts.noCache) mapTokensArgs.push("--no-cache");
+    if (opts.skipMapTokens) mapTokensArgs.push("--skip-agent");
+    const mapTokensStepId = createStep(db, sessionId2, "map tokens", {
+      extractSession: extractSessionId,
+      skipAgent: String(opts.skipMapTokens === true)
+    });
+    const t0MapTokens = Date.now();
+    const rMapTokens = await runStep(mapTokensArgs, cliPath, sessionId2);
+    const mapTokensDurationMs = Date.now() - t0MapTokens;
+    if (rMapTokens.exitCode !== 0) {
+      if (rMapTokens.stderr) process.stderr.write(rMapTokens.stderr);
+      updateStep(db, mapTokensStepId, "failed", {}, rMapTokens.stderr);
+      progressWriter(`${mapTokensLabel}\u2717  failed (${(mapTokensDurationMs / 1e3).toFixed(1)}s)`);
+      steps.push({
+        step: "map tokens",
+        status: "failed",
+        durationMs: mapTokensDurationMs,
+        error: rMapTokens.stderr
+      });
+      db.close();
+      return { session: sessionId2, project: projectRoot, steps };
+    }
+    if (opts.skipMapTokens) {
+      updateStep(db, mapTokensStepId, "complete", { deterministicOnly: "true" });
+      progressWriter(
+        `${mapTokensLabel}\u2713  defaults resolved (agent skipped)  (${(mapTokensDurationMs / 1e3).toFixed(1)}s)`
+      );
+      steps.push({
+        step: "map tokens",
+        status: "complete",
+        durationMs: mapTokensDurationMs,
+        detail: { deterministicOnly: true }
+      });
+    } else if (rMapTokens.stdout.includes("Nothing to map")) {
+      updateStep(db, mapTokensStepId, "complete", { applied: "0" });
+      progressWriter(`${mapTokensLabel}\u2013  skipped (no tokens in session)`);
+      steps.push({
+        step: "map tokens",
+        status: "skipped",
+        reason: "no tokens in session"
+      });
+    } else if (rMapTokens.stdout.includes("cached")) {
+      updateStep(db, mapTokensStepId, "complete", { cached: "true" });
+      progressWriter(`${mapTokensLabel}\u2713  cached  (${(mapTokensDurationMs / 1e3).toFixed(1)}s)`);
+      steps.push({
+        step: "map tokens",
+        status: "complete",
+        durationMs: mapTokensDurationMs,
+        detail: { cached: true }
+      });
+    } else {
+      const appliedMatch = /(\d+) mapping\(s\) applied/.exec(rMapTokens.stdout);
+      const applied = appliedMatch ? Number(appliedMatch[1]) : 0;
+      updateStep(db, mapTokensStepId, "complete", { applied: String(applied) });
+      progressWriter(
+        `${mapTokensLabel}\u2713  ${applied} mapping${applied === 1 ? "" : "s"} applied  (${(mapTokensDurationMs / 1e3).toFixed(1)}s)`
+      );
+      steps.push({
+        step: "map tokens",
+        status: "complete",
+        durationMs: mapTokensDurationMs,
+        detail: { applied }
+      });
+    }
+  }
   if (extractSessionId && !opts.autoRejectCycles) {
     const acceptedCycles = (() => {
       try {
@@ -34436,6 +35041,7 @@ async function launchModifyWizard(input) {
   };
   if (input.generateSessionId) props.seedGenerateSessionId = input.generateSessionId;
   if (input.tokenSessionId) props.seedTokenSessionId = input.tokenSessionId;
+  if (input.tokensPath) props.seedTokensPath = input.tokensPath;
   if (input.compositionMode) props.compositionMode = input.compositionMode;
   if (input.saveMode === "overwrite") props.outDirOverride = input.savePath;
   if (input.outDirOverride) props.outDirOverride = input.outDirOverride;
@@ -34554,6 +35160,7 @@ async function modifyRun(opts) {
     extractSessionId: run.extractSessionId,
     generateSessionId: run.generateSessionId,
     tokenSessionId: run.tokenSessionId,
+    tokensPath: run.tokensPath,
     projectPath: run.projectPath,
     savePath: run.savePath,
     entryStep: "final-review",
@@ -34735,7 +35342,10 @@ function registerImportCommand(program) {
     "Deselect components matching pattern (repeatable)",
     (v, a) => [...a, v],
     []
-  ).option("--skip-analyze", "Skip the analyze step (uses most recent extract session)").option("--skip-generate", "Skip the generate step (uses most recent generate session)").option("--print", "Write components.json to --out after generation").option("--skip-apply", "(deprecated alias for --no-push) Skip pushing to Contentful").option("--no-cache", "Re-run all steps even if output already exists").option("--yes", "Skip interactive confirmation in apply push").option("--verbose", "Show full agent output and all entity progress").option("--exclude-invalid", "Automatically reject components with validation errors (empty names, collisions)").option("--viewports <path>", "JSON file with viewport array (passed to apply push)").option("--host <url>", "Override API base URL (passed to apply push)").option(
+  ).option("--skip-analyze", "Skip the analyze step (uses most recent extract session)").option("--skip-generate", "Skip the generate step (uses most recent generate session)").option("--print", "Write components.json to --out after generation").option("--skip-apply", "(deprecated alias for --no-push) Skip pushing to Contentful").option(
+    "--skip-map-tokens",
+    "Skip agentic token restrictions while still resolving deterministic token-default paths"
+  ).option("--no-cache", "Re-run all steps even if output already exists").option("--yes", "Skip interactive confirmation in apply push").option("--verbose", "Show full agent output and all entity progress").option("--exclude-invalid", "Automatically reject components with validation errors (empty names, collisions)").option("--viewports <path>", "JSON file with viewport array (passed to apply push)").option("--host <url>", "Override API base URL (passed to apply push)").option(
     "--dry-run",
     "(deprecated, will change semantics in a future release) Print generate components prompt without invoking the agent. Use --print-prompt for the same behaviour explicitly, or '--dry-run --no-push' for the upcoming manifest-preview semantics."
   ).option(
@@ -35018,6 +35628,7 @@ function registerImportCommand(program) {
             ...opts.generateMap ? { generateMap: opts.generateMap } : {},
             ...opts.prompt && opts.prompt.length > 0 ? { promptOverrides: opts.prompt } : {},
             noCache: opts.cache === false,
+            skipMapTokens: opts.skipMapTokens ?? false,
             autoFilter: resolveAutoFilter({ autoFilter: opts.autoFilter }, creds.autoFilter),
             livePreview: opts.livePreview !== false,
             noPush: noPushRequested,
@@ -35083,6 +35694,7 @@ function registerImportCommand(program) {
           deselect: opts.deselect.length > 0 ? opts.deselect : void 0,
           skipAnalyze: opts.skipAnalyze ?? false,
           skipGenerate: opts.skipGenerate ?? false,
+          skipMapTokens: opts.skipMapTokens ?? false,
           print: opts.print ?? false,
           skipApply,
           noCache: opts.cache === false,