@olonjs/cli 3.0.103 → 3.0.105

package/assets/src_tenant_alpha.sh

@@ -1646,7 +1646,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.0.90",
+    "@olonjs/core": "^1.0.92",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",
@@ -1947,528 +1947,528 @@ main().catch((error) => {
 END_OF_FILE_CONTENT
 echo "Creating scripts/bake.mjs..."
 cat << 'END_OF_FILE_CONTENT' > "scripts/bake.mjs"
-/**
- * olon bake - production SSG
- *
- * 1) Build client bundle (dist/)
- * 2) Build SSR entry bundle (dist-ssr/)
- * 3) Discover all page slugs from JSON files under src/data/pages
- * 4) Render each slug via SSR and write dist/<slug>/index.html
- */
-
-import { build } from 'vite';
-import path from 'path';
-import { fileURLToPath, pathToFileURL } from 'url';
+/**
+ * olon bake - production SSG
+ *
+ * 1) Build client bundle (dist/)
+ * 2) Build SSR entry bundle (dist-ssr/)
+ * 3) Discover all page slugs from JSON files under src/data/pages
+ * 4) Render each slug via SSR and write dist/<slug>/index.html
+ */
+
+import { build } from 'vite';
+import path from 'path';
+import { fileURLToPath, pathToFileURL } from 'url';
+import fs from 'fs/promises';
+import {
+  buildPageContract,
+  buildPageManifest,
+  buildPageManifestHref,
+  buildSiteManifest,
+} from '../../../packages/core/src/lib/webmcp-contracts.mjs';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const root = path.resolve(__dirname, '..');
+const pagesDir = path.resolve(root, 'src/data/pages');
+const publicDir = path.resolve(root, 'public');
+const distDir = path.resolve(root, 'dist');
+
+async function writeJsonTargets(relativePath, value) {
+  const targets = [
+    path.resolve(publicDir, relativePath),
+    path.resolve(distDir, relativePath),
+  ];
+
+  for (const targetPath of targets) {
+    await fs.mkdir(path.dirname(targetPath), { recursive: true });
+    await fs.writeFile(targetPath, `${JSON.stringify(value, null, 2)}\n`, 'utf-8');
+  }
+}
+
+function escapeHtmlAttribute(value) {
+  return String(value).replace(/&/g, '&amp;').replace(/"/g, '&quot;');
+}
+
+function toCanonicalSlug(relativeJsonPath) {
+  const normalized = relativeJsonPath.replace(/\\/g, '/');
+  const slug = normalized.replace(/\.json$/i, '').replace(/^\/+|\/+$/g, '');
+  if (!slug) throw new Error('[bake] Invalid page slug: empty path segment');
+  return slug;
+}
+
+async function listJsonFilesRecursive(dir) {
+  const items = await fs.readdir(dir, { withFileTypes: true });
+  const files = [];
+  for (const item of items) {
+    const fullPath = path.join(dir, item.name);
+    if (item.isDirectory()) {
+      files.push(...(await listJsonFilesRecursive(fullPath)));
+      continue;
+    }
+    if (item.isFile() && item.name.toLowerCase().endsWith('.json')) files.push(fullPath);
+  }
+  return files;
+}
+
+async function discoverTargets() {
+  let files = [];
+  try {
+    files = await listJsonFilesRecursive(pagesDir);
+  } catch {
+    files = [];
+  }
+
+  const rawSlugs = files.map((fullPath) => toCanonicalSlug(path.relative(pagesDir, fullPath)));
+  const slugs = Array.from(new Set(rawSlugs)).sort((a, b) => a.localeCompare(b));
+
+  return slugs.map((slug) => {
+    const depth = slug === 'home' ? 0 : slug.split('/').length;
+    const out = slug === 'home' ? 'dist/index.html' : `dist/${slug}/index.html`;
+    return { slug, out, depth };
+  });
+}
+
+console.log('\n[bake] Building client...');
+await build({ root, mode: 'production', logLevel: 'warn' });
+console.log('[bake] Client build done.');
+
+console.log('\n[bake] Building SSR bundle...');
+await build({
+  root,
+  mode: 'production',
+  logLevel: 'warn',
+  build: {
+    ssr: 'src/entry-ssg.tsx',
+    outDir: 'dist-ssr',
+    rollupOptions: {
+      output: { format: 'esm' },
+    },
+  },
+  ssr: {
+    noExternal: ['@olonjs/core'],
+  },
+});
+console.log('[bake] SSR build done.');
+
+const targets = await discoverTargets();
+if (targets.length === 0) {
+  throw new Error('[bake] No pages discovered under src/data/pages');
+}
+console.log(`[bake] Targets: ${targets.map((t) => t.slug).join(', ')}`);
+
+const ssrEntryUrl = pathToFileURL(path.resolve(root, 'dist-ssr/entry-ssg.js')).href;
+const { render, getCss, getPageMeta, getWebMcpBuildState } = await import(ssrEntryUrl);
+
+const template = await fs.readFile(path.resolve(root, 'dist/index.html'), 'utf-8');
+const hasCommentMarker = template.includes('<!--app-html-->');
+const hasRootDivMarker = template.includes('<div id="root"></div>');
+if (!hasCommentMarker && !hasRootDivMarker) {
+  throw new Error('[bake] Missing template marker. Expected <!--app-html--> or <div id="root"></div>.');
+}
+
+const inlinedCss = getCss();
+const styleTag = `<style data-bake="inline">${inlinedCss}</style>`;
+const webMcpBuildState = getWebMcpBuildState();
+
+for (const { slug } of targets) {
+  const pageConfig = webMcpBuildState.pages[slug];
+  if (!pageConfig) continue;
+  const contract = buildPageContract({
+    slug,
+    pageConfig,
+    schemas: webMcpBuildState.schemas,
+    siteConfig: webMcpBuildState.siteConfig,
+  });
+  await writeJsonTargets(`schemas/${slug}.schema.json`, contract);
+  const pageManifest = buildPageManifest({
+    slug,
+    pageConfig,
+    schemas: webMcpBuildState.schemas,
+    siteConfig: webMcpBuildState.siteConfig,
+  });
+  await writeJsonTargets(buildPageManifestHref(slug).replace(/^\//, ''), pageManifest);
+}
+
+const mcpManifest = buildSiteManifest({
+  pages: webMcpBuildState.pages,
+  schemas: webMcpBuildState.schemas,
+  siteConfig: webMcpBuildState.siteConfig,
+});
+await writeJsonTargets('mcp-manifest.json', mcpManifest);
+
+for (const { slug, out, depth } of targets) {
+  console.log(`\n[bake] Rendering /${slug === 'home' ? '' : slug}...`);
+
+  const appHtml = render(slug);
+  const { title, description } = getPageMeta(slug);
+  const safeTitle = String(title).replace(/"/g, '&quot;');
+  const safeDescription = String(description).replace(/"/g, '&quot;');
+  const metaTags = [
+    `<meta name="description" content="${safeDescription}">`,
+    `<meta property="og:title" content="${safeTitle}">`,
+    `<meta property="og:description" content="${safeDescription}">`,
+  ].join('\n    ');
+  const jsonLd = JSON.stringify({
+    '@context': 'https://schema.org',
+    '@type': 'WebPage',
+    name: title,
+    description,
+    url: slug === 'home' ? '/' : `/${slug}`,
+  });
+
+  const prefix = depth > 0 ? '../'.repeat(depth) : './';
+  const fixedTemplate = depth > 0 ? template.replace(/(['"])\.\//g, `$1${prefix}`) : template;
+  const mcpManifestHref = `${prefix}${buildPageManifestHref(slug).replace(/^\//, '')}`;
+  const contractHref = `${prefix}schemas/${slug}.schema.json`;
+  const contractLinks = [
+    `<link rel="mcp-manifest" href="${escapeHtmlAttribute(mcpManifestHref)}">`,
+    `<link rel="olon-contract" href="${escapeHtmlAttribute(contractHref)}">`,
+    `<script type="application/ld+json">${jsonLd}</script>`,
+  ].join('\n  ');
+
+  let bakedHtml = fixedTemplate
+    .replace('</head>', `  ${styleTag}\n  ${contractLinks}\n</head>`)
+    .replace(/<title>.*?<\/title>/, `<title>${safeTitle}</title>\n    ${metaTags}`);
+
+  if (hasCommentMarker) {
+    bakedHtml = bakedHtml.replace('<!--app-html-->', appHtml);
+  } else {
+    bakedHtml = bakedHtml.replace('<div id="root"></div>', `<div id="root">${appHtml}</div>`);
+  }
+
+  const outPath = path.resolve(root, out);
+  await fs.mkdir(path.dirname(outPath), { recursive: true });
+  await fs.writeFile(outPath, bakedHtml, 'utf-8');
+  console.log(`[bake] Written -> ${out} [title: "${safeTitle}"]`);
+}
+
+console.log('\n[bake] All pages baked. OK\n');
+
+END_OF_FILE_CONTENT
+echo "Creating scripts/sync-pages-to-public.mjs..."
+cat << 'END_OF_FILE_CONTENT' > "scripts/sync-pages-to-public.mjs"
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const rootDir = path.resolve(__dirname, '..');
+const sourceDir = path.join(rootDir, 'src', 'data', 'pages');
+const targetDir = path.join(rootDir, 'public', 'pages');
+
+if (!fs.existsSync(sourceDir)) {
+  console.warn('[sync-pages-to-public] Source directory not found:', sourceDir);
+  process.exit(0);
+}
+
+fs.rmSync(targetDir, { recursive: true, force: true });
+fs.mkdirSync(targetDir, { recursive: true });
+fs.cpSync(sourceDir, targetDir, { recursive: true });
+
+console.log('[sync-pages-to-public] Synced pages to public/pages');
+
+END_OF_FILE_CONTENT
+echo "Creating scripts/webmcp-feature-check.mjs..."
+cat << 'END_OF_FILE_CONTENT' > "scripts/webmcp-feature-check.mjs"
 import fs from 'fs/promises';
-import {
-  buildPageContract,
-  buildPageManifest,
-  buildPageManifestHref,
-  buildSiteManifest,
-} from '../../../packages/core/src/lib/webmcp-contracts.mjs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { createRequire } from 'module';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const root = path.resolve(__dirname, '..');
-const pagesDir = path.resolve(root, 'src/data/pages');
-const publicDir = path.resolve(root, 'public');
-const distDir = path.resolve(root, 'dist');
-
-async function writeJsonTargets(relativePath, value) {
-  const targets = [
-    path.resolve(publicDir, relativePath),
-    path.resolve(distDir, relativePath),
-  ];
+const rootDir = path.resolve(__dirname, '..');
+const baseUrl = process.env.WEBMCP_BASE_URL ?? 'http://127.0.0.1:4173';
 
-  for (const targetPath of targets) {
-    await fs.mkdir(path.dirname(targetPath), { recursive: true });
-    await fs.writeFile(targetPath, `${JSON.stringify(value, null, 2)}\n`, 'utf-8');
-  }
+function pageFilePathFromSlug(slug) {
+  return path.resolve(rootDir, 'src', 'data', 'pages', `${slug}.json`);
 }
 
-function escapeHtmlAttribute(value) {
-  return String(value).replace(/&/g, '&amp;').replace(/"/g, '&quot;');
+function adminUrlFromSlug(slug) {
+  return `${baseUrl}/admin${slug === 'home' ? '' : `/${slug}`}`;
 }
 
-function toCanonicalSlug(relativeJsonPath) {
-  const normalized = relativeJsonPath.replace(/\\/g, '/');
-  const slug = normalized.replace(/\.json$/i, '').replace(/^\/+|\/+$/g, '');
-  if (!slug) throw new Error('[bake] Invalid page slug: empty path segment');
-  return slug;
+function isStringSchema(schema) {
+  if (!schema || typeof schema !== 'object') return false;
+  if (schema.type === 'string') return true;
+  if (Array.isArray(schema.anyOf)) {
+    return schema.anyOf.some((entry) => entry && typeof entry === 'object' && entry.type === 'string');
+  }
+  return false;
 }
 
-async function listJsonFilesRecursive(dir) {
-  const items = await fs.readdir(dir, { withFileTypes: true });
-  const files = [];
-  for (const item of items) {
-    const fullPath = path.join(dir, item.name);
-    if (item.isDirectory()) {
-      files.push(...(await listJsonFilesRecursive(fullPath)));
-      continue;
-    }
-    if (item.isFile() && item.name.toLowerCase().endsWith('.json')) files.push(fullPath);
+function findTopLevelStringField(sectionSchema) {
+  const properties = sectionSchema?.properties;
+  if (!properties || typeof properties !== 'object') return null;
+  const preferred = ['title', 'sectionTitle', 'label', 'headline', 'name'];
+  for (const key of preferred) {
+    if (isStringSchema(properties[key])) return key;
+  }
+  for (const [key, value] of Object.entries(properties)) {
+    if (isStringSchema(value)) return key;
   }
-  return files;
+  return null;
 }
 
-async function discoverTargets() {
-  let files = [];
+async function loadPlaywright() {
+  const require = createRequire(import.meta.url);
   try {
-    files = await listJsonFilesRecursive(pagesDir);
-  } catch {
-    files = [];
+    return require('playwright');
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(
+      `Playwright is required for WebMCP verification. Install it before running this script. Original error: ${message}`
+    );
   }
+}
 
-  const rawSlugs = files.map((fullPath) => toCanonicalSlug(path.relative(pagesDir, fullPath)));
-  const slugs = Array.from(new Set(rawSlugs)).sort((a, b) => a.localeCompare(b));
+async function readPageJson(slug) {
+  const pageFilePath = pageFilePathFromSlug(slug);
+  const raw = await fs.readFile(pageFilePath, 'utf8');
+  return { raw, json: JSON.parse(raw), pageFilePath };
+}
 
-  return slugs.map((slug) => {
-    const depth = slug === 'home' ? 0 : slug.split('/').length;
-    const out = slug === 'home' ? 'dist/index.html' : `dist/${slug}/index.html`;
-    return { slug, out, depth };
-  });
+async function waitFor(predicate, timeoutMs, label) {
+  const startedAt = Date.now();
+  for (;;) {
+    const result = await predicate();
+    if (result) return result;
+    if (Date.now() - startedAt > timeoutMs) {
+      throw new Error(`Timed out while waiting for ${label}.`);
+    }
+    await new Promise((resolve) => setTimeout(resolve, 150));
+  }
 }
 
-console.log('\n[bake] Building client...');
-await build({ root, mode: 'production', logLevel: 'warn' });
-console.log('[bake] Client build done.');
+async function waitForFileFieldValue(slug, sectionId, fieldKey, expectedValue) {
+  await waitFor(async () => {
+    const { json } = await readPageJson(slug);
+    const section = Array.isArray(json.sections)
+      ? json.sections.find((item) => item?.id === sectionId)
+      : null;
+    return section?.data?.[fieldKey] === expectedValue;
+  }, 8_000, `file field "${fieldKey}" = "${expectedValue}"`);
+}
 
-console.log('\n[bake] Building SSR bundle...');
-await build({
-  root,
-  mode: 'production',
-  logLevel: 'warn',
-  build: {
-    ssr: 'src/entry-ssg.tsx',
-    outDir: 'dist-ssr',
-    rollupOptions: {
-      output: { format: 'esm' },
-    },
-  },
-  ssr: {
-    noExternal: ['@olonjs/core'],
-  },
-});
-console.log('[bake] SSR build done.');
+async function ensureResponseOk(response, label) {
+  if (!response.ok) {
+    const text = await response.text();
+    throw new Error(`${label} failed with ${response.status}: ${text}`);
+  }
+  return response;
+}
 
-const targets = await discoverTargets();
-if (targets.length === 0) {
-  throw new Error('[bake] No pages discovered under src/data/pages');
+async function fetchJson(relativePath, label) {
+  const response = await ensureResponseOk(await fetch(`${baseUrl}${relativePath}`), label);
+  return response.json();
 }
-console.log(`[bake] Targets: ${targets.map((t) => t.slug).join(', ')}`);
 
-const ssrEntryUrl = pathToFileURL(path.resolve(root, 'dist-ssr/entry-ssg.js')).href;
-const { render, getCss, getPageMeta, getWebMcpBuildState } = await import(ssrEntryUrl);
+async function selectTarget() {
+  const siteIndex = await fetchJson('/mcp-manifest.json', 'Manifest index request');
+  const requestedSlug = typeof process.env.WEBMCP_TARGET_SLUG === 'string' && process.env.WEBMCP_TARGET_SLUG.trim()
+    ? process.env.WEBMCP_TARGET_SLUG.trim()
+    : null;
+
+  const candidatePages = requestedSlug
+    ? (siteIndex.pages ?? []).filter((page) => page?.slug === requestedSlug)
+    : (siteIndex.pages ?? []);
 
-const template = await fs.readFile(path.resolve(root, 'dist/index.html'), 'utf-8');
-const hasCommentMarker = template.includes('<!--app-html-->');
-const hasRootDivMarker = template.includes('<div id="root"></div>');
-if (!hasCommentMarker && !hasRootDivMarker) {
-  throw new Error('[bake] Missing template marker. Expected <!--app-html--> or <div id="root"></div>.');
+  for (const pageEntry of candidatePages) {
+    if (!pageEntry?.slug || !pageEntry?.manifestHref || !pageEntry?.contractHref) continue;
+    const pageManifest = await fetchJson(pageEntry.manifestHref, `Page manifest request for ${pageEntry.slug}`);
+    const pageContract = await fetchJson(pageEntry.contractHref, `Page contract request for ${pageEntry.slug}`);
+    const localInstances = Array.isArray(pageContract.sectionInstances)
+      ? pageContract.sectionInstances.filter((section) => section?.scope === 'local')
+      : [];
+    const tools = Array.isArray(pageManifest.tools) ? pageManifest.tools : [];
+
+    for (const tool of tools) {
+      const sectionType = tool?.sectionType;
+      if (typeof tool?.name !== 'string' || typeof sectionType !== 'string') continue;
+      const targetInstance = localInstances.find((section) => section?.type === sectionType);
+      if (!targetInstance?.id) continue;
+      const targetFieldKey = findTopLevelStringField(pageContract.sectionSchemas?.[sectionType]);
+      if (!targetFieldKey) continue;
+      const pageState = await readPageJson(pageEntry.slug);
+      const section = Array.isArray(pageState.json.sections)
+        ? pageState.json.sections.find((item) => item?.id === targetInstance.id)
+        : null;
+      const originalValue = section?.data?.[targetFieldKey];
+      if (typeof originalValue !== 'string') continue;
+
+      return {
+        slug: pageEntry.slug,
+        manifestHref: pageEntry.manifestHref,
+        contractHref: pageEntry.contractHref,
+        toolName: tool.name,
+        sectionId: targetInstance.id,
+        fieldKey: targetFieldKey,
+        originalValue,
+        originalState: pageState,
+      };
+    }
+  }
+
+  throw new Error(
+    requestedSlug
+      ? `No valid WebMCP verification target found for page "${requestedSlug}".`
+      : 'No valid WebMCP verification target found in manifest index.'
+  );
 }
 
-const inlinedCss = getCss();
-const styleTag = `<style data-bake="inline">${inlinedCss}</style>`;
-const webMcpBuildState = getWebMcpBuildState();
+async function main() {
+  const { chromium } = await loadPlaywright();
+  const target = await selectTarget();
+  const nextValue = `${target.originalValue} WebMCP ${Date.now()}`;
+  const browser = await chromium.launch({ headless: true });
+  const page = await browser.newPage();
+  const consoleEvents = [];
+  let mutationApplied = false;
 
-for (const { slug } of targets) {
-  const pageConfig = webMcpBuildState.pages[slug];
-  if (!pageConfig) continue;
-  const contract = buildPageContract({
-    slug,
-    pageConfig,
-    schemas: webMcpBuildState.schemas,
-    siteConfig: webMcpBuildState.siteConfig,
+  page.on('console', (message) => {
+    if (message.type() === 'error' || message.type() === 'warning') {
+      consoleEvents.push(`[console:${message.type()}] ${message.text()}`);
+    }
   });
-  await writeJsonTargets(`schemas/${slug}.schema.json`, contract);
-  const pageManifest = buildPageManifest({
-    slug,
-    pageConfig,
-    schemas: webMcpBuildState.schemas,
-    siteConfig: webMcpBuildState.siteConfig,
+  page.on('pageerror', (error) => {
+    consoleEvents.push(`[pageerror] ${error.message}`);
   });
-  await writeJsonTargets(buildPageManifestHref(slug).replace(/^\//, ''), pageManifest);
-}
 
-const mcpManifest = buildSiteManifest({
-  pages: webMcpBuildState.pages,
-  schemas: webMcpBuildState.schemas,
-  siteConfig: webMcpBuildState.siteConfig,
-});
-await writeJsonTargets('mcp-manifest.json', mcpManifest);
+  const restoreOriginal = async () => {
+    try {
+      await page.evaluate(
+        async ({ toolName, slug, sectionId, fieldKey, value }) => {
+          const runtime = navigator.modelContextTesting;
+          if (!runtime?.executeTool) return;
+          await runtime.executeTool(
+            toolName,
+            JSON.stringify({
+              slug,
+              sectionId,
+              fieldKey,
+              value,
+            })
+          );
+        },
+        {
+          toolName: target.toolName,
+          slug: target.slug,
+          sectionId: target.sectionId,
+          fieldKey: target.fieldKey,
+          value: target.originalValue,
+        }
+      );
+      await waitForFileFieldValue(target.slug, target.sectionId, target.fieldKey, target.originalValue);
+    } catch {
+      await fs.writeFile(target.originalState.pageFilePath, target.originalState.raw, 'utf8');
+    }
+  };
 
-for (const { slug, out, depth } of targets) {
-  console.log(`\n[bake] Rendering /${slug === 'home' ? '' : slug}...`);
+  try {
+    const pageManifest = await fetchJson(target.manifestHref, `Manifest request for ${target.slug}`);
+    if (!Array.isArray(pageManifest.tools) || !pageManifest.tools.some((tool) => tool?.name === target.toolName)) {
+      throw new Error(`Manifest does not expose ${target.toolName}.`);
+    }
 
-  const appHtml = render(slug);
-  const { title, description } = getPageMeta(slug);
-  const safeTitle = String(title).replace(/"/g, '&quot;');
-  const safeDescription = String(description).replace(/"/g, '&quot;');
-  const metaTags = [
-    `<meta name="description" content="${safeDescription}">`,
-    `<meta property="og:title" content="${safeTitle}">`,
-    `<meta property="og:description" content="${safeDescription}">`,
-  ].join('\n    ');
-  const jsonLd = JSON.stringify({
-    '@context': 'https://schema.org',
-    '@type': 'WebPage',
-    name: title,
-    description,
-    url: slug === 'home' ? '/' : `/${slug}`,
-  });
+    const pageContract = await fetchJson(target.contractHref, `Contract request for ${target.slug}`);
+    if (!Array.isArray(pageContract.tools) || !pageContract.tools.some((tool) => tool?.name === target.toolName)) {
+      throw new Error(`Page contract does not expose ${target.toolName}.`);
+    }
 
-  const prefix = depth > 0 ? '../'.repeat(depth) : './';
-  const fixedTemplate = depth > 0 ? template.replace(/(['"])\.\//g, `$1${prefix}`) : template;
-  const mcpManifestHref = `${prefix}${buildPageManifestHref(slug).replace(/^\//, '')}`;
-  const contractHref = `${prefix}schemas/${slug}.schema.json`;
-  const contractLinks = [
-    `<link rel="mcp-manifest" href="${escapeHtmlAttribute(mcpManifestHref)}">`,
-    `<link rel="olon-contract" href="${escapeHtmlAttribute(contractHref)}">`,
-    `<script type="application/ld+json">${jsonLd}</script>`,
-  ].join('\n  ');
+    await page.goto(adminUrlFromSlug(target.slug), { waitUntil: 'networkidle' });
 
-  let bakedHtml = fixedTemplate
-    .replace('</head>', `  ${styleTag}\n  ${contractLinks}\n</head>`)
-    .replace(/<title>.*?<\/title>/, `<title>${safeTitle}</title>\n    ${metaTags}`);
+    try {
+      await page.waitForFunction(
+        ({ manifestHref, contractHref }) => {
+          const manifestLink = document.head.querySelector('link[rel="mcp-manifest"]');
+          const contractLink = document.head.querySelector('link[rel="olon-contract"]');
+          return manifestLink?.getAttribute('href') === manifestHref
+            && contractLink?.getAttribute('href') === contractHref;
+        },
+        { manifestHref: target.manifestHref, contractHref: target.contractHref },
+        { timeout: 10_000 }
+      );
+    } catch (error) {
+      const diagnostics = await page.evaluate(() => ({
+        head: document.head.innerHTML,
+        bodyText: document.body.innerText,
+      }));
+      throw new Error(
+        [
+          error instanceof Error ? error.message : String(error),
+          `head=${diagnostics.head}`,
+          `body=${diagnostics.bodyText}`,
+          ...consoleEvents,
+        ].join('\n')
+      );
+    }
 
-  if (hasCommentMarker) {
-    bakedHtml = bakedHtml.replace('<!--app-html-->', appHtml);
-  } else {
-    bakedHtml = bakedHtml.replace('<div id="root"></div>', `<div id="root">${appHtml}</div>`);
-  }
+    const toolNames = await page.evaluate(() => {
+      const runtime = navigator.modelContextTesting;
+      return runtime?.listTools?.().map((tool) => tool.name) ?? [];
+    });
+    if (!toolNames.includes(target.toolName)) {
+      throw new Error(`Runtime did not register ${target.toolName}. Found: ${toolNames.join(', ')}`);
+    }
+
+    const rawResult = await page.evaluate(
+      async ({ toolName, slug, sectionId, fieldKey, value }) => {
+        const runtime = navigator.modelContextTesting;
+        if (!runtime?.executeTool) {
+          throw new Error('navigator.modelContextTesting.executeTool is unavailable.');
+        }
+        return runtime.executeTool(
+          toolName,
+          JSON.stringify({
+            slug,
+            sectionId,
+            fieldKey,
+            value,
+          })
+        );
+      },
+      {
+        toolName: target.toolName,
+        slug: target.slug,
+        sectionId: target.sectionId,
+        fieldKey: target.fieldKey,
+        value: nextValue,
+      }
+    );
 
-  const outPath = path.resolve(root, out);
-  await fs.mkdir(path.dirname(outPath), { recursive: true });
-  await fs.writeFile(outPath, bakedHtml, 'utf-8');
-  console.log(`[bake] Written -> ${out} [title: "${safeTitle}"]`);
+    const parsedResult = JSON.parse(rawResult);
+    if (parsedResult?.isError) {
+      throw new Error(`WebMCP tool returned an error: ${rawResult}`);
+    }
+
+    mutationApplied = true;
+    await waitForFileFieldValue(target.slug, target.sectionId, target.fieldKey, nextValue);
+    await page.frameLocator('iframe').getByText(nextValue, { exact: true }).waitFor({ state: 'attached' });
+
+    console.log(
+      JSON.stringify({
+        ok: true,
+        slug: target.slug,
+        manifestHref: target.manifestHref,
+        contractHref: target.contractHref,
+        toolName: target.toolName,
+        sectionId: target.sectionId,
+        fieldKey: target.fieldKey,
+        toolNames,
+      })
+    );
+  } finally {
+    if (mutationApplied) {
+      await restoreOriginal();
+    }
+    await browser.close();
+  }
 }
 
-console.log('\n[bake] All pages baked. OK\n');
-
-END_OF_FILE_CONTENT
-echo "Creating scripts/sync-pages-to-public.mjs..."
-cat << 'END_OF_FILE_CONTENT' > "scripts/sync-pages-to-public.mjs"
-import fs from 'fs';
-import path from 'path';
-import { fileURLToPath } from 'url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const rootDir = path.resolve(__dirname, '..');
-const sourceDir = path.join(rootDir, 'src', 'data', 'pages');
-const targetDir = path.join(rootDir, 'public', 'pages');
-
-if (!fs.existsSync(sourceDir)) {
-  console.warn('[sync-pages-to-public] Source directory not found:', sourceDir);
-  process.exit(0);
-}
-
-fs.rmSync(targetDir, { recursive: true, force: true });
-fs.mkdirSync(targetDir, { recursive: true });
-fs.cpSync(sourceDir, targetDir, { recursive: true });
-
-console.log('[sync-pages-to-public] Synced pages to public/pages');
-
-END_OF_FILE_CONTENT
-echo "Creating scripts/webmcp-feature-check.mjs..."
-cat << 'END_OF_FILE_CONTENT' > "scripts/webmcp-feature-check.mjs"
-import fs from 'fs/promises';
-import path from 'path';
-import { fileURLToPath } from 'url';
-import { createRequire } from 'module';
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const rootDir = path.resolve(__dirname, '..');
-const baseUrl = process.env.WEBMCP_BASE_URL ?? 'http://127.0.0.1:4173';
-
-function pageFilePathFromSlug(slug) {
-  return path.resolve(rootDir, 'src', 'data', 'pages', `${slug}.json`);
-}
-
-function adminUrlFromSlug(slug) {
-  return `${baseUrl}/admin${slug === 'home' ? '' : `/${slug}`}`;
-}
-
-function isStringSchema(schema) {
-  if (!schema || typeof schema !== 'object') return false;
-  if (schema.type === 'string') return true;
-  if (Array.isArray(schema.anyOf)) {
-    return schema.anyOf.some((entry) => entry && typeof entry === 'object' && entry.type === 'string');
-  }
-  return false;
-}
-
-function findTopLevelStringField(sectionSchema) {
-  const properties = sectionSchema?.properties;
-  if (!properties || typeof properties !== 'object') return null;
-  const preferred = ['title', 'sectionTitle', 'label', 'headline', 'name'];
-  for (const key of preferred) {
-    if (isStringSchema(properties[key])) return key;
-  }
-  for (const [key, value] of Object.entries(properties)) {
-    if (isStringSchema(value)) return key;
-  }
-  return null;
-}
-
-async function loadPlaywright() {
-  const require = createRequire(import.meta.url);
-  try {
-    return require('playwright');
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    throw new Error(
-      `Playwright is required for WebMCP verification. Install it before running this script. Original error: ${message}`
-    );
-  }
-}
-
-async function readPageJson(slug) {
-  const pageFilePath = pageFilePathFromSlug(slug);
-  const raw = await fs.readFile(pageFilePath, 'utf8');
-  return { raw, json: JSON.parse(raw), pageFilePath };
-}
-
-async function waitFor(predicate, timeoutMs, label) {
-  const startedAt = Date.now();
-  for (;;) {
-    const result = await predicate();
-    if (result) return result;
-    if (Date.now() - startedAt > timeoutMs) {
-      throw new Error(`Timed out while waiting for ${label}.`);
-    }
-    await new Promise((resolve) => setTimeout(resolve, 150));
-  }
-}
-
-async function waitForFileFieldValue(slug, sectionId, fieldKey, expectedValue) {
-  await waitFor(async () => {
-    const { json } = await readPageJson(slug);
-    const section = Array.isArray(json.sections)
-      ? json.sections.find((item) => item?.id === sectionId)
-      : null;
-    return section?.data?.[fieldKey] === expectedValue;
-  }, 8_000, `file field "${fieldKey}" = "${expectedValue}"`);
-}
-
-async function ensureResponseOk(response, label) {
-  if (!response.ok) {
-    const text = await response.text();
-    throw new Error(`${label} failed with ${response.status}: ${text}`);
-  }
-  return response;
-}
-
-async function fetchJson(relativePath, label) {
-  const response = await ensureResponseOk(await fetch(`${baseUrl}${relativePath}`), label);
-  return response.json();
-}
-
-async function selectTarget() {
-  const siteIndex = await fetchJson('/mcp-manifest.json', 'Manifest index request');
-  const requestedSlug = typeof process.env.WEBMCP_TARGET_SLUG === 'string' && process.env.WEBMCP_TARGET_SLUG.trim()
-    ? process.env.WEBMCP_TARGET_SLUG.trim()
-    : null;
-
-  const candidatePages = requestedSlug
-    ? (siteIndex.pages ?? []).filter((page) => page?.slug === requestedSlug)
-    : (siteIndex.pages ?? []);
-
-  for (const pageEntry of candidatePages) {
-    if (!pageEntry?.slug || !pageEntry?.manifestHref || !pageEntry?.contractHref) continue;
-    const pageManifest = await fetchJson(pageEntry.manifestHref, `Page manifest request for ${pageEntry.slug}`);
-    const pageContract = await fetchJson(pageEntry.contractHref, `Page contract request for ${pageEntry.slug}`);
-    const localInstances = Array.isArray(pageContract.sectionInstances)
-      ? pageContract.sectionInstances.filter((section) => section?.scope === 'local')
-      : [];
-    const tools = Array.isArray(pageManifest.tools) ? pageManifest.tools : [];
-
-    for (const tool of tools) {
-      const sectionType = tool?.sectionType;
-      if (typeof tool?.name !== 'string' || typeof sectionType !== 'string') continue;
-      const targetInstance = localInstances.find((section) => section?.type === sectionType);
-      if (!targetInstance?.id) continue;
-      const targetFieldKey = findTopLevelStringField(pageContract.sectionSchemas?.[sectionType]);
-      if (!targetFieldKey) continue;
-      const pageState = await readPageJson(pageEntry.slug);
-      const section = Array.isArray(pageState.json.sections)
-        ? pageState.json.sections.find((item) => item?.id === targetInstance.id)
-        : null;
-      const originalValue = section?.data?.[targetFieldKey];
-      if (typeof originalValue !== 'string') continue;
-
-      return {
-        slug: pageEntry.slug,
-        manifestHref: pageEntry.manifestHref,
-        contractHref: pageEntry.contractHref,
-        toolName: tool.name,
-        sectionId: targetInstance.id,
-        fieldKey: targetFieldKey,
-        originalValue,
-        originalState: pageState,
-      };
-    }
-  }
-
-  throw new Error(
-    requestedSlug
-      ? `No valid WebMCP verification target found for page "${requestedSlug}".`
-      : 'No valid WebMCP verification target found in manifest index.'
-  );
-}
-
-async function main() {
-  const { chromium } = await loadPlaywright();
-  const target = await selectTarget();
-  const nextValue = `${target.originalValue} WebMCP ${Date.now()}`;
-  const browser = await chromium.launch({ headless: true });
-  const page = await browser.newPage();
-  const consoleEvents = [];
-  let mutationApplied = false;
-
-  page.on('console', (message) => {
-    if (message.type() === 'error' || message.type() === 'warning') {
-      consoleEvents.push(`[console:${message.type()}] ${message.text()}`);
-    }
-  });
-  page.on('pageerror', (error) => {
-    consoleEvents.push(`[pageerror] ${error.message}`);
-  });
-
-  const restoreOriginal = async () => {
-    try {
-      await page.evaluate(
-        async ({ toolName, slug, sectionId, fieldKey, value }) => {
-          const runtime = navigator.modelContextTesting;
-          if (!runtime?.executeTool) return;
-          await runtime.executeTool(
-            toolName,
-            JSON.stringify({
-              slug,
-              sectionId,
-              fieldKey,
-              value,
-            })
-          );
-        },
-        {
-          toolName: target.toolName,
-          slug: target.slug,
-          sectionId: target.sectionId,
-          fieldKey: target.fieldKey,
-          value: target.originalValue,
-        }
-      );
-      await waitForFileFieldValue(target.slug, target.sectionId, target.fieldKey, target.originalValue);
-    } catch {
-      await fs.writeFile(target.originalState.pageFilePath, target.originalState.raw, 'utf8');
-    }
-  };
-
-  try {
-    const pageManifest = await fetchJson(target.manifestHref, `Manifest request for ${target.slug}`);
-    if (!Array.isArray(pageManifest.tools) || !pageManifest.tools.some((tool) => tool?.name === target.toolName)) {
-      throw new Error(`Manifest does not expose ${target.toolName}.`);
-    }
-
-    const pageContract = await fetchJson(target.contractHref, `Contract request for ${target.slug}`);
-    if (!Array.isArray(pageContract.tools) || !pageContract.tools.some((tool) => tool?.name === target.toolName)) {
-      throw new Error(`Page contract does not expose ${target.toolName}.`);
-    }
-
-    await page.goto(adminUrlFromSlug(target.slug), { waitUntil: 'networkidle' });
-
-    try {
-      await page.waitForFunction(
-        ({ manifestHref, contractHref }) => {
-          const manifestLink = document.head.querySelector('link[rel="mcp-manifest"]');
-          const contractLink = document.head.querySelector('link[rel="olon-contract"]');
-          return manifestLink?.getAttribute('href') === manifestHref
-            && contractLink?.getAttribute('href') === contractHref;
-        },
-        { manifestHref: target.manifestHref, contractHref: target.contractHref },
-        { timeout: 10_000 }
-      );
-    } catch (error) {
-      const diagnostics = await page.evaluate(() => ({
-        head: document.head.innerHTML,
-        bodyText: document.body.innerText,
-      }));
-      throw new Error(
-        [
-          error instanceof Error ? error.message : String(error),
-          `head=${diagnostics.head}`,
-          `body=${diagnostics.bodyText}`,
-          ...consoleEvents,
-        ].join('\n')
-      );
-    }
-
-    const toolNames = await page.evaluate(() => {
-      const runtime = navigator.modelContextTesting;
-      return runtime?.listTools?.().map((tool) => tool.name) ?? [];
-    });
-    if (!toolNames.includes(target.toolName)) {
-      throw new Error(`Runtime did not register ${target.toolName}. Found: ${toolNames.join(', ')}`);
-    }
-
-    const rawResult = await page.evaluate(
-      async ({ toolName, slug, sectionId, fieldKey, value }) => {
-        const runtime = navigator.modelContextTesting;
-        if (!runtime?.executeTool) {
-          throw new Error('navigator.modelContextTesting.executeTool is unavailable.');
-        }
-        return runtime.executeTool(
-          toolName,
-          JSON.stringify({
-            slug,
-            sectionId,
-            fieldKey,
-            value,
-          })
-        );
-      },
-      {
-        toolName: target.toolName,
-        slug: target.slug,
-        sectionId: target.sectionId,
-        fieldKey: target.fieldKey,
-        value: nextValue,
-      }
-    );
-
-    const parsedResult = JSON.parse(rawResult);
-    if (parsedResult?.isError) {
-      throw new Error(`WebMCP tool returned an error: ${rawResult}`);
-    }
-
-    mutationApplied = true;
-    await waitForFileFieldValue(target.slug, target.sectionId, target.fieldKey, nextValue);
-    await page.frameLocator('iframe').getByText(nextValue, { exact: true }).waitFor({ state: 'attached' });
-
-    console.log(
-      JSON.stringify({
-        ok: true,
-        slug: target.slug,
-        manifestHref: target.manifestHref,
-        contractHref: target.contractHref,
-        toolName: target.toolName,
-        sectionId: target.sectionId,
-        fieldKey: target.fieldKey,
-        toolNames,
-      })
-    );
-  } finally {
-    if (mutationApplied) {
-      await restoreOriginal();
-    }
-    await browser.close();
-  }
-}
-
-main().catch((error) => {
-  console.error(error instanceof Error ? error.stack ?? error.message : String(error));
-  process.exit(1);
-});
+main().catch((error) => {
+  console.error(error instanceof Error ? error.stack ?? error.message : String(error));
+  process.exit(1);
+});
 
 END_OF_FILE_CONTENT
 mkdir -p "specs"
@@ -10340,24 +10340,24 @@ END_OF_FILE_CONTENT
 # SKIP: src/data/pages/design-system.json:Zone.Identifier is binary and cannot be embedded as text.
 echo "Creating src/data/pages/docs.json..."
 cat << 'END_OF_FILE_CONTENT' > "src/data/pages/docs.json"
-{
-  "id": "docs-page",
-  "slug": "docs",
-  "meta": {
-    "title": "OlonJS Architecture Specifications v1.5",
-    "description": "Mandatory Standard — Sovereign Core Edition. Canonical Studio actions, SSG, Save to file, and Hot Save."
-  },
-  "sections": [
-    {
-      "id": "docs-main",
-      "type": "tiptap",
-      "data": {
-        "content": "# 📐 OlonJS Architecture Specifications v1.5\n\n**Status:** Mandatory Standard\\\n**Version:** 1.5.0 (Sovereign Core Edition — Architecture + Studio/ICE UX, Path-Deterministic Nested Editing, Deterministic Local Design Tokens, Three-Layer CSS Bridge Contract)\\\n**Target:** Senior Architects / AI Agents / Enterprise Governance\n\nThis tenant follows the current OlonJS source-of-truth model: the tenant app owns content, schemas, theme, and persistence wiring; `@olonjs/core` owns the Studio shell, routing, preview, and editing engine.\n\n---\n\n## Canonical Editorial Flows\n\nThe supported Studio flows are now:\n\n- `SSG` for static HTML and route output.\n- `Save to file` for local JSON persistence back into tenant source files.\n- `Hot Save` for cloud/editorial persistence when the tenant config provides it.\n- `Add Section` for deterministic section lifecycle management inside Studio.\n\nPrevious one-off bake and JSON export paths are no longer part of Studio.\n\n---\n\n## Persistence Model\n\n`@olonjs/core` no longer performs HTML bake or ZIP export. Studio now invokes tenant-provided persistence callbacks:\n\n- `saveToFile(state, slug)`\n- `hotSave(state, slug)`\n\nThis keeps persistence explicit, tenant-owned, and aligned with the current `JsonPagesConfig` contract.\n\n---\n\n## Tenant Source Of Truth\n\n`apps/tenant-alpha` is the DNA source of truth for this tenant. Generated CLI templates are downstream artifacts and should be regenerated from source apps instead of being edited manually.\n\nThe canonical content and design files remain:\n\n- `src/data/config/site.json`\n- `src/data/config/menu.json`\n- `src/data/config/theme.json`\n- `src/data/pages/<slug>.json`\n\n---\n\n## Reference Specs\n\nUse these monorepo sources for the full protocol and architecture details:\n\n- `specs/olonjsSpecs_V_1_5.md`\n- `apps/tenant-alpha/specs/olonjsSpecs_V.1.3.md`\n\nThese source specs are the maintained references for architecture, Studio behavior, and tenant compliance."
-      },
-      "settings": {}
-    }
-  ]
-}
+{
+  "id": "docs-page",
+  "slug": "docs",
+  "meta": {
+    "title": "OlonJS Architecture Specifications v1.5",
+    "description": "Mandatory Standard — Sovereign Core Edition. Canonical Studio actions, SSG, Save to file, and Hot Save."
+  },
+  "sections": [
+    {
+      "id": "docs-main",
+      "type": "tiptap",
+      "data": {
+        "content": "# 📐 OlonJS Architecture Specifications v1.5\n\n**Status:** Mandatory Standard\\\n**Version:** 1.5.0 (Sovereign Core Edition — Architecture + Studio/ICE UX, Path-Deterministic Nested Editing, Deterministic Local Design Tokens, Three-Layer CSS Bridge Contract)\\\n**Target:** Senior Architects / AI Agents / Enterprise Governance\n\nThis tenant follows the current OlonJS source-of-truth model: the tenant app owns content, schemas, theme, and persistence wiring; `@olonjs/core` owns the Studio shell, routing, preview, and editing engine.\n\n---\n\n## Canonical Editorial Flows\n\nThe supported Studio flows are now:\n\n- `SSG` for static HTML and route output.\n- `Save to file` for local JSON persistence back into tenant source files.\n- `Hot Save` for cloud/editorial persistence when the tenant config provides it.\n- `Add Section` for deterministic section lifecycle management inside Studio.\n\nPrevious one-off bake and JSON export paths are no longer part of Studio.\n\n---\n\n## Persistence Model\n\n`@olonjs/core` no longer performs HTML bake or ZIP export. Studio now invokes tenant-provided persistence callbacks:\n\n- `saveToFile(state, slug)`\n- `hotSave(state, slug)`\n\nThis keeps persistence explicit, tenant-owned, and aligned with the current `JsonPagesConfig` contract.\n\n---\n\n## Tenant Source Of Truth\n\n`apps/tenant-alpha` is the DNA source of truth for this tenant. Generated CLI templates are downstream artifacts and should be regenerated from source apps instead of being edited manually.\n\nThe canonical content and design files remain:\n\n- `src/data/config/site.json`\n- `src/data/config/menu.json`\n- `src/data/config/theme.json`\n- `src/data/pages/<slug>.json`\n\n---\n\n## Reference Specs\n\nUse these monorepo sources for the full protocol and architecture details:\n\n- `specs/olonjsSpecs_V_1_5.md`\n- `apps/tenant-alpha/specs/olonjsSpecs_V.1.3.md`\n\nThese source specs are the maintained references for architecture, Studio behavior, and tenant compliance."
+      },
+      "settings": {}
+    }
+  ]
+}
 
 END_OF_FILE_CONTENT
 echo "Creating src/data/pages/home.json..."
@@ -12686,9 +12686,9 @@ echo "Creating tsconfig.json..."
 cat << 'END_OF_FILE_CONTENT' > "tsconfig.json"
 {
   "compilerOptions": {
-    "target": "ES2020",
+    "target": "ES2022",
     "useDefineForClassFields": true,
-    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
     "module": "ESNext",
     "skipLibCheck": true,
     "moduleResolution": "bundler",
@@ -12698,13 +12698,14 @@ cat << 'END_OF_FILE_CONTENT' > "tsconfig.json"
     "noEmit": true,
     "jsx": "react-jsx",
     "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "esModuleInterop": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true,
     "baseUrl": ".",
     "paths": {
-      "@/*": ["./src/*"],
-      "@olonjs/core": ["../../packages/core/src/index.ts"]
+      "@/*": ["./src/*"]
     }
   },
   "include": ["src"],
@@ -12825,9 +12826,8 @@ function normalizeManifestSlug(raw) {
 }
 
 async function loadWebMcpBuilders() {
-  const moduleUrl = pathToFileURL(
-    path.resolve(__dirname, '..', '..', 'packages', 'core', 'src', 'lib', 'webmcp-contracts.mjs')
-  ).href;
+  const corePkgPath = path.dirname(fileURLToPath(import.meta.resolve('@olonjs/core/package.json')));
+  const moduleUrl = pathToFileURL(path.resolve(corePkgPath, 'src', 'lib', 'webmcp-contracts.mjs')).href;
   return import(moduleUrl);
 }
 export default defineConfig({
@@ -12975,7 +12975,6 @@ export default defineConfig({
   resolve: {
     alias: {
       '@': path.resolve(__dirname, './src'),
-      '@olonjs/core': path.resolve(__dirname, '..', '..', 'packages', 'core', 'src', 'index.ts'),
       'next/link': path.resolve(__dirname, './src/shims/next-link.tsx'),
     },
   },