@bleedingdev/modern-js-create 3.4.0-ultramodern.9 → 3.5.0-ultramodern.1

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

@@ -1,11 +1,11 @@
 import "node:module";
 import { WORKSPACE_PACKAGE_VERSION, modernPackageSpecifier } from "../ultramodern-package-source.js";
-import { appHasEffectApi, remoteDependencyAlias, resolveRemoteRefs, sharedPackages, shellApp, verticalEffectApps, zephyrRemoteDependency } from "./descriptors.js";
+import { appHasApi, remoteDependencyAlias, resolveRemoteRefs, sharedPackages, shellApp, verticalApiApps, zephyrRemoteDependency } from "./descriptors.js";
 import { readFileTemplate } from "./fs-io.js";
 import { packageName, relativeRootFor } from "./naming.js";
 import { createPublicSurfaceGenerationCommand } from "./public-surface.js";
 import { EFFECT_TSGO_VERSION, I18NEXT_VERSION, LEFTHOOK_VERSION, MODULE_FEDERATION_VERSION, NODE_FETCH_VERSION, OXFMT_VERSION, OXLINT_VERSION, PNPM_VERSION, POSTCSS_VERSION, REACT_DOM_VERSION, REACT_ROUTER_VERSION, REACT_VERSION, TAILWIND_POSTCSS_VERSION, TAILWIND_VERSION, TANSTACK_ROUTER_VERSION, TYPESCRIPT_NATIVE_PREVIEW_VERSION, TYPESCRIPT_VERSION, TYPES_REACT_DOM_VERSION, TYPES_REACT_VERSION, ULTRACITE_VERSION, WRANGLER_VERSION, ZEPHYR_AGENT_VERSION, ZEPHYR_RSPACK_PLUGIN_VERSION } from "./versions.js";
-const createEffectTsgoTypecheckCommand = (packageDir)=>`node ${relativeRootFor(packageDir)}/scripts/ultramodern-typecheck.mjs --project tsconfig.json`;
+const createStrictTsgoTypecheckCommand = (packageDir)=>`node ${relativeRootFor(packageDir)}/scripts/ultramodern-typecheck.mts --project tsconfig.json`;
 const effectDiagnostics = [
     'anyUnknownInErrorContext',
     'classSelfMismatch',
@@ -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,14 +96,16 @@ 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;
+        for (const remote of verticalApiApps(remotes))dependencies[packageName(scope, remote.packageSuffix)] = WORKSPACE_PACKAGE_VERSION;
     }
     for (const remote of resolveRemoteRefs(app, remotes))dependencies[packageName(scope, remote.packageSuffix)] = WORKSPACE_PACKAGE_VERSION;
-    if (appHasEffectApi(app)) dependencies['@modern-js/plugin-bff'] = modernPackageSpecifier('@modern-js/plugin-bff', packageSource);
+    if (appHasApi(app)) dependencies['@modern-js/plugin-bff'] = modernPackageSpecifier('@modern-js/plugin-bff', packageSource);
     return dependencies;
 }
 function appDevDependencies(packageSource, enableTailwind) {
@@ -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.mts --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,30 +169,29 @@ 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",
-            'skills:install': "node ./scripts/bootstrap-agent-skills.mjs",
-            'skills:check': "node ./scripts/bootstrap-agent-skills.mjs --check",
-            'agents:refs:install': "node ./scripts/setup-agent-reference-repos.mjs",
-            'agents:refs:check': "node ./scripts/setup-agent-reference-repos.mjs --check",
-            'mf:types': "node ./scripts/assert-mf-types.mjs",
-            'performance:readiness': "node ./scripts/ultramodern-performance-readiness.mjs",
-            'contract:check': "node ./scripts/validate-ultramodern-workspace.mjs",
-            'i18n:boundaries': "node ./scripts/check-ultramodern-i18n-boundaries.mjs",
-            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'
+            'cloudflare:proof': "node ./scripts/proof-cloudflare-version.mts --out .codex/reports/cloudflare-version-proof/public-url-proof.json",
+            'skills:install': "node ./scripts/bootstrap-agent-skills.mts",
+            'skills:check': "node ./scripts/bootstrap-agent-skills.mts --check",
+            'agents:refs:install': "node ./scripts/setup-agent-reference-repos.mts",
+            'agents:refs:check': "node ./scripts/setup-agent-reference-repos.mts --check",
+            'mf:types': "node ./scripts/assert-mf-types.mts",
+            'performance:readiness': "node ./scripts/ultramodern-performance-readiness.mts",
+            'migrate:strict-effect': "node ./scripts/migrate-strict-effect.mts",
+            'contract:check': "node ./scripts/validate-ultramodern-workspace.mts",
+            'api:check': "node ./scripts/check-ultramodern-api-boundaries.mts",
+            'i18n:boundaries': "node ./scripts/check-ultramodern-i18n-boundaries.mts",
+            ...bridgeScripts,
+            postinstall: "oxfmt . '!repos/**' && node ./scripts/bootstrap-agent-skills.mts --postinstall",
+            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 +199,7 @@ function createRootPackageJson(scope, packageSource, remotes = []) {
             ownership: './topology/ownership.json',
             packageSource: {
                 strategy: packageSource.strategy,
-                config: './.modernjs/ultramodern-package-source.json'
+                config: './.modernjs/ultramodern.json'
             }
         },
         devDependencies: {
@@ -301,10 +318,10 @@ function createPackageTsConfig(packageDir, options = {}) {
 function createAppTsConfig(app, remotes = []) {
     const references = [
         ...sharedPackages.map((sharedPackage)=>sharedPackage.directory),
-        ...'shell' === app.kind ? verticalEffectApps(remotes).map((remote)=>remote.directory) : resolveRemoteRefs(app, remotes).map((remote)=>remote.directory)
+        ...'shell' === app.kind ? verticalApiApps(remotes).map((remote)=>remote.directory) : resolveRemoteRefs(app, remotes).map((remote)=>remote.directory)
     ];
     return createPackageTsConfig(app.directory, {
-        includeApi: appHasEffectApi(app),
+        includeApi: appHasApi(app),
         references
     });
 }
@@ -340,7 +357,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');
@@ -354,33 +371,33 @@ function createAppPackage(scope, app, packageSource, enableTailwind, remotes = [
         version: '0.1.0',
         scripts: {
             dev: 'modern dev',
-            build: app.exposes ? `ULTRAMODERN_ZEPHYR=false modern build && ${publicSurfaceBuildCommand} && node ${relativeRootFor(app.directory)}/scripts/assert-mf-types.mjs` : `ULTRAMODERN_ZEPHYR=false modern build && ${publicSurfaceBuildCommand}`,
+            build: app.exposes ? `ULTRAMODERN_ZEPHYR=false modern build && ${publicSurfaceBuildCommand} && node ${relativeRootFor(app.directory)}/scripts/assert-mf-types.mts` : `ULTRAMODERN_ZEPHYR=false modern build && ${publicSurfaceBuildCommand}`,
             'cloudflare:build': `ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern build && ${publicSurfaceCloudflareBuildCommand} && ULTRAMODERN_ZEPHYR=false MODERNJS_DEPLOY=cloudflare modern deploy && ${publicSurfaceCloudflareOutputCommand}`,
             '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}`,
+            'cloudflare:proof': `node ${relativeRootFor(app.directory)}/scripts/proof-cloudflare-version.mts --app ${app.id}`,
             serve: 'modern serve',
-            typecheck: createEffectTsgoTypecheckCommand(app.directory)
+            typecheck: createStrictTsgoTypecheckCommand(app.directory)
         },
         modernjs: {
             preset: 'presetUltramodern',
             role: 'shell' === app.kind ? 'shell' : 'module-federation-remote',
             appId: app.id,
             topology: `${relativeRootFor(app.directory)}/topology/reference-topology.json`,
-            ...appHasEffectApi(app) ? {
-                apiRuntime: 'effect-bff'
+            ...appHasApi(app) ? {
+                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'
+    if (appHasApi(app)) Object.assign(packageExports, {
+        './api': './shared/api.ts',
+        './api/client': `./src/api/${app.api.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;
@@ -396,7 +413,7 @@ function createSharedPackage(scope, id, description) {
             '.': './src/index.ts'
         },
         scripts: {
-            typecheck: createEffectTsgoTypecheckCommand(`packages/${id}`)
+            typecheck: createStrictTsgoTypecheckCommand(`packages/${id}`)
         },
         devDependencies: {
             '@effect/tsgo': EFFECT_TSGO_VERSION,
@@ -412,4 +429,4 @@ function createSharedPackage(scope, id, description) {
 function createSharedContractsIndex() {
     return readFileTemplate('packages/shared-contracts-index.ts');
 }
-export { appDependencies, appDevDependencies, createAppMfTypesTsConfig, createAppPackage, createAppTsConfig, createEffectTsgoTypecheckCommand, createPackageTsConfig, createRootPackageJson, createRootTsConfig, createSharedContractsIndex, createSharedPackage, createSharedPackageTsConfig, createTsConfigBase, createZephyrDependencies, effectDiagnostics };
+export { appDependencies, appDevDependencies, createAppMfTypesTsConfig, createAppPackage, createAppTsConfig, createPackageTsConfig, createRootPackageJson, createRootTsConfig, createSharedContractsIndex, createSharedPackage, createSharedPackageTsConfig, createStrictTsgoTypecheckCommand, createTsConfigBase, createZephyrDependencies, effectDiagnostics };

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

@@ -1,5 +1,5 @@
 import "node:module";
-import { appHasEffectApi, appI18nNamespace, createCloudflarePublicUrlEnv, createCloudflareWorkerName, effectApiPrefix, effectApiStem } from "./descriptors.js";
+import { appHasApi, appI18nNamespace, createCloudflarePublicUrlEnv, createCloudflareWorkerName, resolveApiPrefix, resolveApiStem } from "./descriptors.js";
 import { createLocalisedUrlsMap } from "./routes.js";
 import { isRecord } from "./types.js";
 import { CLOUDFLARE_COMPATIBILITY_DATE } from "./versions.js";
@@ -16,8 +16,8 @@ function createCloudflareProofRoute(app) {
         ssr: localizedPath ?? '/en',
         mfManifest: '/mf-manifest.json',
         locale: `/locales/en/${appI18nNamespace(app)}.json`,
-        ...appHasEffectApi(app) ? {
-            effectReadiness: `${effectApiPrefix(app)}/effect/${effectApiStem(app)}/readiness`
+        ...appHasApi(app) ? {
+            apiReadiness: `${resolveApiPrefix(app)}/${resolveApiStem(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: {
@@ -176,7 +176,7 @@ function createCloudflareDeployContract(scope, app) {
         security: createCloudflareSecurityContract(),
         qualityGates: createPublicWebsiteQualityGateContract(),
         evidence: {
-            proofScript: "scripts/proof-cloudflare-version.mjs",
+            proofScript: "scripts/proof-cloudflare-version.mts",
             reportDefault: '.codex/reports/cloudflare-version-proof/public-url-proof.json'
         }
     };

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/public-surface.js

@@ -49,7 +49,7 @@ function createPublicSurfaceOutputFiles(app) {
     ];
 }
 function createPublicSurfaceGenerationCommand(app, target, requirePublicOrigin = false) {
-    return `node ${relativeRootFor(app.directory)}/scripts/generate-public-surface-assets.mjs --app ${app.id} --target ${target}${requirePublicOrigin ? ' --require-public-origin' : ''}`;
+    return `node ${relativeRootFor(app.directory)}/scripts/generate-public-surface-assets.mts --app ${app.id} --target ${target}${requirePublicOrigin ? ' --require-public-origin' : ''}`;
 }
 function rewriteWorkspaceAssetsForApp(workspaceRoot, app) {
     for (const relativePath of publicSurfaceManagedSourceAssetPaths)node_fs.rmSync(node_path.join(workspaceRoot, app.directory, relativePath), {
@@ -65,7 +65,7 @@ function createPublicSurfaceContract(app) {
         generatedManifest: './src/routes/ultramodern-route-metadata',
         source: 'route-owned-public-routes',
         metadataExport: './src/routes/ultramodern-route-metadata',
-        generator: "scripts/generate-public-surface-assets.mjs",
+        generator: "scripts/generate-public-surface-assets.mts",
         outputRoot: 'dist/public',
         cloudflareOutputRoot: '.output/public',
         privateRoutePolicy: 'omit-from-generated-public-surface',

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';
@@ -8,6 +9,8 @@ const CLOUDFLARE_COMPATIBILITY_DATE = '2026-06-02';
 const TAILWIND_VERSION = '4.3.1';
 const TAILWIND_POSTCSS_VERSION = '4.3.1';
 const POSTCSS_VERSION = '8.5.15';
+const EFFECT_VERSION = '4.0.0-beta.89';
+const EFFECT_VITEST_VERSION = '4.0.0-beta.89';
 const EFFECT_TSGO_VERSION = '0.14.6';
 const TYPESCRIPT_STABLE_VERSION = '6.0.3';
 const TYPESCRIPT_NATIVE_PREVIEW_VERSION = '7.0.0-dev.20260624.1';
@@ -29,8 +32,11 @@ 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,
+    effect: EFFECT_VERSION,
+    effectVitest: EFFECT_VITEST_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, EFFECT_VERSION, EFFECT_VITEST_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

@@ -1,28 +1,111 @@
 import "node:module";
+import node_fs from "node:fs";
+import node_path from "node:path";
+import { verticalApiGroupName } from "./api.js";
 import { remoteComponentOutputPath } from "./demo-components.js";
-import { appHasEffectApi, appI18nNamespace, remoteDependencyAlias, shellApp } from "./descriptors.js";
-import { verticalEffectGroupName } from "./effect-api.js";
+import { appHasApi, appI18nNamespace, remoteDependencyAlias, shellApp } from "./descriptors.js";
 import { readFileTemplate, renderFileTemplate, writeFileReplacing } from "./fs-io.js";
 import { packageName, tailwindPrefixForApp } from "./naming.js";
 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 removeLegacyWorkspaceScript(targetDir, relativePath) {
+    node_fs.rmSync(node_path.join(targetDir, relativePath), {
+        force: true
+    });
+}
+function writeWorkspaceOwnedMtsScript(targetDir, name, content) {
+    writeFileReplacing(targetDir, `scripts/${name}.mts`, content);
+    removeLegacyWorkspaceScript(targetDir, `scripts/${name}.mjs`);
+}
+function migrateCopiedWorkspaceScriptToMts(targetDir, name) {
+    const legacyPath = node_path.join(targetDir, `scripts/${name}.mjs`);
+    const migratedPath = node_path.join(targetDir, `scripts/${name}.mts`);
+    if (!node_fs.existsSync(legacyPath)) return;
+    if (node_fs.existsSync(migratedPath)) return void node_fs.rmSync(legacyPath, {
+        force: true
+    });
+    node_fs.renameSync(legacyPath, migratedPath);
 }
 function createWorkspaceValidationScript(scope, enableTailwind, remotes = []) {
-    const verticals = remotes.filter(appHasEffectApi).map((remote)=>({
+    const verticals = remotes.filter(appHasApi).map((remote)=>({
             id: remote.id,
             domain: remote.domain,
-            stem: remote.effectApi.stem,
-            group: verticalEffectGroupName(remote),
+            stem: remote.api.stem,
+            group: verticalApiGroupName(remote),
             path: remote.directory,
             port: remote.port,
             mfName: remote.mfName,
-            apiPrefix: remote.effectApi.prefix,
+            apiPrefix: remote.api.prefix,
             tailwindPrefix: tailwindPrefixForApp(remote),
             zephyrAlias: remoteDependencyAlias(remote),
             packageName: packageName(scope, remote.packageSuffix),
@@ -63,35 +146,26 @@ 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");
+    return readFileTemplate("workspace-scripts/check-ultramodern-i18n-boundaries.mts");
 }
-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.mts");
 }
 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));
-    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());
+function writeGeneratedWorkspaceScripts(targetDir, _scope, _enableTailwind, _remotes = []) {
+    writeWorkspaceOwnedMtsScript(targetDir, 'assert-mf-types', createToolWrapperScript('mf-types'));
+    writeWorkspaceOwnedMtsScript(targetDir, 'validate-ultramodern-workspace', createToolWrapperScript('validate'));
+    writeWorkspaceOwnedMtsScript(targetDir, 'check-ultramodern-i18n-boundaries', createWorkspaceI18nBoundaryValidationScript());
+    writeWorkspaceOwnedMtsScript(targetDir, 'check-ultramodern-api-boundaries', createWorkspaceApiBoundaryValidationScript());
+    writeWorkspaceOwnedMtsScript(targetDir, 'generate-public-surface-assets', createToolWrapperScript('public-surface'));
+    writeWorkspaceOwnedMtsScript(targetDir, 'proof-cloudflare-version', 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());
+    writeWorkspaceOwnedMtsScript(targetDir, 'ultramodern-performance-readiness', createToolWrapperScript('performance-readiness'));
+    writeWorkspaceOwnedMtsScript(targetDir, 'migrate-strict-effect', createToolWrapperScript('migrate-strict-effect'));
+    writeWorkspaceOwnedMtsScript(targetDir, 'ultramodern-typecheck', createToolWrapperScript('typecheck'));
+    writeWorkspaceOwnedMtsScript(targetDir, 'bootstrap-agent-skills', createSkillsToolWrapperScript());
+    migrateCopiedWorkspaceScriptToMts(targetDir, 'setup-agent-reference-repos');
 }
-export { createAssertMfTypesScript, createCloudflareProofHelperScript, createCloudflareVersionProofScript, createPerformanceReadinessConfigScript, createPerformanceReadinessScript, createPublicSurfaceAssetsScript, createUltramodernTypecheckScript, createWorkspaceI18nBoundaryValidationScript, createWorkspaceValidationScript, writeGeneratedWorkspaceScripts };
+export { createPerformanceReadinessConfigScript, createWorkspaceApiBoundaryValidationScript, createWorkspaceI18nBoundaryValidationScript, createWorkspaceValidationScript, writeGeneratedWorkspaceScripts };