@olonjs/cli 3.0.139 → 3.0.141

package/assets/src_tenant_alpha.sh

@@ -1649,6 +1649,149 @@ cat << 'END_OF_FILE_CONTENT' > "index.html"
 </html>
 
 
+END_OF_FILE_CONTENT
+echo "Creating middleware.ts..."
+cat << 'END_OF_FILE_CONTENT' > "middleware.ts"
+export const config = {
+  matcher: ['/admin', '/admin/:path*'],
+};
+
+const COOKIE_NAME = '__olonjs_admin_session';
+const COOKIE_MAX_AGE = 3600;
+const JWT_MAX_AGE_SECONDS = 300;
+
+function base64urlToBase64(str: string): string {
+  return str.replace(/-/g, '+').replace(/_/g, '/') + '='.repeat((4 - (str.length % 4)) % 4);
+}
+
+function base64ToArrayBuffer(b64: string): ArrayBuffer {
+  const binary = atob(b64);
+  const bytes = new Uint8Array(binary.length);
+  for (let i = 0; i < binary.length; i++) bytes[i] = binary.charCodeAt(i);
+  return bytes.buffer;
+}
+
+function pemToArrayBuffer(pem: string): ArrayBuffer {
+  // Handle both actual newlines and literal \n sequences (common in Vercel env vars)
+  const b64 = pem
+    .replace(/-----BEGIN PUBLIC KEY-----/g, '')
+    .replace(/-----END PUBLIC KEY-----/g, '')
+    .replace(/\\n/g, '')
+    .replace(/\s+/g, '');
+  return base64ToArrayBuffer(b64);
+}
+
+async function importPublicKey(pem: string): Promise<CryptoKey> {
+  return crypto.subtle.importKey(
+    'spki',
+    pemToArrayBuffer(pem),
+    { name: 'ECDSA', namedCurve: 'P-256' },
+    false,
+    ['verify'],
+  );
+}
+
+interface JwtPayload {
+  sub?: string;
+  iat?: number;
+  exp?: number;
+}
+
+async function verifyAdminJwt(
+  token: string,
+  publicKey: CryptoKey,
+  options: { checkExp: boolean } = { checkExp: true },
+): Promise<boolean> {
+  try {
+    const parts = token.split('.');
+    if (parts.length !== 3) return false;
+    const [headerB64, payloadB64, signatureB64] = parts;
+
+    const payload = JSON.parse(atob(base64urlToBase64(payloadB64))) as JwtPayload;
+    if (payload.sub !== 'admin-access') return false;
+
+    if (options.checkExp) {
+      const now = Math.floor(Date.now() / 1000);
+      if (typeof payload.exp !== 'number' || payload.exp < now) return false;
+      if (typeof payload.iat !== 'number' || now - payload.iat > JWT_MAX_AGE_SECONDS) return false;
+    }
+
+    const message = new TextEncoder().encode(`${headerB64}.${payloadB64}`);
+    const signature = base64ToArrayBuffer(base64urlToBase64(signatureB64));
+    return crypto.subtle.verify({ name: 'ECDSA', hash: 'SHA-256' }, publicKey, signature, message);
+  } catch {
+    return false;
+  }
+}
+
+function parseCookies(header: string | null): Record<string, string> {
+  if (!header) return {};
+  return Object.fromEntries(
+    header.split(';').map((c) => {
+      const [k, ...v] = c.trim().split('=');
+      return [k.trim(), decodeURIComponent(v.join('='))];
+    }),
+  );
+}
+
+function deny(hint: string): Response {
+  console.error(`[admin-middleware] 401 reason: ${hint}`);
+  return new Response('Unauthorized', { status: 401 });
+}
+
+export default async function middleware(request: Request): Promise<Response | undefined> {
+  if (!process.env.VERCEL_ENV) return undefined;
+
+  const publicKeyPem = process.env.ADMIN_PUBLIC_KEY;
+  if (!publicKeyPem) return deny('missing_public_key');
+
+  let publicKey: CryptoKey;
+  try {
+    publicKey = await importPublicKey(publicKeyPem);
+  } catch (e) {
+    return deny(`key_import_failed: ${e instanceof Error ? e.message : String(e)}`);
+  }
+
+  const url = new URL(request.url);
+  const cookies = parseCookies(request.headers.get('Cookie'));
+
+  // 1. Session cookie — signature check only; session lifetime governed by cookie Max-Age.
+  //    The JWT stored in the cookie was valid at issue time; exp is intentionally skipped
+  //    to allow 1h sessions without requiring the private key in the Edge Runtime.
+  // parseCookies already decodes values — no extra decodeURIComponent needed here
+  const sessionToken = cookies[COOKIE_NAME];
+  if (sessionToken) {
+    const cookieValid = await verifyAdminJwt(sessionToken, publicKey, { checkExp: false });
+    console.error(`[admin-middleware] cookie check: present=${!!sessionToken} valid=${cookieValid}`);
+    if (cookieValid) return undefined;
+  }
+
+  // 2. Bearer token in Authorization header — full validation including exp
+  const authHeader = request.headers.get('Authorization') ?? '';
+  const bearerToken = authHeader.startsWith('Bearer ') ? authHeader.slice(7) : null;
+  if (bearerToken && (await verifyAdminJwt(bearerToken, publicKey))) {
+    return undefined;
+  }
+
+  // 3. Token as query param — full validation; set session cookie and redirect to clean URL
+  const queryToken = url.searchParams.get('token');
+  if (queryToken && (await verifyAdminJwt(queryToken, publicKey))) {
+    const cleanUrl = new URL(url.toString());
+    cleanUrl.searchParams.delete('token');
+    return new Response(null, {
+      status: 302,
+      headers: {
+        Location: cleanUrl.toString(),
+        // SameSite=Lax required: navigation originates from a cross-site platform (app.olon.it)
+        // SameSite=Strict would block the cookie in the redirect follow-up request
+        'Set-Cookie': `${COOKIE_NAME}=${encodeURIComponent(queryToken)}; Path=/admin; HttpOnly; Secure; SameSite=Lax; Max-Age=${COOKIE_MAX_AGE}`,
+      },
+    });
+  }
+
+  return deny('token_invalid');
+}
+
 END_OF_FILE_CONTENT
 echo "Creating package.json..."
 cat << 'END_OF_FILE_CONTENT' > "package.json"
@@ -1661,9 +1804,9 @@ cat << 'END_OF_FILE_CONTENT' > "package.json"
     "dev": "vite",
     "dev:clean": "vite --force",
     "verify:webmcp": "node scripts/webmcp-feature-check.mjs",
-    "prebuild": "node scripts/sync-pages-to-public.mjs && node scripts/generate-llms-txt.mjs",
+    "prebuild": "node scripts/sync-pages-to-public.mjs && node scripts/generate-llms-txt.mjs && node scripts/bake.mjs && node scripts/sitemap.mjs && node scripts/robots.mjs",
     "build": "tsc && vite build",
-    "dist": "bash ./src2Code.sh --template alpha src .cursor vercel.json components.json index.html tsconfig.json package.json tsconfig.node.json vite.config.ts scripts ",
+    "dist": "bash ./src2Code.sh --template alpha src .cursor vercel.json components.json index.html tsconfig.json package.json tsconfig.node.json vite.config.ts scripts middleware.ts",
     "preview": "vite preview",
     "bake:email": "tsx scripts/bake-email.tsx",
     "bakemail": "npm run bake:email --",
@@ -1674,7 +1817,7 @@ cat << 'END_OF_FILE_CONTENT' > "package.json"
     "@tiptap/extension-link": "^2.11.5",
     "@tiptap/react": "^2.11.5",
     "@tiptap/starter-kit": "^2.11.5",
-    "@olonjs/core": "^1.1.3",
+    "@olonjs/core": "^1.1.5",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",
@@ -2239,6 +2382,149 @@ const outPath = path.join(rootDir, 'public', 'llms.txt');
 fs.writeFileSync(outPath, llmsTxt, 'utf-8');
 console.log('[generate-llms-txt] Written -> public/llms.txt');
 
+END_OF_FILE_CONTENT
+echo "Creating scripts/robots.mjs..."
+cat << 'END_OF_FILE_CONTENT' > "scripts/robots.mjs"
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const rootDir = path.resolve(__dirname, '..');
+
+const baseUrl = process.env.VERCEL_PROJECT_PRODUCTION_URL
+  ? `https://${process.env.VERCEL_PROJECT_PRODUCTION_URL}`
+  : 'http://localhost:5173';
+
+const robotsTxt = `User-agent: *
+Allow: /
+Disallow: /api/
+
+User-agent: GPTBot
+User-agent: ChatGPT-User
+User-agent: ClaudeBot
+User-agent: Claude-Web
+User-agent: PerplexityBot
+User-agent: OAI-SearchBot
+Allow: /
+Allow: /*.json
+Allow: /schemas/
+Allow: /llms.txt
+Allow: /mcp-manifest.json
+Disallow: /api/
+
+Sitemap: ${baseUrl}/sitemap.xml
+`;
+
+const outPath = path.join(rootDir, 'public', 'robots.txt');
+fs.writeFileSync(outPath, robotsTxt, 'utf-8');
+console.log('[robots] Written -> public/robots.txt');
+
+END_OF_FILE_CONTENT
+echo "Creating scripts/sitemap.mjs..."
+cat << 'END_OF_FILE_CONTENT' > "scripts/sitemap.mjs"
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const rootDir = path.resolve(__dirname, '..');
+
+const baseUrl = process.env.VERCEL_PROJECT_PRODUCTION_URL
+  ? `https://${process.env.VERCEL_PROJECT_PRODUCTION_URL}`
+  : 'http://localhost:5173';
+
+function listJsonFilesRecursive(dir) {
+  const items = fs.readdirSync(dir, { withFileTypes: true });
+  const files = [];
+  for (const item of items) {
+    const fullPath = path.join(dir, item.name);
+    if (item.isDirectory()) {
+      files.push(...listJsonFilesRecursive(fullPath));
+      continue;
+    }
+    if (item.isFile() && item.name.toLowerCase().endsWith('.json')) files.push(fullPath);
+  }
+  return files;
+}
+
+function toW3CDate(date) {
+  return date.toISOString().replace(/\.\d{3}Z$/, 'Z');
+}
+
+function urlEntry({ loc, lastmod, changefreq, priority, comment }) {
+  const lines = [];
+  if (comment) lines.push(`  <!-- ${comment} -->`);
+  lines.push(`  <url>`);
+  lines.push(`    <loc>${loc}</loc>`);
+  lines.push(`    <lastmod>${lastmod}</lastmod>`);
+  lines.push(`    <changefreq>${changefreq}</changefreq>`);
+  lines.push(`    <priority>${priority}</priority>`);
+  lines.push(`  </url>`);
+  return lines.join('\n');
+}
+
+function sectionComment(label) {
+  const bar = '='.repeat(42);
+  return [
+    `  <!-- ${bar} -->`,
+    `  <!-- ${label.padEnd(42)} -->`,
+    `  <!-- ${bar} -->`,
+  ].join('\n');
+}
+
+const pagesDir = path.join(rootDir, 'src', 'data', 'pages');
+const buildTime = toW3CDate(new Date());
+
+const pageFiles = listJsonFilesRecursive(pagesDir);
+const pages = pageFiles.map((fullPath) => {
+  const slug = path
+    .relative(pagesDir, fullPath)
+    .replace(/\\/g, '/')
+    .replace(/\.json$/i, '');
+  const lastmod = toW3CDate(fs.statSync(fullPath).mtime);
+  return { slug, lastmod };
+});
+
+const entries = [];
+
+entries.push(sectionComment('GLOBAL AGENT DISCOVERY NODES'));
+entries.push(
+  urlEntry({ loc: `${baseUrl}/llms.txt`, lastmod: buildTime, changefreq: 'weekly', priority: '1.0' }),
+);
+entries.push(
+  urlEntry({ loc: `${baseUrl}/mcp-manifest.json`, lastmod: buildTime, changefreq: 'weekly', priority: '1.0' }),
+);
+
+for (const { slug, lastmod } of pages) {
+  const humanPath = slug === 'home' ? '/' : `/${slug}`;
+  const label = `PAGE: ${slug.toUpperCase()}`;
+
+  entries.push(sectionComment(label));
+  entries.push(
+    urlEntry({ loc: `${baseUrl}${humanPath}`, lastmod, changefreq: 'daily', priority: '0.9', comment: 'Human UI' }),
+  );
+  entries.push(
+    urlEntry({ loc: `${baseUrl}/${slug}.json`, lastmod, changefreq: 'daily', priority: '0.9', comment: 'Machine Payload' }),
+  );
+  entries.push(
+    urlEntry({ loc: `${baseUrl}/schemas/${slug}.schema.json`, lastmod: buildTime, changefreq: 'weekly', priority: '0.8', comment: 'Machine Contract (Schema)' }),
+  );
+}
+
+const xml = [
+  `<?xml version="1.0" encoding="UTF-8"?>`,
+  `<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">`,
+  ``,
+  entries.join('\n'),
+  ``,
+  `</urlset>`,
+].join('\n');
+
+const outPath = path.join(rootDir, 'public', 'sitemap.xml');
+fs.writeFileSync(outPath, xml, 'utf-8');
+console.log('[sitemap] Written -> public/sitemap.xml');
+
 END_OF_FILE_CONTENT
 echo "Creating scripts/sync-pages-to-public.mjs..."
 cat << 'END_OF_FILE_CONTENT' > "scripts/sync-pages-to-public.mjs"
@@ -2582,20 +2868,18 @@ cat << 'END_OF_FILE_CONTENT' > "src/App.tsx"
  * Data from getHydratedData (file-backed or draft); assets from public/assets/images.
  * Supports Hybrid Persistence: Local Filesystem (Dev) or Cloud Bridge (Prod).
  */
-import { useCallback, useEffect, useMemo, useRef, useState, Suspense, lazy } from 'react';
-// Visitor path uses the runtime-only bundle (~28 KB gz), per ADR-0009 D7.
-// The full @olonjs/core is loaded on demand only when the URL targets /admin.
-import { OlonJSEngine } from '@olonjs/core/runtime';
-import type { JsonPagesConfig, LibraryImageEntry, ProjectState } from '@olonjs/core/runtime';
-import { normalizeBasePath, withBasePath } from '@olonjs/core/runtime';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { JsonPagesEngine } from '@olonjs/core';
+import type { JsonPagesConfig, LibraryImageEntry, ProjectState } from '@olonjs/core';
+import { normalizeBasePath, withBasePath } from '@olonjs/core';
 import { ComponentRegistry } from '@/lib/ComponentRegistry';
 import { SECTION_SCHEMAS, SECTION_SUBMISSION_SCHEMAS } from '@/lib/schemas';
 import { addSectionConfig } from '@/lib/addSectionConfig';
 import { getHydratedData } from '@/lib/draftStorage';
 import type { SiteConfig, ThemeConfig, MenuConfig, PageConfig } from '@/types';
-import type { DeployPhase, StepId } from '@olonjs/core/runtime';
-import { DEPLOY_STEPS } from '@olonjs/core/runtime';
-import { startCloudSaveStream } from '@olonjs/core/runtime';
+import type { DeployPhase, StepId } from '@olonjs/core';
+import { DEPLOY_STEPS } from '@olonjs/core';
+import { startCloudSaveStream } from '@olonjs/core';
 import siteData from '@/data/config/site.json';
 import themeData from '@/data/config/theme.json';
 import menuData from '@/data/config/menu.json';
@@ -2605,23 +2889,9 @@ import { EmptyTenantView } from '@/components/empty-tenant';
 import { Skeleton } from '@/components/ui/skeleton';
 import { ThemeProvider } from '@/components/ThemeProvider';
 import { useOlonForms } from '@/lib/useOlonForms';
-import { OlonFormsContext } from '@olonjs/core/runtime';
+import { OlonFormsContext } from '@olonjs/core';
 import { iconMap } from '@/lib/IconResolver';
 
-/**
- * Engine selector. Visitors get OlonJSEngine (~28 KB gz); /admin paths
- * lazy-load the full JsonPagesEngine (~128 KB gz) which mounts the
- * Studio editor surface. The check runs at module load time — once per
- * page, before React mounts — so Vite statically splits the chunks.
- * See ADR-0008 + ADR-0009 + docs/plans/core-studio-split.md (Task 3.1).
- */
-const isAdminPath =
-  typeof window !== 'undefined' && window.location.pathname.startsWith('/admin');
-
-const LazyJsonPagesEngine = lazy(() =>
-  import('@olonjs/core').then((m) => ({ default: m.JsonPagesEngine })),
-);
-
 import tenantCss from './index.css?inline';
 
 // Cloud Configuration (Injected by Vercel/Netlify Env Vars)
@@ -3683,12 +3953,8 @@ function App() {
      {shouldRenderEngine ? (
         isTenantEmpty ? (
           <EmptyTenantView />
-        ) : isAdminPath ? (
-          <Suspense fallback={null}>
-            <LazyJsonPagesEngine config={config} />
-          </Suspense>
         ) : (
-          <OlonJSEngine config={config} />
+          <JsonPagesEngine config={config} />
         )
       ) : null}
       {isCloudMode && (contentMode === 'error' || contentFallback?.reasonCode === 'CLOUD_REFRESH_FAILED') ? (
@@ -3864,7 +4130,7 @@ END_OF_FILE_CONTENT
 echo "Creating src/components/empty-tenant/schema.ts..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/empty-tenant/schema.ts"
 import { z } from 'zod';
-import { BaseSectionData } from '@olonjs/core/runtime';
+import { BaseSectionData } from '@olonjs/core';
 
 export const EmptyTenantSchema = BaseSectionData.extend({
   title: z.string().optional().describe('ui:text'),
@@ -3887,7 +4153,7 @@ mkdir -p "src/components/form-demo"
 echo "Creating src/components/form-demo/View.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/form-demo/View.tsx"
 import { Icon } from '@/lib/IconResolver';
-import { useFormState } from '@olonjs/core/runtime';
+import { useFormState } from '@olonjs/core';
 import type { FormDemoData } from './types';
 
 type FormDemoViewProps = {
@@ -4051,7 +4317,7 @@ END_OF_FILE_CONTENT
 echo "Creating src/components/form-demo/schema.ts..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/form-demo/schema.ts"
 import { z } from 'zod';
-import { BaseSectionData, WithFormRecipient } from '@olonjs/core/runtime';
+import { BaseSectionData, WithFormRecipient } from '@olonjs/core';
 
 export const FormDemoSchema = BaseSectionData.merge(WithFormRecipient).extend({
   icon: z.string().optional().describe('ui:icon-picker'),
@@ -4090,7 +4356,7 @@ END_OF_FILE_CONTENT
 mkdir -p "src/components/save-drawer"
 echo "Creating src/components/save-drawer/DeployConnector.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/save-drawer/DeployConnector.tsx"
-import type { StepState } from '@olonjs/core/runtime';
+import type { StepState } from '@olonjs/core';
 
 interface DeployConnectorProps {
   fromState: StepState;
@@ -4136,7 +4402,7 @@ END_OF_FILE_CONTENT
 echo "Creating src/components/save-drawer/DeployNode.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/save-drawer/DeployNode.tsx"
 import type { CSSProperties } from 'react';
-import type { DeployStep, StepState } from '@olonjs/core/runtime';
+import type { DeployStep, StepState } from '@olonjs/core';
 
 interface DeployNodeProps {
   step: DeployStep;
@@ -4224,8 +4490,8 @@ echo "Creating src/components/save-drawer/DopaDrawer.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/save-drawer/DopaDrawer.tsx"
 import { useEffect, useMemo, useState } from 'react';
 import { createPortal } from 'react-dom';
-import type { StepId, StepState } from '@olonjs/core/runtime';
-import { DEPLOY_STEPS } from '@olonjs/core/runtime';
+import type { StepId, StepState } from '@olonjs/core';
+import { DEPLOY_STEPS } from '@olonjs/core';
 import fontsCss from '@/fonts.css?inline';
 import saverStyleCss from './saverStyle.css?inline';
 import { DeployNode } from './DeployNode';
@@ -5432,7 +5698,7 @@ import {
   Code2, Quote, SquareCode,
   Link2, Unlink2, ImagePlus, Eraser,
 } from 'lucide-react';
-import { STUDIO_EVENTS, useConfig, useStudio } from '@olonjs/core/runtime';
+import { STUDIO_EVENTS, useConfig, useStudio } from '@olonjs/core';
 import type { TiptapData, TiptapSettings } from './types';
 
 // ── UI primitives ─────────────────────────────────────────────────
@@ -5755,7 +6021,7 @@ END_OF_FILE_CONTENT
 echo "Creating src/components/tiptap/schema.ts..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/tiptap/schema.ts"
 import { z } from 'zod';
-import { BaseSectionData } from '@olonjs/core/runtime';
+import { BaseSectionData } from '@olonjs/core';
 
 export const TiptapSchema = BaseSectionData.extend({
   content: z.string().default('').describe('ui:editorial-markdown'),
@@ -5776,7 +6042,7 @@ END_OF_FILE_CONTENT
 mkdir -p "src/components/ui"
 echo "Creating src/components/ui/OlonMark.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/ui/OlonMark.tsx"
-import { cn } from '@olonjs/core/runtime'
+import { cn } from '@olonjs/core'
 
 interface OlonMarkProps {
   size?: number
@@ -5866,7 +6132,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/components/ui/accordion.tsx"
 import * as React from "react"
 import { Accordion as AccordionPrimitive } from "radix-ui"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 import { ChevronDownIcon, ChevronUpIcon } from "lucide-react"
 
 function Accordion({
@@ -5970,7 +6236,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/components/ui/avatar.tsx"
 import * as React from "react"
 import { Avatar as AvatarPrimitive } from "radix-ui"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 
 function Avatar({
   className,
@@ -6085,7 +6351,7 @@ echo "Creating src/components/ui/badge.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/ui/badge.tsx"
 import * as React from 'react'
 import { cva, type VariantProps } from 'class-variance-authority'
-import { cn } from '@olonjs/core/runtime'
+import { cn } from '@olonjs/core'
 
 const badgeVariants = cva(
   'inline-flex items-center px-2.5 py-0.5 text-xs font-medium transition-colors',
@@ -6120,7 +6386,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/components/ui/breadcrumb.tsx"
 import * as React from "react"
 import { Slot } from "radix-ui"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 import { ChevronRightIcon, MoreHorizontalIcon } from "lucide-react"
 
 function Breadcrumb({ className, ...props }: React.ComponentProps<"nav">) {
@@ -6247,7 +6513,7 @@ echo "Creating src/components/ui/button.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/ui/button.tsx"
 import * as React from 'react'
 import { cva, type VariantProps } from 'class-variance-authority'
-import { cn } from '@olonjs/core/runtime'
+import { cn } from '@olonjs/core'
 
 const buttonVariants = cva(
   'inline-flex items-center justify-center gap-2 whitespace-nowrap font-medium transition-all duration-150 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-40 shrink-0',
@@ -6308,7 +6574,7 @@ END_OF_FILE_CONTENT
 echo "Creating src/components/ui/card.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/ui/card.tsx"
 import * as React from 'react'
-import { cn } from '@olonjs/core/runtime'
+import { cn } from '@olonjs/core'
 
 const Card = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
   ({ className, ...props }, ref) => (
@@ -6367,7 +6633,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/components/ui/checkbox.tsx"
 import * as React from "react"
 import { Checkbox as CheckboxPrimitive } from "radix-ui"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 import { CheckIcon } from "lucide-react"
 
 function Checkbox({
@@ -6407,7 +6673,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/components/ui/dialog.tsx"
 import * as React from "react"
 import { Dialog as DialogPrimitive } from "radix-ui"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 import { Button } from "@/components/ui/button"
 import { XIcon } from "lucide-react"
 
@@ -6579,7 +6845,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/components/ui/dropdown-menu.tsx"
 import * as React from "react"
 import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 import { CheckIcon, ChevronRightIcon } from "lucide-react"
 
 function DropdownMenu({
@@ -6854,7 +7120,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/components/ui/hover-card.tsx"
 import * as React from "react"
 import { HoverCard as HoverCardPrimitive } from "radix-ui"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 
 function HoverCard({
   ...props
@@ -6900,7 +7166,7 @@ END_OF_FILE_CONTENT
 echo "Creating src/components/ui/input.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/ui/input.tsx"
 import * as React from 'react'
-import { cn } from '@olonjs/core/runtime'
+import { cn } from '@olonjs/core'
 
 export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {}
 
@@ -6931,7 +7197,7 @@ END_OF_FILE_CONTENT
 echo "Creating src/components/ui/label.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/ui/label.tsx"
 import * as React from 'react'
-import { cn } from '@olonjs/core/runtime'
+import { cn } from '@olonjs/core'
 
 const Label = React.forwardRef<
   HTMLLabelElement,
@@ -6955,7 +7221,7 @@ import * as React from "react"
 import { cva } from "class-variance-authority"
 import { NavigationMenu as NavigationMenuPrimitive } from "radix-ui"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 import { ChevronDownIcon } from "lucide-react"
 
 function NavigationMenu({
@@ -7124,7 +7390,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/components/ui/progress.tsx"
 import * as React from "react"
 import { Progress as ProgressPrimitive } from "radix-ui"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 
 function Progress({
   className,
@@ -7159,7 +7425,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/components/ui/scroll-area.tsx"
 import * as React from "react"
 import { ScrollArea as ScrollAreaPrimitive } from "radix-ui"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 
 function ScrollArea({
   className,
@@ -7218,7 +7484,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/components/ui/select.tsx"
 import * as React from "react"
 import { Select as SelectPrimitive } from "radix-ui"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 import { ChevronDownIcon, CheckIcon, ChevronUpIcon } from "lucide-react"
 
 function Select({
@@ -7604,7 +7870,7 @@ END_OF_FILE_CONTENT
 echo "Creating src/components/ui/separator.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/ui/separator.tsx"
 import * as React from 'react'
-import { cn } from '@olonjs/core/runtime'
+import { cn } from '@olonjs/core'
 
 const Separator = React.forwardRef<
   HTMLDivElement,
@@ -7633,7 +7899,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/components/ui/sheet.tsx"
 import * as React from "react"
 import { Dialog as SheetPrimitive } from "radix-ui"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 import { Button } from "@/components/ui/button"
 import { XIcon } from "lucide-react"
 
@@ -7781,7 +8047,7 @@ END_OF_FILE_CONTENT
 # SKIP: src/components/ui/sheet.tsx:Zone.Identifier is binary and cannot be embedded as text.
 echo "Creating src/components/ui/skeleton.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/ui/skeleton.tsx"
-import { cn } from '@olonjs/core/runtime';
+import { cn } from '@olonjs/core';
 import type { HTMLAttributes } from 'react';
 
 function Skeleton({
@@ -7805,7 +8071,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/components/ui/switch.tsx"
 import * as React from "react"
 import { Switch as SwitchPrimitive } from "radix-ui"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 
 function Switch({
   className,
@@ -7841,7 +8107,7 @@ echo "Creating src/components/ui/table.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/ui/table.tsx"
 import * as React from "react"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 
 function Table({ className, ...props }: React.ComponentProps<"table">) {
   return (
@@ -7965,7 +8231,7 @@ import * as React from "react"
 import { cva, type VariantProps } from "class-variance-authority"
 import { Tabs as TabsPrimitive } from "radix-ui"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 
 function Tabs({
   className,
@@ -8057,7 +8323,7 @@ echo "Creating src/components/ui/textarea.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/ui/textarea.tsx"
 import * as React from "react"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 
 function Textarea({ className, ...props }: React.ComponentProps<"textarea">) {
   return (
@@ -8086,7 +8352,7 @@ import * as React from "react"
 import { type VariantProps } from "class-variance-authority"
 import { ToggleGroup as ToggleGroupPrimitive } from "radix-ui"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 import { toggleVariants } from "@/components/ui/toggle"
 
 const ToggleGroupContext = React.createContext<
@@ -8181,7 +8447,7 @@ import * as React from "react"
 import { cva, type VariantProps } from "class-variance-authority"
 import { Toggle as TogglePrimitive } from "radix-ui"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 
 const toggleVariants = cva(
   "group/toggle inline-flex items-center justify-center gap-1 rounded-lg text-sm font-medium whitespace-nowrap transition-all outline-none hover:bg-muted hover:text-foreground focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 aria-pressed:bg-muted data-[state=on]:bg-muted dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
@@ -8233,7 +8499,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/components/ui/tooltip.tsx"
 import * as React from "react"
 import { Tooltip as TooltipPrimitive } from "radix-ui"
 
-import { cn } from "@olonjs/core/runtime"
+import { cn } from "@olonjs/core"
 
 function TooltipProvider({
   delayDuration = 0,
@@ -8936,7 +9202,7 @@ echo "Creating src/entry-ssg.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/entry-ssg.tsx"
 import { renderToString } from 'react-dom/server';
 import { StaticRouter } from 'react-router-dom/server';
-import { ConfigProvider, PageRenderer, StudioProvider, resolveRuntimeConfig } from '@olonjs/core/runtime';
+import { ConfigProvider, PageRenderer, StudioProvider, resolveRuntimeConfig } from '@olonjs/core';
 import type { JsonPagesConfig, PageConfig, SiteConfig, ThemeConfig } from '@/types';
 import { ThemeProvider } from '@/components/ThemeProvider';
 import { ComponentRegistry } from '@/lib/ComponentRegistry';
@@ -10144,7 +10410,7 @@ export const Icon: React.FC<IconProps> = ({ name, size = 20, className }) => {
 END_OF_FILE_CONTENT
 echo "Creating src/lib/addSectionConfig.ts..."
 cat << 'END_OF_FILE_CONTENT' > "src/lib/addSectionConfig.ts"
-import type { AddSectionConfig } from '@olonjs/core/runtime';
+import type { AddSectionConfig } from '@olonjs/core';
 
 const addableSectionTypes = ['empty-tenant', 'form-demo'] as const;
 
@@ -10285,7 +10551,7 @@ export {
   BaseSectionSettingsSchema,
   CtaSchema,
   ImageSelectionSchema,
-} from '@olonjs/core/runtime';
+} from '@olonjs/core';
 
 END_OF_FILE_CONTENT
 echo "Creating src/lib/useFormSubmit.ts..."
@@ -10380,7 +10646,7 @@ END_OF_FILE_CONTENT
 echo "Creating src/lib/useOlonForms.ts..."
 cat << 'END_OF_FILE_CONTENT' > "src/lib/useOlonForms.ts"
 import { useCallback, useEffect, useState } from 'react';
-import type { FormState } from '@olonjs/core/runtime';
+import type { FormState } from '@olonjs/core';
 
 const API_BASE =
   (import.meta.env.VITE_OLONJS_CLOUD_URL as string | undefined) ??
@@ -10581,12 +10847,6 @@ export type SectionComponentPropsMap = {
   'form-demo': { data: FormDemoData; settings?: FormDemoSettings };
 };
 
-// MTRP module augmentation. TypeScript treats `@olonjs/core` and
-// `@olonjs/core/runtime` as separate module identifiers (different
-// import specifiers). After ADR-0009 the tenant imports JsonPagesConfig
-// from `/runtime` for the visitor path, so the section registries must
-// be augmented for *both* identifiers, otherwise PageConfig.sections
-// resolves to a generic FallbackSection on the runtime side.
 declare module '@olonjs/core' {
   export interface SectionDataRegistry {
     'empty-tenant': EmptyTenantData;
@@ -10598,26 +10858,7 @@ declare module '@olonjs/core' {
   }
 }
 
-declare module '@olonjs/core/runtime' {
-  export interface SectionDataRegistry {
-    'empty-tenant': EmptyTenantData;
-    'form-demo': FormDemoData;
-  }
-  export interface SectionSettingsRegistry {
-    'empty-tenant': EmptyTenantSettings;
-    'form-demo': FormDemoSettings;
-  }
-}
-
-// ADR-0009 D7: tenant types re-export from the runtime subpath, NOT the
-// full @olonjs/core. This is a value re-export — even though every
-// consumer in this codebase only does `import type`, Vite's static
-// graph treats `export *` as a runtime dependency edge. Pointing it at
-// '@olonjs/core' would pull the full Studio bundle (AdminSidebar,
-// FormFactory, StudioStage, admin-skin) into the visitor main chunk.
-// Pointing it at '@olonjs/core/runtime' anchors the graph to the
-// runtime-only bundle (~28 KB gz) so the visitor entry stays clean.
-export * from '@olonjs/core/runtime';
+export * from '@olonjs/core';
 
 END_OF_FILE_CONTENT
 echo "Creating src/vite-env.d.ts..."