@bleedingdev/modern-js-create 3.2.0-ultramodern.62 → 3.2.0-ultramodern.64

package/README.md

@@ -156,6 +156,10 @@ CSS federation is explicit:
 - Tailwind CSS v4 is configured per app through `@tailwindcss/postcss`.
 - Duplicate base styles are forbidden; SSR first paint depends on shared token
   CSS plus Modern/Rspack-emitted app CSS.
+- Apps should not inject remote `async-index.css` paths, hardcode remote
+  stylesheet links, or disable filename hashing to make CSS URLs predictable.
+  UltraModern SSR resolves federated CSS from build output and MF manifests so
+  generated shells and demos can keep normal hashed assets.
 
 Version switching evidence must keep UI, Effect API, CSS, i18n JSON, and MF
 manifest markers in lockstep for the same vertical version.

package/dist/index.js

@@ -610,6 +610,14 @@ const modernPackageNames = [
     '@modern-js/plugin-tanstack',
     '@modern-js/runtime'
 ];
+function sortJsonValue(value) {
+    if (Array.isArray(value)) return value.map(sortJsonValue);
+    if (null !== value && 'object' == typeof value) return Object.fromEntries(Object.entries(value).sort(([left], [right])=>left.localeCompare(right)).map(([key, entry])=>[
+            key,
+            sortJsonValue(entry)
+        ]));
+    return value;
+}
 const ULTRAMODERN_WORKSPACE_FLAG = '--ultramodern-workspace';
 function isRecord(value) {
     return null !== value && 'object' == typeof value && !Array.isArray(value);
@@ -973,10 +981,10 @@ function createRootPackageJson(scope, packageSource, remotes = []) {
                     `pnpm --filter ${ultramodern_workspace_packageName(scope, remote.packageSuffix)} dev`
                 ])),
             build: `${remoteBuildPrefix}pnpm --filter "./apps/shell-super-app" run build && pnpm ultramodern:assert-mf-types`,
-            format: 'oxfmt .',
-            'format:check': 'oxfmt --check .',
-            lint: 'oxlint .',
-            'lint:fix': 'oxlint . --fix',
+            format: "oxfmt . '!repos/**'",
+            'format:check': "oxfmt --check . '!repos/**'",
+            lint: 'oxlint apps/*/src verticals/*/src packages/*/src --ignore-pattern "**/modern-tanstack/**"',
+            'lint:fix': 'oxlint apps/*/src verticals/*/src packages/*/src --ignore-pattern "**/modern-tanstack/**" --fix',
             typecheck: `pnpm -r --filter "@${scope}/*" typecheck`,
             'cloudflare:build': `${remoteCloudflareBuildPrefix}pnpm --filter "./apps/shell-super-app" run cloudflare:build && pnpm ultramodern:assert-mf-types`,
             'cloudflare:deploy': `${remoteCloudflareDeployPrefix}pnpm --filter "./apps/shell-super-app" run cloudflare:deploy`,
@@ -987,8 +995,9 @@ function createRootPackageJson(scope, packageSource, remotes = []) {
             'agents:refs:check': "node ./scripts/setup-agent-reference-repos.mjs --check",
             'ultramodern:assert-mf-types': "node ./scripts/assert-mf-types.mjs",
             'ultramodern:check': "node ./scripts/validate-ultramodern-workspace.mjs",
-            postinstall: "node ./scripts/bootstrap-agent-skills.mjs && (git rev-parse --is-inside-work-tree >/dev/null 2>&1 && lefthook install || true) && node ./scripts/setup-agent-reference-repos.mjs",
-            check: 'pnpm format:check && pnpm lint && pnpm typecheck && pnpm skills:check && pnpm ultramodern:check'
+            'ultramodern:i18n-boundaries': "node ./scripts/check-ultramodern-i18n-boundaries.mjs",
+            postinstall: "oxfmt . '!repos/**' && node ./scripts/bootstrap-agent-skills.mjs && node ./scripts/setup-agent-reference-repos.mjs && (git rev-parse --is-inside-work-tree >/dev/null 2>&1 && lefthook install || true)",
+            check: 'pnpm format:check && pnpm lint && pnpm typecheck && pnpm skills:check && pnpm ultramodern:i18n-boundaries && pnpm ultramodern:check'
         },
         engines: {
             node: '>=20',
@@ -1160,7 +1169,7 @@ function createAppPackage(scope, app, packageSource, enableTailwind, remotes = [
             dev: 'modern dev',
             build: app.exposes ? `modern build && node ${relativeRootFor(app.directory)}/scripts/assert-mf-types.mjs` : 'modern build',
             'cloudflare:build': 'ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern build && ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern deploy',
-            'cloudflare:deploy': 'ULTRAMODERN_CLOUDFLARE_REQUIRE_PUBLIC_URLS=true ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern deploy',
+            'cloudflare:deploy': 'ULTRAMODERN_CLOUDFLARE_REQUIRE_PUBLIC_URLS=true pnpm run cloudflare:build && wrangler deploy --config .output/wrangler.json',
             'cloudflare:preview': 'pnpm run cloudflare:build && wrangler dev --config .output/wrangler.json',
             'cloudflare:proof': `node ${relativeRootFor(app.directory)}/scripts/proof-cloudflare-version.mjs --app ${app.id}`,
             serve: 'modern serve',
@@ -1325,6 +1334,7 @@ ${bffConfig}      output: {
         i18nPlugin({
           backend: {
             enabled: true,
+            loadPath: '/locales/{{lng}}/{{ns}}.json',
           },
           reactI18next: false,
           localeDetection: {
@@ -1365,9 +1375,7 @@ ${bffPluginEntry}        moduleFederationPlugin(),
       ...(cloudflareDeployEnabled
         ? {
             deploy: {
-              target: 'cloudflare',
               worker: {
-                name: cloudflareWorkerName,
                 ssr: true,
               },
             },
@@ -1377,7 +1385,7 @@ ${bffPluginEntry}        moduleFederationPlugin(),
         port,
         publicDir: ['./locales', './assets'],
         ssr: {
-          mode: 'stream',
+          mode: 'string',
           moduleFederationAppSSR: true,
         },
       },
@@ -1547,10 +1555,10 @@ function createBuildMarker(scope, app) {
 function createUltramodernBuildModule(scope, app) {
     return `export const ultramodernVerticalIdentity = {
   appId: '${app.id}',
-  packageName: '${ultramodern_workspace_packageName(scope, app.packageSuffix)}',
-  version: '0.1.0',
   build: '${createBuildMarker(scope, app)}',
   deployProfile: 'cloudflare-ssr-mf-effect-v1',
+  packageName: '${ultramodern_workspace_packageName(scope, app.packageSuffix)}',
+  version: '0.1.0',
 } as const;
 
 export const ultramodernUiMarker = {
@@ -1791,8 +1799,8 @@ function createLocalisedUrlsMap(app) {
     }));
 }
 function createRouteMetadataModule(app) {
-    const routes = createRouteOwnedI18nPaths(app);
-    const localisedUrls = createLocalisedUrlsMap(app);
+    const routes = sortJsonValue(createRouteOwnedI18nPaths(app));
+    const localisedUrls = sortJsonValue(createLocalisedUrlsMap(app));
     const namespace = appI18nNamespace(app);
     return `export const ultramodernRouteNamespace = '${namespace}' as const;
 
@@ -1801,10 +1809,10 @@ export const ultramodernRouteMetadata = ${JSON.stringify(routes, null, 2)} as co
 export const ultramodernLocalisedUrls = ${JSON.stringify(localisedUrls, null, 2)} as const;
 
 export const ultramodernRouteConfig = {
-  source: 'route-owned',
-  namespace: ultramodernRouteNamespace,
   localisedUrls: ultramodernLocalisedUrls,
+  namespace: ultramodernRouteNamespace,
   routes: ultramodernRouteMetadata,
+  source: 'route-owned',
 } as const;
 `;
 }
@@ -1830,37 +1838,40 @@ function createRouteAliasPage(canonicalPath) {
 }
 function createBoundaryDebugMetadata(scope, remotes = []) {
     return {
-        schemaVersion: 1,
         appId: shellApp.id,
         boundaries: [
             shellApp,
             ...remotes
         ].map((app)=>({
                 appId: app.id,
+                label: app.displayName,
                 mfName: app.mfName,
-                packageName: ultramodern_workspace_packageName(scope, app.packageSuffix),
-                role: 'shell' === app.kind ? 'host' : 'vertical',
                 ownerTeam: app.ownership.team,
-                label: app.displayName
-            }))
+                packageName: ultramodern_workspace_packageName(scope, app.packageSuffix),
+                role: 'shell' === app.kind ? 'host' : 'vertical'
+            })),
+        schemaVersion: 1
     };
 }
 function createAppEnvDts(app, remotes = []) {
     const remoteModuleDeclarations = resolveRemoteRefs(app, remotes).flatMap((remote)=>Object.keys(remote.exposes ?? {}).filter((expose)=>'./Route' !== expose).map((expose)=>{
             const moduleName = `${remoteDependencyAlias(remote)}/${expose.replace(/^\.\//u, '')}`;
             return `declare module '${moduleName}' {
-  const Component: import('react').ComponentType<Record<string, never>>;
+  const Component: React.ComponentType<Record<string, never>>;
   export default Component;
 }
 `;
         })).join('\n');
-    return `/// <reference types='@modern-js/app-tools/types' />
+    const reactTypeReference = remoteModuleDeclarations ? "/// <reference types='react' />\n" : '';
+    const siteUrlDeclaration = 'declare const ULTRAMODERN_SITE_URL: string;';
+    return `${reactTypeReference}/// <reference types='@modern-js/app-tools/types' />
 
-declare const ULTRAMODERN_SITE_URL: string;
+${siteUrlDeclaration}
 declare module '*.svg' {
   const url: string;
   export default url;
 }
+declare module '*.css';
 ${remoteModuleDeclarations ? `\n${remoteModuleDeclarations}` : ''}`;
 }
 function createAppRuntimeConfig(app, scope, remotes = []) {
@@ -1889,10 +1900,10 @@ export default defineRuntimeConfig({
       supportedLngs: ['en', 'cs'],
     },
   },
+${pluginsConfig}
   router: {
     framework: 'tanstack',
   },
-${pluginsConfig}
 });
 `;
 }
@@ -1953,7 +1964,7 @@ function createTw(prefix) {
 function workspaceAssetsForApp(_app) {
     return {};
 }
-function createLocalizedHeadComponent() {
+function createLocalizedHeadComponent(includeLocationSuffix = true) {
     return `const fallbackLanguage = 'en';
 const supportedLanguages = ['en', 'cs'] as const;
 type SupportedLanguage = (typeof supportedLanguages)[number];
@@ -1967,7 +1978,7 @@ const isSupportedLanguage = (value: string): value is SupportedLanguage =>
   supportedLanguages.includes(value as SupportedLanguage);
 
 const normalisePath = (pathname: string) => {
-  const normalised = pathname.replace(/\\/+$/u, '').replace(/\\/+/gu, '/');
+  const normalised = pathname.replaceAll(/\\/+/gu, '/').replace(/\\/+$/u, '');
   return normalised.length > 0 ? normalised : '/';
 };
 
@@ -1980,7 +1991,7 @@ const stripLanguagePrefix = (pathname: string) => {
 };
 
 const escapeRegExp = (value: string) =>
-  value.replace(/[.*+?^\${}()|[\\]\\\\]/g, '\\\\$&');
+  value.replaceAll(/[.*+?^\${}()|[\\]\\\\]/gu, '\\\\$&');
 
 const paramName = (segment: string) => segment.slice(1).replace(/\\?$/u, '');
 
@@ -1997,16 +2008,19 @@ const matchPattern = (pathname: string, pattern: string) => {
       return \`/\${escapeRegExp(segment)}\`;
     })
     .join('');
-  const match = new RegExp(\`^\${source || '/'}$\`).exec(normalisePath(pathname));
+  const match = new RegExp(\`^\${source || '/'}$\`, 'u').exec(
+    normalisePath(pathname),
+  );
 
-  if (!match) {
-    return undefined;
+  if (match === null) {
+    return;
   }
 
-  return names.reduce<Record<string, string>>((params, name, index) => {
+  const params: Record<string, string> = {};
+  for (const [index, name] of names.entries()) {
     params[name] = decodeURIComponent(match[index + 1] ?? '');
-    return params;
-  }, {});
+  }
+  return params;
 };
 
 const buildPath = (pattern: string, params: Record<string, string>) => {
@@ -2018,7 +2032,9 @@ const buildPath = (pattern: string, params: Record<string, string>) => {
         return segment;
       }
       const value = params[paramName(segment)];
-      return value ? encodeURIComponent(value) : '';
+      return value !== undefined && value.length > 0
+        ? encodeURIComponent(value)
+        : '';
     })
     .filter(Boolean)
     .join('/');
@@ -2034,16 +2050,17 @@ const resolveLocalisedPath = (
 
   for (const entry of Object.values(localisedUrls)) {
     const targetPattern = entry[targetLanguage];
-    if (!targetPattern) {
+    if (targetPattern === undefined) {
       continue;
     }
 
     for (const language of supportedLanguages) {
       const sourcePattern = entry[language];
-      const params = sourcePattern
-        ? matchPattern(pathWithoutLanguage, sourcePattern)
-        : undefined;
-      if (params) {
+      const params =
+        sourcePattern === undefined
+          ? undefined
+          : matchPattern(pathWithoutLanguage, sourcePattern);
+      if (params !== undefined) {
         return buildPath(targetPattern, params);
       }
     }
@@ -2062,21 +2079,22 @@ const absoluteUrl = (pathname: string) => {
   return \`\${origin}\${pathname}\`;
 };
 
-const locationSuffix = (location: {
+${includeLocationSuffix ? `const locationSuffix = (location: {
   hash?: unknown;
   search?: unknown;
   searchStr?: unknown;
 }) => {
-  const locationSearch =
-    typeof location.searchStr === 'string'
-      ? location.searchStr
-      : typeof location.search === 'string'
-        ? location.search
-        : '';
+  let locationSearch = '';
+  if (typeof location.searchStr === 'string') {
+    locationSearch = location.searchStr;
+  } else if (typeof location.search === 'string') {
+    locationSearch = location.search;
+  }
   const locationHash = typeof location.hash === 'string' ? location.hash : '';
 
   return \`\${locationSearch}\${locationHash}\`;
 };
+` : ''}
 
 const LocalizedHead = () => {
   const location = useLocation();
@@ -2114,7 +2132,7 @@ import { VerticalShowcase } from '../vertical-components';
 import { ultramodernLocalisedUrls } from '../ultramodern-route-metadata';
 import { ultramodernUiMarker } from '../../ultramodern-build';
 
-${createLocalizedHeadComponent()}
+${createLocalizedHeadComponent(false)}
 export default function ShellHome() {
   const { i18nInstance } = useModernI18n();
   const t = i18nInstance['t'].bind(i18nInstance);
@@ -2172,9 +2190,9 @@ import { ultramodernLocalisedUrls } from './ultramodern-route-metadata';
 const supportedLanguages = ['en', 'cs'] as const;
 type SupportedLanguage = (typeof supportedLanguages)[number];
 
-type ShellFrameProps = {
+interface ShellFrameProps {
   children: ReactNode;
-};
+}
 
 const localisedUrls = ultramodernLocalisedUrls as Record<
   string,
@@ -2185,7 +2203,7 @@ const isSupportedLanguage = (value: string): value is SupportedLanguage =>
   supportedLanguages.includes(value as SupportedLanguage);
 
 const normalisePath = (pathname: string) => {
-  const normalised = pathname.replace(/\\/+$/u, '').replace(/\\/+/gu, '/');
+  const normalised = pathname.replaceAll(/\\/+/gu, '/').replace(/\\/+$/u, '');
   return normalised.length > 0 ? normalised : '/';
 };
 
@@ -2198,7 +2216,7 @@ const stripLanguagePrefix = (pathname: string) => {
 };
 
 const escapeRegExp = (value: string) =>
-  value.replace(/[.*+?^\${}()|[\\]\\\\]/g, '\\\\$&');
+  value.replaceAll(/[.*+?^\${}()|[\\]\\\\]/gu, '\\\\$&');
 
 const paramName = (segment: string) => segment.slice(1).replace(/\\?$/u, '');
 
@@ -2215,16 +2233,19 @@ const matchPattern = (pathname: string, pattern: string) => {
       return \`/\${escapeRegExp(segment)}\`;
     })
     .join('');
-  const match = new RegExp(\`^\${source || '/'}$\`).exec(normalisePath(pathname));
+  const match = new RegExp(\`^\${source || '/'}$\`, 'u').exec(
+    normalisePath(pathname),
+  );
 
-  if (!match) {
-    return undefined;
+  if (match === null) {
+    return;
   }
 
-  return names.reduce<Record<string, string>>((params, name, index) => {
+  const params: Record<string, string> = {};
+  for (const [index, name] of names.entries()) {
     params[name] = decodeURIComponent(match[index + 1] ?? '');
-    return params;
-  }, {});
+  }
+  return params;
 };
 
 const buildPath = (pattern: string, params: Record<string, string>) => {
@@ -2236,7 +2257,9 @@ const buildPath = (pattern: string, params: Record<string, string>) => {
         return segment;
       }
       const value = params[paramName(segment)];
-      return value ? encodeURIComponent(value) : '';
+      return value !== undefined && value.length > 0
+        ? encodeURIComponent(value)
+        : '';
     })
     .filter(Boolean)
     .join('/');
@@ -2252,16 +2275,17 @@ const resolveLocalisedPath = (
 
   for (const entry of Object.values(localisedUrls)) {
     const targetPattern = entry[targetLanguage];
-    if (!targetPattern) {
+    if (targetPattern === undefined) {
       continue;
     }
 
     for (const language of supportedLanguages) {
       const sourcePattern = entry[language];
-      const params = sourcePattern
-        ? matchPattern(pathWithoutLanguage, sourcePattern)
-        : undefined;
-      if (params) {
+      const params =
+        sourcePattern === undefined
+          ? undefined
+          : matchPattern(pathWithoutLanguage, sourcePattern);
+      if (params !== undefined) {
         return buildPath(targetPattern, params);
       }
     }
@@ -2280,12 +2304,12 @@ const locationSuffix = (location: {
   search?: unknown;
   searchStr?: unknown;
 }) => {
-  const locationSearch =
-    typeof location.searchStr === 'string'
-      ? location.searchStr
-      : typeof location.search === 'string'
-        ? location.search
-        : '';
+  let locationSearch = '';
+  if (typeof location.searchStr === 'string') {
+    locationSearch = location.searchStr;
+  } else if (typeof location.search === 'string') {
+    locationSearch = location.search;
+  }
   const locationHash = typeof location.hash === 'string' ? location.hash : '';
 
   return \`\${locationSearch}\${locationHash}\`;
@@ -2351,21 +2375,19 @@ function createShellRemoteComponents(scope, remotes = []) {
     const remoteCount = String(widgetRemotes.length);
     return `import { createLazyComponent } from '@module-federation/modern-js-v3/react';
 import { getInstance, loadRemote } from '@module-federation/modern-js-v3/runtime';
-import { Suspense, useEffect, useMemo, useState, type ComponentType } from 'react';
+import { Suspense, useEffect, useMemo, useState } from 'react';
+import type { ComponentType } from 'react';
 import { I18nLink, useModernI18n } from '@modern-js/plugin-i18n/runtime';
 ${serverImports}
 
-type RemoteComponentModule = {
+interface RemoteComponentModule {
   default: ComponentType;
-};
+}
 
-const loadRemoteComponent = async (specifier: string) => {
-  const module = await loadRemote<RemoteComponentModule>(specifier);
-  if (!module) {
-    throw new Error(\`Remote module unavailable: \${specifier}\`);
-  }
-  return module;
-};
+const widgetCount = Number('${remoteCount}');
+
+const loadRemoteComponent = (specifier: string) =>
+  loadRemote<RemoteComponentModule>(specifier) as Promise<RemoteComponentModule>;
 
 const remoteFallback =
   ({ error }: { error: Error }) => {
@@ -2374,11 +2396,9 @@ const remoteFallback =
     return <div className="${tw('rounded-xl border border-red-900/20 bg-red-50 px-4 py-3 text-sm font-semibold text-red-900')}" data-remote-error={error.name}>{t('shell.remoteUnavailable')}</div>;
   };
 
-const createHydratedRemote = (
-  ServerComponent: ComponentType,
-  specifier: string,
-) => {
-  return function HydratedRemote() {
+const createHydratedRemote =
+  (ServerComponent: ComponentType, specifier: string) =>
+  function HydratedRemote() {
     const [hydrated, setHydrated] = useState(false);
 
     useEffect(() => {
@@ -2387,11 +2407,11 @@ const createHydratedRemote = (
 
     const FederatedComponent = useMemo(() => {
       if (!hydrated) {
-        return undefined;
+        return null;
       }
       const instance = getInstance();
-      if (!instance) {
-        return undefined;
+      if (instance === null || instance === undefined) {
+        return null;
       }
       return createLazyComponent({
         export: 'default',
@@ -2402,7 +2422,7 @@ const createHydratedRemote = (
       });
     }, [hydrated]);
 
-    if (!FederatedComponent) {
+    if (FederatedComponent === null) {
       return <ServerComponent />;
     }
 
@@ -2412,11 +2432,10 @@ const createHydratedRemote = (
       </Suspense>
     );
   };
-};
 
 ${hydratedExports}
 
-export function Header() {
+export const Header = () => {
   const { i18nInstance } = useModernI18n();
   const t = i18nInstance['t'].bind(i18nInstance);
 
@@ -2425,24 +2444,24 @@ export function Header() {
       <I18nLink className="${tw('whitespace-nowrap text-xl font-black tracking-normal text-stone-950 no-underline')}" to="/">{t('shell.title')}</I18nLink>
     </header>
   );
-}
+};
 
-export function StatusBadge() {
+export const StatusBadge = () => {
   const { i18nInstance } = useModernI18n();
   const t = i18nInstance['t'].bind(i18nInstance);
 
   return (
     <span className="${tw('inline-flex h-10 shrink-0 items-center justify-center rounded-full border border-stone-900/15 bg-white px-4 text-sm font-extrabold text-stone-950 shadow-lg shadow-stone-900/5')}">
-      {${remoteCount}} {t('shell.hero.cardOneKicker')}
+      {widgetCount} {t('shell.hero.cardOneKicker')}
     </span>
   );
-}
+};
 
-export function VerticalShowcase() {
+export const VerticalShowcase = () => {
   const { i18nInstance } = useModernI18n();
   const t = i18nInstance['t'].bind(i18nInstance);
 
-  if (${remoteCount} === 0) {
+  if (widgetCount === 0) {
     return (
       <section className="${tw('mx-auto mt-12 max-w-7xl rounded-2xl bg-white/90 p-6 shadow-xl shadow-stone-900/10')}">
         <p className="${tw('text-lg font-bold text-stone-700')}">{t('shell.hero.empty')}</p>
@@ -2457,39 +2476,50 @@ ${showcaseItems}
       </div>
     </section>
   );
-}
+};
 `;
 }
 function createRemotePage(app) {
     const tw = createTw(tailwindPrefixForApp(app));
+    const listEffectItems = `list${toPascalCase(effectApiStem(app))}`;
     const effectBffImport = appHasEffectApi(app) ? `import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
 import { Helmet } from '@modern-js/runtime/head';
 import { useLocation } from '@modern-js/plugin-tanstack/runtime';
 import { useEffect, useState } from 'react';
+import {
+  Effect,
+  ${listEffectItems},
+  runEffectRequest,
+} from '../../effect/${effectApiStem(app)}-client';
 import { ultramodernLocalisedUrls } from '../ultramodern-route-metadata';
 import { ultramodernUiMarker } from '../../ultramodern-build';
 ` : "import { useModernI18n } from '@modern-js/plugin-i18n/runtime';\nimport { Helmet } from '@modern-js/runtime/head';\nimport { useLocation } from '@modern-js/plugin-tanstack/runtime';\nimport { ultramodernLocalisedUrls } from '../ultramodern-route-metadata';\nimport { ultramodernUiMarker } from '../../ultramodern-build';\n";
     const effectBffState = appHasEffectApi(app) ? `  const [effectApiStatus, setEffectApiStatus] = useState('pending');
 
   useEffect(() => {
-    void fetch('${effectApiPrefix(app)}/effect/${effectApiStem(app)}?limit=1', {
-      headers: {
-        accept: 'application/json',
-      },
-    })
-      .then(response => {
-        if (!response.ok) {
-          throw new Error(\`Effect BFF request failed: \${response.status}\`);
-        }
+    let cancelled = false;
+    void runEffectRequest(
+      ${listEffectItems}({ limit: 1 }).pipe(
+        Effect.match({
+          onFailure: () => {
+            if (cancelled) {
+              return;
+            }
+            setEffectApiStatus('unavailable');
+          },
+          onSuccess: data => {
+            if (cancelled) {
+              return;
+            }
+            setEffectApiStatus(data.items.at(0)?.title ?? 'empty');
+          },
+        }),
+      ),
+    );
 
-        return response.json() as Promise<{ items?: Array<{ title?: string }> }>;
-      })
-      .then(data => {
-        setEffectApiStatus(data.items[0]?.title ?? 'empty');
-      })
-      .catch(() => {
-        setEffectApiStatus('unavailable');
-      });
+    return () => {
+      cancelled = true;
+    };
   }, []);
 
 ` : '';
@@ -2518,7 +2548,7 @@ ${effectBffState}  return (
         ))}
       </nav>
       <h1 className="${tw('mt-10 text-5xl font-black')}">{t('${app.domain}.title')}</h1>
-      <p className="${tw('mt-3 text-lg text-stone-600')}" data-mf-role="${app.kind}">{t('${app.domain}.role')}</p>
+      <p className="${tw('mt-3 text-lg text-stone-600')}" data-modern-mf-role="${app.kind}">{t('${app.domain}.role')}</p>
       <p className="${tw('sr-only')}" data-build-marker={ultramodernUiMarker.build} data-testid="ultramodern-ui-marker">
         {ultramodernUiMarker.appId}:{ultramodernUiMarker.version}
       </p>
@@ -2554,7 +2584,7 @@ export default function ${toPascalCase(domain)}Route() {
   const t = i18nInstance['t'].bind(i18nInstance);
 
   return (
-    <section className="${tw('rounded-2xl bg-white/90 p-5 shadow-xl shadow-stone-900/10')}" data-mf-remote="${app.id}" data-mf-expose="./Route">
+    <section className="${tw('rounded-2xl bg-white/90 p-5 shadow-xl shadow-stone-900/10')}" data-modern-boundary-id="${app.mfName}" data-modern-mf-expose="./Route">
       <h2 className="${tw('text-2xl font-black')}">{t('${domain}.title')}</h2>
       <p className="${tw('mt-2 text-stone-600')}">{t('${domain}.routeSurface')}</p>
     </section>
@@ -2573,7 +2603,7 @@ export default function ${componentName}() {
   const t = i18nInstance['t'].bind(i18nInstance);
 
   return (
-    <section className="${tw('rounded-2xl bg-white/90 p-5 shadow-xl shadow-stone-900/10')}" data-mf-remote="${app.id}">
+    <section className="${tw('rounded-2xl bg-white/90 p-5 shadow-xl shadow-stone-900/10')}" data-modern-boundary-id="${app.mfName}" data-modern-mf-expose="./Widget">
       <h2 className="${tw('text-2xl font-black')}">{t('${domain}.title')}</h2>
       <p className="${tw('mt-2 text-stone-600')}">{t('${domain}.widgetBody')}</p>
     </section>
@@ -2672,7 +2702,7 @@ export default function ${componentName}() {
 
   return (
     <>
-      <section className="${tw('mx-auto mt-10 grid max-w-7xl items-center gap-8 md:grid-cols-[1fr_0.95fr] lg:gap-14')}" data-modern-boundary-id="${app.mfName}" data-modern-mf-expose="${expose}" data-mf-remote="${app.id}">
+      <section className="${tw('mx-auto mt-10 grid max-w-7xl items-center gap-8 md:grid-cols-[1fr_0.95fr] lg:gap-14')}" data-modern-boundary-id="${app.mfName}" data-modern-mf-expose="${expose}">
         <div className="${tw('rounded-3xl border-[18px] border-amber-200 bg-white/90 p-8 shadow-2xl shadow-stone-900/15')}">
           <p className="${tw('text-xs font-black uppercase tracking-[0.18em] text-emerald-800')}">{t('records.record.lifecycle')}</p>
           <dl className="${tw('mt-6 grid gap-4')}">
@@ -2741,7 +2771,7 @@ export default function ${componentName}() {
   const queue = useActionQueue();
 
   return (
-    <section className="${tw('mx-auto mt-10 max-w-7xl')}" data-modern-boundary-id="${app.mfName}" data-modern-mf-expose="${expose}" data-mf-remote="${app.id}">
+    <section className="${tw('mx-auto mt-10 max-w-7xl')}" data-modern-boundary-id="${app.mfName}" data-modern-mf-expose="${expose}">
       <h1 className="${tw('text-5xl font-black leading-none tracking-normal text-stone-950 md:text-7xl')}">{t('actions.queue.title')}</h1>
       <div className="${tw('mt-8 rounded-2xl bg-white/90 p-5 shadow-xl shadow-stone-900/10')}">
         {queue.lines.length === 0 ? (
@@ -2783,7 +2813,7 @@ export default function ${componentName}() {
   const t = i18nInstance['t'].bind(i18nInstance);
 
   return (
-    <section className="${tw('rounded-2xl bg-white/90 p-5 shadow-xl shadow-stone-900/10')}" data-modern-boundary-id="${app.mfName}" data-modern-mf-expose="${expose}" data-mf-remote="${app.id}">
+    <section className="${tw('rounded-2xl bg-white/90 p-5 shadow-xl shadow-stone-900/10')}" data-modern-boundary-id="${app.mfName}" data-modern-mf-expose="${expose}">
       <h2 className="${tw('text-2xl font-black')}">{t('${domain}.title')}</h2>
       <p className="${tw('mt-2 text-stone-600')}">{t('${domain}.federatedSurface')}</p>
     </section>
@@ -2795,22 +2825,18 @@ function createRecordsRemoteComponents(scope, app) {
     const tw = createTw(tailwindPrefixForApp(app));
     return `import { createLazyComponent } from '@module-federation/modern-js-v3/react';
 import { getInstance, loadRemote } from '@module-federation/modern-js-v3/runtime';
-import { Suspense, useEffect, useMemo, useState, type ComponentType } from 'react';
+import { Suspense, useEffect, useMemo, useState } from 'react';
+import type { ComponentType } from 'react';
 import { useModernI18n } from '@modern-js/plugin-i18n/runtime';
 import HighlightsServer from '${ultramodern_workspace_packageName(scope, 'workspace')}/Highlights';
 import StartActionServer from '${ultramodern_workspace_packageName(scope, 'actions')}/StartAction';
 
-type RemoteComponentModule = {
+interface RemoteComponentModule {
   default: ComponentType;
-};
+}
 
-const loadRemoteComponent = async (specifier: string) => {
-  const module = await loadRemote<RemoteComponentModule>(specifier);
-  if (!module) {
-    throw new Error(\`Remote module unavailable: \${specifier}\`);
-  }
-  return module;
-};
+const loadRemoteComponent = (specifier: string) =>
+  loadRemote<RemoteComponentModule>(specifier) as Promise<RemoteComponentModule>;
 
 const remoteFallback =
   ({ error }: { error: Error }) => {
@@ -2819,11 +2845,9 @@ const remoteFallback =
     return <div className="${tw('rounded-xl border border-red-900/20 bg-red-50 px-4 py-3 text-sm font-semibold text-red-900')}" data-remote-error={error.name}>{t('records.remoteUnavailable')}</div>;
   };
 
-const createHydratedRemote = (
-  ServerComponent: ComponentType,
-  specifier: string,
-) => {
-  return function HydratedRemote() {
+const createHydratedRemote =
+  (ServerComponent: ComponentType, specifier: string) =>
+  function HydratedRemote() {
     const [hydrated, setHydrated] = useState(false);
 
     useEffect(() => {
@@ -2832,11 +2856,11 @@ const createHydratedRemote = (
 
     const FederatedComponent = useMemo(() => {
       if (!hydrated) {
-        return undefined;
+        return null;
       }
       const instance = getInstance();
-      if (!instance) {
-        return undefined;
+      if (instance === null || instance === undefined) {
+        return null;
       }
       return createLazyComponent({
         export: 'default',
@@ -2847,7 +2871,7 @@ const createHydratedRemote = (
       });
     }, [hydrated]);
 
-    if (!FederatedComponent) {
+    if (FederatedComponent === null) {
       return <ServerComponent />;
     }
 
@@ -2857,7 +2881,6 @@ const createHydratedRemote = (
       </Suspense>
     );
   };
-};
 
 export const Highlights = createHydratedRemote(HighlightsServer, 'workspace/Highlights');
 export const StartAction = createHydratedRemote(StartActionServer, 'actions/StartAction');
@@ -2960,7 +2983,7 @@ const generatedLocaleResources = {
         },
         shell: {
             boundaries: {
-                toggle: 'zobrazit hranice verticalů'
+                toggle: 'zobrazit hranice týmů'
             },
             hero: {
                 cardOne: 'Přidejte první business vertical příkazem create <domain> --vertical, až ho opravdu potřebujete.',
@@ -3069,7 +3092,7 @@ const generatedLocaleResources = {
         },
         shell: {
             boundaries: {
-                toggle: 'show vertical boundaries'
+                toggle: 'show team boundaries'
             },
             hero: {
                 cardOne: 'Add the first business vertical with create <domain> --vertical when the product needs one.',
@@ -3454,8 +3477,7 @@ const ${groupName}Items = [
   },
 ];
 
-const operationAttributes = (operationContext: OperationContext) => {
-  return {
+const operationAttributes = (operationContext: OperationContext) => ({
     'modernjs.operation.id': operationContext.operationId,
     'modernjs.operation.method': operationContext.method,
     'modernjs.operation.route': operationContext.routePath,
@@ -3463,8 +3485,7 @@ const operationAttributes = (operationContext: OperationContext) => {
     ...(typeof operationContext.traceId === 'string'
       ? { 'modernjs.trace.id': operationContext.traceId }
       : {}),
-  };
-};
+  });
 
 const ${groupName}Layer = HttpApiBuilder.group(
   ${apiExport},
@@ -3555,6 +3576,7 @@ function createEffectClient(service, contractImportPath) {
     const getName = `get${toPascalCase(singular)}`;
     const createName = `create${toPascalCase(singular)}`;
     return `import {
+  Effect,
   makeEffectHttpApiClient,
   runEffectRequest,
 } from '@modern-js/plugin-bff/effect-client';
@@ -3562,85 +3584,74 @@ import {
   ${contractExport}ApiContract,
   ${apiExport},
   ${groupName}OperationContexts,
-  type OperationContext,
 } from '${contractImportPath}';
+import type { OperationContext } from '${contractImportPath}';
+
+export { Effect, runEffectRequest };
 
-export type ${clientOptionsName} = {
+export interface ${clientOptionsName} {
   baseUrl?: string | URL;
   locale?: string;
   operationContext?: OperationContext;
   traceparent?: string;
-};
+}
 
-export function ${createClientName}(
+export const ${createClientName} = (
   options: ${clientOptionsName} = {},
-) {
-  return makeEffectHttpApiClient(${apiExport}, {
+) =>
+  makeEffectHttpApiClient(${apiExport}, {
     baseUrl: options.baseUrl ?? ${contractExport}ApiContract.apiPrefix,
   });
-}
 
-export function ${listName}(
+export const ${listName} = (
   options: ${clientOptionsName} & { limit?: number } = {},
-) {
-  return runEffectRequest(
-    ${createClientName}({
-      ...options,
-      operationContext:
-        options.operationContext ?? ${groupName}OperationContexts.list,
-    }),
-  ).then(client =>
-    runEffectRequest(
+) =>
+  ${createClientName}({
+    ...options,
+    operationContext:
+      options.operationContext ?? ${groupName}OperationContexts.list,
+  }).pipe(
+    Effect.flatMap(client =>
       client.${groupName}.list({ query: { limit: options.limit } }),
     ),
   );
-}
 
-export function ${readinessName}(
+export const ${readinessName} = (
   options: ${clientOptionsName} = {},
-) {
-  return runEffectRequest(
-    ${createClientName}({
-      ...options,
-      operationContext:
-        options.operationContext ?? ${groupName}OperationContexts.readiness,
-    }),
-  ).then(client =>
-    runEffectRequest(client.${groupName}.readiness({})),
+) =>
+  ${createClientName}({
+    ...options,
+    operationContext:
+      options.operationContext ?? ${groupName}OperationContexts.readiness,
+  }).pipe(
+    Effect.flatMap(client => client.${groupName}.readiness({})),
   );
-}
 
-export function ${getName}(
+export const ${getName} = (
   id: string,
   options: ${clientOptionsName} = {},
-) {
-  return runEffectRequest(
-    ${createClientName}({
-      ...options,
-      operationContext:
-        options.operationContext ?? ${groupName}OperationContexts.get,
-    }),
-  ).then(client =>
-    runEffectRequest(client.${groupName}.get({ params: { id } })),
+) =>
+  ${createClientName}({
+    ...options,
+    operationContext:
+      options.operationContext ?? ${groupName}OperationContexts.get,
+  }).pipe(
+    Effect.flatMap(client => client.${groupName}.get({ params: { id } })),
   );
-}
 
-export function ${createName}(
+export const ${createName} = (
   title: string,
   options: ${clientOptionsName} = {},
-) {
-  return runEffectRequest(
-    ${createClientName}({
-      ...options,
-      operationContext:
-        options.operationContext ?? ${groupName}OperationContexts.create,
-    }),
-  ).then(client =>
-    runEffectRequest(
+) =>
+  ${createClientName}({
+    ...options,
+    operationContext:
+      options.operationContext ?? ${groupName}OperationContexts.create,
+  }).pipe(
+    Effect.flatMap(client =>
       client.${groupName}.create({ payload: { title } }),
     ),
   );
-}
 `;
 }
 function createShellEffectClient(scope, remotes = []) {
@@ -3850,6 +3861,7 @@ function createTopology(scope, remotes = []) {
         validation: {
             script: "scripts/validate-ultramodern-workspace.mjs",
             commands: [
+                'pnpm ultramodern:i18n-boundaries',
                 'pnpm ultramodern:check'
             ]
         }
@@ -4193,7 +4205,7 @@ function createAppGeneratedContract(scope, app, apps, enableTailwind) {
             }
         },
         ssr: {
-            mode: 'stream',
+            mode: 'string',
             moduleFederationAppSSR: true
         },
         i18n: {
@@ -4415,6 +4427,7 @@ function createTemplateManifest(modernVersion, packageSource) {
             expectedCommands: [
                 'mise install',
                 'pnpm install',
+                'pnpm run ultramodern:i18n-boundaries',
                 'pnpm run ultramodern:check'
             ]
         }
@@ -4492,6 +4505,197 @@ for (const appDir of appDirs) {
 }
 `;
 }
+function createWorkspaceI18nBoundaryValidationScript() {
+    return `#!/usr/bin/env node
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
+const sourceRoots = ['apps', 'verticals'];
+const languageConditionalPattern =
+  /\\b(language|locale|lng|currentLanguage)\\s*={0,2}={1,2}\\s*['"][a-z-]+['"]\\s*\\?\\s*([^:;\\n]+)\\s*:\\s*([^;\\n})]+)/gu;
+const allowedLanguageConditionalBranches = new Set([
+  "'page'",
+  '"page"',
+  'undefined',
+  'null',
+  'true',
+  'false',
+]);
+const visibleCopyAttributes = new Set([
+  'alt',
+  'aria-label',
+  'label',
+  'placeholder',
+  'title',
+]);
+
+function fail(message) {
+  throw new Error(message);
+}
+
+function walk(directory, files = []) {
+  if (!fs.existsSync(directory)) {
+    return files;
+  }
+  for (const entry of fs.readdirSync(directory, { withFileTypes: true })) {
+    if (entry.name === 'node_modules' || entry.name === 'dist' || entry.name === '.output') {
+      continue;
+    }
+    const entryPath = path.join(directory, entry.name);
+    if (entry.isDirectory()) {
+      walk(entryPath, files);
+    } else {
+      files.push(entryPath);
+    }
+  }
+  return files;
+}
+
+function relative(filePath) {
+  return path.relative(root, filePath).replace(/\\\\/gu, '/');
+}
+
+function isSourceFile(filePath) {
+  return /\\.(?:ts|tsx|js|jsx)$/u.test(filePath);
+}
+
+function isLocaleJson(filePath) {
+  const normalized = relative(filePath);
+  return /\\/locales\\/(en|cs)\\/[^/]+\\.json$/u.test(normalized);
+}
+
+function readText(filePath) {
+  return fs.readFileSync(filePath, 'utf8');
+}
+
+function branchIsUserCopy(branch) {
+  const value = branch.trim().replace(/,$/u, '');
+  if (allowedLanguageConditionalBranches.has(value)) {
+    return false;
+  }
+  return /^['"][^'"]{2,}['"]$/u.test(value);
+}
+
+function checkRuntimeResources(filePath, text) {
+  if (!relative(filePath).endsWith('/src/modern.runtime.ts')) {
+    return;
+  }
+  if (/initOptions\\s*:\\s*\\{[\\s\\S]*?\\bresources\\s*:/u.test(text)) {
+    fail(\`\${relative(filePath)} must not inline i18n resources in modern.runtime.ts; use locale JSON files.\`);
+  }
+}
+
+function checkLanguageConditionals(filePath, text) {
+  for (const match of text.matchAll(languageConditionalPattern)) {
+    const [, name, whenTrue = '', whenFalse = ''] = match;
+    if (branchIsUserCopy(whenTrue) || branchIsUserCopy(whenFalse)) {
+      fail(
+        \`\${relative(filePath)} contains manual \${name} copy branching. Put user-facing copy in i18n JSON resources.\`,
+      );
+    }
+  }
+}
+
+function checkLiteralVisibleAttributes(filePath, text) {
+  if (!filePath.endsWith('.tsx') && !filePath.endsWith('.jsx')) {
+    return;
+  }
+  for (const attribute of visibleCopyAttributes) {
+    const pattern = new RegExp(\`\\\\b\${attribute}=["'][^"'{}]*[A-Za-z][^"'{}]*["']\`, 'u');
+    if (pattern.test(text)) {
+      fail(
+        \`\${relative(filePath)} contains literal \${attribute} copy. Use t(...) or route metadata for visible text.\`,
+      );
+    }
+  }
+}
+
+function checkSplitPhraseKeys(filePath, text) {
+  if (/t\\(\\s*['"][^'"]+\\.(?:prefix|suffix|before|after)['"]\\s*\\)/u.test(text)) {
+    fail(
+      \`\${relative(filePath)} uses split phrase translation keys. Keep translator-owned phrases whole.\`,
+    );
+  }
+}
+
+function checkBoundaryAttributes(filePath, text) {
+  if (!filePath.endsWith('.tsx') && !filePath.endsWith('.jsx')) {
+    return;
+  }
+  if (/\\bdata-mf-(?:remote|expose)=/u.test(text)) {
+    fail(
+      \`\${relative(filePath)} uses legacy data-mf-* boundary attributes. Use data-modern-boundary-id and data-modern-mf-expose.\`,
+    );
+  }
+}
+
+function visitLocaleKeys(value, visitor, pathParts = []) {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    return;
+  }
+  for (const [key, child] of Object.entries(value)) {
+    const nextPath = [...pathParts, key];
+    visitor(key, child, nextPath);
+    visitLocaleKeys(child, visitor, nextPath);
+  }
+}
+
+function checkPluralResources(filePath, json) {
+  const language = relative(filePath).split('/locales/')[1]?.split('/')[0];
+  const requiredSuffixes =
+    language === 'cs' ? ['one', 'few', 'many', 'other'] : ['one', 'other'];
+  const groups = new Map();
+
+  visitLocaleKeys(json, (key, value, pathParts) => {
+    if (typeof value === 'string' && value.includes('{{count}}')) {
+      const suffixMatch = key.match(/^(.*)_(one|few|many|other)$/u);
+      if (!suffixMatch) {
+        fail(
+          \`\${relative(filePath)} key \${pathParts.join('.')} contains {{count}} but is not plural-suffixed.\`,
+        );
+      }
+      const [, base = '', suffix = ''] = suffixMatch;
+      const parentPath = pathParts.slice(0, -1).join('.');
+      const groupKey = \`\${parentPath}.\${base}\`;
+      const existing = groups.get(groupKey) ?? new Set();
+      existing.add(suffix);
+      groups.set(groupKey, existing);
+    }
+  });
+
+  for (const [group, suffixes] of groups) {
+    for (const suffix of requiredSuffixes) {
+      if (!suffixes.has(suffix)) {
+        fail(\`\${relative(filePath)} plural group \${group} is missing _\${suffix}.\`);
+      }
+    }
+  }
+}
+
+const sourceFiles = sourceRoots.flatMap(sourceRoot =>
+  walk(path.join(root, sourceRoot)).filter(filePath => isSourceFile(filePath)),
+);
+for (const filePath of sourceFiles) {
+  const text = readText(filePath);
+  checkRuntimeResources(filePath, text);
+  checkLanguageConditionals(filePath, text);
+  checkLiteralVisibleAttributes(filePath, text);
+  checkSplitPhraseKeys(filePath, text);
+  checkBoundaryAttributes(filePath, text);
+}
+
+const localeFiles = sourceRoots.flatMap(sourceRoot =>
+  walk(path.join(root, sourceRoot)).filter(filePath => isLocaleJson(filePath)),
+);
+for (const filePath of localeFiles) {
+  checkPluralResources(filePath, JSON.parse(readText(filePath)));
+}
+
+console.log('UltraModern i18n and boundary guardrails validated');
+`;
+}
 function createWorkspaceValidationScript(scope, enableTailwind, remotes = []) {
     const verticals = remotes.filter(appHasEffectApi).map((remote)=>({
             id: remote.id,
@@ -4579,6 +4783,7 @@ const requiredPaths = [
   '.modernjs/ultramodern-generated-contract.json',
   'scripts/assert-mf-types.mjs',
   'scripts/bootstrap-agent-skills.mjs',
+  'scripts/check-ultramodern-i18n-boundaries.mjs',
   'scripts/proof-cloudflare-version.mjs',
   'scripts/setup-agent-reference-repos.mjs',
   'apps/shell-super-app/package.json',
@@ -4662,12 +4867,13 @@ assert(
 );
 assert(rootPackage.scripts?.['cloudflare:build'] === expectedCloudflareBuildScript, 'Root cloudflare:build script is incorrect');
 assert(rootPackage.scripts?.['ultramodern:check'] === 'node ./scripts/validate-ultramodern-workspace.mjs', 'Root must expose ultramodern:check');
+assert(rootPackage.scripts?.['ultramodern:i18n-boundaries'] === 'node ./scripts/check-ultramodern-i18n-boundaries.mjs', 'Root must expose ultramodern:i18n-boundaries');
 assert(rootPackage.scripts?.['ultramodern:assert-mf-types'] === 'node ./scripts/assert-mf-types.mjs', 'Root must expose ultramodern:assert-mf-types');
 assert(rootPackage.scripts?.['cloudflare:deploy'] === expectedCloudflareDeployScript, 'Root must expose cloudflare:deploy');
 assert(rootPackage.scripts?.['cloudflare:proof'] === 'node ./scripts/proof-cloudflare-version.mjs --out .codex/reports/cloudflare-version-proof/public-url-proof.json', 'Root must expose cloudflare:proof');
 assert(rootPackage.scripts?.['skills:install'] === 'node ./scripts/bootstrap-agent-skills.mjs', 'Root must expose skills:install');
 assert(rootPackage.scripts?.['skills:check'] === 'node ./scripts/bootstrap-agent-skills.mjs --check', 'Root must expose skills:check');
-assert(rootPackage.scripts?.postinstall === 'node ./scripts/bootstrap-agent-skills.mjs && (git rev-parse --is-inside-work-tree >/dev/null 2>&1 && lefthook install || true) && node ./scripts/setup-agent-reference-repos.mjs', 'Root postinstall must bootstrap agent skills and hooks before reference repositories');
+assert(rootPackage.scripts?.postinstall === "oxfmt . '!repos/**' && node ./scripts/bootstrap-agent-skills.mjs && node ./scripts/setup-agent-reference-repos.mjs && (git rev-parse --is-inside-work-tree >/dev/null 2>&1 && lefthook install || true)", 'Root postinstall must format, bootstrap agent skills, install reference repositories, and enable hooks last');
 
 const expectedAppIds = ['shell-super-app', ...fullStackVerticals.map(vertical => vertical.id)];
 assert(
@@ -4721,7 +4927,7 @@ assert(!('effectServices' in topology), 'Default APIs must be vertical-owned, no
 for (const vertical of fullStackVerticals) {
   const packageJson = readJson(\`\${vertical.path}/package.json\`);
   assert(packageJson.name === vertical.packageName, \`\${vertical.id} package name is incorrect\`);
-  assert(packageJson.scripts?.['cloudflare:deploy'] === 'ULTRAMODERN_CLOUDFLARE_REQUIRE_PUBLIC_URLS=true ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern deploy', \`\${vertical.id} must expose cloudflare:deploy\`);
+  assert(packageJson.scripts?.['cloudflare:deploy'] === 'ULTRAMODERN_CLOUDFLARE_REQUIRE_PUBLIC_URLS=true pnpm run cloudflare:build && wrangler deploy --config .output/wrangler.json', \`\${vertical.id} must expose cloudflare:deploy\`);
   assert(packageJson.scripts?.['cloudflare:proof']?.includes(\`--app \${vertical.id}\`), \`\${vertical.id} must expose cloudflare:proof\`);
   assert(packageJson.dependencies?.['@modern-js/plugin-bff'], \`\${vertical.id} must depend on plugin-bff\`);
   assert(packageJson.exports?.['./effect/client'] === \`./src/effect/\${vertical.stem}-client.ts\`, \`\${vertical.id} must export its Effect client\`);
@@ -5124,6 +5330,7 @@ main().then(
 function writeGeneratedWorkspaceScripts(targetDir, scope, enableTailwind, remotes = []) {
     writeFileReplacing(targetDir, "scripts/assert-mf-types.mjs", createAssertMfTypesScript(remotes));
     writeFileReplacing(targetDir, "scripts/validate-ultramodern-workspace.mjs", createWorkspaceValidationScript(scope, enableTailwind, remotes));
+    writeFileReplacing(targetDir, "scripts/check-ultramodern-i18n-boundaries.mjs", createWorkspaceI18nBoundaryValidationScript());
     writeFileReplacing(targetDir, "scripts/proof-cloudflare-version.mjs", createCloudflareVersionProofScript());
 }
 function writeApp(targetDir, scope, app, packageSource, enableTailwind, remotes = []) {

package/package.json

@@ -21,7 +21,7 @@
   "engines": {
     "node": ">=20"
   },
-  "version": "3.2.0-ultramodern.62",
+  "version": "3.2.0-ultramodern.64",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/index.js",
   "bin": {
@@ -41,7 +41,7 @@
     "@types/node": "^25.9.1",
     "@typescript/native-preview": "7.0.0-dev.20260527.2",
     "tsx": "^4.22.3",
-    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.2.0-ultramodern.62"
+    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.2.0-ultramodern.64"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -54,6 +54,6 @@
     "start": "node ./dist/index.js"
   },
   "ultramodern": {
-    "frameworkVersion": "3.2.0-ultramodern.62"
+    "frameworkVersion": "3.2.0-ultramodern.64"
   }
 }

package/template/AGENTS.md

@@ -10,7 +10,7 @@ This project is generated for Codex-first UltraModern.js work.
 - `pnpm i18n:check` rejects hardcoded user-visible JSX text.
 - `pnpm ultramodern:check` verifies the generated contract.
 - Generated Codex stop hooks and subagent-stop hooks run `pnpm format && pnpm lint:fix && pnpm ultramodern:check`.
-- `postinstall` installs `lefthook` when the app is inside a Git worktree. Generated `lefthook.yml` runs `pnpm format`, `pnpm lint:fix`, and `pnpm ultramodern:check` on pre-commit; pre-push runs `pnpm ultramodern:check`.
+- `postinstall` installs `lefthook` when the app is inside a Git worktree. Generated `lefthook.yml` runs `pnpm format && pnpm lint:fix && pnpm ultramodern:check` on pre-commit; pre-push runs `pnpm ultramodern:check`.
 
 ## Internationalization
 

package/template/lefthook.yml

@@ -1,13 +1,8 @@
 pre-commit:
   commands:
-    format:
-      run: pnpm format
+    fix-and-check:
+      run: pnpm format && pnpm lint:fix && pnpm ultramodern:check
       stage_fixed: true
-    lint:
-      run: pnpm lint:fix
-      stage_fixed: true
-    check:
-      run: pnpm ultramodern:check
 
 pre-push:
   commands:

package/template-workspace/AGENTS.md

@@ -11,7 +11,7 @@ instructions, not optional reading.
 - `pnpm typecheck` runs effect-tsgo as the TypeScript checker.
 - `pnpm check` runs formatting, linting, effect-tsgo, private-skill availability checks, and the generated workspace contract.
 - Generated Codex stop hooks and subagent-stop hooks run `pnpm format && pnpm lint:fix && pnpm check`.
-- `postinstall` installs `lefthook` when the workspace is inside a Git worktree. Generated `lefthook.yml` runs `pnpm format`, `pnpm lint:fix`, and `pnpm check` on pre-commit; pre-push runs `pnpm check`.
+- `postinstall` formats the generated tree, installs agent skills and reference repos, then installs `lefthook` when the workspace is inside a Git worktree. Generated `lefthook.yml` runs `pnpm format && pnpm lint:fix && pnpm check` on pre-commit; pre-push runs `pnpm check`.
 
 ## Localized Routes
 

package/template-workspace/lefthook.yml

@@ -1,13 +1,8 @@
 pre-commit:
   commands:
-    format:
-      run: pnpm format
+    fix-and-check:
+      run: pnpm format && pnpm lint:fix && pnpm check
       stage_fixed: true
-    lint:
-      run: pnpm lint:fix
-      stage_fixed: true
-    check:
-      run: pnpm check
 
 pre-push:
   commands:

package/template-workspace/oxfmt.config.ts

@@ -8,6 +8,7 @@ export default defineConfig({
     '**/*.json',
     'dist',
     'node_modules',
+    'repos/**',
     '.modern',
     '.modernjs',
     '**/routeTree.gen.ts',

package/template-workspace/oxlint.config.ts

@@ -12,6 +12,7 @@ export default defineConfig({
     '.agents',
     'dist',
     'node_modules',
+    'repos/**',
     '.modern',
     '.modernjs',
     '**/routeTree.gen.ts',