diff --git a/app/api/scan-repo/route.ts b/app/api/scan-repo/route.ts
index e0d4513..9987296 100644
--- a/app/api/scan-repo/route.ts
+++ b/app/api/scan-repo/route.ts
@@ -6,9 +6,10 @@ import type {
     RepoScanSummary,
     RepoStructureSummary,
 } from "@/types/repo-scan"
-import { collectConventionValues, normalizeConventionValue } from "@/lib/convention-values"
+import { loadStackQuestionMetadata, normalizeConventionValue } from "@/lib/question-metadata"
 import { loadStackConventions } from "@/lib/conventions"
 import { inferStackFromScan } from "@/lib/scan-to-wizard"
+import { stackQuestion } from "@/lib/wizard-config"
 
 const GITHUB_API_BASE_URL = "https://api.github.com"
 const GITHUB_HOSTNAMES = new Set(["github.com", "www.github.com"])
@@ -302,10 +303,10 @@ const getTestingConventionValues = async (stackId: string): Promise<TestingConve
         return testingConventionCache.get(normalized)!
     }
 
-    const { conventions } = await loadStackConventions(normalized)
+    const metadata = await loadStackQuestionMetadata(normalized)
     const values: TestingConventionValues = {
-        unit: collectConventionValues(conventions, "testingUT"),
-        e2e: collectConventionValues(conventions, "testingE2E"),
+        unit: metadata.answersByResponseKey.testingUT ?? [],
+        e2e: metadata.answersByResponseKey.testingE2E ?? [],
     }
     testingConventionCache.set(normalized, values)
     return values
@@ -873,8 +874,16 @@ export async function GET(request: NextRequest): Promise<NextResponse<RepoScanRe
 
         const detectedStack = inferStackFromScan(summary)
         const { conventions, hasStackFile } = await loadStackConventions(detectedStack)
+        const stackAnswers = stackQuestion?.answers ?? []
+        const matchedStackAnswer = stackAnswers.find((answer) => answer.value === detectedStack) ?? null
+        const stackSupported = matchedStackAnswer
+            ? matchedStackAnswer.disabled !== true && matchedStackAnswer.enabled !== false
+            : false
+        const stackLabel = matchedStackAnswer?.label ?? null
         summary.conventions = {
             stack: detectedStack,
+            stackLabel,
+            isSupported: stackSupported,
             hasCustomConventions: hasStackFile,
             structureRelevant: conventions.structureRelevant,
         }
diff --git a/app/existing/[repoUrl]/repo-scan-client.tsx b/app/existing/[repoUrl]/repo-scan-client.tsx
index 1c1b85a..e66989e 100644
--- a/app/existing/[repoUrl]/repo-scan-client.tsx
+++ b/app/existing/[repoUrl]/repo-scan-client.tsx
@@ -18,6 +18,7 @@ import type { GeneratedFileResult } from "@/types/output"
 const buildQuery = (url: string) => `/api/scan-repo?url=${encodeURIComponent(url)}`
 const CONVENTIONS_DOC_URL =
     process.env.NEXT_PUBLIC_CONVENTIONS_URL ?? "https://github.com/devcontext-ai/devcontext/tree/main/conventions"
+const STACKS_DATA_DOC_URL = "https://github.com/spivx/devcontext/blob/main/data/stacks.json"
 
 const formatList = (values: string[]) => (values.length > 0 ? values.join(", ") : "Not detected")
 
@@ -127,6 +128,11 @@ export default function RepoScanClient({ initialRepoUrl }: RepoScanClientProps)
     }
 
     const warnings = scanResult?.warnings ?? []
+    const stackMeta = scanResult?.conventions ?? null
+    const detectedStackId = stackMeta?.stack ?? null
+    const detectedStackLabel = stackMeta?.stackLabel ?? detectedStackId ?? "Not detected"
+    const stackIsSupported = stackMeta?.isSupported ?? false
+    const showUnsupportedStackNotice = Boolean(detectedStackId) && !stackIsSupported
     const repoSlug = repoUrlForScan ? toSlug(repoUrlForScan) : null
     const promptVisible = Boolean(repoUrlForScan && !hasConfirmed && !isLoading && !scanResult && !error)
     const canRetry = hasConfirmed && !isLoading
@@ -138,7 +144,7 @@ export default function RepoScanClient({ initialRepoUrl }: RepoScanClientProps)
     const [generatedFile, setGeneratedFile] = useState<GeneratedFileResult | null>(null)
 
     const handleGenerate = useCallback(async (fileId: string) => {
-        if (!scanResult) return
+        if (!scanResult || scanResult.conventions?.isSupported === false) return
         setIsGeneratingMap((prev) => ({ ...prev, [fileId]: true }))
         setGeneratedFile(null)
         try {
@@ -228,7 +234,22 @@ export default function RepoScanClient({ initialRepoUrl }: RepoScanClientProps)
                                     </p>
                                 </section>
                                 <section className="grid gap-6 md:grid-cols-2">
-                                    {scanResult.conventions && !scanResult.conventions.hasCustomConventions ? (
+                                    <div className="rounded-2xl border border-border/60 bg-background/70 p-5">
+                                        <div className="flex items-center gap-2 text-sm font-semibold">
+                                            <CheckCircle2 className="size-4 text-primary" aria-hidden="true" />
+                                            Detected stack
+                                        </div>
+                                        <p className="mt-3 text-base text-foreground">{detectedStackLabel}</p>
+                                        {detectedStackId && detectedStackLabel !== detectedStackId ? (
+                                            <p className="mt-1 text-xs text-muted-foreground">
+                                                Stack ID: <code className="rounded bg-muted px-1 py-0.5">{detectedStackId}</code>
+                                            </p>
+                                        ) : null}
+                                        {showUnsupportedStackNotice ? (
+                                            <p className="mt-2 text-xs font-medium text-destructive">Not yet supported</p>
+                                        ) : null}
+                                    </div>
+                                    {!showUnsupportedStackNotice && scanResult.conventions && !scanResult.conventions.hasCustomConventions ? (
                                         <div className="md:col-span-2 rounded-2xl border border-dashed border-border/60 bg-background/70 p-5">
                                             <div className="flex flex-col gap-2 text-sm text-muted-foreground">
                                                 <span>
@@ -250,107 +271,138 @@ export default function RepoScanClient({ initialRepoUrl }: RepoScanClientProps)
                                             </div>
                                         </div>
                                     ) : null}
-                                    <div className="rounded-2xl border border-border/60 bg-background/70 p-5">
-                                        <div className="flex items-center gap-2 text-sm font-semibold">
-                                            <CheckCircle2 className="size-4 text-primary" aria-hidden="true" />
-                                            Primary language
-                                        </div>
-                                        <p className="mt-3 text-base text-foreground">
-                                            {scanResult.language ?? "Not detected"}
-                                        </p>
-                                        {scanResult.languages.length > 1 ? (
-                                            <p className="mt-2 text-xs text-muted-foreground">
-                                                Also spotted: {scanResult.languages.slice(1).join(", ")}
-                                            </p>
-                                        ) : null}
-                                    </div>
-                                    <div className="rounded-2xl border border-border/60 bg-background/70 p-5">
-                                        <div className="flex items-center gap-2 text-sm font-semibold">
-                                            <CheckCircle2 className="size-4 text-primary" aria-hidden="true" />
-                                            Default branch
-                                        </div>
-                                        <p className="mt-3 text-base text-foreground">{scanResult.defaultBranch}</p>
-                                    </div>
-                                </section>
-                                <section className="grid gap-6 md:grid-cols-2">
-                                    <div className="rounded-2xl border border-border/60 bg-background/70 p-5">
-                                        <h3 className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">Frameworks</h3>
-                                        <p className="mt-3 text-sm text-foreground">{formatList(scanResult.frameworks)}</p>
-                                    </div>
-                                    <div className="rounded-2xl border border-border/60 bg-background/70 p-5">
-                                        <h3 className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">Tooling</h3>
-                                        <p className="mt-3 text-sm text-foreground">{formatList(scanResult.tooling)}</p>
-                                    </div>
-                                    <div className="rounded-2xl border border-border/60 bg-background/70 p-5">
-                                        <h3 className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">Testing</h3>
-                                        <p className="mt-3 text-sm text-foreground">{formatList(scanResult.testing)}</p>
-                                    </div>
-                                    <div className="rounded-2xl border border-border/60 bg-background/70 p-5">
-                                        <h3 className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">Structure hints</h3>
-                                        <ul className="mt-3 space-y-2 text-sm text-foreground">
-                                            {structureEntries.map(({ key, value }) => (
-                                                <li key={key} className="flex items-center justify-between gap-4">
-                                                    <span className="font-medium capitalize">{key}</span>
-                                                    <span className={value ? "text-emerald-400" : "text-muted-foreground"}>
-                                                        {value ? "Present" : "Missing"}
-                                                    </span>
-                                                </li>
-                                            ))}
-                                        </ul>
-                                    </div>
-                                </section>
-                                <section className="space-y-4 rounded-2xl border border-border/60 bg-background/70 p-5">
-                                    <div className="space-y-1">
-                                        <h3 className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">Generate instructions</h3>
-                                        <p className="text-xs text-muted-foreground">
-                                            Choose the file you need—each one opens an Instructions ready preview powered by this scan.
-                                        </p>
-                                    </div>
-                                    <div className="flex flex-wrap gap-3">
-                                        {fileOptions.map((file) => {
-                                            const busy = Boolean(isGeneratingMap[file.id])
-                                            return (
-                                                <Button
-                                                    key={file.id}
-                                                    onClick={() => void handleGenerate(file.id)}
-                                                    disabled={busy}
-                                                    className="flex h-[36px] items-center rounded-full px-4 py-0 text-sm"
-                                                >
-                                                    {busy ? `Generating ${file.filename}…` : `Generate ${file.filename}`}
-                                                </Button>
-                                            )
-                                        })}
-                                    </div>
+                                    {!showUnsupportedStackNotice ? (
+                                        <>
+                                            <div className="rounded-2xl border border-border/60 bg-background/70 p-5">
+                                                <div className="flex items-center gap-2 text-sm font-semibold">
+                                                    <CheckCircle2 className="size-4 text-primary" aria-hidden="true" />
+                                                    Primary language
+                                                </div>
+                                                <p className="mt-3 text-base text-foreground">
+                                                    {scanResult.language ?? "Not detected"}
+                                                </p>
+                                                {scanResult.languages.length > 1 ? (
+                                                    <p className="mt-2 text-xs text-muted-foreground">
+                                                        Also spotted: {scanResult.languages.slice(1).join(", ")}
+                                                    </p>
+                                                ) : null}
+                                            </div>
+                                            <div className="rounded-2xl border border-border/60 bg-background/70 p-5">
+                                                <div className="flex items-center gap-2 text-sm font-semibold">
+                                                    <CheckCircle2 className="size-4 text-primary" aria-hidden="true" />
+                                                    Default branch
+                                                </div>
+                                                <p className="mt-3 text-base text-foreground">{scanResult.defaultBranch}</p>
+                                            </div>
+                                        </>
+                                    ) : null}
                                 </section>
-                                {warnings.length > 0 ? (
-                                    <div className="rounded-2xl border border-amber-400/60 bg-amber-950/40 p-4 text-amber-200">
-                                        <div className="flex items-start gap-2">
-                                            <AlertTriangle className="mt-0.5 size-4" aria-hidden="true" />
-                                            <div className="space-y-1 text-sm">
-                                                {warnings.map((warning) => (
-                                                    <p key={warning}>{warning}</p>
-                                                ))}
+                                {showUnsupportedStackNotice ? (
+                                    <div className="rounded-2xl border border-dashed border-destructive/40 bg-destructive/10 p-5">
+                                        <div className="flex items-start gap-3 text-sm text-muted-foreground">
+                                            <AlertTriangle className="mt-0.5 size-5 text-destructive" aria-hidden="true" />
+                                            <div className="space-y-2">
+                                                <p>
+                                                    We detected <span className="font-semibold text-foreground">{detectedStackLabel}</span>, but this stack isn’t supported yet.
+                                                </p>
+                                                <p>
+                                                    Contribute a new entry in{" "}
+                                                    <Link
+                                                        href={STACKS_DATA_DOC_URL}
+                                                        target="_blank"
+                                                        rel="noreferrer"
+                                                        className="inline-flex items-center font-semibold text-primary hover:underline"
+                                                    >
+                                                        data/stacks.json
+                                                    </Link>{" "}
+                                                    to enable full summaries for this stack.
+                                                </p>
                                             </div>
                                         </div>
                                     </div>
-                                ) : null}
-                                <div
-                                    className="rounded-2xl border border-border/60 bg-background/70 p-5"
-                                    data-testid="repo-scan-raw-json"
-                                >
-                                    <h3 className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">Raw response</h3>
-                                    <pre className="mt-3 max-h-72 overflow-auto rounded-md bg-muted p-3 text-xs text-muted-foreground">
-                                        {JSON.stringify(scanResult, null, 2)}
-                                    </pre>
-                                </div>
-                                {generatedFile ? (
-                                    <FinalOutputView
-                                        fileName={generatedFile.fileName}
-                                        fileContent={generatedFile.fileContent}
-                                        mimeType={generatedFile.mimeType}
-                                        onClose={() => setGeneratedFile(null)}
-                                    />
-                                ) : null}
+                                ) : (
+                                    <>
+                                        <section className="grid gap-6 md:grid-cols-2">
+                                            <div className="rounded-2xl border border-border/60 bg-background/70 p-5">
+                                                <h3 className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">Frameworks</h3>
+                                                <p className="mt-3 text-sm text-foreground">{formatList(scanResult.frameworks)}</p>
+                                            </div>
+                                            <div className="rounded-2xl border border-border/60 bg-background/70 p-5">
+                                                <h3 className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">Tooling</h3>
+                                                <p className="mt-3 text-sm text-foreground">{formatList(scanResult.tooling)}</p>
+                                            </div>
+                                            <div className="rounded-2xl border border-border/60 bg-background/70 p-5">
+                                                <h3 className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">Testing</h3>
+                                                <p className="mt-3 text-sm text-foreground">{formatList(scanResult.testing)}</p>
+                                            </div>
+                                            <div className="rounded-2xl border border-border/60 bg-background/70 p-5">
+                                                <h3 className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">Structure hints</h3>
+                                                <ul className="mt-3 space-y-2 text-sm text-foreground">
+                                                    {structureEntries.map(({ key, value }) => (
+                                                        <li key={key} className="flex items-center justify-between gap-4">
+                                                            <span className="font-medium capitalize">{key}</span>
+                                                            <span className={value ? "text-emerald-400" : "text-muted-foreground"}>
+                                                                {value ? "Present" : "Missing"}
+                                                            </span>
+                                                        </li>
+                                                    ))}
+                                                </ul>
+                                            </div>
+                                        </section>
+                                        <section className="space-y-4 rounded-2xl border border-border/60 bg-background/70 p-5">
+                                            <div className="space-y-1">
+                                                <h3 className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">Generate instructions</h3>
+                                                <p className="text-xs text-muted-foreground">
+                                                    Choose the file you need—each one opens an Instructions ready preview powered by this scan.
+                                                </p>
+                                            </div>
+                                            <div className="flex flex-wrap gap-3">
+                                                {fileOptions.map((file) => {
+                                                    const busy = Boolean(isGeneratingMap[file.id])
+                                                    return (
+                                                        <Button
+                                                            key={file.id}
+                                                            onClick={() => void handleGenerate(file.id)}
+                                                            disabled={busy}
+                                                            className="flex h-[36px] items-center rounded-full px-4 py-0 text-sm"
+                                                        >
+                                                            {busy ? `Generating ${file.filename}…` : `Generate ${file.filename}`}
+                                                        </Button>
+                                                    )
+                                                })}
+                                            </div>
+                                        </section>
+                                        {warnings.length > 0 ? (
+                                            <div className="rounded-2xl border border-amber-400/60 bg-amber-950/40 p-4 text-amber-200">
+                                                <div className="flex items-start gap-2">
+                                                    <AlertTriangle className="mt-0.5 size-4" aria-hidden="true" />
+                                                    <div className="space-y-1 text-sm">
+                                                        {warnings.map((warning) => (
+                                                            <p key={warning}>{warning}</p>
+                                                        ))}
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        ) : null}
+                                        <div
+                                            className="rounded-2xl border border-border/60 bg-background/70 p-5"
+                                            data-testid="repo-scan-raw-json"
+                                        >
+                                            <h3 className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">Raw response</h3>
+                                            <pre className="mt-3 max-h-72 overflow-auto rounded-md bg-muted p-3 text-xs text-muted-foreground">
+                                                {JSON.stringify(scanResult, null, 2)}
+                                            </pre>
+                                        </div>
+                                        {generatedFile ? (
+                                            <FinalOutputView
+                                                fileName={generatedFile.fileName}
+                                                fileContent={generatedFile.fileContent}
+                                                mimeType={generatedFile.mimeType}
+                                                onClose={() => setGeneratedFile(null)}
+                                            />
+                                        ) : null}
+                                    </>
+                                )}
                             </div>
                         ) : null}
                     </CardContent>
diff --git a/conventions/angular.json b/conventions/angular.json
index ffddbb7..64389f2 100644
--- a/conventions/angular.json
+++ b/conventions/angular.json
@@ -1,16 +1,6 @@
 {
   "id": "angular",
   "structureRelevant": ["src", "components", "tests", "apps"],
-  "defaults": {
-    "tooling": "angular-cli",
-    "language": "typescript-strict",
-    "fileStructure": "standalone-first",
-    "styling": "scss",
-    "stateManagement": "ngrx-store",
-    "apiLayer": "httpclient",
-    "dataFetching": "httpclient",
-    "reactPerf": "memoHooks"
-  },
   "rules": [
     {
       "if": { "toolingIncludes": ["nx"] },
diff --git a/conventions/astro.json b/conventions/astro.json
index aaa4fc9..b9e5a63 100644
--- a/conventions/astro.json
+++ b/conventions/astro.json
@@ -1,12 +1,5 @@
 {
   "id": "astro",
-  "defaults": {
-    "tooling": "react",
-    "dataFetching": "ssg",
-    "folders": "content-collections",
-    "collaboration": "vercel",
-    "reactPerf": "memoHooks"
-  },
   "rules": [
     {
       "if": { "toolingIncludes": ["vue"] },
diff --git a/conventions/default.json b/conventions/default.json
index 9179177..12d48b4 100644
--- a/conventions/default.json
+++ b/conventions/default.json
@@ -2,30 +2,5 @@
   "id": "default",
   "applyToGlob": "**/*.{ts,tsx,js,jsx,md}",
   "structureRelevant": ["src", "components", "tests", "apps", "packages"],
-  "defaults": {
-    "projectPriority": "maintainability",
-    "codeStyle": "airbnb",
-    "variableNaming": "camelCase",
-    "fileNaming": "kebab-case",
-    "componentNaming": "PascalCase",
-    "exports": "named",
-    "comments": "docblocks",
-    "collaboration": "async",
-    "fileStructure": "flat",
-    "styling": "cssmodules",
-    "stateManagement": "context-hooks",
-    "apiLayer": "http-client",
-    "folders": "by-feature",
-    "dataFetching": "swr",
-    "reactPerf": "memoHooks",
-    "auth": "env",
-    "validation": "zod",
-    "logging": "structured",
-    "commitStyle": "conventional",
-    "prRules": "reviewRequired",
-    "testingUT": null,
-    "testingE2E": null,
-    "tooling": "custom-config"
-  },
   "rules": []
 }
diff --git a/conventions/nextjs.json b/conventions/nextjs.json
index 3c5c287..261affa 100644
--- a/conventions/nextjs.json
+++ b/conventions/nextjs.json
@@ -1,16 +1,6 @@
 {
   "id": "nextjs",
   "structureRelevant": ["src", "tests", "apps"],
-  "defaults": {
-    "tooling": "create-next-app",
-    "fileStructure": "app-directory",
-    "styling": "tailwind",
-    "stateManagement": "zustand",
-    "apiLayer": "server-actions",
-    "dataFetching": "server-components",
-    "reactPerf": "memoHooks",
-    "auth": "next-auth"
-  },
   "rules": [
     {
       "if": { "routingIs": ["pages"] },
diff --git a/conventions/nuxt.json b/conventions/nuxt.json
index 8a7e96e..8f80bd1 100644
--- a/conventions/nuxt.json
+++ b/conventions/nuxt.json
@@ -1,14 +1,5 @@
 {
   "id": "nuxt",
-  "defaults": {
-    "tooling": "nuxi",
-    "dataFetching": "server-side",
-    "apiLayer": "use-fetch",
-    "styling": "tailwind",
-    "folders": "vercel",
-    "stateManagement": "pinia",
-    "reactPerf": "memoHooks"
-  },
   "rules": [
     {
       "if": { "toolingIncludes": ["tailwind"] },
diff --git a/conventions/python.json b/conventions/python.json
index f849c24..ce7c28f 100644
--- a/conventions/python.json
+++ b/conventions/python.json
@@ -2,28 +2,6 @@
   "id": "python",
   "applyToGlob": "**/*.{py,pyi,md}",
   "structureRelevant": ["src", "tests", "packages"],
-  "defaults": {
-    "tooling": "pip",
-    "language": "Python",
-    "variableNaming": "snake_case",
-    "fileNaming": "snake_case",
-    "componentNaming": "Not applicable",
-    "exports": "module exports",
-    "comments": "docstrings",
-    "fileStructure": "top-level modules",
-    "styling": "Not applicable",
-    "stateManagement": "Not applicable",
-    "apiLayer": "TODO: document primary framework (FastAPI, Django, Flask, etc.)",
-    "folders": "by-module",
-    "dataFetching": "Not applicable",
-    "reactPerf": "Not applicable",
-    "testingUT": "pytest",
-    "testingE2E": "TODO: outline integration / end-to-end coverage",
-    "auth": "TODO: document auth/session strategy",
-    "validation": "TODO: specify validation library (Pydantic, Marshmallow, etc.)",
-    "logging": "TODO: describe logging approach (structlog, stdlib logging)",
-    "codeStyle": "pep8"
-  },
   "rules": [
     {
       "if": { "toolingIncludes": ["poetry"] },
diff --git a/conventions/react.json b/conventions/react.json
index bd277c2..e4f0329 100644
--- a/conventions/react.json
+++ b/conventions/react.json
@@ -1,12 +1,5 @@
 {
   "id": "react",
-  "defaults": {
-    "tooling": "vite",
-    "styling": "cssmodules",
-    "stateManagement": "context-hooks",
-    "dataFetching": "swr",
-    "reactPerf": "memoHooks"
-  },
   "rules": [
     {
       "if": { "toolingIncludes": ["tailwind css", "tailwind"] },
diff --git a/conventions/remix.json b/conventions/remix.json
index 953f7da..9cc6e41 100644
--- a/conventions/remix.json
+++ b/conventions/remix.json
@@ -1,12 +1,5 @@
 {
   "id": "remix",
-  "defaults": {
-    "folders": "vercel",
-    "dataFetching": "route-loaders",
-    "styling": "tailwind",
-    "testingUT": "vitest",
-    "reactPerf": "memoHooks"
-  },
   "rules": [
     {
       "if": { "toolingIncludes": ["jest"] },
diff --git a/conventions/svelte.json b/conventions/svelte.json
index c515c0a..2fdd367 100644
--- a/conventions/svelte.json
+++ b/conventions/svelte.json
@@ -1,13 +1,5 @@
 {
   "id": "svelte",
-  "defaults": {
-    "tooling": "sveltekit",
-    "language": "typescript",
-    "stateManagement": "svelte-stores",
-    "styling": "scoped-css",
-    "testingUT": "vitest",
-    "reactPerf": "memoHooks"
-  },
   "rules": [
     {
       "if": { "toolingIncludes": ["vite"] },
diff --git a/conventions/vue.json b/conventions/vue.json
index 89af80f..aa172cb 100644
--- a/conventions/vue.json
+++ b/conventions/vue.json
@@ -1,13 +1,5 @@
 {
   "id": "vue",
-  "defaults": {
-    "tooling": "vite",
-    "language": "typescript",
-    "fileStructure": "feature-folders",
-    "stateManagement": "pinia",
-    "dataFetching": "swr",
-    "reactPerf": "memoHooks"
-  },
   "rules": [
     {
       "if": { "toolingIncludes": ["create-vue"] },
diff --git a/docs/scan-flow.md b/docs/scan-flow.md
index 6e2f9c2..4c6752f 100644
--- a/docs/scan-flow.md
+++ b/docs/scan-flow.md
@@ -6,18 +6,17 @@ This document outlines how repository scans are transformed into AI instruction
 
 1. **Scan the repository** (`app/api/scan-repo/route.ts`)
    - Detect languages, frameworks, tooling, structure hints, and enriched metadata.
-   - Use stack conventions (`collectConventionValues`) to cross-check detection lists (e.g., testing tools) so any signal we add in `conventions/<stack>.json` becomes discoverable with minimal code changes.
-   - Reuse convention values to expand stack-specific heuristics (e.g., Python’s Behave directories, Next.js routing shapes), so each conventions file remains the source of truth for new detections.
+   - Load stack question metadata (`loadStackQuestionMetadata`) so detection lists (e.g., testing tools) map onto the same canonical values the wizard exposes.
+   - Reuse those canonical values to expand stack-specific heuristics (e.g., Python’s Behave directories, Next.js routing shapes) without hard-coding strings inside the scanner.
    - Infer the primary stack using `inferStackFromScan`.
    - Load stack conventions (`loadStackConventions`) to determine which structure hints matter and whether stack-specific rules exist.
    - Attach `summary.conventions` so the UI knows which directories to highlight and whether a conventions file was found.
 
 2. **Build wizard defaults** (`lib/scan-to-wizard.ts`)
    - Start with an empty `WizardResponses` object.
-   - Apply convention defaults from `conventions/<stack>.json` + `default.json`.
-   - Layer in detections from the scan (tooling, testing, naming signals, etc.), matching scan values against convention-provided options so stack JSON remains the single source of truth.
+   - Layer in detections from the scan (tooling, testing, naming signals, etc.), matching scan values against the question catalog so defaults stay in sync with the wizard.
    - Run convention rules to tweak values based on detected tooling/testing.
-   - Pull default answers directly from the stack’s question set (`buildStepsForStack`) and fill any remaining empty responses. We track which questions were auto-defaulted (`defaultedQuestionIds`) so the summary can explain why.
+   - Pull default answers directly from the stack’s question set (`loadStackQuestionMetadata`) and fill any remaining empty responses. We track which questions were auto-defaulted (`defaultedQuestionIds`) so the summary can explain why.
 
 3. **Persist and surface responses**
    - `lib/scan-prefill.ts` merges the generated responses into local wizard state and stores both `autoFilledMap` and `defaultedMap` in localStorage.
@@ -34,8 +33,9 @@ This document outlines how repository scans are transformed into AI instruction
 
 | Location | Purpose |
 | --- | --- |
-| `conventions/default.json` & `/conventions/<stack>.json` | Declarative defaults + rules for each stack (tooling choices, structure hints, apply-to glob, etc.). |
-| `lib/convention-values.ts` | Helpers that normalize and aggregate convention values (e.g., testingUT/testingE2E) for both the scanner and the wizard. |
+| `conventions/default.json` & `/conventions/<stack>.json` | Declarative rules, `applyToGlob`, and structure hints for each stack. |
+| `lib/question-metadata.ts` | Caches question answers/defaults per stack so both the scanner and wizard share a single source of truth. |
+| `lib/wizard-responses.ts` | Produces empty `WizardResponses` objects and guards response keys. |
 | `data/stacks.json` | List of stacks exposed to the wizard; each should have a matching conventions file. |
 | `data/questions/<stack>.json` | Stack-specific questions with default answers and metadata. These defaults are now honored automatically when scan data is missing. |
 
diff --git a/lib/convention-values.ts b/lib/convention-values.ts
deleted file mode 100644
index 5d7ed46..0000000
--- a/lib/convention-values.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import type { LoadedConvention } from "@/types/conventions"
-import type { WizardResponses } from "@/types/wizard"
-
-export const normalizeConventionValue = (value: string): string => value.trim().toLowerCase()
-
-export const collectConventionValues = (
-  conventions: LoadedConvention,
-  key: keyof WizardResponses,
-): string[] => {
-  const values: string[] = []
-  const seen = new Set<string>()
-
-  const pushValue = (candidate: unknown) => {
-    if (typeof candidate !== "string") {
-      return
-    }
-    const normalized = normalizeConventionValue(candidate)
-    if (!normalized || seen.has(normalized)) {
-      return
-    }
-    seen.add(normalized)
-    values.push(candidate)
-  }
-
-  pushValue(conventions.defaults[key])
-
-  conventions.rules.forEach((rule) => {
-    pushValue(rule.set?.[key])
-  })
-
-  return values
-}
diff --git a/lib/question-metadata.ts b/lib/question-metadata.ts
new file mode 100644
index 0000000..5d11197
--- /dev/null
+++ b/lib/question-metadata.ts
@@ -0,0 +1,73 @@
+import { buildStepsForStack } from "@/lib/wizard-summary-data"
+import { isWizardResponseKey } from "@/lib/wizard-responses"
+import type { WizardResponses, WizardStep } from "@/types/wizard"
+
+export const normalizeConventionValue = (value: string): string => value.trim().toLowerCase()
+
+export type StackQuestionDefault = {
+  questionId: string
+  responseKey: keyof WizardResponses
+  value: string
+  label: string
+}
+
+export type StackQuestionMetadata = {
+  defaults: StackQuestionDefault[]
+  answersByResponseKey: Partial<Record<keyof WizardResponses, string[]>>
+}
+
+const metadataCache = new Map<string, StackQuestionMetadata>()
+
+const extractQuestionMetadata = (steps: WizardStep[], stack: string): StackQuestionMetadata => {
+  const defaults: StackQuestionDefault[] = []
+  const answersByResponseKey: Partial<Record<keyof WizardResponses, string[]>> = {}
+
+  steps.forEach((step) => {
+    step.questions.forEach((question) => {
+      const rawKey = question.responseKey ?? question.id
+      if (!rawKey || rawKey === "stackSelection" || !isWizardResponseKey(rawKey)) {
+        return
+      }
+
+      const key = rawKey as keyof WizardResponses
+      const enabledAnswers = question.answers.filter((answer) => !answer.disabled)
+
+      if (enabledAnswers.length > 0) {
+        const seen = new Set<string>()
+        answersByResponseKey[key] = enabledAnswers.reduce<string[]>((list, answer) => {
+          const value = typeof answer.value === "string" ? answer.value : ""
+          if (!value || seen.has(value.toLowerCase())) {
+            return list
+          }
+          seen.add(value.toLowerCase())
+          list.push(value)
+          return list
+        }, [])
+      }
+
+      const defaultAnswer = enabledAnswers.find((answer) => answer.isDefault)
+      if (defaultAnswer && typeof defaultAnswer.value === "string" && defaultAnswer.value.trim().length > 0) {
+        defaults.push({
+          questionId: question.id,
+          responseKey: key,
+          value: defaultAnswer.value,
+          label: defaultAnswer.label ?? defaultAnswer.value,
+        })
+      }
+    })
+  })
+
+  return { defaults, answersByResponseKey }
+}
+
+export const loadStackQuestionMetadata = async (stack: string): Promise<StackQuestionMetadata> => {
+  const normalized = stack.trim().toLowerCase()
+  if (metadataCache.has(normalized)) {
+    return metadataCache.get(normalized)!
+  }
+
+  const { steps } = await buildStepsForStack(stack)
+  const metadata = extractQuestionMetadata(steps, stack)
+  metadataCache.set(normalized, metadata)
+  return metadata
+}
diff --git a/lib/scan-to-wizard.ts b/lib/scan-to-wizard.ts
index 861e24e..290a061 100644
--- a/lib/scan-to-wizard.ts
+++ b/lib/scan-to-wizard.ts
@@ -1,9 +1,9 @@
-import { collectConventionValues, normalizeConventionValue } from "@/lib/convention-values"
 import { applyConventionRules, loadStackConventions } from "@/lib/conventions"
-import { buildStepsForStack } from "@/lib/wizard-summary-data"
+import { loadStackQuestionMetadata, normalizeConventionValue } from "@/lib/question-metadata"
+import { createEmptyResponses } from "@/lib/wizard-responses"
 import type { RepoScanSummary } from "@/types/repo-scan"
 import type { LoadedConvention } from "@/types/conventions"
-import type { WizardResponses, WizardStep } from "@/types/wizard"
+import type { WizardResponses } from "@/types/wizard"
 
 const STACK_FALLBACK = "react"
 
@@ -12,14 +12,12 @@ const toLowerArray = (values: string[] | undefined | null) =>
 
 const detectFromScanList = (
   scanList: string[] | undefined | null,
-  conventions: LoadedConvention,
-  key: keyof WizardResponses,
+  candidates: string[] | undefined | null,
 ): string | null => {
   if (!Array.isArray(scanList) || scanList.length === 0) {
     return null
   }
-  const candidates = collectConventionValues(conventions, key)
-  if (candidates.length === 0) {
+  if (!Array.isArray(candidates) || candidates.length === 0) {
     return null
   }
 
@@ -66,35 +64,6 @@ const detectStack = (scan: RepoScanSummary): string => {
 
 export const inferStackFromScan = (scan: RepoScanSummary): string => detectStack(scan)
 
-const createEmptyResponses = (stack: string): WizardResponses => ({
-  stackSelection: stack,
-  tooling: null,
-  language: null,
-  fileStructure: null,
-  styling: null,
-  testingUT: null,
-  testingE2E: null,
-  projectPriority: null,
-  codeStyle: null,
-  variableNaming: null,
-  fileNaming: null,
-  componentNaming: null,
-  exports: null,
-  comments: null,
-  collaboration: null,
-  stateManagement: null,
-  apiLayer: null,
-  folders: null,
-  dataFetching: null,
-  reactPerf: null,
-  auth: null,
-  validation: null,
-  logging: null,
-  commitStyle: null,
-  prRules: null,
-  outputFile: null,
-})
-
 const detectLanguage = (scan: RepoScanSummary): string | null => {
   const languages = toLowerArray(scan.languages)
   if (languages.includes("typescript")) return "typescript"
@@ -103,22 +72,17 @@ const detectLanguage = (scan: RepoScanSummary): string | null => {
   return scan.language ? String(scan.language) : null
 }
 
-const detectTestingUnit = (scan: RepoScanSummary, conventions: LoadedConvention): string | null =>
-  detectFromScanList(scan.testing, conventions, "testingUT")
+const detectTestingUnit = (scan: RepoScanSummary, candidates: string[] | undefined | null): string | null =>
+  detectFromScanList(scan.testing, candidates)
 
-const detectTestingE2E = (scan: RepoScanSummary, conventions: LoadedConvention): string | null =>
-  detectFromScanList(scan.testing, conventions, "testingE2E")
+const detectTestingE2E = (scan: RepoScanSummary, candidates: string[] | undefined | null): string | null =>
+  detectFromScanList(scan.testing, candidates)
 
-const detectToolingSummary = (scan: RepoScanSummary, conventions: LoadedConvention): string | null => {
+const detectToolingSummary = (scan: RepoScanSummary): string | null => {
   if (scan.tooling && scan.tooling.length > 0) {
     return scan.tooling.join(" + ")
   }
 
-  const defaultTooling = conventions.defaults.tooling
-  if (typeof defaultTooling === "string" && defaultTooling.trim().length > 0) {
-    return defaultTooling
-  }
-
   return null
 }
 
@@ -150,57 +114,6 @@ const detectPRRules = (scan: RepoScanSummary): string | null => {
   return null
 }
 
-type StackQuestionDefault = {
-  questionId: string
-  responseKey: keyof WizardResponses
-  value: string
-  label: string
-}
-
-const defaultsCache = new Map<string, StackQuestionDefault[]>()
-
-const extractDefaultsFromSteps = (steps: WizardStep[], template: WizardResponses): StackQuestionDefault[] => {
-  const defaults: StackQuestionDefault[] = []
-  steps.forEach((step) => {
-    step.questions.forEach((question) => {
-      const rawKey = question.responseKey ?? question.id
-      if (!rawKey || rawKey === "stackSelection") {
-        return
-      }
-      const defaultAnswer = question.answers.find((answer) => answer.isDefault && !answer.disabled)
-      if (!defaultAnswer) {
-        return
-      }
-      if (!(rawKey in template)) {
-        return
-      }
-      const key = rawKey as keyof WizardResponses
-      defaults.push({
-        questionId: question.id,
-        responseKey: key,
-        value: defaultAnswer.value,
-        label: defaultAnswer.label ?? defaultAnswer.value,
-      })
-    })
-  })
-  return defaults
-}
-
-const loadStackQuestionDefaults = async (
-  stack: string,
-  template: WizardResponses,
-): Promise<StackQuestionDefault[]> => {
-  const normalized = stack.trim().toLowerCase()
-  if (defaultsCache.has(normalized)) {
-    return defaultsCache.get(normalized)!
-  }
-
-  const { steps } = await buildStepsForStack(stack)
-  const defaults = extractDefaultsFromSteps(steps, template)
-  defaultsCache.set(normalized, defaults)
-  return defaults
-}
-
 type BuildResult = {
   stack: string
   responses: WizardResponses
@@ -213,20 +126,21 @@ type BuildResult = {
 export const buildResponsesFromScan = async (scan: RepoScanSummary): Promise<BuildResult> => {
   const stack = detectStack(scan)
   const { conventions, hasStackFile } = await loadStackConventions(stack)
+  const { defaults: questionDefaults, answersByResponseKey } = await loadStackQuestionMetadata(stack)
 
   const base = createEmptyResponses(stack)
-  const withDefaults: WizardResponses = { ...base, ...conventions.defaults }
-
-  applyDetectedValue(withDefaults, "tooling", detectToolingSummary(scan, conventions))
-  applyDetectedValue(withDefaults, "language", detectLanguage(scan))
-  applyDetectedValue(withDefaults, "testingUT", detectTestingUnit(scan, conventions))
-  applyDetectedValue(withDefaults, "testingE2E", detectTestingE2E(scan, conventions))
-  applyDetectedValue(withDefaults, "fileNaming", detectFileNaming(scan))
-  applyDetectedValue(withDefaults, "componentNaming", detectComponentNaming(scan))
-  applyDetectedValue(withDefaults, "commitStyle", detectCommitStyle(scan))
-  applyDetectedValue(withDefaults, "prRules", detectPRRules(scan))
-
-  const afterRules = applyConventionRules(withDefaults, conventions.rules, scan)
+  const withDetected: WizardResponses = { ...base }
+
+  applyDetectedValue(withDetected, "tooling", detectToolingSummary(scan))
+  applyDetectedValue(withDetected, "language", detectLanguage(scan))
+  applyDetectedValue(withDetected, "testingUT", detectTestingUnit(scan, answersByResponseKey.testingUT))
+  applyDetectedValue(withDetected, "testingE2E", detectTestingE2E(scan, answersByResponseKey.testingE2E))
+  applyDetectedValue(withDetected, "fileNaming", detectFileNaming(scan))
+  applyDetectedValue(withDetected, "componentNaming", detectComponentNaming(scan))
+  applyDetectedValue(withDetected, "commitStyle", detectCommitStyle(scan))
+  applyDetectedValue(withDetected, "prRules", detectPRRules(scan))
+
+  const afterRules = applyConventionRules(withDetected, conventions.rules, scan)
   afterRules.stackSelection = stack
 
   const defaultedQuestionIds: Record<string, boolean> = {}
@@ -234,7 +148,6 @@ export const buildResponsesFromScan = async (scan: RepoScanSummary): Promise<Bui
     keyof WizardResponses,
     { questionId: string; label: string; value: string }
   >> = {}
-  const questionDefaults = await loadStackQuestionDefaults(stack, afterRules)
   questionDefaults.forEach(({ responseKey, questionId, value, label }) => {
     const currentValue = afterRules[responseKey]
     if (currentValue === null || currentValue === undefined || currentValue === "") {
@@ -248,17 +161,14 @@ export const buildResponsesFromScan = async (scan: RepoScanSummary): Promise<Bui
     }
   })
 
-  if (!afterRules.tooling) {
-    applyDetectedValue(afterRules, "tooling", detectToolingSummary(scan, conventions))
-  }
   if (!afterRules.language) {
     applyDetectedValue(afterRules, "language", detectLanguage(scan))
   }
   if (!afterRules.testingUT) {
-    applyDetectedValue(afterRules, "testingUT", detectTestingUnit(scan, conventions))
+    applyDetectedValue(afterRules, "testingUT", detectTestingUnit(scan, answersByResponseKey.testingUT))
   }
   if (!afterRules.testingE2E) {
-    applyDetectedValue(afterRules, "testingE2E", detectTestingE2E(scan, conventions))
+    applyDetectedValue(afterRules, "testingE2E", detectTestingE2E(scan, answersByResponseKey.testingE2E))
   }
   if (!afterRules.fileNaming) {
     applyDetectedValue(afterRules, "fileNaming", detectFileNaming(scan))
diff --git a/lib/wizard-responses.ts b/lib/wizard-responses.ts
new file mode 100644
index 0000000..cc4e2d5
--- /dev/null
+++ b/lib/wizard-responses.ts
@@ -0,0 +1,69 @@
+import type { WizardResponses } from "@/types/wizard"
+
+const RESPONSE_KEYS = [
+  "stackSelection",
+  "tooling",
+  "language",
+  "fileStructure",
+  "styling",
+  "testingUT",
+  "testingE2E",
+  "projectPriority",
+  "codeStyle",
+  "variableNaming",
+  "fileNaming",
+  "componentNaming",
+  "exports",
+  "comments",
+  "collaboration",
+  "stateManagement",
+  "apiLayer",
+  "folders",
+  "dataFetching",
+  "reactPerf",
+  "auth",
+  "validation",
+  "logging",
+  "commitStyle",
+  "prRules",
+  "outputFile",
+] as const satisfies ReadonlyArray<keyof WizardResponses>
+
+const BASE_RESPONSES: Omit<WizardResponses, "stackSelection"> = {
+  tooling: null,
+  language: null,
+  fileStructure: null,
+  styling: null,
+  testingUT: null,
+  testingE2E: null,
+  projectPriority: null,
+  codeStyle: null,
+  variableNaming: null,
+  fileNaming: null,
+  componentNaming: null,
+  exports: null,
+  comments: null,
+  collaboration: null,
+  stateManagement: null,
+  apiLayer: null,
+  folders: null,
+  dataFetching: null,
+  reactPerf: null,
+  auth: null,
+  validation: null,
+  logging: null,
+  commitStyle: null,
+  prRules: null,
+  outputFile: null,
+}
+
+const RESPONSE_KEY_SET = new Set<keyof WizardResponses>(RESPONSE_KEYS)
+
+export const createEmptyResponses = (stack: string): WizardResponses => ({
+  stackSelection: stack,
+  ...BASE_RESPONSES,
+})
+
+export const isWizardResponseKey = (value: string): value is keyof WizardResponses =>
+  RESPONSE_KEY_SET.has(value as keyof WizardResponses)
+
diff --git a/types/repo-scan.ts b/types/repo-scan.ts
index a43a299..203e881 100644
--- a/types/repo-scan.ts
+++ b/types/repo-scan.ts
@@ -8,6 +8,8 @@ export type RepoStructureSummary = {
 
 export type RepoScanConventionsMeta = {
     stack: string
+    stackLabel: string | null
+    isSupported: boolean
     hasCustomConventions: boolean
     structureRelevant: Array<keyof RepoStructureSummary>
 }