@contentful/experience-design-system-cli 2.28.1-dev-build-60a02cc.0 → 2.28.1-dev-build-090b2d1.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.28.1-dev-build-60a02cc.0",
+  "version": "2.28.1-dev-build-090b2d1.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -38,7 +38,6 @@
     "lint:fix": "nx lint:fix experience-design-system-cli"
   },
   "dependencies": {
-    "@contentful/experience-design-system-cli-v2": "workspace:*",
     "@contentful/experience-design-system-types": "workspace:*",
     "@segment/analytics-node": "^3.0.0",
     "@vue/compiler-sfc": "^3.5.31",

package/dist/src/index.js

@@ -46,6 +46,7 @@ function findJsonObjectEnd(line) {
 function readToolCallObjects(stdout) {
   const objects = [];
   const warnings = [];
+  let hadDroppedLine = false;
   for (const raw of stdout.split("\n")) {
     const line = raw.trim();
     if (!line.startsWith("{"))
@@ -53,6 +54,7 @@ function readToolCallObjects(stdout) {
     const end = findJsonObjectEnd(line);
     if (end === -1) {
       warnings.push(`unparseable line: ${line.slice(0, 120)}`);
+      hadDroppedLine = true;
       continue;
     }
     let parsed;
@@ -60,6 +62,7 @@ function readToolCallObjects(stdout) {
       parsed = JSON.parse(line.slice(0, end + 1));
     } catch {
       warnings.push(`unparseable line: ${line.slice(0, 120)}`);
+      hadDroppedLine = true;
       continue;
     }
     const trailing = line.slice(end + 1);
@@ -68,9 +71,11 @@ function readToolCallObjects(stdout) {
     }
     if (typeof parsed === "object" && parsed !== null && "tool" in parsed) {
       objects.push(parsed);
+    } else {
+      hadDroppedLine = true;
     }
   }
-  return { objects, warnings };
+  return { objects, warnings, hadDroppedLine };
 }
 function parseSelectToolCallLines(stdout) {
   const calls = [];
@@ -101,7 +106,7 @@ function parseSelectToolCallLines(stdout) {
 }
 function parseToolCallLines(stdout) {
   const calls = [];
-  const { objects, warnings } = readToolCallObjects(stdout);
+  const { objects, warnings, hadDroppedLine } = readToolCallObjects(stdout);
   for (const rec of objects) {
     if (!VALID_TOOL_NAMES.has(rec.tool)) {
       warnings.push(`unknown tool: ${String(rec.tool)}`);
@@ -186,7 +191,7 @@ function parseToolCallLines(stdout) {
       calls.push(call);
     }
   }
-  return { calls, warnings };
+  return { calls, warnings, hadDroppedLine };
 }
 function parseTokenToolCallLines(stdout) {
   const calls = [];
@@ -9574,6 +9579,26 @@ function loadRawComponents(db, sessionId2, allowedNames) {
     })
   );
 }
+function rewrittenSourcePaths(basePath) {
+  for (const [emitted, sources] of TS_ESM_EXTENSION_REWRITES) {
+    if (!basePath.endsWith(emitted)) continue;
+    const stem = basePath.slice(0, -emitted.length);
+    return sources.map((ext) => `${stem}${ext}`);
+  }
+  return [];
+}
+function identifiersIn(propTypes) {
+  const names = /* @__PURE__ */ new Set();
+  for (const propType of propTypes) {
+    for (const match2 of propType.matchAll(IDENTIFIER_PATTERN)) names.add(match2[0]);
+  }
+  return [...names];
+}
+function declaresAnyType(text, typeNames) {
+  return typeNames.some(
+    (name) => new RegExp(`\\b(?:type|interface|enum|const|class)\\s+${escapeForRegExp(name)}\\b`).test(text)
+  );
+}
 function extractRelativeImportPaths(sourceText) {
   const specifiers = /* @__PURE__ */ new Set();
   for (const match2 of sourceText.matchAll(RELATIVE_IMPORT_PATTERN)) {
@@ -9585,6 +9610,7 @@ async function resolveRelativeImport(specifier, fromDir) {
   const basePath = resolve7(fromDir, specifier);
   const candidates = [
     basePath,
+    ...rewrittenSourcePaths(basePath),
     ...SIBLING_FILE_EXTENSIONS.map((ext) => `${basePath}${ext}`),
     ...SIBLING_FILE_EXTENSIONS.map((ext) => resolve7(basePath, `index${ext}`))
   ];
@@ -9605,7 +9631,7 @@ async function resolveImportSpecifiers(sourceText, fromDir) {
   }
   return resolvedPaths;
 }
-async function loadSiblingFiles(sourceText, sourcePath, propNames) {
+async function loadSiblingFiles(sourceText, sourcePath, propNames, candidateTypeNames = []) {
   const visited = /* @__PURE__ */ new Set([resolve7(sourcePath)]);
   const discovered = [];
   let frontier = [{ text: sourceText, dir: dirname7(sourcePath) }];
@@ -9630,9 +9656,16 @@ async function loadSiblingFiles(sourceText, sourcePath, propNames) {
     }
     frontier = nextFrontier;
   }
+  const inHand = [sourceText, ...discovered.map((d) => d.content)];
+  const declaredTypeNames = candidateTypeNames.filter((name) => inHand.some((text) => declaresAnyType(text, [name])));
   const usesNotShown = /* @__PURE__ */ new Set();
+  const searchNames = [.../* @__PURE__ */ new Set([...propNames, ...declaredTypeNames])];
+  let enlarged = 0;
   const siblings = discovered.slice(0, MAX_SIBLING_FILES).map((d) => {
-    const excerpt = excerptAroundNames(d.content, propNames, MAX_SIBLING_SNIPPET_CHARS);
+    const enlarge = enlarged < MAX_ENLARGED_SIBLINGS && declaresAnyType(d.content, declaredTypeNames);
+    if (enlarge) enlarged++;
+    const budget = enlarge ? MAX_TYPE_DECLARING_SIBLING_CHARS : MAX_SIBLING_SNIPPET_CHARS;
+    const excerpt = excerptAroundNames(d.content, searchNames, budget);
     for (const name of excerpt.usesNotShown) usesNotShown.add(name);
     return { path: d.path, content: excerpt.content };
   });
@@ -9640,25 +9673,32 @@ async function loadSiblingFiles(sourceText, sourcePath, propNames) {
   return {
     siblings,
     truncatedCount,
-    usesNotShown: propNames.filter((name) => usesNotShown.has(name))
+    usesNotShown: propNames.filter((name) => usesNotShown.has(name)),
+    declaredTypeNames
   };
 }
-async function loadComponentSourceRef(name, sourcePath, propNames = []) {
+async function loadComponentSourceRef(name, sourcePath, propNames = [], propTypes = []) {
   let content = null;
   let siblingFiles = [];
   let truncatedSiblingCount = 0;
   const usesNotShown = /* @__PURE__ */ new Set();
   try {
     const rawText = await readFile7(sourcePath, "utf8");
-    const mainExcerpt = excerptAroundNames(rawText, propNames, MAX_COMPONENT_SOURCE_CHARS);
-    content = mainExcerpt.content;
-    for (const name2 of mainExcerpt.usesNotShown) usesNotShown.add(name2);
     let siblingUsesNotShown;
+    let declaredTypeNames;
     ({
       siblings: siblingFiles,
       truncatedCount: truncatedSiblingCount,
-      usesNotShown: siblingUsesNotShown
-    } = await loadSiblingFiles(rawText, sourcePath, propNames));
+      usesNotShown: siblingUsesNotShown,
+      declaredTypeNames
+    } = await loadSiblingFiles(rawText, sourcePath, propNames, identifiersIn(propTypes)));
+    const mainExcerpt = excerptAroundNames(
+      rawText,
+      [.../* @__PURE__ */ new Set([...propNames, ...declaredTypeNames])],
+      MAX_COMPONENT_SOURCE_CHARS
+    );
+    content = mainExcerpt.content;
+    for (const name2 of mainExcerpt.usesNotShown) usesNotShown.add(name2);
     for (const name2 of siblingUsesNotShown) usesNotShown.add(name2);
   } catch {
   }
@@ -9673,13 +9713,18 @@ async function loadComponentSourceRefs(db, sessionId2) {
   const rows = db.prepare(
     `SELECT component_id, name, source, source_path FROM raw_components WHERE session_id = ? AND status = 'generated' ORDER BY rowid`
   ).all(sessionId2);
-  const propNamesFor = db.prepare(
-    `SELECT name FROM raw_props WHERE session_id = ? AND component_id = ? ORDER BY position`
+  const propsFor = db.prepare(
+    `SELECT name, type FROM raw_props WHERE session_id = ? AND component_id = ? ORDER BY position`
   );
   return Promise.all(
     rows.map((r) => {
-      const propNames = propNamesFor.all(sessionId2, r.component_id).map((p) => p.name);
-      return loadComponentSourceRef(r.name, r.source_path ?? r.source, propNames);
+      const props = propsFor.all(sessionId2, r.component_id);
+      return loadComponentSourceRef(
+        r.name,
+        r.source_path ?? r.source,
+        props.map((p) => p.name),
+        props.map((p) => p.type)
+      );
     })
   );
 }
@@ -10562,7 +10607,7 @@ function lookupSelectCache(db, componentHash, promptHash, cliVersion2) {
     updatedAt: row.updated_at
   };
 }
-var SCHEMA, MAX_COMPONENT_SOURCE_CHARS, MAX_SIBLING_FILES, MAX_SIBLING_SNIPPET_CHARS, MAX_SIBLING_DEPTH, MAX_SIBLING_CANDIDATES_EXPLORED, RELATIVE_IMPORT_PATTERN, SIBLING_FILE_EXTENSIONS, _cliCacheVersionCache;
+var SCHEMA, MAX_COMPONENT_SOURCE_CHARS, MAX_SIBLING_FILES, MAX_SIBLING_SNIPPET_CHARS, MAX_TYPE_DECLARING_SIBLING_CHARS, MAX_ENLARGED_SIBLINGS, MAX_SIBLING_DEPTH, MAX_SIBLING_CANDIDATES_EXPLORED, RELATIVE_IMPORT_PATTERN, SIBLING_FILE_EXTENSIONS, TS_ESM_EXTENSION_REWRITES, IDENTIFIER_PATTERN, _cliCacheVersionCache;
 var init_db = __esm({
   "packages/experience-design-system-cli/src/session/db.ts"() {
     "use strict";
@@ -10748,10 +10793,19 @@ CREATE INDEX IF NOT EXISTS idx_scanned_files_session    ON scanned_files(session
     MAX_COMPONENT_SOURCE_CHARS = 8e3;
     MAX_SIBLING_FILES = 5;
     MAX_SIBLING_SNIPPET_CHARS = 1200;
+    MAX_TYPE_DECLARING_SIBLING_CHARS = 4e3;
+    MAX_ENLARGED_SIBLINGS = 2;
     MAX_SIBLING_DEPTH = 2;
     MAX_SIBLING_CANDIDATES_EXPLORED = 25;
     RELATIVE_IMPORT_PATTERN = /from\s+['"](\.[^'"]+)['"]/g;
     SIBLING_FILE_EXTENSIONS = [".ts", ".tsx", ".js", ".jsx"];
+    TS_ESM_EXTENSION_REWRITES = [
+      [".js", [".ts", ".tsx", ".js", ".jsx"]],
+      [".jsx", [".tsx", ".jsx"]],
+      [".mjs", [".mts", ".mjs"]],
+      [".cjs", [".cts", ".cjs"]]
+    ];
+    IDENTIFIER_PATTERN = /[A-Za-z_$][A-Za-z0-9_$]*/g;
     _cliCacheVersionCache = null;
   }
 });
@@ -32468,7 +32522,8 @@ async function runOneComponent(agent, model, db, sessionId2, component, tokensIn
   const sourceRef = await loadComponentSourceRef(
     component.name,
     component.sourcePath ?? component.source,
-    component.props.map((p) => p.name)
+    component.props.map((p) => p.name),
+    component.props.map((p) => p.type)
   );
   const prompt2 = await buildPrompt({
     skill: "components",
@@ -32516,11 +32571,16 @@ ${outputBuf}`);
       lastError = describeAgentFailure(result);
       continue;
     }
-    const { calls, warnings } = parseToolCallLines(result.stdout);
+    const { calls, warnings, hadDroppedLine } = parseToolCallLines(result.stdout);
     if (calls.length === 0) {
       lastError = describeAgentFailure(result);
       continue;
     }
+    if (hadDroppedLine) {
+      lastError = `agent output dropped at least one tool-call line: ${warnings.join("; ").slice(0, 200)}`;
+      if (attempt < maxAttempts) continue;
+      break;
+    }
     const applied = applyToolCalls(db, sessionId2, component.component_id, component.name, calls, warnings);
     if (!noCache) {
       const inputHash = computeComponentInputHash(component);
@@ -32709,7 +32769,8 @@ async function runGenerateSkill(skill, opts, verbose = false) {
     const sampleSourceRef = sampleComponent ? await loadComponentSourceRef(
       sampleComponent.name,
       sampleComponent.sourcePath ?? sampleComponent.source,
-      sampleComponent.props.map((p) => p.name)
+      sampleComponent.props.map((p) => p.name),
+      sampleComponent.props.map((p) => p.type)
     ) : void 0;
     const prompt2 = await buildPrompt({
       skill,
@@ -32785,6 +32846,11 @@ async function runGenerateSkill(skill, opts, verbose = false) {
         `Error: all ${componentResults.length} component(s) failed to generate \u2014 see the per-component errors above.`
       );
     }
+    if (failed.length > 0) {
+      die2(
+        `Error: ${failed.length}/${componentResults.length} component(s) failed to generate \u2014 see the per-component errors above.`
+      );
+    }
   } else if (skill === "tokens") {
     const noCache = opts.cache === false || process.env.EDS_NO_CACHE === "1";
     const tokenInputContent = rawTokensInline ?? "";
@@ -33412,7 +33478,7 @@ import { basename as basename5, resolve as resolve19 } from "node:path";
 
 // packages/experience-design-system-cli/src/print/validate/validators/cdf-validator.ts
 import { readFile as readFile19 } from "node:fs/promises";
-import { validateCDF as validateCDF2 } from "@contentful/experience-design-system-types";
+import { validateCDF as validateCDF2, checkCDFComponentInvariants } from "@contentful/experience-design-system-types";
 function extractValue(input, path) {
   if (path === "/") return void 0;
   const parts = path.split("/").filter(Boolean);
@@ -33496,6 +33562,14 @@ async function validateCDFFile(filePath) {
     }).map((e) => rewriteDiagnostic(e, parsed));
     return { valid: false, summary: "", diagnostics };
   }
+  const invariantErrors = checkCDFComponentInvariants(cdfResult.components);
+  if (invariantErrors.length > 0) {
+    return {
+      valid: false,
+      summary: "",
+      diagnostics: invariantErrors.map((e) => rewriteDiagnostic(e, parsed))
+    };
+  }
   const count = cdfResult.components.length;
   return {
     valid: true,
@@ -36824,15 +36898,6 @@ async function runBuild(opts) {
     child.on("exit", (code) => settle(code ?? 1));
   });
 }
-function registerImportV2Command(program) {
-  program.command("importv2").description("Launch the v2 import TUI (experience-design-system-cli-v2)").action(async () => {
-    const { render: render7 } = await import("ink");
-    const { createElement: createElement7 } = await import("react");
-    const { App: App2 } = await import("@contentful/experience-design-system-cli-v2/app");
-    const { waitUntilExit } = render7(createElement7(App2));
-    await waitUntilExit();
-  });
-}
 function registerBuildCommand(program) {
   program.command("build").description("Rebuild from source and re-link exo/experiences binaries to this build").action(async () => {
     const pkgRoot = resolve26(dirname14(fileURLToPath5(import.meta.url)), "..", "..");
@@ -36853,7 +36918,6 @@ function createProgram() {
   registerApplyCommand(program);
   registerSessionCommand(program);
   registerImportCommand(program);
-  registerImportV2Command(program);
   registerSetupCommand(program);
   registerRunsCommand(program);
   registerBuildCommand(program);

package/dist/src/session/db.d.ts

@@ -107,7 +107,7 @@ export type RawComponentWithId = RawComponentDefinition & {
     component_id: string;
 };
 export declare function loadRawComponents(db: DatabaseSync, sessionId: string, allowedNames?: Set<string>): RawComponentWithId[];
-export declare function loadComponentSourceRef(name: string, sourcePath: string, propNames?: string[]): Promise<ComponentSourceRef>;
+export declare function loadComponentSourceRef(name: string, sourcePath: string, propNames?: string[], propTypes?: string[]): Promise<ComponentSourceRef>;
 export declare function loadComponentSourceRefs(db: DatabaseSync, sessionId: string): Promise<ComponentSourceRef[]>;
 export declare function renameEmptySlots(db: DatabaseSync, sessionId: string, componentId: string, componentName: string, slotCount: number): {
     renames: Array<{

package/dist/src/session/source-excerpt.d.ts

@@ -16,6 +16,7 @@ export interface SourceExcerpt {
      */
     usesNotShown: string[];
 }
+export declare function escapeForRegExp(value: string): string;
 /**
  * Returns `text` whole when it fits `maxChars`. Otherwise returns windows of
  * `contextLines` lines around every line that mentions one of `names`, merged

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.28.1-dev-build-60a02cc.0",
+  "version": "2.28.1-dev-build-090b2d1.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -39,8 +39,7 @@
     "svelte": "^5.56.4",
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
-    "@contentful/experience-design-system-cli-v2": "2.28.1-dev-build-60a02cc.0",
-    "@contentful/experience-design-system-types": "2.28.1-dev-build-60a02cc.0"
+    "@contentful/experience-design-system-types": "2.28.1-dev-build-090b2d1.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",
@@ -52,9 +51,9 @@
     "ink-testing-library": "^4.0.0",
     "typescript-eslint": "^8.67.0",
     "vitest": "^4.0.16",
-    "@contentful/experience-design-system-extraction": "2.28.1-dev-build-60a02cc.0",
-    "@contentful/experience-design-system-client": "2.28.1-dev-build-60a02cc.0",
-    "@contentful/experience-design-system-generation": "2.28.1-dev-build-60a02cc.0"
+    "@contentful/experience-design-system-extraction": "2.28.1-dev-build-090b2d1.0",
+    "@contentful/experience-design-system-client": "2.28.1-dev-build-090b2d1.0",
+    "@contentful/experience-design-system-generation": "2.28.1-dev-build-090b2d1.0"
   },
   "repository": {
     "type": "git",

package/skills/generate-components.md

@@ -91,7 +91,7 @@ Emit one JSON object per line. The CLI parses lines starting with `{`. Lines not
 - Every prop in the input must produce exactly one call: `classify_prop` OR `exclude_prop`.
 - Every slot must produce exactly one `classify_slot` call.
 - Emit `classify_component` once at the start (required). The `description` field is **required** — always provide a brief description of the component's purpose.
-- `values` is required for `cdf_type: "enum"` — must be a non-empty string array of the variant names the prop accepts.
+- `values` is required for `cdf_type: "enum"` — must be a non-empty string array of the variant names the prop accepts. **There is no legal `enum` with a guessed list.** If the value set is shown to you anywhere in the material below — the type's own declaration, an `allowedValues` list on the raw prop, a variant/lookup map, a default, a sibling excerpt — copy it and emit `enum`. If it is shown nowhere, emit `cdf_type: "string"` and leave `values` off. `string` is an unrestricted enum: the author can still pass the real value. A guessed list silently rejects it.
 - **Do NOT include `values` for `cdf_type: "token"`.** The two property types carry different kinds of list. An `enum` prop's list holds *variant names* the component accepts (`"primary"`, `"secondary"`). A `token` prop's list holds *design token paths* (`"color.brand.primary"`), produced by the separate token-mapping step (`$token.allowed`) — never by you. Emitting `values` on a token prop makes the definition invalid.
 - `token_kind` is required for `cdf_type: "token"` — must be a DTCG `$type` string, e.g. `"color"`.
 - `required` must be a JSON boolean (`true`/`false`), not a string.
@@ -208,12 +208,14 @@ the default "could be overridden" (every default can), or because the tie-break
 below exists. Nothing downstream re-derives, corrects, or second-guesses this —
 what you emit is what ships.
 
-**Ambiguity resolves to `enum` — but only when Q1–Q3 cannot be answered.** The
-tie-break applies solely when the source shown does not let you answer the three
-questions: the property is interpolated in one place and looked up in another,
-the use sits in a file you cannot see, or the source is truncated at the point
-of use (the "uses not shown" line). In those cases emit `enum` (or `string` when
-it has no value set) and record the ambiguity in `reason`. When the three
+**Ambiguity resolves to `enum` — but only when Q1–Q3 cannot be answered, and only
+when you can still cite its values.** The tie-break applies solely when the source
+shown does not let you answer the three questions: the property is interpolated
+in one place and looked up in another, the use sits in a file you cannot see, or
+the source is truncated at the point of use (the "uses not shown" line). In those
+cases emit `enum` if a value set is citable from the source shown, else `cdf_type:
+"string"` per "no legal `enum` with a guessed list" — either way, record the
+ambiguity in `reason`. When the three
 questions *can* be answered from the source shown, they are answered and the
 tie-break does not apply: a clear Q1-yes is `enum`, a clear Q2-yes + Q3-yes is
 `token`, and a type annotation does not create ambiguity. An `enum` is delivered
@@ -297,7 +299,7 @@ A prop with a complex TypeScript type is **not automatically excluded**. Many pr
 | Raw type pattern | How to resolve |
 |---|---|
 | `'primary' \| 'secondary' \| 'ghost'` (union of literals) | → `enum`, extract `values` |
-| `HeadingSize` / `ButtonVariant` / any named type that is clearly a finite set of visual options | → `enum`. **Never invent a value list.** Use only values you can cite from the source shown (the type's own declaration, a lookup table, a default). If the source shown does not enumerate the values, this is the "cannot be answered" case — apply "Ambiguity resolves to `enum`": emit `enum` (or `string` if it has no discoverable value set) and record the missing evidence in `description` (not `reason` — `description` ships to the CDF, `reason` does not), e.g. `"WARNING: values not visible in source — enum values unconfirmed"`. Do not default to a generic guess like `['sm', 'md', 'lg']` or `['primary', 'secondary']` — those are one design system's vocabulary, not a fallback for missing evidence. |
+| `HeadingSize` / `ButtonVariant` / any named type that is clearly a finite set of visual options | → `enum` if you can cite its values from the source shown (the type's own declaration, a lookup table, a default) — copy them, never invent them. If the source shown does not enumerate the values, this is not the Q1–Q3 ambiguity tie-break — it is the "no legal `enum` with a guessed list" rule: emit `cdf_type: "string"` instead, with the missing evidence noted in `reason`. Do not default to a generic guess like `['sm', 'md', 'lg']` or `['primary', 'secondary']` — those are one design system's vocabulary, not a fallback for missing evidence. |
 | `Variant` / `variant` prop | Usually a visual design variant. → `enum`, `cdf_category: "design"`. Same evidence rule as above — cite values from the source shown; do not invent them. |
 | `Section[]` / array of custom items where the structure is unclear | → `exclude_prop` only if the array elements are complex objects with no obvious flat representation. If items are simple (title, label, id), consider representing as `string` (a comma-separated IDs or keys) or note in `description` why. |
 | `ExperienceConfiguration<Variant>` / deep generic | Personalization config — → `exclude_prop`, reason: `"personalization configuration — framework internal"` |
@@ -364,7 +366,7 @@ as enum so the author picks "primary" and the component receives "primary".
 
 ---
 
-## Category correction rules
+## Category and required corrections
 
 The pre-classified `category` is wrong in predictable ways. Correct silently (document in `description`):
 
@@ -375,6 +377,11 @@ The pre-classified `category` is wrong in predictable ways. Correct silently (do
 
 > **Key question for category**: "Who fills this in?" — A content editor fills in `content`. A designer configures `design`. Neither fills in `state` — it comes from routing, runtime behavior, or component infrastructure.
 
+**`required` is also a hint, and it is also wrong.** Verify it against the declaration:
+- A prop with a default value — a `$default`, a destructure default, or a `defaultVariants` entry — is **never** `required: true`. The two together are incoherent.
+- A prop declared `foo?:` is `required: false`, whatever the hint says.
+- Props reached through `VariantProps<typeof x>` or a Radix/`ComponentPropsWithoutRef` base are optional unless the component's own interface redeclares them as required.
+
 ---
 
 ## Slot classification
@@ -462,14 +469,30 @@ footer is supplementary and optional
 {"tool":"classify_slot","slot":"footer","required":false,"description":"Optional footer area for actions or metadata","rationale":"Footer is a supplementary region typically used for actions or metadata. Optional because most cards do not need one and the card renders correctly without it."}
 ```
 
-### Named type (HeadingSize, ButtonVariant, etc.)
+### Named type (HeadingSize, ButtonVariant, etc.) — do NOT infer the values
+
+When a prop has a named TypeScript type that is not inlined as a union literal,
+the value set is whatever that type's declaration says. A type *name* is not
+evidence of its members: `HeadingSize` could be `h1`–`h6`, `sm|md|lg`, or
+`s|m|l|xl`. Guessing picks one design system's vocabulary and is wrong more
+often than it is right, and a wrong name matches no style rule — the author's
+setting silently does nothing.
+
+So: look for the declaration in the source shown. If it is there, copy it. If it
+is not, **emit `string`** — `string` is an unrestricted enum, so the author stays
+unrestricted but correct.
 
-When a prop has a named TypeScript type that is not inlined as a union literal, reason from the prop name and type name to infer the finite value set.
+Members visible in the source shown — copy them, do not paraphrase:
+```
+titleSize has type HeadingSize; HeadingSize is declared in the excerpt as 'sm' | 'md' | 'lg'
+{"tool":"classify_prop","prop":"titleSize","cdf_type":"enum","cdf_category":"design","required":false,"values":["sm","md","lg"],"description":"Heading size","reason":"Copied from the HeadingSize declaration shown in the excerpt."}
+```
 
+Members NOT visible in the source shown — degrade to `string`:
 ```
-titleSize has type HeadingSize — this is a named enum controlling heading size
-inferring likely values: ["h1", "h2", "h3", "h4", "h5", "h6"] — documenting inference
-{"tool":"classify_prop","prop":"titleSize","cdf_type":"enum","cdf_category":"design","required":false,"values":["h1","h2","h3","h4","h5","h6"],"description":"Heading level — inferred from HeadingSize type name; actual values may be h1–h6 or sm/md/lg"}
+titleSize has type HeadingSize; HeadingSize is not declared anywhere in the source shown
+no evidence for its members, so no values list — string, not a guess
+{"tool":"classify_prop","prop":"titleSize","cdf_type":"string","cdf_category":"design","required":false,"description":"Heading size","reason":"HeadingSize is not declared in the source shown, so its members cannot be cited. Emitted as string rather than inventing a value list."}
 ```
 
 ### href prop
@@ -495,7 +518,7 @@ Before emitting any tool calls, verify:
 1. Every prop in the input has exactly one `classify_prop` or `exclude_prop` call
 2. Every slot has exactly one `classify_slot` call
 3. `classify_component` is emitted exactly once
-4. Every `cdf_type: "enum"` has a non-empty `values` array
+4. Every `cdf_type: "enum"` has a non-empty `values` array taken from the material shown. A prop whose value set was shown nowhere is `cdf_type: "string"` with no `values` — never an `enum` with a plausible-looking list, and never an `exclude_prop`.
 5. Every `cdf_type: "token"` has `token_kind` (or a warning in `description` if lookup failed) and does **not** have `values` set
 6. No `cdf_type: "link"` — all href/url props use `string`
 7. `required` values are JSON booleans, not strings
@@ -507,7 +530,8 @@ Before emitting any tool calls, verify:
 13. `rationale.description` follows the same "Description content rules" as `description` — no internal initiative names (`INTEG-*`, `EDSI`, `DSI`, `M1`, `M2`, wave/phase references, etc.).
 14. Every `cdf_type: "token"` prop cites a line that interpolates its value into a style **and** a token reference at that use (Q2 yes, Q3 yes), and carries no `values`. If you cannot cite both, it is `enum` or `string`; if you can, it is `token` — its type annotation is not a reason to emit `string`.
 15. Every prop whose values are friendly names is `enum` with a non-empty `values` array, even when each name resolves to a design token internally; every prop for which Q1–Q3 could not be answered was emitted as `enum` (or `string`) with the ambiguity stated in `reason`, and no answerable prop was called ambiguous.
-16. Every `enum`'s `values` array is copied from evidence in the source shown (a type declaration, lookup table, or default) — none of it was invented. Where no evidence exists for the values, the `description` states so (e.g. `"WARNING: values not visible in source"`), not just `reason`.
+16. Every `enum`'s `values` array is copied from evidence in the material shown — a type declaration, an `allowedValues` list on the raw prop, a variant or lookup map, a default, in the component's own file or in any sibling excerpt — and none of it was invented. Where the value set appears nowhere, the prop is `cdf_type: "string"`, with the reason recorded in `reason`. Do not drop a prop merely because you could not enumerate its values.
+17. No prop has `required: true` alongside a default value (`$default`, a destructure default, or a `defaultVariants` entry) — the two are incoherent. A prop declared `foo?:`, or reached through `VariantProps<typeof x>` or a Radix/`ComponentPropsWithoutRef` base without its own required redeclaration, is `required: false`.
 
 After the run completes, the developer can validate the pipeline output with:
 
@@ -528,4 +552,6 @@ properties — this is never acceptable.
 If you are genuinely uncertain about every prop, classify each as:
 {"tool":"classify_prop","prop":"<name>","cdf_type":"string","cdf_category":"content","required":false,"description":"Uncertain classification — review recommended"}
 
-An imperfect classification is infinitely better than no classification.
+An imperfect classification is infinitely better than no classification. That is
+about **classifying a prop rather than dropping it** — it is not a licence to
+invent a `values` list. The uncertain answer is `cdf_type: "string"`, every time.