@siteable/core 0.1.0 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@siteable/core",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Siteable core engine — blocks, visual editor, config store, theme presets, HTML export. JSON-first website builder engine.",
   "license": "MIT",
   "type": "module",

package/src/blocks/faq/FaqBlock.tsx

@@ -1,6 +1,7 @@
 import { useState } from 'react'
 import { ChevronDown } from 'lucide-react'
 import type { BlockConfig } from '../types'
+import { defaultFaqItems } from '@/lib/block-default-content'
 
 interface FaqItem {
   question: string
@@ -13,12 +14,9 @@ interface FaqProps {
   items?: FaqItem[]
 }
 
-const defaultFaqs: FaqItem[] = [
-  { question: 'What is OpenPage?', answer: 'OpenPage is a visual website builder that uses structured JSON config as the source of truth. Both humans and AI agents can edit the same config to build beautiful websites.' },
-  { question: 'How does the JSON config work?', answer: 'Every website is represented as a JSON document with blocks, styles, and content. The visual editor reads and writes this JSON, and agents can make surgical edits via the API.' },
-  { question: 'Can I use my own components?', answer: 'Yes! OpenPage supports custom components. You can build your own blocks following our component schema and register them in the block registry.' },
-  { question: 'Is it free to use?', answer: 'OpenPage offers a free tier for personal projects with up to 5 blocks. Pro and Team plans unlock unlimited blocks, custom domains, and priority support.' },
-]
+// ISS-005: fallback FAQs are the block-default-content contract, shared with
+// the prop normalizer (was an inline literal, value-identical).
+const defaultFaqs = defaultFaqItems as FaqItem[]
 
 function AccordionItem({ item, isOpen, onToggle }: { item: FaqItem; isOpen: boolean; onToggle: () => void }) {
   return (

package/src/blocks/footer/FooterBlock.tsx

@@ -1,4 +1,5 @@
 import type { BlockConfig } from '../types'
+import { defaultFooterColumns } from '@/lib/block-default-content'
 
 interface FooterProps {
   logo: string
@@ -41,12 +42,9 @@ function FooterSimple({ props }: { props: FooterProps }) {
 }
 
 function FooterMultiColumn({ props }: { props: FooterProps }) {
-  const columns = props.columns || [
-    { title: 'Product', links: ['Features', 'Pricing', 'Changelog', 'Roadmap'] },
-    { title: 'Company', links: ['About', 'Blog', 'Careers', 'Press'] },
-    { title: 'Resources', links: ['Documentation', 'API Reference', 'Guides', 'Community'] },
-    { title: 'Legal', links: ['Privacy', 'Terms', 'Security', 'Cookie Policy'] },
-  ]
+  // ISS-005: fallback columns are the block-metadata contract (defaultFooterColumns),
+  // shared with the prop normalizer so shape and render default can never drift.
+  const columns = props.columns || defaultFooterColumns
 
   return (
     <footer className="px-6 @md:px-10 py-12 border-t border-border-subtle">

package/src/blocks/gallery/GalleryBlock.tsx

@@ -1,5 +1,9 @@
 import { ImageIcon } from 'lucide-react'
 import type { BlockConfig } from '../types'
+// ISS-005: fallback images are the block-default-content contract, shared with
+// the prop normalizer (was an inline literal; src/caption:'' additions are
+// falsy → placeholder icon + no caption div, byte-identical render).
+import { defaultGalleryImages } from '@/lib/block-default-content'
 
 interface GalleryImage {
   src?: string
@@ -7,11 +11,6 @@ interface GalleryImage {
   caption?: string
 }
 
-const defaultImages: GalleryImage[] = [
-  { alt: 'Image 1' }, { alt: 'Image 2' }, { alt: 'Image 3' },
-  { alt: 'Image 4' }, { alt: 'Image 5' }, { alt: 'Image 6' },
-]
-
 function ImageCard({ image, tall }: { image: GalleryImage; tall?: boolean }) {
   return (
     <div className={`rounded-lg overflow-hidden border border-border-default group ${tall ? 'row-span-2' : ''}`}>
@@ -34,7 +33,7 @@ export function GalleryBlock({ block }: { block: BlockConfig }) {
   const title = props.title as string | undefined
   const images = ((props.images as GalleryImage[]) || []).length > 0
     ? (props.images as GalleryImage[])
-    : defaultImages
+    : defaultGalleryImages
 
   if (variant === 'masonry') {
     return (

package/src/blocks/image/ImageBlock.tsx

@@ -1,5 +1,9 @@
 import { ImageIcon } from 'lucide-react'
 import type { BlockConfig } from '../types'
+// ISS-005: grid placeholder items are the block-default-content contract, shared
+// with the prop normalizer (was an inline literal; src:'' is falsy like the
+// original src:undefined → identical Placeholder render).
+import { defaultImageGridItems } from '@/lib/block-default-content'
 
 function Placeholder({ className }: { className?: string }) {
   return (
@@ -41,7 +45,7 @@ export function ImageBlock({ block }: { block: BlockConfig }) {
   if (variant === 'grid') {
     const gridImages = images.length > 0
       ? images.slice(0, 4)
-      : [{ src: undefined, alt: '1' }, { src: undefined, alt: '2' }, { src: undefined, alt: '3' }, { src: undefined, alt: '4' }]
+      : defaultImageGridItems
 
     return (
       <div className="px-6 py-12 @lg:px-16 @lg:py-16">

package/src/blocks/logocloud/LogoCloudBlock.tsx

@@ -1,12 +1,13 @@
 import type { BlockConfig } from '../types'
+// ISS-005: fallback logos are the block-default-content contract, shared with
+// the prop normalizer (was an inline literal, value-identical).
+import { defaultLogos } from '@/lib/block-default-content'
 
 interface LogoCloudProps {
   title?: string
   logos?: string[]
 }
 
-const defaultLogos = ['Vercel', 'Stripe', 'GitHub', 'Figma', 'Notion', 'Linear']
-
 function LogoPlaceholder({ name }: { name: string }) {
   return (
     <div className="group cursor-pointer transition-all">

package/src/blocks/pricing/PricingBlock.tsx

@@ -1,5 +1,6 @@
 import type { BlockConfig } from '../types'
 import { Check, Star } from 'lucide-react'
+import { defaultPricingTiers } from '@/lib/block-default-content'
 
 interface PricingTier {
   name: string
@@ -17,33 +18,9 @@ interface PricingProps {
   tiers?: PricingTier[]
 }
 
-const defaultTiers: PricingTier[] = [
-  {
-    name: 'Starter',
-    price: '$0',
-    period: '/month',
-    description: 'For personal projects',
-    features: ['1 website', '5 blocks', 'Basic export', 'Community support'],
-    cta: 'Get Started',
-  },
-  {
-    name: 'Pro',
-    price: '$19',
-    period: '/month',
-    description: 'For professionals',
-    features: ['Unlimited websites', 'All blocks', 'Custom domains', 'Priority support', 'Agent API access', 'Version history'],
-    cta: 'Upgrade to Pro',
-    featured: true,
-  },
-  {
-    name: 'Team',
-    price: '$49',
-    period: '/month',
-    description: 'For teams and agencies',
-    features: ['Everything in Pro', 'Team collaboration', 'Custom components', 'SSO', 'Dedicated support'],
-    cta: 'Contact Sales',
-  },
-]
+// ISS-005: fallback tiers are the block-metadata contract (defaultPricingTiers),
+// shared with the prop normalizer so shape and render default can never drift.
+const defaultTiers = defaultPricingTiers as PricingTier[]
 
 function PricingSimple({ props }: { props: PricingProps }) {
   const tiers = props.tiers || defaultTiers

package/src/blocks/stats/StatsBlock.tsx

@@ -1,4 +1,5 @@
 import type { BlockConfig } from '../types'
+import { defaultStatItems } from '@/lib/block-default-content'
 
 interface StatItem {
   value: string
@@ -10,12 +11,9 @@ interface StatsProps {
   items?: StatItem[]
 }
 
-const defaultStats: StatItem[] = [
-  { value: '10K+', label: 'Sites built' },
-  { value: '99.9%', label: 'Uptime' },
-  { value: '50ms', label: 'Avg. response' },
-  { value: '4.9/5', label: 'User rating' },
-]
+// ISS-005: fallback items are the block-default-content contract, shared with
+// the prop normalizer (was an inline literal, value-identical).
+const defaultStats = defaultStatItems as StatItem[]
 
 function StatsGrid({ props }: { props: StatsProps }) {
   const items = props.items || defaultStats

package/src/blocks/team/TeamBlock.tsx

@@ -1,4 +1,5 @@
 import type { BlockConfig } from '../types'
+import { defaultTeamMembers } from '@/lib/block-default-content'
 
 interface TeamMember {
   name: string
@@ -12,12 +13,9 @@ interface TeamProps {
   members?: TeamMember[]
 }
 
-const defaultMembers: TeamMember[] = [
-  { name: 'Alex Rivera', role: 'CEO & Founder' },
-  { name: 'Jordan Lee', role: 'CTO' },
-  { name: 'Sam Patel', role: 'Head of Design' },
-  { name: 'Casey Morgan', role: 'Lead Engineer' },
-]
+// ISS-005: fallback members are the block-default-content contract, shared with
+// the prop normalizer (was an inline literal, value-identical).
+const defaultMembers = defaultTeamMembers as TeamMember[]
 
 export function TeamBlock({ block }: { block: BlockConfig }) {
   const props = block.props as unknown as TeamProps

package/src/blocks/testimonials/TestimonialsBlock.tsx

@@ -1,6 +1,10 @@
 import { useState } from 'react'
 import { ChevronLeft, ChevronRight, Star, Quote } from 'lucide-react'
 import type { BlockConfig } from '../types'
+// ISS-005: fallback testimonials are the block-default-content contract, shared
+// with the prop normalizer (was an inline literal; avatar:'' additions are
+// falsy → initials branch renders byte-identically).
+import { defaultTestimonials } from '@/lib/block-default-content'
 
 interface Testimonial {
   name: string
@@ -16,12 +20,6 @@ interface TestimonialsProps {
   items?: Testimonial[]
 }
 
-const defaultTestimonials: Testimonial[] = [
-  { name: 'Sarah Chen', role: 'CEO at TechCorp', quote: 'OpenPage completely changed how we build landing pages. The JSON config approach is genius.', rating: 5 },
-  { name: 'Marcus Johnson', role: 'Lead Developer', quote: 'Finally, a tool where both designers and AI agents can work together seamlessly.', rating: 5 },
-  { name: 'Emma Wilson', role: 'Product Manager', quote: 'We shipped our marketing site in half the time. The component library is incredible.', rating: 4 },
-]
-
 function StarRating({ rating }: { rating: number }) {
   return (
     <div className="flex gap-0.5">

package/src/editor/AgentPanel.tsx

@@ -87,7 +87,9 @@ function generateResponse(input: string, blocks: { id: string; type: string; var
         id: `block-${Date.now()}`,
         type: meta.type,
         variant: meta.variants[0],
-        props: { ...meta.defaultProps },
+        // ISS-005 review item 3: deep copy — defaultProps now hold shared array-of-object
+        // constants; a shallow spread would let this block's edits mutate every future insert.
+        props: structuredClone(meta.defaultProps),
       }
       return { action: 'addBlock', block, message: `Adding a ${meta.label} block.` }
     }

package/src/editor/LayersPanel.tsx

@@ -195,7 +195,9 @@ export function LayersPanel() {
       id: `block-${Date.now()}`,
       type,
       variant: meta.variants[0],
-      props: { ...meta.defaultProps },
+      // ISS-005 review item 3: deep copy — defaultProps now hold shared array-of-object
+      // constants; a shallow spread would let this block's edits mutate every future insert.
+      props: structuredClone(meta.defaultProps),
     }
     addBlock(block)
     selectBlock(block.id)

package/src/editor/LeftSidebar.tsx

@@ -44,7 +44,9 @@ function ComponentsPanel() {
       id: generateBlockId(),
       type,
       variant: meta.variants[0],
-      props: { ...meta.defaultProps },
+      // ISS-005 review item 3: deep copy — defaultProps now hold shared array-of-object
+      // constants; a shallow spread would let this block's edits mutate every future insert.
+      props: structuredClone(meta.defaultProps),
     }
     addBlock(block)
     selectBlock(block.id)

package/src/lib/block-default-content.ts

@@ -0,0 +1,110 @@
+/**
+ * ISS-005 (class fix) — single source of truth for block default CONTENT.
+ *
+ * These literals were previously inline fallbacks inside block components
+ * (or absent entirely), so the shape-driven prop normalizer had no contract
+ * to coerce AI-returned values against. Each constant is value-identical to
+ * the fallback it replaced: valid configs render byte-for-byte the same.
+ *
+ * block-metadata references them from defaultProps; the blocks import them
+ * as render fallbacks (still needed for legacy persisted configs).
+ */
+
+// ISS-005 (review item 1): logocloud logos were inline-only; LogoPlaceholder
+// does name.charAt(0) + renders {name} → object entries crash exactly like
+// navbar links did.
+export const defaultLogos = ['Vercel', 'Stripe', 'GitHub', 'Figma', 'Notion', 'Linear']
+
+export const defaultFooterColumns: { title: string; links: string[] }[] = [
+  { title: 'Product', links: ['Features', 'Pricing', 'Changelog', 'Roadmap'] },
+  { title: 'Company', links: ['About', 'Blog', 'Careers', 'Press'] },
+  { title: 'Resources', links: ['Documentation', 'API Reference', 'Guides', 'Community'] },
+  { title: 'Legal', links: ['Privacy', 'Terms', 'Security', 'Cookie Policy'] },
+]
+
+export const defaultPricingTiers: {
+  name: string
+  price: string
+  period?: string
+  description?: string
+  features: string[]
+  cta: string
+  featured?: boolean
+}[] = [
+  {
+    name: 'Starter',
+    price: '$0',
+    period: '/month',
+    description: 'For personal projects',
+    features: ['1 website', '5 blocks', 'Basic export', 'Community support'],
+    cta: 'Get Started',
+  },
+  {
+    name: 'Pro',
+    price: '$19',
+    period: '/month',
+    description: 'For professionals',
+    features: ['Unlimited websites', 'All blocks', 'Custom domains', 'Priority support', 'Agent API access', 'Version history'],
+    cta: 'Upgrade to Pro',
+    featured: true,
+  },
+  {
+    name: 'Team',
+    price: '$49',
+    period: '/month',
+    description: 'For teams and agencies',
+    features: ['Everything in Pro', 'Team collaboration', 'Custom components', 'SSO', 'Dedicated support'],
+    cta: 'Contact Sales',
+  },
+]
+
+export const defaultStatItems: { value: string; label: string }[] = [
+  { value: '10K+', label: 'Sites built' },
+  { value: '99.9%', label: 'Uptime' },
+  { value: '50ms', label: 'Avg. response' },
+  { value: '4.9/5', label: 'User rating' },
+]
+
+export const defaultFaqItems: { question: string; answer: string }[] = [
+  { question: 'What is OpenPage?', answer: 'OpenPage is a visual website builder that uses structured JSON config as the source of truth. Both humans and AI agents can edit the same config to build beautiful websites.' },
+  { question: 'How does the JSON config work?', answer: 'Every website is represented as a JSON document with blocks, styles, and content. The visual editor reads and writes this JSON, and agents can make surgical edits via the API.' },
+  { question: 'Can I use my own components?', answer: 'Yes! OpenPage supports custom components. You can build your own blocks following our component schema and register them in the block registry.' },
+  { question: 'Is it free to use?', answer: 'OpenPage offers a free tier for personal projects with up to 5 blocks. Pro and Team plans unlock unlimited blocks, custom domains, and priority support.' },
+]
+
+export const defaultTeamMembers: { name: string; role: string }[] = [
+  { name: 'Alex Rivera', role: 'CEO & Founder' },
+  { name: 'Jordan Lee', role: 'CTO' },
+  { name: 'Sam Patel', role: 'Head of Design' },
+  { name: 'Casey Morgan', role: 'Lead Engineer' },
+]
+
+// avatar:'' added vs the original inline literal (falsy → renders the initials
+// fallback exactly as before) so the normalizer has a string shape for it.
+export const defaultTestimonials: {
+  name: string
+  role: string
+  quote: string
+  rating?: number
+  avatar?: string
+}[] = [
+  { name: 'Sarah Chen', role: 'CEO at TechCorp', quote: 'OpenPage completely changed how we build landing pages. The JSON config approach is genius.', rating: 5, avatar: '' },
+  { name: 'Marcus Johnson', role: 'Lead Developer', quote: 'Finally, a tool where both designers and AI agents can work together seamlessly.', rating: 5, avatar: '' },
+  { name: 'Emma Wilson', role: 'Product Manager', quote: 'We shipped our marketing site in half the time. The component library is incredible.', rating: 4, avatar: '' },
+]
+
+// src/caption:'' added vs the original { alt } literals — falsy renders the
+// placeholder icon + skips the caption div, byte-identical output, and gives
+// the normalizer full string shapes for every GalleryImage field.
+export const defaultGalleryImages: { src?: string; alt?: string; caption?: string }[] = [
+  { src: '', alt: 'Image 1', caption: '' }, { src: '', alt: 'Image 2', caption: '' }, { src: '', alt: 'Image 3', caption: '' },
+  { src: '', alt: 'Image 4', caption: '' }, { src: '', alt: 'Image 5', caption: '' }, { src: '', alt: 'Image 6', caption: '' },
+]
+
+// Was inline in ImageBlock grid variant as { src: undefined, alt: '1' }.
+// src promoted to '' — renders identically (falsy → Placeholder) but gives
+// the normalizer a string contract for src. Type mirrors ImageBlock's
+// declared { src?, alt? } so props.images || FALLBACK unions stay assignable.
+export const defaultImageGridItems: { src?: string; alt: string }[] = [
+  { src: '', alt: '1' }, { src: '', alt: '2' }, { src: '', alt: '3' }, { src: '', alt: '4' },
+]

package/src/lib/block-metadata.ts

@@ -1,4 +1,15 @@
 import type { BlockType } from '@/blocks/types'
+import {
+  defaultFooterColumns,
+  defaultLogos,
+  defaultPricingTiers,
+  defaultStatItems,
+  defaultFaqItems,
+  defaultTeamMembers,
+  defaultTestimonials,
+  defaultGalleryImages,
+  defaultImageGridItems,
+} from '@/lib/block-default-content'
 
 export interface BlockMeta {
   type: BlockType
@@ -9,6 +20,10 @@ export interface BlockMeta {
   defaultProps: Record<string, unknown>
 }
 
+// ISS-005 (class fix): defaultProps below ARE the prop contracts the generation
+// normalizer (src/lib/prop-normalization.ts) coerces AI output against.
+// Content defaults live in src/lib/block-default-content.ts.
+
 export const blockMetadata: BlockMeta[] = [
   {
     type: 'navbar',
@@ -24,7 +39,9 @@ export const blockMetadata: BlockMeta[] = [
     description: 'Full-width hero section with headline and CTAs',
     category: 'Hero',
     variants: ['centered', 'split', 'gradient', 'minimal'],
-    defaultProps: { headline: 'Your Headline Here', subheadline: 'A compelling subheadline that explains your value proposition.', primaryCta: 'Get Started', secondaryCta: 'Learn More' },
+    // badge:'' gives the normalizer a string contract for badge (renders only
+    // when truthy → byte-identical output vs the key being absent) — ISS-005 review item 1.
+    defaultProps: { badge: '', headline: 'Your Headline Here', subheadline: 'A compelling subheadline that explains your value proposition.', primaryCta: 'Get Started', secondaryCta: 'Learn More' },
   },
   {
     type: 'features',
@@ -40,7 +57,7 @@ export const blockMetadata: BlockMeta[] = [
     description: 'Pricing tiers with feature comparison',
     category: 'Commerce',
     variants: ['simple', 'comparison'],
-    defaultProps: { title: 'Pricing', subtitle: 'Choose the plan that fits your needs' },
+    defaultProps: { title: 'Pricing', subtitle: 'Choose the plan that fits your needs', tiers: defaultPricingTiers },
   },
   {
     type: 'cta',
@@ -56,7 +73,7 @@ export const blockMetadata: BlockMeta[] = [
     description: 'Page footer with links and copyright',
     category: 'Navigation',
     variants: ['simple', 'multi-column', 'minimal'],
-    defaultProps: { logo: 'Brand', copyright: '2026 Brand. All rights reserved.', links: ['Privacy', 'Terms'] },
+    defaultProps: { logo: 'Brand', copyright: '2026 Brand. All rights reserved.', links: ['Privacy', 'Terms'], columns: defaultFooterColumns },
   },
   {
     type: 'testimonials',
@@ -64,7 +81,7 @@ export const blockMetadata: BlockMeta[] = [
     description: 'Customer testimonials with quotes and ratings',
     category: 'Social Proof',
     variants: ['cards', 'carousel', 'spotlight'],
-    defaultProps: { title: 'What our customers say' },
+    defaultProps: { title: 'What our customers say', items: defaultTestimonials },
   },
   {
     type: 'stats',
@@ -72,7 +89,7 @@ export const blockMetadata: BlockMeta[] = [
     description: 'Key metrics and statistics display',
     category: 'Social Proof',
     variants: ['grid', 'bar', 'counter'],
-    defaultProps: { title: 'By the numbers' },
+    defaultProps: { title: 'By the numbers', items: defaultStatItems },
   },
   {
     type: 'faq',
@@ -80,7 +97,7 @@ export const blockMetadata: BlockMeta[] = [
     description: 'Frequently asked questions accordion',
     category: 'Content',
     variants: ['accordion'],
-    defaultProps: { title: 'Frequently Asked Questions' },
+    defaultProps: { title: 'Frequently Asked Questions', items: defaultFaqItems },
   },
   {
     type: 'team',
@@ -88,7 +105,7 @@ export const blockMetadata: BlockMeta[] = [
     description: 'Team member grid with photos and roles',
     category: 'Content',
     variants: ['grid'],
-    defaultProps: { title: 'Meet the Team' },
+    defaultProps: { title: 'Meet the Team', members: defaultTeamMembers },
   },
   {
     type: 'contact',
@@ -112,7 +129,7 @@ export const blockMetadata: BlockMeta[] = [
     description: 'Company logos with hover effects',
     category: 'Social Proof',
     variants: ['default'],
-    defaultProps: { title: 'Trusted by leading companies' },
+    defaultProps: { title: 'Trusted by leading companies', logos: defaultLogos },
   },
   {
     type: 'content',
@@ -128,7 +145,7 @@ export const blockMetadata: BlockMeta[] = [
     description: 'Image with text overlay or side-by-side layout',
     category: 'Media',
     variants: ['hero-image', 'side-by-side', 'grid'],
-    defaultProps: { title: 'Visual Storytelling', subtitle: 'A picture is worth a thousand words.', imageSide: 'left' },
+    defaultProps: { title: 'Visual Storytelling', subtitle: 'A picture is worth a thousand words.', imageSide: 'left', images: defaultImageGridItems },
   },
   {
     type: 'video',
@@ -144,7 +161,7 @@ export const blockMetadata: BlockMeta[] = [
     description: 'Image gallery in grid or masonry layout',
     category: 'Media',
     variants: ['grid', 'masonry'],
-    defaultProps: { title: 'Gallery' },
+    defaultProps: { title: 'Gallery', images: defaultGalleryImages },
   },
   {
     type: 'divider',
@@ -160,7 +177,7 @@ export const blockMetadata: BlockMeta[] = [
     description: 'Announcement bar or ribbon',
     category: 'Content',
     variants: ['ribbon', 'bar'],
-    defaultProps: { text: 'New: We just launched v2.0!', linkText: 'Learn more' },
+    defaultProps: { text: 'New: We just launched v2.0!', linkText: 'Learn more', linkUrl: '#' },
   },
 ]
 

package/src/lib/generate-site.ts

@@ -1,6 +1,7 @@
 import type { SiteConfig, BlockConfig, ThemeConfig } from '@/blocks/types'
 import { blockMetadata } from '@/lib/block-metadata'
 import { GENERATION_PROMPT } from '@/lib/generation-prompt'
+import { normalizeBlockProps } from '@/lib/prop-normalization'
 import { getTemplateForPrompt } from '@/lib/templates'
 
 const VALID_BLOCK_TYPES = new Set<string>(blockMetadata.map((b) => b.type))
@@ -35,7 +36,12 @@ export async function generateSiteConfig(
   // 2. Injected server fallback (caller-supplied; the engine is route-agnostic)
   if (onServerFallback) {
     try {
-      const config = await onServerFallback(prompt, signal)
+      const raw = await onServerFallback(prompt, signal)
+      // ISS-005: the host's result must go through the SAME validation as tier 1 —
+      // previously it was returned unchecked (object props reached blocks → crash).
+      // validateSiteConfig never throws (all inputs type-guarded), so an unexpected
+      // throw would still be caught here and degrade to the template fallback.
+      const config = validateSiteConfig(raw, prompt)
       return { config, source: 'ai' }
     } catch (err) {
       if (err instanceof Error && err.name === 'AbortError') throw err
@@ -113,6 +119,9 @@ function validateTheme(raw: Record<string, unknown>): Partial<ThemeConfig> {
 }
 
 function validateBlock(raw: Record<string, unknown>, index: number): BlockConfig | null {
+  // ISS-005 hardening: blocks arrays may contain null/primitives from hostile or
+  // malformed AI output — validateSiteConfig must never throw by design.
+  if (!raw || typeof raw !== 'object') return null
   const type = raw.type as string
   if (!type || !VALID_BLOCK_TYPES.has(type)) return null
 
@@ -123,7 +132,11 @@ function validateBlock(raw: Record<string, unknown>, index: number): BlockConfig
   }
 
   const defaultProps = DEFAULT_PROPS_MAP[type] || {}
-  const props = typeof raw.props === 'object' && raw.props ? { ...defaultProps, ...raw.props } : defaultProps
+  // ISS-005 root fix: raw prop VALUES are normalized against the defaultProps
+  // shape (generic, no per-block guards) before merging over the defaults.
+  const props = typeof raw.props === 'object' && raw.props
+    ? { ...defaultProps, ...normalizeBlockProps(raw.props, defaultProps) }
+    : defaultProps
 
   return {
     id: typeof raw.id === 'string' && raw.id ? raw.id : `block-${type}-${index}-${Date.now()}`,

package/src/lib/generation-prompt.ts

@@ -27,12 +27,12 @@ Each page has its own blocks array. Generate at least 2 pages: Home and one addi
 
 ## Available Block Types
 
-1. navbar (variants: default, centered) - Props: { logo, links[], ctaText }
+1. navbar (variants: default, centered) - Props: { logo, links: string[], ctaText }
 2. hero (variants: centered, split, gradient, minimal) - Props: { badge?, headline, subheadline, primaryCta, secondaryCta? }
 3. features (variants: grid, list, alternating) - Props: { label?, title, subtitle?, items: [{ icon?, title, description }] }
-4. pricing (variants: simple, comparison) - Props: { title, subtitle?, tiers?: [{ name, price, period?, description?, features[], cta, featured? }] }
+4. pricing (variants: simple, comparison) - Props: { title, subtitle?, tiers?: [{ name, price, period?, description?, features: string[], cta, featured? }] }
 5. cta (variants: simple, split) - Props: { headline, subheadline?, buttonText }
-6. footer (variants: simple, multi-column, minimal) - Props: { logo, copyright, links[] }
+6. footer (variants: simple, multi-column, minimal) - Props: { logo, copyright, links: string[], columns?: [{ title, links: string[] }] }
 7. testimonials (variants: cards, carousel, spotlight) - Props: { title?, items?: [{ name, role?, quote, rating? }] }
 8. stats (variants: grid, bar, counter) - Props: { title?, items?: [{ value, label }] }
 9. faq (variants: accordion) - Props: { title?, items?: [{ question, answer }] }
@@ -60,5 +60,6 @@ Fonts: DM Sans, Inter, Space Grotesk, Poppins, Manrope, Outfit, Plus Jakarta San
 6. Do NOT use placeholder text like "Lorem ipsum"
 7. Make copy compelling and specific to the described business
 8. Each page needs a unique id (page-home, page-about, etc.), a name, and a path (/, /about, etc.)
+9. Link/label arrays (navbar links, footer links, footer columns[].links, pricing tiers[].features) are plain strings — NEVER objects like {label, href}
 
 Return ONLY valid JSON. No markdown, no code fences, no explanation.`