@decantr/cli 1.6.1 → 1.6.3

package/dist/bin.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-import "./chunk-DESYSWLL.js";
-import "./chunk-PMBLHVBX.js";
+import "./chunk-HWMN432I.js";
+import "./chunk-5MKMLONH.js";

package/dist/{chunk-PMBLHVBX.js → chunk-5MKMLONH.js}

@@ -217,20 +217,13 @@ function generateTreatmentCSS(spatialTokens, treatmentOverrides, themeDecorators
   lines.push("}");
   lines.push("");
   lines.push("} /* end @layer treatments */");
-  if (themeDecorators && Object.keys(themeDecorators).length > 0) {
-    const label = themeName ? ` (${themeName})` : "";
-    lines.push("");
-    lines.push("@layer decorators {");
-    lines.push("");
-    lines.push(`/* \u2500\u2500 Layer 3: Theme Decorators${label} \u2500\u2500 */`);
-    lines.push("");
-    for (const [name, description] of Object.entries(themeDecorators)) {
-      const rule = generateDecoratorRule(name, description);
-      lines.push(rule);
-      lines.push("");
-    }
-    lines.push("} /* end @layer decorators */");
-  }
+  const decoratorBlock = `
+@layer decorators {
+  /* Decorator CSS is AI-generated from structured definitions in section context files. */
+  /* See .decantr/context/section-*.md for intent, suggested properties, and usage guidance. */
+}
+`;
+  lines.push(decoratorBlock);
   return lines.join("\n");
 }
 function generatePersonalityCSS(personality, themeData) {
@@ -252,6 +245,7 @@ function generatePersonalityCSS(personality, themeData) {
     rules.push(`.status-ring[data-status="error"] { border-color: var(--d-error); box-shadow: 0 0 12px color-mix(in srgb, var(--d-error) 25%, transparent); }`);
     rules.push(`.status-ring[data-status="warning"] { border-color: var(--d-warning); }`);
     rules.push(`.status-ring[data-status="idle"] { border-color: var(--d-text-muted); }`);
+    rules.push(`.status-ring[data-status="processing"] { border-color: var(--d-primary); }`);
     rules.push(`@keyframes pulse-ring { 0% { opacity: 0.6; transform: scale(1); } 100% { opacity: 0; transform: scale(1.3); } }`);
     rules.push(`.status-ring[data-status="active"]::after { content: ''; position: absolute; inset: -4px; border-radius: 50%; border: 2px solid var(--d-success); opacity: 0; animation: pulse-ring 2s ease-out infinite; }`);
   }
@@ -539,7 +533,7 @@ function generateTokensCSS(themeData, mode, spatialTokens) {
     return {
       // Seed colors
       "--d-primary": seed.primary || "#6366f1",
-      "--d-secondary": seed.secondary || "#a1a1aa",
+      "--d-secondary": palette.secondary?.[tokenMode] || palette.secondary?.dark || seed.secondary || "#A1A1AA",
       "--d-accent": seed.accent || "#f59e0b",
       // Palette colors (mode-aware)
       "--d-bg": palette.background?.[tokenMode] || "#18181b",
@@ -693,135 +687,6 @@ input, button, textarea, select {
 }
 `;
 }
-function generateDecoratorRule(name, description) {
-  const rules = [];
-  const descLower = description.toLowerCase();
-  const nameLower = name.toLowerCase();
-  const isCard = descLower.includes("card") || descLower.includes("panel") || nameLower.includes("card") || nameLower.includes("panel");
-  const isInput = descLower.includes("input") || descLower.includes("field") || descLower.includes("textarea") || nameLower.includes("input") || nameLower.includes("textarea");
-  const isGlass = descLower.includes("glassmorphic") || descLower.includes("glass") || nameLower.includes("glass");
-  const isInteractive = isCard || isInput || isGlass;
-  const isNonInteractive = descLower.includes("divider") || descLower.includes("skeleton") || descLower.includes("keyframe") || descLower.includes("canvas") || nameLower.includes("divider") || nameLower.includes("skeleton") || nameLower.includes("canvas");
-  if (descLower.includes("monospace") || descLower.includes("mono font")) {
-    rules.push("font-family: ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', monospace");
-  }
-  if (descLower.includes("surface-raised") || descLower.includes("surface raised")) {
-    rules.push("background: var(--d-surface-raised)");
-  } else if (descLower.includes("surface background") || descLower.includes("surface elevation")) {
-    rules.push("background: var(--d-surface)");
-  } else if (descLower.includes("background") && descLower.includes("theme")) {
-    rules.push("background: var(--d-bg)");
-  } else if (descLower.includes("primary-tinted") || descLower.includes("primary background")) {
-    rules.push("background: color-mix(in srgb, var(--d-primary) 15%, var(--d-surface))");
-  }
-  if (isInput) {
-    if (!rules.some((r) => r.startsWith("background"))) {
-      rules.push("background: var(--d-surface)");
-    }
-    rules.push("color: var(--d-text)");
-    rules.push("padding: 0.5rem 0.75rem");
-    rules.push("border-radius: var(--d-radius)");
-    rules.push("width: 100%");
-    rules.push("outline: none");
-  }
-  const leftBorderMatch = descLower.match(/(\d+)px\s+left\s+border/);
-  if (leftBorderMatch) {
-    rules.push(`border-left: ${leftBorderMatch[1]}px solid var(--d-primary)`);
-  } else if (descLower.includes("left border")) {
-    rules.push("border-left: 3px solid var(--d-primary)");
-  } else if (descLower.includes("1px border") || descLower.includes("subtle border")) {
-    rules.push("border: 1px solid var(--d-border)");
-  } else if (descLower.includes("border") && !descLower.includes("radius")) {
-    rules.push("border: 1px solid var(--d-border)");
-  }
-  const radiusMatch = descLower.match(/(\d+)px radius/);
-  if (radiusMatch) {
-    rules.push(`border-radius: ${radiusMatch[1]}px`);
-  } else if ((descLower.includes("radius") || descLower.includes("rounded")) && !isInput) {
-    rules.push("border-radius: var(--d-radius)");
-  }
-  if (descLower.includes("elevation") || descLower.includes("shadow")) {
-    rules.push("box-shadow: var(--d-shadow)");
-  }
-  if (isInteractive && !isNonInteractive) {
-    rules.push("transition: border-color 0.15s ease, box-shadow 0.15s ease, background 0.15s ease");
-  }
-  if (descLower.includes("entrance animation") || descLower.includes("fade")) {
-    rules.push("animation: decantr-fade-in 0.2s ease-out");
-  }
-  if (descLower.includes("pulse animation") || descLower.includes("skeleton")) {
-    rules.push("animation: decantr-pulse 1.5s ease-in-out infinite");
-  }
-  const blurMatch = descLower.match(/blur\((\d+)px\)/);
-  if (blurMatch) {
-    rules.push(`backdrop-filter: blur(${blurMatch[1]}px)`);
-    rules.push(`-webkit-backdrop-filter: blur(${blurMatch[1]}px)`);
-  } else if (isGlass) {
-    rules.push("backdrop-filter: blur(12px)");
-    rules.push("-webkit-backdrop-filter: blur(12px)");
-  } else if (descLower.includes("blur")) {
-    rules.push("backdrop-filter: blur(8px)");
-    rules.push("-webkit-backdrop-filter: blur(8px)");
-  }
-  if (descLower.includes("semi-transparent") || descLower.includes("glassmorphic")) {
-    const bgIdx = rules.findIndex((r) => r.startsWith("background:"));
-    const rgbaBg = "background: rgba(31, 31, 35, 0.8)";
-    if (bgIdx !== -1) {
-      rules[bgIdx] = rgbaBg;
-    } else {
-      rules.push(rgbaBg);
-    }
-  }
-  if (descLower.includes("right-aligned")) {
-    rules.push("margin-left: auto");
-  } else if (descLower.includes("left-aligned")) {
-    rules.push("margin-right: auto");
-  }
-  if (descLower.includes("message bubble") || descLower.includes("bubble")) {
-    rules.push("padding: var(--d-gap-3) var(--d-gap-4)");
-    rules.push("border-radius: var(--d-radius-lg)");
-    rules.push("max-width: 80%");
-  }
-  if (descLower.includes("monospace") || descLower.includes("code")) {
-    if (!rules.some((r) => r.startsWith("padding"))) {
-      rules.push("padding: 0.75rem 1rem");
-    }
-    if (!rules.some((r) => r.startsWith("border-radius"))) {
-      rules.push("border-radius: var(--d-radius-sm)");
-    }
-    rules.push("overflow-x: auto");
-  }
-  if (rules.length === 0) {
-    return `/* .${name}: ${description} */`;
-  }
-  let css = `.${name} {
-  ${rules.join(";\n  ")};
-}`;
-  if (isInteractive && !isNonInteractive) {
-    const stateRules = [];
-    if (isCard || isGlass) {
-      stateRules.push(`.${name}:hover {
-  border-color: var(--d-primary-hover, var(--d-border));
-  box-shadow: var(--d-shadow-md);
-}`);
-    }
-    if (isInput) {
-      stateRules.push(`.${name}:focus {
-  border-color: var(--d-primary);
-  box-shadow: 0 0 0 3px color-mix(in srgb, var(--d-primary) 25%, transparent);
-}`);
-      stateRules.push(`.${name}::placeholder {
-  color: var(--d-text-muted);
-}`);
-      stateRules.push(`.${name}:disabled {
-  opacity: 0.5;
-  cursor: not-allowed;
-}`);
-    }
-    css += "\n\n" + stateRules.join("\n\n");
-  }
-  return css;
-}
 function serializeLayoutItem(item) {
   if (typeof item === "string") {
     return item;
@@ -897,64 +762,6 @@ function resolvePatternAlias(item, patterns) {
   }
   return item;
 }
-function buildEssence(options, archetypeData) {
-  let structure = [
-    { id: "home", shell: options.shell, layout: ["hero"] }
-  ];
-  let features = options.features;
-  if (archetypeData?.pages) {
-    structure = archetypeData.pages.map((p) => {
-      const resolvedLayout = (p.default_layout?.length ? p.default_layout : ["hero"]).map((item) => resolvePatternAlias(item, p.patterns));
-      return {
-        id: p.id,
-        shell: p.shell || options.shell,
-        layout: resolvedLayout
-      };
-    });
-  }
-  if (archetypeData?.features) {
-    features = [.../* @__PURE__ */ new Set([...features, ...archetypeData.features])];
-  }
-  const contentGapMap = {
-    compact: "_gap2",
-    comfortable: "_gap4",
-    spacious: "_gap6"
-  };
-  const archetype = options.archetype || "custom";
-  const essence = {
-    version: "2.0.0",
-    archetype,
-    theme: {
-      style: options.theme,
-      mode: options.mode,
-      recipe: options.theme,
-      // Legacy v2 field — kept for backward compatibility
-      shape: options.shape
-    },
-    personality: options.personality,
-    platform: {
-      type: "spa",
-      routing: "hash"
-    },
-    structure,
-    features,
-    guard: {
-      enforce_style: true,
-      enforce_recipe: true,
-      // Legacy v2 field — kept for backward compatibility
-      mode: options.guard
-    },
-    density: {
-      level: options.density,
-      content_gap: contentGapMap[options.density] || "_gap4"
-    },
-    target: options.target
-  };
-  if (options.accessibility) {
-    essence.accessibility = options.accessibility;
-  }
-  return essence;
-}
 function buildEssenceV3(options, archetypeData, themeHints) {
   let pages = [
     { id: "home", layout: ["hero"] }
@@ -1321,10 +1128,8 @@ function generateDecantrMdV31(params) {
   briefLines.push("## Project Brief");
   briefLines.push("");
   briefLines.push(`- **Blueprint:** ${params.blueprintId || "custom"}`);
-  const themeParts = [params.themeName || "default"];
-  if (params.themeMode) themeParts.push(`${params.themeMode} mode`);
-  if (params.themeShape) themeParts.push(params.themeShape);
-  briefLines.push(`- **Theme:** ${themeParts.join(" (").replace(/ \($/, "") + (themeParts.length > 1 ? ")" : "")}`);
+  const themeDesc = `${params.themeName || "default"} (${params.themeMode || "dark"} mode${params.themeShape ? `, ${params.themeShape} shape` : ""})`;
+  briefLines.push(`- **Theme:** ${themeDesc}`);
   if (params.personality && params.personality.length > 0) {
     briefLines.push(`- **Personality:** ${params.personality.join(". ")}`);
   }
@@ -1337,7 +1142,17 @@ function generateDecantrMdV31(params) {
   }
   briefLines.push(`- **Guard mode:** ${params.guardMode}`);
   briefLines.push("");
-  if (params.decorators && params.decorators.length > 0) {
+  if (params.decoratorDefinitions && Object.keys(params.decoratorDefinitions).length > 0) {
+    briefLines.push("### Decorator Quick Reference");
+    briefLines.push("| Class | Intent | Key CSS |");
+    briefLines.push("|-------|--------|---------|");
+    for (const [name, def] of Object.entries(params.decoratorDefinitions)) {
+      const intent = def.intent || "";
+      const cssProps = def.css ? Object.entries(def.css).map(([p, v]) => `${p}: ${v}`).join("; ") : "";
+      briefLines.push(`| \`.${name}\` | ${intent} | ${cssProps} |`);
+    }
+    briefLines.push("");
+  } else if (params.decorators && params.decorators.length > 0) {
     briefLines.push("### Decorator Quick Reference");
     briefLines.push("| Class | Purpose |");
     briefLines.push("|-------|---------|");
@@ -1381,6 +1196,9 @@ function generateProjectJson(detected, options, registrySource) {
       flags: buildFlagsString(options)
     }
   };
+  if (options.blueprint) {
+    data.blueprintId = options.blueprint;
+  }
   return JSON.stringify(data, null, 2);
 }
 function buildFlagsString(options) {
@@ -1391,38 +1209,23 @@ function buildFlagsString(options) {
   if (options.guard) flags.push(`--guard=${options.guard}`);
   return flags.join(" ");
 }
-function generateTaskContext(templateName, essence) {
-  const template = loadTemplate(templateName);
-  const defaultShell = essence.structure[0]?.shell || "sidebar-main";
-  const layout = essence.structure[0]?.layout.map(serializeLayoutItem).join(", ") || "none";
-  const scaffoldStructure = essence.structure.map((p) => {
-    const patterns = p.layout.length > 0 ? `
-  - Patterns: ${p.layout.map(serializeLayoutItem).join(", ")}` : "";
-    return `- **${p.id}** (${p.shell})${patterns}`;
-  }).join("\n");
-  const vars = {
-    TARGET: essence.target,
-    THEME_STYLE: essence.theme.style,
-    THEME_MODE: essence.theme.mode,
-    THEME_RECIPE: essence.theme.style,
-    DEFAULT_SHELL: defaultShell,
-    GUARD_MODE: essence.guard.mode,
-    LAYOUT: layout,
-    DENSITY: essence.density.level,
-    CONTENT_GAP: essence.density.content_gap,
-    SCAFFOLD_STRUCTURE: scaffoldStructure
-  };
-  return renderTemplate(template, vars);
-}
 function generateTaskContextV3(templateName, essence) {
   const template = loadTemplate(templateName);
-  const pages = essence.blueprint.sections && essence.blueprint.sections.length > 0 ? essence.blueprint.sections.flatMap((s) => s.pages) : essence.blueprint.pages || [];
-  const defaultShell = essence.blueprint.sections?.[0]?.shell || essence.blueprint.shell || "sidebar-main";
+  const sections = essence.blueprint.sections && essence.blueprint.sections.length > 0 ? essence.blueprint.sections : [];
+  const pages = sections.length > 0 ? sections.flatMap((s) => s.pages) : essence.blueprint.pages || [];
+  const defaultShell = sections[0]?.shell || essence.blueprint.shell || "sidebar-main";
   const layout = pages[0]?.layout?.map(serializeLayoutItem).join(", ") || "none";
+  const pageShellMap = /* @__PURE__ */ new Map();
+  for (const s of sections) {
+    for (const p of s.pages) {
+      pageShellMap.set(p.id, s.shell);
+    }
+  }
   const scaffoldStructure = pages.map((p) => {
+    const shell = pageShellMap.get(p.id) || defaultShell;
     const patterns = p.layout.length > 0 ? `
   - Patterns: ${p.layout.map(serializeLayoutItem).join(", ")}` : "";
-    return `- **${p.id}** (${defaultShell})${patterns}`;
+    return `- **${p.id}** (${shell})${patterns}`;
   }).join("\n");
   const densityLevel = essence.dna.spacing?.density || "comfortable";
   const contentGap = essence.dna.spacing?.content_gap || "_gap4";
@@ -1506,7 +1309,6 @@ ${cacheEntry}
 }
 async function scaffoldProject(projectRoot, options, detected, registry, archetypeData, registrySource = "cache", themeData, topologyMarkdown, composedSections, routeMap, patternSpecs, blueprintData) {
   const essenceV3 = buildEssenceV3(options, archetypeData, themeData);
-  const essence = buildEssence(options, archetypeData);
   const decantrDir = join(projectRoot, ".decantr");
   const contextDir = join(decantrDir, "context");
   const cacheDir = join(decantrDir, "cache");
@@ -1515,10 +1317,15 @@ async function scaffoldProject(projectRoot, options, detected, registry, archety
   const essencePath = join(projectRoot, "decantr.essence.json");
   writeFileSync(essencePath, JSON.stringify(essenceV3, null, 2) + "\n");
   const projectJsonPath = join(decantrDir, "project.json");
-  writeFileSync(projectJsonPath, generateProjectJson(detected, options, registrySource));
+  const projectJsonStr = generateProjectJson(detected, options, registrySource);
+  const projectJsonObj = JSON.parse(projectJsonStr);
+  if (blueprintData?.voice) {
+    projectJsonObj.voice = blueprintData.voice;
+  }
+  writeFileSync(projectJsonPath, JSON.stringify(projectJsonObj, null, 2));
   const contextFiles = [];
   const scaffoldPath = join(contextDir, "task-scaffold.md");
-  writeFileSync(scaffoldPath, generateTaskContext("task-scaffold.md.template", essence));
+  writeFileSync(scaffoldPath, generateTaskContextV3("task-scaffold.md.template", essenceV3));
   contextFiles.push(scaffoldPath);
   if (composedSections) {
     essenceV3.version = "3.1.0";
@@ -1541,7 +1348,7 @@ async function scaffoldProject(projectRoot, options, detected, registry, archety
     }
     writeFileSync(essencePath, JSON.stringify(essenceV3, null, 2) + "\n");
   }
-  const refreshResult = await refreshDerivedFiles(projectRoot, essenceV3, registry, themeData, { isInitialScaffold: true });
+  const refreshResult = await refreshDerivedFiles(projectRoot, essenceV3, registry, themeData, { isInitialScaffold: true, patternSpecs });
   contextFiles.push(...refreshResult.contextFiles);
   const gitignoreUpdated = updateGitignore(projectRoot);
   return {
@@ -1741,10 +1548,81 @@ When available, use these tools:
     gitignoreUpdated
   };
 }
+async function resolvePatternSpec(name, registry, prefetched, includeExtendedFields = true) {
+  if (prefetched && (prefetched.layout_hints || prefetched.visual_brief || !includeExtendedFields)) {
+    if (!prefetched.components || prefetched.components.length === 0) {
+      const syntheticComps2 = generateSyntheticComponents(name, prefetched.description);
+      if (syntheticComps2.length > 0) prefetched.components = syntheticComps2;
+    }
+    if (!prefetched.slots || Object.keys(prefetched.slots).length === 0) {
+      const synthetic = generateSyntheticSlots(name, prefetched.description);
+      if (Object.keys(synthetic).length > 0) prefetched.slots = synthetic;
+    }
+    return prefetched;
+  }
+  try {
+    const patResult = await registry.fetchPattern(name);
+    if (patResult?.data) {
+      const inner = patResult.data;
+      const defaultPreset = inner.default_preset || "standard";
+      const preset = inner.presets?.[defaultPreset];
+      let slots = preset?.layout?.slots || {};
+      if (Object.keys(slots).length === 0) {
+        const synthetic = generateSyntheticSlots(name, inner.description || "");
+        if (Object.keys(synthetic).length > 0) slots = synthetic;
+      }
+      const spec = {
+        description: inner.description || prefetched?.description || "",
+        components: inner.components || prefetched?.components || [],
+        slots,
+        layout_hints: inner.layout_hints,
+        ...includeExtendedFields ? {
+          visual_brief: inner.visual_brief,
+          composition: inner.composition,
+          motion: inner.motion,
+          responsive: inner.responsive,
+          accessibility: inner.accessibility
+        } : {}
+      };
+      if (!spec.components || spec.components.length === 0) {
+        const syntheticComps2 = generateSyntheticComponents(name, spec.description);
+        if (syntheticComps2.length > 0) spec.components = syntheticComps2;
+      }
+      return spec;
+    }
+  } catch {
+  }
+  if (prefetched) {
+    if (!prefetched.components || prefetched.components.length === 0) {
+      const syntheticComps2 = generateSyntheticComponents(name, prefetched.description);
+      if (syntheticComps2.length > 0) prefetched.components = syntheticComps2;
+    }
+    if (!prefetched.slots || Object.keys(prefetched.slots).length === 0) {
+      const synthetic = generateSyntheticSlots(name, prefetched.description);
+      if (Object.keys(synthetic).length > 0) prefetched.slots = synthetic;
+    }
+    return prefetched;
+  }
+  const syntheticSlots = generateSyntheticSlots(name, "");
+  const syntheticComps = generateSyntheticComponents(name, "");
+  if (Object.keys(syntheticSlots).length > 0 || syntheticComps.length > 0) {
+    return { description: "", components: syntheticComps, slots: syntheticSlots };
+  }
+  return null;
+}
 async function refreshDerivedFiles(projectRoot, essence, registry, prefetchedThemeData, options) {
   const decantrDir = join(projectRoot, ".decantr");
   const contextDir = join(decantrDir, "context");
   mkdirSync(contextDir, { recursive: true });
+  let storedBlueprintId;
+  const projectJsonFilePath = join(decantrDir, "project.json");
+  if (existsSync(projectJsonFilePath)) {
+    try {
+      const projData = JSON.parse(readFileSync(projectJsonFilePath, "utf-8"));
+      if (projData.blueprintId) storedBlueprintId = projData.blueprintId;
+    } catch {
+    }
+  }
   const themeName = essence.dna.theme.id || essence.dna.theme.style || "default";
   const mode = essence.dna.theme.mode;
   const guardMode = essence.meta.guard.mode;
@@ -1862,14 +1740,15 @@ async function refreshDerivedFiles(projectRoot, essence, registry, prefetchedThe
   writeFileSync(decantrMdPath, generateDecantrMdV31({
     guardMode,
     cssApproach: CSS_APPROACH_CONTENT,
-    blueprintId: essence.meta.blueprint || void 0,
+    blueprintId: storedBlueprintId || essence.meta.blueprint || void 0,
     themeName,
     themeMode: mode,
     themeShape: essence.dna.theme.shape || void 0,
     personality,
     sections: sectionSummaries.length > 0 ? sectionSummaries : void 0,
     features: allFeatures.length > 0 ? allFeatures : void 0,
-    decorators: earlyDecoratorList.length > 0 ? earlyDecoratorList : void 0
+    decorators: earlyDecoratorList.length > 0 ? earlyDecoratorList : void 0,
+    decoratorDefinitions: themeData?.decorator_definitions
   }));
   const hasSections = essence.blueprint.sections && essence.blueprint.sections.length > 0;
   const contextFiles = [];
@@ -1895,6 +1774,7 @@ async function refreshDerivedFiles(projectRoot, essence, registry, prefetchedThe
         section.shell = primarySectionShell;
       }
     }
+    const prefetchedSpecs = options?.patternSpecs;
     const patternSpecs = {};
     const seenPatterns = /* @__PURE__ */ new Set();
     for (const section of sections) {
@@ -1904,49 +1784,8 @@ async function refreshDerivedFiles(projectRoot, essence, registry, prefetchedThe
           for (const name of names) {
             if (!seenPatterns.has(name)) {
               seenPatterns.add(name);
-              try {
-                const patResult = await registry.fetchPattern(name);
-                if (patResult?.data) {
-                  const inner = patResult.data;
-                  const defaultPreset = inner.default_preset || "standard";
-                  const preset = inner.presets?.[defaultPreset];
-                  let slots = preset?.layout?.slots || {};
-                  if (Object.keys(slots).length === 0) {
-                    const synthetic = generateSyntheticSlots(name, inner.description || "");
-                    if (Object.keys(synthetic).length > 0) {
-                      slots = synthetic;
-                    }
-                  }
-                  const spec = {
-                    description: inner.description || "",
-                    components: inner.components || [],
-                    slots,
-                    layout_hints: inner.layout_hints,
-                    visual_brief: inner.visual_brief,
-                    composition: inner.composition,
-                    motion: inner.motion,
-                    responsive: inner.responsive,
-                    accessibility: inner.accessibility
-                  };
-                  if (!spec.components || spec.components.length === 0) {
-                    const syntheticComps = generateSyntheticComponents(name, spec.description);
-                    if (syntheticComps.length > 0) spec.components = syntheticComps;
-                  }
-                  patternSpecs[name] = spec;
-                } else {
-                  const synthetic = generateSyntheticSlots(name, "");
-                  const syntheticComps = generateSyntheticComponents(name, "");
-                  if (Object.keys(synthetic).length > 0 || syntheticComps.length > 0) {
-                    patternSpecs[name] = { description: "", components: syntheticComps, slots: synthetic };
-                  }
-                }
-              } catch {
-                const synthetic = generateSyntheticSlots(name, "");
-                const syntheticComps = generateSyntheticComponents(name, "");
-                if (Object.keys(synthetic).length > 0 || syntheticComps.length > 0) {
-                  patternSpecs[name] = { description: "", components: syntheticComps, slots: synthetic };
-                }
-              }
+              const spec = await resolvePatternSpec(name, registry, prefetchedSpecs?.[name], true);
+              if (spec) patternSpecs[name] = spec;
             }
           }
         }
@@ -2047,10 +1886,18 @@ async function refreshDerivedFiles(projectRoot, essence, registry, prefetchedThe
       writeFileSync(sectionContextPath, contextContent);
       contextFiles.push(sectionContextPath);
     }
+    let projectVoice;
+    if (existsSync(projectJsonFilePath)) {
+      try {
+        const projData = JSON.parse(readFileSync(projectJsonFilePath, "utf-8"));
+        if (projData.voice) projectVoice = projData.voice;
+      } catch {
+      }
+    }
     const routes = blueprint.routes || {};
     const scaffoldContent = generateScaffoldContext({
       appName: essence.meta.archetype || "Application",
-      blueprintId: "",
+      blueprintId: storedBlueprintId || essence.meta.blueprint || "",
       themeName,
       personality,
       topologyMarkdown,
@@ -2058,7 +1905,8 @@ async function refreshDerivedFiles(projectRoot, essence, registry, prefetchedThe
       routes,
       constraints: essence.dna.constraints,
       seo: essence.meta.seo,
-      navigation: essence.meta.navigation
+      navigation: essence.meta.navigation,
+      voice: projectVoice
     });
     const scaffoldMdPath = join(contextDir, "scaffold.md");
     writeFileSync(scaffoldMdPath, scaffoldContent);
@@ -2074,6 +1922,7 @@ async function refreshDerivedFiles(projectRoot, essence, registry, prefetchedThe
       description: `${essence.meta.archetype || "Application"} section`,
       pages
     };
+    const prefetchedSpecs = options?.patternSpecs;
     const patternSpecs = {};
     const seenPatterns = /* @__PURE__ */ new Set();
     for (const page of pages) {
@@ -2082,44 +1931,8 @@ async function refreshDerivedFiles(projectRoot, essence, registry, prefetchedThe
         for (const name of names) {
           if (!seenPatterns.has(name)) {
             seenPatterns.add(name);
-            try {
-              const patResult = await registry.fetchPattern(name);
-              if (patResult?.data) {
-                const inner = patResult.data;
-                const defaultPreset = inner.default_preset || "standard";
-                const preset = inner.presets?.[defaultPreset];
-                let slots = preset?.layout?.slots || {};
-                if (Object.keys(slots).length === 0) {
-                  const synthetic = generateSyntheticSlots(name, inner.description || "");
-                  if (Object.keys(synthetic).length > 0) {
-                    slots = synthetic;
-                  }
-                }
-                const spec = {
-                  description: inner.description || "",
-                  components: inner.components || [],
-                  slots,
-                  layout_hints: inner.layout_hints
-                };
-                if (!spec.components || spec.components.length === 0) {
-                  const syntheticComps = generateSyntheticComponents(name, spec.description);
-                  if (syntheticComps.length > 0) spec.components = syntheticComps;
-                }
-                patternSpecs[name] = spec;
-              } else {
-                const synthetic = generateSyntheticSlots(name, "");
-                const syntheticComps = generateSyntheticComponents(name, "");
-                if (Object.keys(synthetic).length > 0 || syntheticComps.length > 0) {
-                  patternSpecs[name] = { description: "", components: syntheticComps, slots: synthetic };
-                }
-              }
-            } catch {
-              const synthetic = generateSyntheticSlots(name, "");
-              const syntheticComps = generateSyntheticComponents(name, "");
-              if (Object.keys(synthetic).length > 0 || syntheticComps.length > 0) {
-                patternSpecs[name] = { description: "", components: syntheticComps, slots: synthetic };
-              }
-            }
+            const spec = await resolvePatternSpec(name, registry, prefetchedSpecs?.[name], false);
+            if (spec) patternSpecs[name] = spec;
           }
         }
       }
@@ -2306,7 +2119,8 @@ function generateSectionContext(input) {
     text: "Body text, headings, primary content",
     "text-muted": "Secondary text, placeholders, labels",
     primary: "Brand color, key interactive, selected states",
-    "primary-hover": "Hover state for primary elements"
+    "primary-hover": "Hover state for primary elements",
+    secondary: "Secondary brand color, supporting elements"
   };
   if (input.themeData?.palette) {
     const modeKey = input.themeMode || "dark";
@@ -2317,12 +2131,36 @@ function generateSectionContext(input) {
   }
   if (input.themeData?.seed?.accent) {
     lines.push(`| \`--d-accent\` | \`${input.themeData.seed.accent}\` | CTAs, links, active states, glow effects |`);
+    const accentGlowVal = input.themeData?.palette?.["accent-glow"]?.[input.themeMode || "dark"] || input.themeData?.tokens?.base?.["accent-glow"];
+    if (accentGlowVal) {
+      lines.push(`| \`--d-accent-glow\` | \`${accentGlowVal}\` | Ambient glow effect around accent elements |`);
+    }
   }
   lines.push("");
   lines.push("Full token set: `src/styles/tokens.css`");
   lines.push("");
   lines.push("**Visual Treatments:** All 6 base treatments available (see DECANTR.md for usage).");
-  if (decorators.length > 0) {
+  const decoratorDefs = input.themeData?.decorator_definitions;
+  if (decoratorDefs && Object.keys(decoratorDefs).length > 0) {
+    lines.push("**Theme decorators:**");
+    lines.push("");
+    lines.push("| Class | Intent | Key CSS | Pairs with |");
+    lines.push("|-------|--------|---------|------------|");
+    for (const [name, def] of Object.entries(decoratorDefs)) {
+      const intent = def.intent || "";
+      const cssProps = def.css ? Object.entries(def.css).map(([p, v]) => `${p}: ${v}`).join("; ") : "";
+      const pairsWith = def.pairs_with || "";
+      lines.push(`| \`.${name}\` | ${intent} | ${cssProps} | ${pairsWith} |`);
+    }
+    lines.push("");
+    lines.push("**Decorator usage guide:**");
+    for (const [name, def] of Object.entries(decoratorDefs)) {
+      if (def.usage && def.usage.length > 0) {
+        lines.push(`- \`.${name}\`: ${def.usage.join(", ")}`);
+      }
+    }
+    lines.push("");
+  } else if (decorators.length > 0) {
     lines.push("**Theme decorators:**");
     lines.push("");
     lines.push("| Class | Usage |");
@@ -2332,12 +2170,16 @@ function generateSectionContext(input) {
     }
     lines.push("");
   } else {
-    lines.push("**Theme decorators:** None defined for this theme.");
+    lines.push("No theme decorators defined.");
     lines.push("");
   }
   if (themeHints) {
     if (themeHints.preferred && themeHints.preferred.length > 0) {
-      lines.push(`**Preferred:** ${themeHints.preferred.join(", ")}`);
+      const sectionPatterns = new Set(section.pages.flatMap((p) => p.layout.map((l) => typeof l === "string" ? l : l.pattern)));
+      const relevant = themeHints.preferred.filter((p) => sectionPatterns.has(p));
+      if (relevant.length > 0) {
+        lines.push(`**Preferred:** ${relevant.join(", ")}`);
+      }
     }
     if (themeHints.compositions) {
       lines.push(`**Compositions:** ${themeHints.compositions}`);

package/dist/{chunk-DESYSWLL.js → chunk-HWMN432I.js}

@@ -9,7 +9,7 @@ import {
   scaffoldMinimal,
   scaffoldProject,
   syncRegistry
-} from "./chunk-PMBLHVBX.js";
+} from "./chunk-5MKMLONH.js";
 
 // src/index.ts
 import { readFileSync as readFileSync15, existsSync as existsSync23, readdirSync as readdirSync6 } from "fs";
@@ -4332,7 +4332,7 @@ async function main() {
       break;
     }
     case "upgrade": {
-      const { cmdUpgrade } = await import("./upgrade-2OG7UKTR.js");
+      const { cmdUpgrade } = await import("./upgrade-3AAWHJGG.js");
       const applyFlag = args.includes("--apply");
       await cmdUpgrade(process.cwd(), { apply: applyFlag });
       break;

package/dist/index.js

@@ -1,2 +1,2 @@
-import "./chunk-DESYSWLL.js";
-import "./chunk-PMBLHVBX.js";
+import "./chunk-HWMN432I.js";
+import "./chunk-5MKMLONH.js";

package/dist/{upgrade-2OG7UKTR.js → upgrade-3AAWHJGG.js}

@@ -1,7 +1,7 @@
 import {
   RegistryClient,
   refreshDerivedFiles
-} from "./chunk-PMBLHVBX.js";
+} from "./chunk-5MKMLONH.js";
 
 // src/commands/upgrade.ts
 import { readFileSync, writeFileSync, existsSync } from "fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decantr/cli",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "Decantr CLI — search the registry, validate essence files, and access design intelligence from the terminal",
   "license": "MIT",
   "repository": {