@olonjs/cli 3.0.157 → 3.0.158

package/assets/src_tenant_alpha.sh

@@ -1817,9 +1817,9 @@ 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.25",
-    "@olonjs/react": "^0.1.8",
-    "@olonjs/studio": "^0.1.8",
+    "@olonjs/core": "^1.1.26",
+    "@olonjs/react": "^0.1.9",
+    "@olonjs/studio": "^0.1.9",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",

package/assets/templates/alpha/src_tenant.sh

@@ -1817,9 +1817,9 @@ 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.25",
-    "@olonjs/react": "^0.1.8",
-    "@olonjs/studio": "^0.1.8",
+    "@olonjs/core": "^1.1.26",
+    "@olonjs/react": "^0.1.9",
+    "@olonjs/studio": "^0.1.9",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",

package/assets/templates/next/src_tenant.sh

@@ -491,10 +491,10 @@ cat << 'END_OF_FILE_CONTENT' > "package.json"
     "dist:dna": "npm run dist"
   },
   "dependencies": {
-    "@olonjs/core": "^1.1.25",
-    "@olonjs/next": "^0.0.5",
-    "@olonjs/react": "^0.1.8",
-    "@olonjs/studio": "^0.1.8",
+    "@olonjs/core": "^1.1.26",
+    "@olonjs/next": "^0.0.6",
+    "@olonjs/react": "^0.1.9",
+    "@olonjs/studio": "^0.1.9",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",
     "next": "^15.5.0",
@@ -529,6 +529,151 @@ export default config;
 
 END_OF_FILE_CONTENT
 mkdir -p "scripts"
+echo "Creating scripts/generate-SystemsArchitect-next.test.mjs..."
+cat << 'END_OF_FILE_CONTENT' > "scripts/generate-SystemsArchitect-next.test.mjs"
+/**
+ * Static gates for generate_SystemsArchitect_next.sh (TDD for the Next SystemsArchitect generator).
+ * Run: node --test scripts/generate-SystemsArchitect-next.test.mjs
+ */
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import path from 'node:path';
+import { describe, it } from 'node:test';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const SCRIPT = path.resolve(__dirname, '../templates/generate_SystemsArchitect_next.sh');
+
+function readScript() {
+  assert.ok(fs.existsSync(SCRIPT), `missing ${SCRIPT}`);
+  return fs.readFileSync(SCRIPT, 'utf8');
+}
+
+describe('generate_SystemsArchitect_next.sh harness gates', () => {
+  it('exists and is a bash script', () => {
+    const src = readScript();
+    assert.match(src, /^#!\/usr\/bin\/env bash|^#!\/bin\/bash/m);
+  });
+
+  it('must not target Vite-only surfaces', () => {
+    const src = readScript();
+    assert.doesNotMatch(src, /cat > index\.html/);
+    assert.doesNotMatch(src, /cat > src\/index\.css/);
+    assert.doesNotMatch(src, /cat > src\/App\.tsx/);
+    assert.doesNotMatch(src, /from ['"]@\/components\/ThemeProvider['"]/);
+    assert.doesNotMatch(src, /useTheme\s*\(/);
+  });
+
+  it('must write Next theme bridge to app/globals.css', () => {
+    const src = readScript();
+    assert.match(src, /cat > app\/globals\.css/);
+    assert.match(src, /\[data-theme=["']light["']\]/);
+  });
+
+  it('must verify Next admin wiring instead of App.tsx', () => {
+    const src = readScript();
+    assert.match(src, /AdminStudioClient/);
+    assert.doesNotMatch(src, /verifying App\.tsx/);
+  });
+
+  it('must cd to tenant root (parent of templates/) before writing files', () => {
+    const src = readScript();
+    assert.match(src, /cd "\$\(cd "\$\(dirname "\$\{BASH_SOURCE\[0\]\}"\)\/\.\." && pwd\)"/);
+  });
+
+  it('must clean DNA demo capsules before writing SystemsArchitect', () => {
+    const src = readScript();
+    assert.match(src, /Cleaning demo capsules/);
+    assert.match(src, /rm -rf \\\s*\n\s*src\/components\/books-list/m);
+    assert.match(src, /cat > src\/lib\/VisitorSection\.tsx/);
+    assert.doesNotMatch(src, /from '@\/components\/books-list'/);
+  });
+
+  it('must install react-markdown deps used by post-detail', () => {
+    const src = readScript();
+    assert.match(src, /npm install[^\n]*react-markdown/);
+    assert.match(src, /from 'react-markdown'/);
+    assert.match(src, /from 'remark-gfm'/);
+    assert.match(src, /from 'rehype-sanitize'/);
+  });
+
+  it('must not generate empty-tenant registry wiring (cleanup rm path ok)', () => {
+    const src = readScript();
+    assert.doesNotMatch(src, /@\/components\/empty-tenant/);
+    assert.doesNotMatch(src, /['"]empty-tenant['"]/);
+    assert.match(src, /src\/components\/empty-tenant/);
+  });
+
+  it('must force shadcn radix base non-interactively', () => {
+    const src = readScript();
+    assert.match(src, /shadcn@latest init[^\n]*--base radix/);
+    assert.match(src, /shadcn@latest init[^\n]*--defaults/);
+  });
+});
+
+END_OF_FILE_CONTENT
+echo "Creating scripts/generate-inkwell-next.test.mjs..."
+cat << 'END_OF_FILE_CONTENT' > "scripts/generate-inkwell-next.test.mjs"
+/**
+ * Static gates for generate_inkwell_next.sh (TDD for the Next Inkwell generator).
+ * Run: node --test scripts/generate-inkwell-next.test.mjs
+ */
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import path from 'node:path';
+import { describe, it } from 'node:test';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const SCRIPT = path.resolve(__dirname, '../templates/generate_inkwell_next.sh');
+
+function readScript() {
+  assert.ok(fs.existsSync(SCRIPT), `missing ${SCRIPT}`);
+  return fs.readFileSync(SCRIPT, 'utf8');
+}
+
+describe('generate_inkwell_next.sh harness gates', () => {
+  it('exists and is a bash script', () => {
+    const src = readScript();
+    assert.match(src, /^#!\/usr\/bin\/env bash|^#!\/bin\/bash/m);
+  });
+
+  it('must not target Vite-only surfaces', () => {
+    const src = readScript();
+    assert.doesNotMatch(src, /cat > index\.html/);
+    assert.doesNotMatch(src, /cat > src\/index\.css/);
+    assert.doesNotMatch(src, /cat > src\/App\.tsx/);
+    assert.doesNotMatch(src, /from ['"]@\/components\/ThemeProvider['"]/);
+    assert.doesNotMatch(src, /useTheme\s*\(/);
+  });
+
+  it('must write Next theme bridge to app/globals.css', () => {
+    const src = readScript();
+    assert.match(src, /cat > app\/globals\.css/);
+    assert.match(src, /\[data-theme=["']light["']\]/);
+  });
+
+  it('must verify Next admin wiring instead of App.tsx', () => {
+    const src = readScript();
+    assert.match(src, /AdminStudioClient/);
+    assert.doesNotMatch(src, /verifying App\.tsx/);
+  });
+
+  it('must cd to tenant root (parent of templates/) before writing files', () => {
+    const src = readScript();
+    assert.match(src, /cd "\$\(cd "\$\(dirname "\$\{BASH_SOURCE\[0\]\}"\)\/\.\." && pwd\)"/);
+  });
+
+  it('must clean DNA demo capsules before writing Inkwell', () => {
+    const src = readScript();
+    assert.match(src, /Cleaning demo capsules/);
+    assert.match(src, /rm -rf \\\s*\n[\s\S]*?src\/components\/books-list/m);
+    assert.match(src, /cat > src\/lib\/VisitorSection\.tsx/);
+    assert.doesNotMatch(src, /from '@\/components\/books-list'/);
+  });
+});
+
+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';
@@ -580,6 +725,7 @@ console.log('[sync-pages-to-public] Synced pages, collections, and site config t
 
 END_OF_FILE_CONTENT
 mkdir -p "src"
+# SKIP: src/App.tsx is binary and cannot be embedded as text.
 mkdir -p "src/collections"
 mkdir -p "src/collections/autori"
 echo "Creating src/collections/autori/index.ts..."
@@ -827,7 +973,7 @@ import type {
 } from '@olonjs/core';
 import { AdminStudioClient } from '@/components/admin/AdminStudioClient';
 import { useCloudSave } from '@/lib/admin/useCloudSave';
-import { cloudPolicy, TENANT_ID } from '@/lib/env/tenantEnv';
+import { getCloudPolicy, TENANT_ID } from '@/lib/env/tenantEnv';
 
 const ColdSaveDrawer = lazy(() =>
   import('@/components/admin/ColdSaveDrawer').then((m) => ({ default: m.ColdSaveDrawer })),
@@ -846,6 +992,7 @@ export type AdminStudioWithCloudProps = {
  * Local save when cloud credentials are absent; cold save when Save2Repo is enabled.
  */
 export function AdminStudioWithCloud(props: AdminStudioWithCloudProps) {
+  const cloudPolicy = getCloudPolicy();
   const { cloudSaveUi, runCloudSave, closeCloudDrawer, retryCloudSave } = useCloudSave({
     apiUrl: cloudPolicy.apiUrl,
     apiKey: cloudPolicy.apiKey,
@@ -2766,6 +2913,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/data/pages/libri/[slug].json"
 }
 
 END_OF_FILE_CONTENT
+# SKIP: src/index.css is binary and cannot be embedded as text.
 mkdir -p "src/lib"
 echo "Creating src/lib/CollectionRegistry.ts..."
 cat << 'END_OF_FILE_CONTENT' > "src/lib/CollectionRegistry.ts"
@@ -3458,6 +3606,58 @@ export function buildServerApiCandidates(raw: string): string[] {
   return Array.from(new Set([withApi, base]));
 }
 
+END_OF_FILE_CONTENT
+echo "Creating src/lib/env/tenantEnv.test.ts..."
+cat << 'END_OF_FILE_CONTENT' > "src/lib/env/tenantEnv.test.ts"
+import assert from 'node:assert/strict';
+import { describe, it } from 'vitest';
+import { getCloudPolicy, readCloudEnvFromNext } from './tenantEnv';
+
+describe('readCloudEnvFromNext', () => {
+  it('maps OLONJS public env to cloud + Save2Repo policy inputs', () => {
+    const input = readCloudEnvFromNext({
+      NEXT_PUBLIC_OLONJS_CLOUD_URL: ' https://api.example.com ',
+      NEXT_PUBLIC_OLONJS_API_KEY: ' key ',
+      NEXT_PUBLIC_OLONJS_SAVE2REPO: 'true',
+    });
+    assert.equal(input.apiUrl, 'https://api.example.com');
+    assert.equal(input.apiKey, 'key');
+    assert.equal(input.save2RepoFlag, true);
+  });
+
+  it('treats SAVE2REPO other than exact "true" as off', () => {
+    const input = readCloudEnvFromNext({
+      NEXT_PUBLIC_OLONJS_CLOUD_URL: 'https://api.example.com',
+      NEXT_PUBLIC_OLONJS_API_KEY: 'key',
+      NEXT_PUBLIC_OLONJS_SAVE2REPO: '1',
+    });
+    assert.equal(input.save2RepoFlag, false);
+  });
+});
+
+describe('getCloudPolicy', () => {
+  it('enables cold save and disables local save when credentials + Save2Repo', () => {
+    const policy = getCloudPolicy({
+      NEXT_PUBLIC_OLONJS_CLOUD_URL: 'https://api.example.com',
+      NEXT_PUBLIC_OLONJS_API_KEY: 'key',
+      NEXT_PUBLIC_OLONJS_SAVE2REPO: 'true',
+    });
+    assert.equal(policy.isCloudMode, true);
+    assert.equal(policy.bootSource, 'static');
+    assert.equal(policy.showLocalSave, false);
+    assert.equal(policy.showColdSave, true);
+  });
+
+  it('stays local when credentials are missing', () => {
+    const policy = getCloudPolicy({
+      NEXT_PUBLIC_OLONJS_SAVE2REPO: 'true',
+    });
+    assert.equal(policy.isCloudMode, false);
+    assert.equal(policy.showLocalSave, true);
+    assert.equal(policy.showColdSave, false);
+  });
+});
+
 END_OF_FILE_CONTENT
 echo "Creating src/lib/env/tenantEnv.ts..."
 cat << 'END_OF_FILE_CONTENT' > "src/lib/env/tenantEnv.ts"
@@ -3468,18 +3668,43 @@ import { resolveCloudPolicy, type CloudEnvInput, type CloudPolicy } from '@olonj
  * Prefer NEXT_PUBLIC_OLONJS_* ; also accept NEXT_PUBLIC_JSONPAGES_* and
  * NEXT_PUBLIC_SAVE2REPO (alpha-style flag name under the Next public prefix).
  *
- * Note: `import.meta.env` / VITE_* are not available in the Next client bundle
- * unless mirrored via next.config — do not call readCloudEnvFromVite here.
+ * CRITICAL: default path MUST use direct `process.env.NEXT_PUBLIC_*` property
+ * access so the Next client bundler can inline values at build time.
+ * Indexing via `const env = process.env; env.NEXT_PUBLIC_…` stays empty in the
+ * browser → Studio always thinks it is Local → save-to-file → EROFS on Vercel.
+ *
+ * Pass `env` only in unit tests.
  */
 export function readCloudEnvFromNext(
-  env: Record<string, string | undefined> = typeof process !== 'undefined' ? process.env : {},
+  env?: Record<string, string | undefined>,
 ): CloudEnvInput {
-  const apiUrl =
-    (env.NEXT_PUBLIC_OLONJS_CLOUD_URL ?? env.NEXT_PUBLIC_JSONPAGES_CLOUD_URL ?? '').trim();
-  const apiKey =
-    (env.NEXT_PUBLIC_OLONJS_API_KEY ?? env.NEXT_PUBLIC_JSONPAGES_API_KEY ?? '').trim();
+  if (env) {
+    const apiUrl =
+      (env.NEXT_PUBLIC_OLONJS_CLOUD_URL ?? env.NEXT_PUBLIC_JSONPAGES_CLOUD_URL ?? '').trim();
+    const apiKey =
+      (env.NEXT_PUBLIC_OLONJS_API_KEY ?? env.NEXT_PUBLIC_JSONPAGES_API_KEY ?? '').trim();
+    const save2RepoRaw =
+      env.NEXT_PUBLIC_OLONJS_SAVE2REPO ?? env.NEXT_PUBLIC_SAVE2REPO ?? '';
+    return {
+      apiUrl,
+      apiKey,
+      save2RepoFlag: save2RepoRaw === 'true',
+    };
+  }
+
+  const apiUrl = (
+    process.env.NEXT_PUBLIC_OLONJS_CLOUD_URL ??
+    process.env.NEXT_PUBLIC_JSONPAGES_CLOUD_URL ??
+    ''
+  ).trim();
+  const apiKey = (
+    process.env.NEXT_PUBLIC_OLONJS_API_KEY ??
+    process.env.NEXT_PUBLIC_JSONPAGES_API_KEY ??
+    ''
+  ).trim();
   const save2RepoRaw =
-    env.NEXT_PUBLIC_OLONJS_SAVE2REPO ?? env.NEXT_PUBLIC_SAVE2REPO ?? '';
+    process.env.NEXT_PUBLIC_OLONJS_SAVE2REPO ?? process.env.NEXT_PUBLIC_SAVE2REPO ?? '';
+
   return {
     apiUrl,
     apiKey,
@@ -3487,8 +3712,13 @@ export function readCloudEnvFromNext(
   };
 }
 
-/** Single policy path for the Next admin island. */
-export const cloudPolicy: CloudPolicy = resolveCloudPolicy(readCloudEnvFromNext());
+/** Resolve policy (call from client components; do not cache across env shapes in tests). */
+export function getCloudPolicy(env?: Record<string, string | undefined>): CloudPolicy {
+  return resolveCloudPolicy(readCloudEnvFromNext(env));
+}
+
+/** Module policy for the Next admin island (build-time inlined NEXT_PUBLIC_*). */
+export const cloudPolicy: CloudPolicy = getCloudPolicy();
 
 export const CLOUD_API_URL = cloudPolicy.apiUrl;
 export const CLOUD_API_KEY = cloudPolicy.apiKey;

package/package.json

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