@bleedingdev/modern-js-create 3.4.0-ultramodern.2 → 3.4.0-ultramodern.20

package/dist/esm-node/ultramodern-workspace/module-federation.js

@@ -9,16 +9,23 @@ function createAppModernConfig(scope, app) {
     const bffImport = appHasEffectApi(app) ? "import { bffPlugin } from '@modern-js/plugin-bff';\n" : '';
     const bffConfig = appHasEffectApi(app) ? `      bff: {
         effect: {
-          entry: './api/effect/index',
+          entry: './api/index',
           openapi: {
             path: '/openapi.json',
           },
+          strictEffectApproach: true,
         },
         prefix: '${effectApiPrefix(app)}',
         runtimeFramework: 'effect',
       },
 ` : '';
     const bffPluginEntry = appHasEffectApi(app) ? '        bffPlugin(),\n' : '';
+    const defaultAssetPrefixSource = 'shell' === app.kind ? "const defaultAssetPrefix = '/';" : `const remoteAssetOrigin =
+  configuredCloudflareUrl ||
+  inferredCloudflareUrl ||
+  (cloudflareDeployEnabled ? '/' : \`http://localhost:\${port}\`);
+const defaultRemoteAssetPrefix = \`\${remoteAssetOrigin.replace(/\\/+$/u, '')}/\`;
+const defaultAssetPrefix = defaultRemoteAssetPrefix;`;
     return `// @effect-diagnostics processEnv:off
 import {
   appTools,
@@ -65,6 +72,8 @@ const configuredSiteUrl = envValue('MODERN_PUBLIC_SITE_URL');
 const configuredCloudflareUrl = envValue('${createCloudflarePublicUrlEnv(app)}');
 const configuredUltramodernAssetPrefix = envValue('ULTRAMODERN_ASSET_PREFIX');
 const configuredModernAssetPrefix = envValue('MODERN_ASSET_PREFIX');
+const moduleFederationDevServerOrigin =
+  envValue('ULTRAMODERN_MF_DEV_ORIGIN') || 'http://localhost:${shellApp.port}';
 const cloudflareWorkersDevSubdomain = envValue(
   'ULTRAMODERN_CLOUDFLARE_WORKERS_DEV_SUBDOMAIN',
 );
@@ -79,12 +88,12 @@ const siteUrl =
   configuredCloudflareUrl ||
   inferredCloudflareUrl ||
   \`http://localhost:\${port}\`;
-// Asset loading is intentionally independent from the canonical site URL and
-// deployment public URL. Without an explicit asset prefix, assets stay
-// origin-relative so self-hosted apps, tunnels, and reverse proxies never leak
-// localhost URLs into production HTML.
+${defaultAssetPrefixSource}
+// Asset loading is intentionally independent from the canonical site URL.
+// Module Federation remotes must publish an absolute publicPath so browsers
+// load remoteEntry.js and exposed chunks from the remote origin, not the host.
 const assetPrefix =
-  configuredModernAssetPrefix || configuredUltramodernAssetPrefix || '/';
+  configuredModernAssetPrefix || configuredUltramodernAssetPrefix || defaultAssetPrefix;
 
 if (
   cloudflareDeployEnabled &&
@@ -188,6 +197,9 @@ ${bffPluginEntry}        moduleFederationPlugin(),
         },
         mainEntryName: 'index',
       },
+      splitChunks: {
+        chunks: 'async',
+      },
       tools: {
         autoprefixer: {
           overrideBrowserslist: ['defaults'],
@@ -196,12 +208,14 @@ ${bffPluginEntry}        moduleFederationPlugin(),
           chain.output
             .uniqueName('${createRspackUniqueName(app)}')
             .chunkLoadingGlobal('${createRspackChunkLoadingGlobal(app)}');
-          chain.ignoreWarnings([
-            {
-              message: /the request of a dependency is an expression/u,
-              module: /modern-js-plugin-i18n/u,
-            },
-          ]);
+        },
+        devServer: {
+          headers: {
+            'Access-Control-Allow-Headers':
+              'Accept, Authorization, Content-Type, X-Requested-With',
+            'Access-Control-Allow-Methods': 'GET, HEAD, OPTIONS',
+            'Access-Control-Allow-Origin': moduleFederationDevServerOrigin,
+          },
         },
       },
     },
@@ -223,11 +237,6 @@ function createSharedModuleFederationConfig() {
       singleton: true,
       treeShaking: false,
     },
-    '@modern-js/plugin-i18n/runtime': {
-      requiredVersion: pluginI18nVersion,
-      singleton: true,
-      treeShaking: false,
-    },
     '@modern-js/plugin-tanstack/runtime': {
       requiredVersion: pluginTanstackVersion,
       singleton: true,
@@ -331,6 +340,7 @@ function createShellModuleFederationConfig(scope, remotes = []) {
         verticalRefs: remotes.map((remote)=>remote.id)
     };
     return `// @effect-diagnostics nodeBuiltinImport:off processEnv:off
+// ultramodern-mf: host-only
 import { createRequire } from 'node:module';
 import { createModuleFederationConfig } from '@module-federation/modern-js-v3';
 import { dependencies } from './package.json';
@@ -343,7 +353,9 @@ const reactVersion = (require('react/package.json') as { version: string }).vers
 const reactDomVersion = (require('react-dom/package.json') as { version: string }).version;
 
 ${createModuleFederationRemoteUrlHelpers(shellHost, remotes)}
-export default createModuleFederationConfig({
+const moduleFederationConfig: Parameters<
+  typeof createModuleFederationConfig
+>[0] = createModuleFederationConfig({
   bridge: {
     enableBridgeRouter: false,
   },
@@ -355,12 +367,15 @@ export default createModuleFederationConfig({
     generateTypes: {
       compilerInstance: 'tsgo',
     },
+    tsConfigPath: './tsconfig.mf-types.json',
   },
   filename: 'remoteEntry.js',
   name: '${shellApp.mfName}',
 ${createModuleFederationRemotesConfig(scope, shellHost, remotes)}${createSharedModuleFederationConfig()},
   treeShakingSharedExcludePlugins: ['RspackModuleFederationPlugin'],
 });
+
+export default moduleFederationConfig;
 `;
 }
 function createBuildMarker(scope, app) {
@@ -382,10 +397,18 @@ export const ultramodernUiMarker = {
 
 export const ultramodernApiMarker = {
   ...ultramodernVerticalIdentity,
-  surface: 'effect-bff',
+  surface: 'api',
 } as const;
 `;
 }
+function createUltramodernBuildReexportModule() {
+    return `export {
+  ultramodernApiMarker,
+  ultramodernUiMarker,
+  ultramodernVerticalIdentity,
+} from '../shared/ultramodern-build';
+`;
+}
 function createRemoteModuleFederationConfig(scope, app, remotes = []) {
     const exposes = formatTsObjectLiteral(app.exposes ?? {});
     return `// @effect-diagnostics nodeBuiltinImport:off
@@ -401,7 +424,9 @@ const reactVersion = (require('react/package.json') as { version: string }).vers
 const reactDomVersion = (require('react-dom/package.json') as { version: string }).version;
 
 ${createModuleFederationRemoteUrlHelpers(app, remotes)}
-export default createModuleFederationConfig({
+const moduleFederationConfig: Parameters<
+  typeof createModuleFederationConfig
+>[0] = createModuleFederationConfig({
   bridge: {
     enableBridgeRouter: false,
   },
@@ -413,6 +438,7 @@ export default createModuleFederationConfig({
     generateTypes: {
       compilerInstance: 'tsgo',
     },
+    tsConfigPath: './tsconfig.mf-types.json',
   },
   exposes: ${exposes},
   filename: 'remoteEntry.js',
@@ -420,6 +446,8 @@ export default createModuleFederationConfig({
 ${createModuleFederationRemotesConfig(scope, app, remotes)}${createSharedModuleFederationConfig()},
   treeShakingSharedExcludePlugins: ['RspackModuleFederationPlugin'],
 });
+
+export default moduleFederationConfig;
 `;
 }
-export { createAppModernConfig, createBuildMarker, createModuleFederationRemoteUrlHelpers, createModuleFederationRemotesConfig, createRemoteModuleFederationConfig, createSharedModuleFederationConfig, createShellModuleFederationConfig, createUltramodernBuildModule, formatTsObjectLiteral };
+export { createAppModernConfig, createBuildMarker, createModuleFederationRemoteUrlHelpers, createModuleFederationRemotesConfig, createRemoteModuleFederationConfig, createSharedModuleFederationConfig, createShellModuleFederationConfig, createUltramodernBuildModule, createUltramodernBuildReexportModule, formatTsObjectLiteral };

package/dist/esm-node/ultramodern-workspace/package-json.js

@@ -81,7 +81,7 @@ const effectDiagnostics = [
     'unnecessaryPipe',
     'unnecessaryPipeChain'
 ];
-function appDependencies(scope, packageSource, app, remotes = []) {
+function appDependencies(scope, packageSource, app, remotes = [], bridge) {
     const dependencies = {
         '@modern-js/plugin-tanstack': modernPackageSpecifier('@modern-js/plugin-tanstack', packageSource),
         '@modern-js/plugin-i18n': modernPackageSpecifier('@modern-js/plugin-i18n', packageSource),
@@ -96,8 +96,10 @@ function appDependencies(scope, packageSource, app, remotes = []) {
         [packageName(scope, 'shared-design-tokens')]: WORKSPACE_PACKAGE_VERSION,
         react: REACT_VERSION,
         'react-dom': REACT_DOM_VERSION,
-        'react-router': REACT_ROUTER_VERSION
+        'react-router': REACT_ROUTER_VERSION,
+        'react-router-dom': REACT_ROUTER_VERSION
     };
+    for (const dependency of bridge?.dependencies ?? [])dependencies[dependency] = WORKSPACE_PACKAGE_VERSION;
     if ('shell' === app.kind) {
         dependencies['@modern-js/plugin-bff'] = modernPackageSpecifier('@modern-js/plugin-bff', packageSource);
         for (const remote of verticalEffectApps(remotes))dependencies[packageName(scope, remote.packageSuffix)] = WORKSPACE_PACKAGE_VERSION;
@@ -124,12 +126,28 @@ function appDevDependencies(packageSource, enableTailwind) {
         wrangler: WRANGLER_VERSION
     };
 }
-function createRootPackageJson(scope, packageSource, remotes = []) {
+function createRootPackageJson(scope, packageSource, remotes = [], bridge) {
     const shellFilter = `--filter ${packageName(scope, shellApp.packageSuffix)}`;
     const remoteFilters = remotes.map((remote)=>`--filter ${packageName(scope, remote.packageSuffix)}`);
     const remoteBuildPrefix = remotes.length > 0 ? 'ULTRAMODERN_ZEPHYR=false pnpm -r --filter "./verticals/*" run build && ' : '';
     const remoteCloudflareBuildPrefix = remotes.length > 0 ? 'pnpm -r --filter "./verticals/*" run cloudflare:build && ' : '';
     const remoteCloudflareDeployPrefix = remotes.length > 0 ? 'pnpm -r --filter "./verticals/*" run cloudflare:deploy && ' : '';
+    const generatedPackageTypecheck = 'pnpm -r --filter "./apps/*" --filter "./verticals/*" --filter "./packages/*" run typecheck';
+    const typecheck = bridge ? generatedPackageTypecheck : "node ./scripts/ultramodern-typecheck.mjs --build tsconfig.json";
+    const bridgeScripts = bridge ? {
+        ...Object.fromEntries(bridge.gates.map((gate)=>[
+                `bridge:${gate.name}`,
+                `${gate.cwd ? `cd ${gate.cwd} && ` : ''}${gate.command}`
+            ])),
+        'bridge:check': bridge.gates.map((gate)=>`pnpm run bridge:${gate.name}`).join(' && ')
+    } : {};
+    const bridgeCheck = bridge ? ' && pnpm bridge:check' : '';
+    const workspacePackages = [
+        'apps/*',
+        'verticals/*',
+        'packages/*',
+        ...bridge?.workspacePackages.map((entry)=>entry.pattern) ?? []
+    ];
     return {
         private: true,
         name: scope,
@@ -151,7 +169,7 @@ function createRootPackageJson(scope, packageSource, remotes = []) {
             'format:check': "oxfmt --check . '!repos/**'",
             lint: 'oxlint apps verticals packages',
             'lint:fix': 'oxlint apps verticals packages --fix',
-            typecheck: "node ./scripts/ultramodern-typecheck.mjs --build tsconfig.json",
+            typecheck,
             'cloudflare:build': `${remoteCloudflareBuildPrefix}pnpm --filter "./apps/shell-super-app" run cloudflare:build && pnpm mf:types`,
             'cloudflare:deploy': `${remoteCloudflareDeployPrefix}pnpm --filter "./apps/shell-super-app" run cloudflare:deploy`,
             'cloudflare:proof': "node ./scripts/proof-cloudflare-version.mjs --out .codex/reports/cloudflare-version-proof/public-url-proof.json",
@@ -162,19 +180,17 @@ function createRootPackageJson(scope, packageSource, remotes = []) {
             'mf:types': "node ./scripts/assert-mf-types.mjs",
             'performance:readiness': "node ./scripts/ultramodern-performance-readiness.mjs",
             'contract:check': "node ./scripts/validate-ultramodern-workspace.mjs",
+            'api:check': "node ./scripts/check-ultramodern-api-boundaries.mjs",
             'i18n:boundaries': "node ./scripts/check-ultramodern-i18n-boundaries.mjs",
+            ...bridgeScripts,
             postinstall: "oxfmt . '!repos/**' && node ./scripts/bootstrap-agent-skills.mjs --postinstall",
-            check: 'pnpm format:check && pnpm lint && pnpm typecheck && pnpm skills:check && pnpm i18n:boundaries && pnpm contract:check && pnpm performance:readiness'
+            check: `pnpm format:check && pnpm lint && pnpm typecheck && pnpm skills:check && pnpm i18n:boundaries && pnpm api:check && pnpm contract:check && pnpm performance:readiness${bridgeCheck}`
         },
         engines: {
             node: '>=26',
             pnpm: '>=11'
         },
-        workspaces: [
-            'apps/*',
-            'verticals/*',
-            'packages/*'
-        ],
+        workspaces: workspacePackages,
         modernjs: {
             preset: 'presetUltramodern',
             workspace: 'ultramodern-superapp',
@@ -182,7 +198,7 @@ function createRootPackageJson(scope, packageSource, remotes = []) {
             ownership: './topology/ownership.json',
             packageSource: {
                 strategy: packageSource.strategy,
-                config: './.modernjs/ultramodern-package-source.json'
+                config: './.modernjs/ultramodern.json#packageSource'
             }
         },
         devDependencies: {
@@ -256,6 +272,10 @@ function createTsBuildInfoFile(packageDir) {
     const cacheKey = packageDir.replace(/[^a-zA-Z0-9._-]+/gu, '__');
     return `${relativeRootFor(packageDir)}/node_modules/.cache/tsgo/${cacheKey}.tsbuildinfo`;
 }
+function createTsDeclarationOutDir(packageDir) {
+    const cacheKey = packageDir.replace(/[^a-zA-Z0-9._-]+/gu, '__');
+    return `${relativeRootFor(packageDir)}/node_modules/.cache/tsgo/declarations/${cacheKey}`;
+}
 function createReferences(packageDir, references) {
     return [
         ...new Set(references)
@@ -269,16 +289,24 @@ function createPackageTsConfig(packageDir, options = {}) {
     } : options;
     const include = resolvedOptions.include ?? [
         'src',
+        'locales/**/*.json',
         'modern.config.ts',
-        'module-federation.config.ts'
+        'module-federation.config.ts',
+        'package.json',
+        'shared'
     ];
-    if (resolvedOptions.includeApi) include.push('api', 'shared');
+    if (resolvedOptions.includeApi) include.push('api');
     const references = createReferences(packageDir, resolvedOptions.references ?? []);
     const tsconfig = {
         extends: `${relativeRootFor(packageDir)}/tsconfig.base.json`,
         compilerOptions: {
             composite: true,
+            declaration: true,
+            declarationMap: false,
+            emitDeclarationOnly: true,
             incremental: true,
+            noEmit: false,
+            outDir: createTsDeclarationOutDir(packageDir),
             tsBuildInfoFile: createTsBuildInfoFile(packageDir)
         },
         include
@@ -296,6 +324,18 @@ function createAppTsConfig(app, remotes = []) {
         references
     });
 }
+function createAppMfTypesTsConfig(app) {
+    const exposedFiles = Object.values(app.exposes ?? {}).map((exposePath)=>exposePath.replace(/^\.\//u, ''));
+    return {
+        extends: './tsconfig.json',
+        include: [
+            ...new Set([
+                ...exposedFiles,
+                'src/modern-app-env.d.ts'
+            ])
+        ]
+    };
+}
 function createSharedPackageTsConfig(packageDir) {
     return createPackageTsConfig(packageDir, {
         include: [
@@ -316,7 +356,7 @@ function createRootTsConfig(apps = []) {
         ]
     };
 }
-function createAppPackage(scope, app, packageSource, enableTailwind, remotes = []) {
+function createAppPackage(scope, app, packageSource, enableTailwind, remotes = [], bridge) {
     const publicSurfaceBuildCommand = createPublicSurfaceGenerationCommand(app, 'dist');
     const publicSurfaceCloudflareBuildCommand = createPublicSurfaceGenerationCommand(app, 'dist');
     const publicSurfaceCloudflareOutputCommand = createPublicSurfaceGenerationCommand(app, 'cloudflare');
@@ -344,19 +384,19 @@ function createAppPackage(scope, app, packageSource, enableTailwind, remotes = [
             appId: app.id,
             topology: `${relativeRootFor(app.directory)}/topology/reference-topology.json`,
             ...appHasEffectApi(app) ? {
-                apiRuntime: 'effect-bff'
+                apiRuntime: 'effect'
             } : {}
         },
         'zephyr:dependencies': createZephyrDependencies(scope, app, remotes),
-        dependencies: appDependencies(scope, packageSource, app, remotes),
+        dependencies: appDependencies(scope, packageSource, app, remotes, bridge),
         devDependencies: appDevDependencies(packageSource, enableTailwind)
     };
     if (appHasEffectApi(app)) Object.assign(packageExports, {
-        './effect/client': `./src/effect/${app.effectApi.stem}-client.ts`,
-        './shared/effect/api': './shared/effect/api.ts'
+        './api': './shared/api.ts',
+        './api/client': `./src/api/${app.effectApi.stem}-client.ts`
     });
     else if ('shell' === app.kind) Object.assign(packageExports, {
-        './effect/clients': './src/effect/vertical-clients.ts'
+        './api/clients': './src/api/vertical-clients.ts'
     });
     if (Object.keys(packageExports).length > 0) packageJson.exports = packageExports;
     return packageJson;
@@ -388,4 +428,4 @@ function createSharedPackage(scope, id, description) {
 function createSharedContractsIndex() {
     return readFileTemplate('packages/shared-contracts-index.ts');
 }
-export { appDependencies, appDevDependencies, createAppPackage, createAppTsConfig, createEffectTsgoTypecheckCommand, createPackageTsConfig, createRootPackageJson, createRootTsConfig, createSharedContractsIndex, createSharedPackage, createSharedPackageTsConfig, createTsConfigBase, createZephyrDependencies, effectDiagnostics };
+export { appDependencies, appDevDependencies, createAppMfTypesTsConfig, createAppPackage, createAppTsConfig, createEffectTsgoTypecheckCommand, createPackageTsConfig, createRootPackageJson, createRootTsConfig, createSharedContractsIndex, createSharedPackage, createSharedPackageTsConfig, createTsConfigBase, createZephyrDependencies, effectDiagnostics };

package/dist/esm-node/ultramodern-workspace/policy.js

@@ -17,7 +17,7 @@ function createCloudflareProofRoute(app) {
         mfManifest: '/mf-manifest.json',
         locale: `/locales/en/${appI18nNamespace(app)}.json`,
         ...appHasEffectApi(app) ? {
-            effectReadiness: `${effectApiPrefix(app)}/effect/${effectApiStem(app)}/readiness`
+            apiReadiness: `${effectApiPrefix(app)}/${effectApiStem(app)}/readiness`
         } : {}
     };
 }
@@ -108,7 +108,7 @@ const PUBLIC_WEBSITE_POLICY = {
             requireWebManifestWhenPresent: true
         },
         statusCodes: {
-            notFoundRoute: '/__ultramodern-smoke-missing',
+            notFoundRoute: '/__ultramodern-smoke-missing/nope',
             unknownRouteStatus: 404
         },
         indexing: {

package/dist/esm-node/ultramodern-workspace/public-api.js

@@ -1,3 +1,4 @@
 import "node:module";
 export { addUltramodernVertical, planUltramodernVertical } from "./add-vertical.js";
+export { normalizeUltramodernBridgeConfig } from "./bridge-config.js";
 export { generateUltramodernWorkspace } from "./write-workspace.js";

package/dist/esm-node/ultramodern-workspace/versions.js

@@ -1,5 +1,6 @@
 import "node:module";
 const TANSTACK_ROUTER_VERSION = '1.170.16';
+const TANSTACK_ROUTER_CORE_VERSION = '1.171.13';
 const MODULE_FEDERATION_VERSION = '2.6.0';
 const ZEPHYR_RSPACK_PLUGIN_VERSION = '1.1.1';
 const ZEPHYR_AGENT_VERSION = '1.1.1';
@@ -29,8 +30,9 @@ const RSTACK_AGENT_SKILLS_COMMIT = '61c948b42512e223bad44b83af4080eba48b2677';
 const MODULE_FEDERATION_AGENT_SKILLS_COMMIT = '07bb5b6c43ad457609e00c081b72d4c42508ec76';
 const ultramodernWorkspaceVersions = {
     tanstackRouter: TANSTACK_ROUTER_VERSION,
+    tanstackRouterCore: TANSTACK_ROUTER_CORE_VERSION,
     moduleFederation: MODULE_FEDERATION_VERSION,
     tailwind: TAILWIND_VERSION,
     tailwindPostcss: TAILWIND_POSTCSS_VERSION
 };
-export { CLOUDFLARE_COMPATIBILITY_DATE, EFFECT_TSGO_VERSION, I18NEXT_VERSION, LEFTHOOK_VERSION, MODULE_FEDERATION_AGENT_SKILLS_COMMIT, MODULE_FEDERATION_VERSION, NODE_FETCH_VERSION, NODE_VERSION, OXFMT_VERSION, OXLINT_VERSION, PNPM_VERSION, POSTCSS_VERSION, REACT_DOM_VERSION, REACT_ROUTER_VERSION, REACT_VERSION, RSTACK_AGENT_SKILLS_COMMIT, TAILWIND_POSTCSS_VERSION, TAILWIND_VERSION, TANSTACK_ROUTER_VERSION, TYPESCRIPT_NATIVE_PREVIEW_VERSION, TYPESCRIPT_STABLE_VERSION, TYPESCRIPT_VERSION, TYPES_REACT_DOM_VERSION, TYPES_REACT_VERSION, ULTRACITE_VERSION, WRANGLER_VERSION, ZEPHYR_AGENT_VERSION, ZEPHYR_RSPACK_PLUGIN_VERSION, ultramodernWorkspaceVersions };
+export { CLOUDFLARE_COMPATIBILITY_DATE, EFFECT_TSGO_VERSION, I18NEXT_VERSION, LEFTHOOK_VERSION, MODULE_FEDERATION_AGENT_SKILLS_COMMIT, MODULE_FEDERATION_VERSION, NODE_FETCH_VERSION, NODE_VERSION, OXFMT_VERSION, OXLINT_VERSION, PNPM_VERSION, POSTCSS_VERSION, REACT_DOM_VERSION, REACT_ROUTER_VERSION, REACT_VERSION, RSTACK_AGENT_SKILLS_COMMIT, TAILWIND_POSTCSS_VERSION, TAILWIND_VERSION, TANSTACK_ROUTER_CORE_VERSION, TANSTACK_ROUTER_VERSION, TYPESCRIPT_NATIVE_PREVIEW_VERSION, TYPESCRIPT_STABLE_VERSION, TYPESCRIPT_VERSION, TYPES_REACT_DOM_VERSION, TYPES_REACT_VERSION, ULTRACITE_VERSION, WRANGLER_VERSION, ZEPHYR_AGENT_VERSION, ZEPHYR_RSPACK_PLUGIN_VERSION, ultramodernWorkspaceVersions };

package/dist/esm-node/ultramodern-workspace/workspace-scripts.js

@@ -8,10 +8,73 @@ import { createCloudflareSecurityContract } from "./policy.js";
 import { publicSurfaceManagedSourceAssetPaths } from "./public-surface.js";
 import { createLocalisedUrlsMap, createRouteMetaFilePath, createRouteOwnedI18nPaths, createRoutePageFilePath } from "./routes.js";
 import { CLOUDFLARE_COMPATIBILITY_DATE, NODE_VERSION, PNPM_VERSION } from "./versions.js";
-function createAssertMfTypesScript(remotes = []) {
-    return renderFileTemplate("workspace-scripts/assert-mf-types.mjs", {
-        defaultAppDirsJson: JSON.stringify(remotes.map((remote)=>remote.directory), null, 2)
+function createToolWrapperScript(command, extraArgs = []) {
+    const commandJson = JSON.stringify(command);
+    const extraArgsJson = JSON.stringify(extraArgs);
+    return `#!/usr/bin/env node
+import { spawnSync } from 'node:child_process';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const createBin = process.env.ULTRAMODERN_CREATE_BIN;
+const forwardedArgs = process.argv.slice(2);
+const workspaceRoot =
+  process.env.ULTRAMODERN_WORKSPACE_ROOT ??
+  path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
+const ultramodernArgs = ['ultramodern', ${commandJson}, ...${extraArgsJson}, ...forwardedArgs];
+const result = createBin
+  ? spawnSync(process.execPath, [createBin, ...ultramodernArgs], {
+      env: { ...process.env, ULTRAMODERN_WORKSPACE_ROOT: workspaceRoot },
+      stdio: 'inherit',
+    })
+  : spawnSync('modern-js-create', ultramodernArgs, {
+      env: { ...process.env, ULTRAMODERN_WORKSPACE_ROOT: workspaceRoot },
+      shell: process.platform === 'win32',
+      stdio: 'inherit',
     });
+
+if (result.error) {
+  console.error(result.error.message);
+  process.exit(1);
+}
+
+process.exit(result.status ?? 1);
+`;
+}
+function createSkillsToolWrapperScript() {
+    return `#!/usr/bin/env node
+import { spawnSync } from 'node:child_process';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const createBin = process.env.ULTRAMODERN_CREATE_BIN;
+const forwardedArgs = process.argv.slice(2);
+const workspaceRoot =
+  process.env.ULTRAMODERN_WORKSPACE_ROOT ??
+  path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
+const checkOnly = forwardedArgs.includes('--check');
+const skillArgs = checkOnly
+  ? ['skills', 'check', ...forwardedArgs.filter(arg => arg !== '--check')]
+  : ['skills', 'install', ...forwardedArgs];
+const ultramodernArgs = ['ultramodern', ...skillArgs];
+const result = createBin
+  ? spawnSync(process.execPath, [createBin, ...ultramodernArgs], {
+      env: { ...process.env, ULTRAMODERN_WORKSPACE_ROOT: workspaceRoot },
+      stdio: 'inherit',
+    })
+  : spawnSync('modern-js-create', ultramodernArgs, {
+      env: { ...process.env, ULTRAMODERN_WORKSPACE_ROOT: workspaceRoot },
+      shell: process.platform === 'win32',
+      stdio: 'inherit',
+    });
+
+if (result.error) {
+  console.error(result.error.message);
+  process.exit(1);
+}
+
+process.exit(result.status ?? 1);
+`;
 }
 function createWorkspaceValidationScript(scope, enableTailwind, remotes = []) {
     const verticals = remotes.filter(appHasEffectApi).map((remote)=>({
@@ -65,33 +128,22 @@ function createWorkspaceValidationScript(scope, enableTailwind, remotes = []) {
 function createWorkspaceI18nBoundaryValidationScript() {
     return readFileTemplate("workspace-scripts/check-ultramodern-i18n-boundaries.mjs");
 }
-function createPublicSurfaceAssetsScript() {
-    return readFileTemplate("workspace-scripts/generate-public-surface-assets.mjs");
-}
-function createCloudflareProofHelperScript() {
-    return readFileTemplate("workspace-scripts/ultramodern-cloudflare-proof.mjs");
-}
-function createCloudflareVersionProofScript() {
-    return readFileTemplate("workspace-scripts/proof-cloudflare-version.mjs");
+function createWorkspaceApiBoundaryValidationScript() {
+    return readFileTemplate("workspace-scripts/check-ultramodern-api-boundaries.mjs");
 }
 function createPerformanceReadinessConfigScript() {
     return readFileTemplate("workspace-scripts/ultramodern-performance-readiness.config.mjs");
 }
-function createPerformanceReadinessScript() {
-    return readFileTemplate("workspace-scripts/ultramodern-performance-readiness.mjs");
-}
-function createUltramodernTypecheckScript() {
-    return readFileTemplate("workspace-scripts/ultramodern-typecheck.mjs");
-}
-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));
+function writeGeneratedWorkspaceScripts(targetDir, _scope, _enableTailwind, _remotes = []) {
+    writeFileReplacing(targetDir, "scripts/assert-mf-types.mjs", createToolWrapperScript('mf-types'));
+    writeFileReplacing(targetDir, "scripts/validate-ultramodern-workspace.mjs", createToolWrapperScript('validate'));
     writeFileReplacing(targetDir, "scripts/check-ultramodern-i18n-boundaries.mjs", createWorkspaceI18nBoundaryValidationScript());
-    writeFileReplacing(targetDir, "scripts/generate-public-surface-assets.mjs", createPublicSurfaceAssetsScript());
-    writeFileReplacing(targetDir, "scripts/ultramodern-cloudflare-proof.mjs", createCloudflareProofHelperScript());
-    writeFileReplacing(targetDir, "scripts/proof-cloudflare-version.mjs", createCloudflareVersionProofScript());
+    writeFileReplacing(targetDir, "scripts/check-ultramodern-api-boundaries.mjs", createWorkspaceApiBoundaryValidationScript());
+    writeFileReplacing(targetDir, "scripts/generate-public-surface-assets.mjs", createToolWrapperScript('public-surface'));
+    writeFileReplacing(targetDir, "scripts/proof-cloudflare-version.mjs", createToolWrapperScript('cloudflare-proof'));
     writeFileReplacing(targetDir, "scripts/ultramodern-performance-readiness.config.mjs", createPerformanceReadinessConfigScript());
-    writeFileReplacing(targetDir, "scripts/ultramodern-performance-readiness.mjs", createPerformanceReadinessScript());
-    writeFileReplacing(targetDir, "scripts/ultramodern-typecheck.mjs", createUltramodernTypecheckScript());
+    writeFileReplacing(targetDir, "scripts/ultramodern-performance-readiness.mjs", createToolWrapperScript('performance-readiness'));
+    writeFileReplacing(targetDir, "scripts/ultramodern-typecheck.mjs", createToolWrapperScript('typecheck'));
+    writeFileReplacing(targetDir, "scripts/bootstrap-agent-skills.mjs", createSkillsToolWrapperScript());
 }
-export { createAssertMfTypesScript, createCloudflareProofHelperScript, createCloudflareVersionProofScript, createPerformanceReadinessConfigScript, createPerformanceReadinessScript, createPublicSurfaceAssetsScript, createUltramodernTypecheckScript, createWorkspaceI18nBoundaryValidationScript, createWorkspaceValidationScript, writeGeneratedWorkspaceScripts };
+export { createPerformanceReadinessConfigScript, createWorkspaceApiBoundaryValidationScript, createWorkspaceI18nBoundaryValidationScript, createWorkspaceValidationScript, writeGeneratedWorkspaceScripts };