@olonjs/cli 3.0.107 → 3.0.109

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.94",
+    "@olonjs/core": "^1.0.96",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",
@@ -1960,12 +1960,18 @@ import { build } from 'vite';
 import path from 'path';
 import { fileURLToPath, pathToFileURL } from 'url';
 import fs from 'fs/promises';
-import {
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+const corePkgPath = require.resolve('@olonjs/core/package.json');
+const contractsUrl = pathToFileURL(corePkgPath.replace('package.json', 'src/lib/webmcp-contracts.mjs')).href;
+
+const {
   buildPageContract,
   buildPageManifest,
   buildPageManifestHref,
   buildSiteManifest,
-} from '../../../packages/core/src/lib/webmcp-contracts.mjs';
+} = await import(contractsUrl);
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const root = path.resolve(__dirname, '..');
@@ -2073,6 +2079,10 @@ const webMcpBuildState = getWebMcpBuildState();
 for (const { slug } of targets) {
   const pageConfig = webMcpBuildState.pages[slug];
   if (!pageConfig) continue;
+  
+  // Export the raw JSON data for the agentic web (so readResource works on SSG)
+  await writeJsonTargets(`pages/${slug}.json`, pageConfig);
+
   const contract = buildPageContract({
     slug,
     pageConfig,
@@ -2089,6 +2099,9 @@ for (const { slug } of targets) {
   await writeJsonTargets(buildPageManifestHref(slug).replace(/^\//, ''), pageManifest);
 }
 
+// Export the site config for the agentic web
+await writeJsonTargets('config/site.json', webMcpBuildState.siteConfig);
+
 const mcpManifest = buildSiteManifest({
   pages: webMcpBuildState.pages,
   schemas: webMcpBuildState.schemas,
@@ -12912,7 +12925,12 @@ export default defineConfig({
 
           if (isPageJsonRequest) {
             const normalizedPath = decodeURIComponent(pathname).replace(/\\/g, '/');
-            const slug = normalizedPath.replace(/^\/+/, '').replace(/\.json$/i, '').replace(/^\/+|\/+$/g, '');
+            // Rimuoviamo la root folder opzionale "/pages/" introdotta per matchare la prod e il file extension
+            const slug = normalizedPath
+              .replace(/^\/+/, '')
+              .replace(/^pages\//i, '')
+              .replace(/\.json$/i, '')
+              .replace(/^\/+|\/+$/g, '');
             const candidate = path.resolve(DATA_PAGES_DIR, `${slug}.json`);
             const isInsidePagesDir = candidate.startsWith(`${DATA_PAGES_DIR}${path.sep}`) || candidate === DATA_PAGES_DIR;
             if (!slug || !isInsidePagesDir || !fs.existsSync(candidate) || !fs.statSync(candidate).isFile()) {

package/assets/templates/agritourism/src_tenant.sh

@@ -596,7 +596,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.94",
+    "@olonjs/core": "^1.0.96",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",
     "react": "^19.0.0",

package/assets/templates/alpha/src_tenant.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.94",
+    "@olonjs/core": "^1.0.96",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",
@@ -1960,12 +1960,18 @@ import { build } from 'vite';
 import path from 'path';
 import { fileURLToPath, pathToFileURL } from 'url';
 import fs from 'fs/promises';
-import {
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+const corePkgPath = require.resolve('@olonjs/core/package.json');
+const contractsUrl = pathToFileURL(corePkgPath.replace('package.json', 'src/lib/webmcp-contracts.mjs')).href;
+
+const {
   buildPageContract,
   buildPageManifest,
   buildPageManifestHref,
   buildSiteManifest,
-} from '../../../packages/core/src/lib/webmcp-contracts.mjs';
+} = await import(contractsUrl);
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const root = path.resolve(__dirname, '..');
@@ -2073,6 +2079,10 @@ const webMcpBuildState = getWebMcpBuildState();
 for (const { slug } of targets) {
   const pageConfig = webMcpBuildState.pages[slug];
   if (!pageConfig) continue;
+  
+  // Export the raw JSON data for the agentic web (so readResource works on SSG)
+  await writeJsonTargets(`pages/${slug}.json`, pageConfig);
+
   const contract = buildPageContract({
     slug,
     pageConfig,
@@ -2089,6 +2099,9 @@ for (const { slug } of targets) {
   await writeJsonTargets(buildPageManifestHref(slug).replace(/^\//, ''), pageManifest);
 }
 
+// Export the site config for the agentic web
+await writeJsonTargets('config/site.json', webMcpBuildState.siteConfig);
+
 const mcpManifest = buildSiteManifest({
   pages: webMcpBuildState.pages,
   schemas: webMcpBuildState.schemas,
@@ -12912,7 +12925,12 @@ export default defineConfig({
 
           if (isPageJsonRequest) {
             const normalizedPath = decodeURIComponent(pathname).replace(/\\/g, '/');
-            const slug = normalizedPath.replace(/^\/+/, '').replace(/\.json$/i, '').replace(/^\/+|\/+$/g, '');
+            // Rimuoviamo la root folder opzionale "/pages/" introdotta per matchare la prod e il file extension
+            const slug = normalizedPath
+              .replace(/^\/+/, '')
+              .replace(/^pages\//i, '')
+              .replace(/\.json$/i, '')
+              .replace(/^\/+|\/+$/g, '');
             const candidate = path.resolve(DATA_PAGES_DIR, `${slug}.json`);
             const isInsidePagesDir = candidate.startsWith(`${DATA_PAGES_DIR}${path.sep}`) || candidate === DATA_PAGES_DIR;
             if (!slug || !isInsidePagesDir || !fs.existsSync(candidate) || !fs.statSync(candidate).isFile()) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@olonjs/cli",
-    "version": "3.0.107",
+    "version": "3.0.109",
     "description": "The Sovereign CLI Engine for OlonJS.",
     "type": "module",
     "bin": {