@bleedingdev/modern-js-ultramodern-create 3.9.0-ultramodern.10 → 3.9.0-ultramodern.12

package/dist/cjs/ultramodern-tooling/commands/cloudflare-output-verify.cjs

@@ -39,10 +39,10 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     runCloudflareOutputVerify: ()=>runCloudflareOutputVerify
 });
+const external_node_module_namespaceObject = require("node:module");
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const external_config_cjs_namespaceObject = require("../config.cjs");
-const external_context_cjs_namespaceObject = require("./context.cjs");
 const external_options_cjs_namespaceObject = require("./options.cjs");
 const resolveCloudflareOutputVerifyTargets = (args, context)=>{
     const outputDirectory = (0, external_options_cjs_namespaceObject.readOption)(args, '--output');
@@ -60,51 +60,7 @@ const resolveCloudflareOutputVerifyTargets = (args, context)=>{
     if (0 === targets.length) throw new Error(`No generated UltraModern app matched ${appId}.`);
     return targets;
 };
-const renderCloudflareOutputVerifyModule = ({ workspaceRoot, targets, excludePaths })=>`
-import { createRequire } from 'node:module';
-import path from 'node:path';
-
-const workspaceRoot = ${JSON.stringify(workspaceRoot)};
-const targets = ${JSON.stringify(targets, null, 2)};
-const scanRoots = [workspaceRoot];
-const excludePaths = ${JSON.stringify(excludePaths)};
-const verifierRequire = createRequire(path.join(workspaceRoot, 'package.json'));
-const {
-  verifyCloudflareOutput,
-  verifyCloudflareOutputMutationPolicy,
-} = verifierRequire('@modern-js/app-tools-extensions/cloudflare-output-verifier');
-
-let failed = false;
-for (const target of targets) {
-  const result = await verifyCloudflareOutput({
-    outputDirectory: target.outputDirectory,
-    importWorker: true,
-  });
-  if (result.ok) {
-    console.log(\`[ultramodern] Cloudflare output verified: \${target.label}\`);
-  } else {
-    failed = true;
-    console.error(\`[ultramodern] Cloudflare output failed: \${target.label}\`);
-    for (const issue of result.issues) {
-      console.error(\`- \${issue.code}: \${issue.message}\${issue.path ? \` (\${issue.path})\` : ''}\`);
-    }
-  }
-}
-
-if (scanRoots.length > 0) {
-  const policyResult = await verifyCloudflareOutputMutationPolicy({ scanRoots, excludePaths });
-  if (!policyResult.ok) {
-    failed = true;
-    console.error('[ultramodern] generated-output mutation policy failed');
-    for (const issue of policyResult.issues) {
-      console.error(\`- \${issue.code}: \${issue.message}\${issue.path ? \` (\${issue.path})\` : ''}\`);
-    }
-  }
-}
-
-process.exit(failed ? 1 : 0);
-`;
-function runCloudflareOutputVerify(args, context) {
+async function runCloudflareOutputVerify(args, context) {
     if (args.includes('--help') || args.includes('-h')) {
         process.stdout.write(`Usage:
   ultramodern-create ultramodern cloudflare-output-verify [--app <id> | --output <dir>]
@@ -114,14 +70,34 @@ Without --app or --output, every generated workspace app is verified.
 `);
         return 0;
     }
-    const source = renderCloudflareOutputVerifyModule({
-        workspaceRoot: context.workspaceRoot,
-        targets: resolveCloudflareOutputVerifyTargets(args, context),
-        excludePaths: [
-            external_node_path_default().join(context.workspaceRoot, "scripts", 'validate-ultramodern-workspace.mts')
-        ]
+    const targets = resolveCloudflareOutputVerifyTargets(args, context);
+    const verifierRequire = (0, external_node_module_namespaceObject.createRequire)(external_node_path_default().join(context.workspaceRoot, 'package.json'));
+    const { verifyCloudflareOutput, verifyCloudflareOutputMutationPolicy } = verifierRequire('@modern-js/app-tools-extensions/cloudflare-output-verifier');
+    let failed = false;
+    for (const target of targets){
+        const result = await verifyCloudflareOutput({
+            outputDirectory: target.outputDirectory,
+            importWorker: true
+        });
+        if (result.ok) console.log(`[ultramodern] Cloudflare output verified: ${target.label}`);
+        else {
+            failed = true;
+            console.error(`[ultramodern] Cloudflare output failed: ${target.label}`);
+            for (const issue of result.issues)console.error(`- ${issue.code}: ${issue.message}${issue.path ? ` (${issue.path})` : ''}`);
+        }
+    }
+    const policyResult = await verifyCloudflareOutputMutationPolicy({
+        scanRoots: [
+            context.workspaceRoot
+        ],
+        excludePaths: []
     });
-    return (0, external_context_cjs_namespaceObject.runRenderedModule)(source, context);
+    if (!policyResult.ok) {
+        failed = true;
+        console.error('[ultramodern] generated-output mutation policy failed');
+        for (const issue of policyResult.issues)console.error(`- ${issue.code}: ${issue.message}${issue.path ? ` (${issue.path})` : ''}`);
+    }
+    return failed ? 1 : 0;
 }
 exports.runCloudflareOutputVerify = __webpack_exports__.runCloudflareOutputVerify;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/cjs/ultramodern-tooling/commands/context.cjs

@@ -43,15 +43,10 @@ __webpack_require__.d(__webpack_exports__, {
     AD_HOC_TOOLING_COMMANDS: ()=>AD_HOC_TOOLING_COMMANDS,
     createPackageRoot: ()=>createPackageRoot,
     printHelp: ()=>printHelp,
-    runRenderedModule: ()=>runRenderedModule,
     runTemplateBackedToolingCommand: ()=>runTemplateBackedToolingCommand,
     spawnNodeScript: ()=>spawnNodeScript
 });
 const external_node_child_process_namespaceObject = require("node:child_process");
-const external_node_fs_namespaceObject = require("node:fs");
-var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
-const external_node_os_namespaceObject = require("node:os");
-var external_node_os_default = /*#__PURE__*/ __webpack_require__.n(external_node_os_namespaceObject);
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const external_node_url_namespaceObject = require("node:url");
@@ -100,37 +95,15 @@ function runTemplateBackedToolingCommand(command, args, context) {
         cwd: 'invocation' === toolingCommand.cwd ? context.invocationCwd : context.workspaceRoot
     });
 }
-function runRenderedModule(source, context) {
-    const tempDir = external_node_fs_default().mkdtempSync(external_node_path_default().join(external_node_os_default().tmpdir(), 'ultramodern-tool-'));
-    const tempFile = external_node_path_default().join(tempDir, 'command.mjs');
-    try {
-        external_node_fs_default().writeFileSync(tempFile, source, 'utf-8');
-        const result = (0, external_node_child_process_namespaceObject.spawnSync)(process.execPath, [
-            tempFile
-        ], {
-            cwd: context.workspaceRoot,
-            stdio: 'inherit'
-        });
-        if (result.error) throw result.error;
-        return result.status ?? 1;
-    } finally{
-        external_node_fs_default().rmSync(tempDir, {
-            force: true,
-            recursive: true
-        });
-    }
-}
 exports.AD_HOC_TOOLING_COMMANDS = __webpack_exports__.AD_HOC_TOOLING_COMMANDS;
 exports.createPackageRoot = __webpack_exports__.createPackageRoot;
 exports.printHelp = __webpack_exports__.printHelp;
-exports.runRenderedModule = __webpack_exports__.runRenderedModule;
 exports.runTemplateBackedToolingCommand = __webpack_exports__.runTemplateBackedToolingCommand;
 exports.spawnNodeScript = __webpack_exports__.spawnNodeScript;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "AD_HOC_TOOLING_COMMANDS",
     "createPackageRoot",
     "printHelp",
-    "runRenderedModule",
     "runTemplateBackedToolingCommand",
     "spawnNodeScript"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];

package/dist/cjs/ultramodern-tooling/commands/routes-generate-app.cjs

@@ -0,0 +1,60 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+var __webpack_exports__ = {};
+const external_node_module_namespaceObject = require("node:module");
+const external_node_path_namespaceObject = require("node:path");
+var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
+const external_node_url_namespaceObject = require("node:url");
+async function main() {
+    const [appDirectory, label] = process.argv.slice(2);
+    try {
+        if (!appDirectory || !label) throw new Error('Route generation requires an app directory and label.');
+        const appRequire = (0, external_node_module_namespaceObject.createRequire)(external_node_path_default().join(appDirectory, 'package.json'));
+        const pluginUrl = (0, external_node_url_namespaceObject.pathToFileURL)(appRequire.resolve('@modern-js/plugin-tanstack')).href;
+        const { generateTanstackRouteArtifacts } = await import(pluginUrl);
+        await generateTanstackRouteArtifacts({
+            appDirectory
+        });
+        console.log(`[ultramodern] TanStack route artifacts generated: ${label}`);
+    } catch (error) {
+        process.exitCode = 1;
+        console.error(`[ultramodern] TanStack route generation failed: ${label}`);
+        let current = error;
+        let depth = 0;
+        while(current){
+            const detail = current instanceof Error ? current.stack ?? `${current.name}: ${current.message}` : String(current);
+            console.error(`${0 === depth ? '-' : '  caused by:'} ${detail}`);
+            current = current instanceof Error ? current.cause : void 0;
+            depth += 1;
+        }
+    }
+}
+main();
+for(var __rspack_i in __webpack_exports__)exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/ultramodern-tooling/commands/routes-generate.cjs

@@ -53,49 +53,6 @@ const resolveRoutesGenerateTargets = (args, context)=>{
     if (0 === targets.length) throw new Error(`No generated UltraModern app matched ${appId ?? '<any>'}.`);
     return targets;
 };
-const renderRoutesGenerateModule = ({ workspaceRoot, targets })=>`
-import { createRequire } from 'node:module';
-import path from 'node:path';
-import { pathToFileURL } from 'node:url';
-
-const workspaceRoot = ${JSON.stringify(workspaceRoot)};
-const targets = ${JSON.stringify(targets, null, 2)};
-const appRequire = createRequire(path.join(workspaceRoot, 'package.json'));
-const pluginUrl = pathToFileURL(
-  appRequire.resolve('@modern-js/plugin-tanstack'),
-).href;
-const { generateTanstackRouteArtifacts } = await import(pluginUrl);
-
-let failed = false;
-// Sequential — the app-tools cli singleton is not re-entrant.
-for (const target of targets) {
-  try {
-    await generateTanstackRouteArtifacts({ appDirectory: target.appDirectory });
-    console.log(\`[ultramodern] TanStack route artifacts generated: \${target.label}\`);
-  } catch (error) {
-    failed = true;
-    console.error(\`[ultramodern] TanStack route generation failed: \${target.label}\`);
-    // Print the full underlying failure, including the cause chain. The
-    // route-generate crash is often an opaque node error thrown deep inside
-    // app-tools/plugin (e.g. a path TypeError), so surfacing only
-    // \`error.message\` swallows the stack that points at the real culprit.
-    let current = error;
-    let depth = 0;
-    while (current) {
-      const label = depth === 0 ? '-' : '  caused by:';
-      const detail =
-        current instanceof Error
-          ? current.stack ?? \`\${current.name}: \${current.message}\`
-          : String(current);
-      console.error(\`\${label} \${detail}\`);
-      current = current instanceof Error ? current.cause : undefined;
-      depth += 1;
-    }
-  }
-}
-
-process.exit(failed ? 1 : 0);
-`;
 function runRoutesGenerate(args, context) {
     if (args.includes('--help') || args.includes('-h')) {
         process.stdout.write(`Usage:
@@ -107,11 +64,18 @@ generated workspace app is regenerated.
 `);
         return 0;
     }
-    const source = renderRoutesGenerateModule({
-        workspaceRoot: context.workspaceRoot,
-        targets: resolveRoutesGenerateTargets(args, context)
-    });
-    return (0, external_context_cjs_namespaceObject.runRenderedModule)(source, context);
+    const targets = resolveRoutesGenerateTargets(args, context);
+    let failed = false;
+    for (const target of targets){
+        const status = (0, external_context_cjs_namespaceObject.spawnNodeScript)('dist/esm-node/ultramodern-tooling/commands/routes-generate-app.js', [
+            target.appDirectory,
+            target.label
+        ], context, {
+            cwd: target.appDirectory
+        });
+        failed ||= 0 !== status;
+    }
+    return failed ? 1 : 0;
 }
 exports.runRoutesGenerate = __webpack_exports__.runRoutesGenerate;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/cjs/ultramodern-tooling/commands/validate.cjs

@@ -46,7 +46,8 @@ const cohort_parity_cjs_namespaceObject = require("../../ultramodern-workspace/c
 const contracts_cjs_namespaceObject = require("../../ultramodern-workspace/contracts.cjs");
 const descriptors_cjs_namespaceObject = require("../../ultramodern-workspace/descriptors.cjs");
 const patch_parity_cjs_namespaceObject = require("../../ultramodern-workspace/patch-parity.cjs");
-const workspace_scripts_cjs_namespaceObject = require("../../ultramodern-workspace/workspace-scripts.cjs");
+const workspace_cjs_namespaceObject = require("../../ultramodern-workspace/validation/workspace.cjs");
+const workspace_validation_contract_cjs_namespaceObject = require("../../ultramodern-workspace/workspace-validation-contract.cjs");
 const external_config_cjs_namespaceObject = require("../config.cjs");
 const external_context_cjs_namespaceObject = require("./context.cjs");
 function runValidate(context) {
@@ -88,8 +89,9 @@ function runValidate(context) {
         return 1;
     }
     const releaseCohort = config.packageSource?.strategy === 'install' ? (0, external_ultramodern_release_cohort_cjs_namespaceObject.readWorkspaceReleaseCohort)(context.workspaceRoot) : void 0;
-    const source = (0, workspace_scripts_cjs_namespaceObject.createPackagedWorkspaceValidationScript)(config.workspace.packageScope, config.features.tailwind, remotes, releaseCohort, additionalShells, primaryShell, compactConfig, (0, external_config_cjs_namespaceObject.readJsonObject)(external_node_path_default().join(context.workspaceRoot, 'topology/ownership.json')), void 0, context.workspaceRoot);
-    return (0, external_context_cjs_namespaceObject.runRenderedModule)(source, context);
+    const contract = (0, workspace_validation_contract_cjs_namespaceObject.createWorkspaceValidationContract)(config.workspace.packageScope, config.features.tailwind, remotes, releaseCohort, additionalShells, primaryShell, compactConfig, (0, external_config_cjs_namespaceObject.readJsonObject)(external_node_path_default().join(context.workspaceRoot, 'topology/ownership.json')), void 0, context.workspaceRoot);
+    (0, workspace_cjs_namespaceObject.validateWorkspace)(context.workspaceRoot, contract);
+    return 0;
 }
 exports.runValidate = __webpack_exports__.runValidate;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/cjs/ultramodern-tooling/commands.cjs

@@ -67,9 +67,9 @@ async function runUltramodernToolingCli(args, workspaceRoot = process.env.ULTRAM
             case tooling_command_catalog_cjs_namespaceObject.GENERATED_TOOLING_COMMANDS.mfTypes.command:
                 return (0, mf_types_cjs_namespaceObject.runMfTypes)(rest, context);
             case tooling_command_catalog_cjs_namespaceObject.GENERATED_TOOLING_COMMANDS.cloudflareOutputVerify.command:
-                return (0, cloudflare_output_verify_cjs_namespaceObject.runCloudflareOutputVerify)(rest, context);
+                return await (0, cloudflare_output_verify_cjs_namespaceObject.runCloudflareOutputVerify)(rest, context);
             case tooling_command_catalog_cjs_namespaceObject.GENERATED_TOOLING_COMMANDS.routesGenerate.command:
-                return (0, routes_generate_cjs_namespaceObject.runRoutesGenerate)(rest, context);
+                return await (0, routes_generate_cjs_namespaceObject.runRoutesGenerate)(rest, context);
             case context_cjs_namespaceObject.AD_HOC_TOOLING_COMMANDS.syncDeliveryUnit:
                 return (0, sync_delivery_unit_cjs_namespaceObject.runSyncDeliveryUnit)(rest, context);
             case context_cjs_namespaceObject.AD_HOC_TOOLING_COMMANDS.skills:

package/dist/cjs/ultramodern-tooling/config/normalize.cjs

@@ -232,7 +232,7 @@ function allWorkspaceAppsFromToolingConfig(config, workspaceRoot) {
         ...additionalShellsFromToolingConfig(config)
     ];
 }
-function normalizeWorkspaceInputs(workspaceRoot, inputs, sourcePath = external_node_path_default().join(workspaceRoot, descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH)) {
+function normalizeWorkspaceInputs(workspaceRoot, inputs, sourcePath = external_node_path_default().join(workspaceRoot, descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH), options = {}) {
     const config = normalizeCompactConfig(workspaceRoot, sourcePath, inputs.config);
     const ports = inputs.overlay?.ports ?? {};
     const additionalShells = additionalShellsFromToolingConfig(config);
@@ -240,6 +240,16 @@ function normalizeWorkspaceInputs(workspaceRoot, inputs, sourcePath = external_n
         (0, topology_cjs_namespaceObject.createPrimaryShellDescriptor)(inputs.topology, inputs.config),
         ...(0, topology_cjs_namespaceObject.verticalsFromTopology)(inputs.topology, ports)
     ] : workspaceAppsFromToolingConfig(config, workspaceRoot);
+    if ('compact' === options.primaryComposition) {
+        const primary = topologyApps.find((app)=>app.id === descriptors_cjs_namespaceObject.shellApp.id);
+        if (primary) {
+            const configured = (0, topology_cjs_namespaceObject.createPrimaryShellDescriptor)({}, inputs.config);
+            const refs = inputs.config.topology?.apps?.find((app)=>app.id === descriptors_cjs_namespaceObject.shellApp.id)?.moduleFederation?.verticalRefs;
+            Object.assign(primary, configured, {
+                verticalRefs: Array.isArray(refs) ? configured.verticalRefs : topologyApps.filter((app)=>'vertical' === app.kind && (0, descriptors_cjs_namespaceObject.appEmitsBrowserUi)(app)).map((app)=>app.id)
+            });
+        }
+    }
     const apps = [
         ...topologyApps.map((app)=>({
                 ...app,

package/dist/cjs/ultramodern-workspace/add-shell.cjs

@@ -42,15 +42,13 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_node_fs_namespaceObject = require("node:fs");
 var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
-const external_node_os_namespaceObject = require("node:os");
-var external_node_os_default = /*#__PURE__*/ __webpack_require__.n(external_node_os_namespaceObject);
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const config_cjs_namespaceObject = require("../ultramodern-tooling/config.cjs");
 const constants_cjs_namespaceObject = require("./add-vertical/constants.cjs");
 const preflight_cjs_namespaceObject = require("./add-vertical/preflight.cjs");
+const preview_cjs_namespaceObject = require("./add-vertical/preview.cjs");
 const shell_files_cjs_namespaceObject = require("./add-vertical/shell-files.cjs");
-const topology_cjs_namespaceObject = require("./add-vertical/topology.cjs");
 const transaction_cjs_namespaceObject = require("./add-vertical/transaction.cjs");
 const workspace_state_cjs_namespaceObject = require("./add-vertical/workspace-state.cjs");
 const external_descriptors_cjs_namespaceObject = require("./descriptors.cjs");
@@ -60,40 +58,37 @@ const external_module_federation_cjs_namespaceObject = require("./module-federat
 const external_naming_cjs_namespaceObject = require("./naming.cjs");
 const external_shells_cjs_namespaceObject = require("./shells.cjs");
 const external_tsconfigs_cjs_namespaceObject = require("./tsconfigs.cjs");
-const external_types_cjs_namespaceObject = require("./types.cjs");
 const external_workspace_artifact_ownership_cjs_namespaceObject = require("./workspace-artifact-ownership.cjs");
 const external_workspace_scripts_cjs_namespaceObject = require("./workspace-scripts.cjs");
 const external_write_app_cjs_namespaceObject = require("./write-app.cjs");
 const external_zerops_cjs_namespaceObject = require("./zerops.cjs");
-function readRequiredJsonObject(filePath) {
-    if (!external_node_fs_default().existsSync(filePath)) throw new Error(`Missing UltraModern workspace file: ${filePath}`);
-    const value = (0, external_fs_io_cjs_namespaceObject.readJsonFile)(filePath);
-    if (!(0, external_types_cjs_namespaceObject.isRecord)(value)) throw new Error(`UltraModern workspace file must contain a JSON object: ${filePath}`);
-    return value;
-}
 function prepareAddUltramodernShell(options) {
     const name = (0, external_shells_cjs_namespaceObject.assertValidShellName)(options.name);
     const configPath = external_node_path_default().join(options.workspaceRoot, external_descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH);
     const overlayPath = external_node_path_default().join(options.workspaceRoot, constants_cjs_namespaceObject.DEVELOPMENT_OVERLAY_PATH);
     const topologyPath = external_node_path_default().join(options.workspaceRoot, constants_cjs_namespaceObject.TOPOLOGY_PATH);
-    const rootPackage = readRequiredJsonObject(external_node_path_default().join(options.workspaceRoot, 'package.json'));
-    const config = readRequiredJsonObject(configPath);
-    const overlay = readRequiredJsonObject(overlayPath);
-    const topology = readRequiredJsonObject(topologyPath);
+    const rootPackage = (0, preflight_cjs_namespaceObject.readRequiredJsonObject)(external_node_path_default().join(options.workspaceRoot, 'package.json'));
+    const config = (0, preflight_cjs_namespaceObject.readRequiredJsonObject)(configPath);
+    const overlay = (0, preflight_cjs_namespaceObject.readRequiredJsonObject)(overlayPath);
+    const topology = (0, preflight_cjs_namespaceObject.readRequiredJsonObject)(topologyPath);
     overlay.ports ??= {};
     const scope = (0, external_naming_cjs_namespaceObject.toPackageScope)(String(rootPackage.name ?? external_node_path_default().basename(options.workspaceRoot)));
-    const packageSource = (0, workspace_state_cjs_namespaceObject.existingPackageSource)(options.workspaceRoot, options.modernVersion, options.packageSource);
-    const enableTailwind = options.enableTailwind ?? (0, workspace_state_cjs_namespaceObject.existingTailwindEnabled)(options.workspaceRoot);
-    const bridge = (0, workspace_state_cjs_namespaceObject.existingBridgeConfig)(options.workspaceRoot);
-    const existingVerticals = (0, topology_cjs_namespaceObject.verticalsFromTopology)(topology, overlay.ports);
-    const existingAdditionalShells = (0, external_shells_cjs_namespaceObject.resolveConfiguredAdditionalShells)(config);
+    const workspace = (0, config_cjs_namespaceObject.normalizeWorkspaceInputs)(options.workspaceRoot, {
+        config,
+        topology,
+        overlay
+    }, void 0, {
+        primaryComposition: 'compact'
+    });
+    const { packageSource, enableTailwind, bridge } = (0, workspace_state_cjs_namespaceObject.workspaceOperationSettings)(options, workspace.config);
+    const { primaryShell: resolvedPrimaryShell, verticals: existingVerticals, additionalShells: existingAdditionalShells } = workspace;
+    const primaryShell = resolvedPrimaryShell;
     const shellId = `shell-${name}`;
     if (shellId === external_shells_cjs_namespaceObject.PRIMARY_SHELL_ID || existingAdditionalShells.some((existing)=>existing.id === shellId)) throw new Error(`Shell "${shellId}" already exists in this workspace.`);
     if (external_node_fs_default().existsSync(external_node_path_default().join(options.workspaceRoot, `apps/${shellId}`))) throw new Error(`Refusing to overwrite existing path: apps/${shellId}`);
-    const overlayPorts = overlay.ports ?? {};
     const portsWithPrimary = {
-        ...overlayPorts,
-        [external_descriptors_cjs_namespaceObject.shellApp.id]: 'number' == typeof overlayPorts[external_descriptors_cjs_namespaceObject.shellApp.id] ? overlayPorts[external_descriptors_cjs_namespaceObject.shellApp.id] : external_descriptors_cjs_namespaceObject.shellApp.port
+        ...overlay.ports,
+        [primaryShell.id]: primaryShell.port
     };
     (0, workspace_state_cjs_namespaceObject.assertGlobalPortUniqueness)(portsWithPrimary, existingAdditionalShells);
     const shell = (0, external_shells_cjs_namespaceObject.createShellDescriptor)(name, (0, workspace_state_cjs_namespaceObject.nextAvailablePort)(portsWithPrimary, existingAdditionalShells, external_shells_cjs_namespaceObject.FIRST_ADDITIONAL_SHELL_PORT));
@@ -126,10 +121,10 @@ function prepareAddUltramodernShell(options) {
         packageSource,
         enableTailwind,
         bridge,
+        primaryShell,
         existingVerticals,
         existingAdditionalShells,
-        shell,
-        composedVerticals
+        shell
     };
 }
 function addUltramodernShell(options) {
@@ -141,22 +136,16 @@ function addUltramodernShell(options) {
 function executeAddUltramodernShell(options, logicalWorkspaceRoot = options.workspaceRoot) {
     const beforeFiles = (0, external_generation_result_cjs_namespaceObject.createFileSnapshot)(options.workspaceRoot);
     const preflight = prepareAddUltramodernShell(options);
-    const { scope, configPath, config, packageSource, enableTailwind, bridge, existingVerticals, existingAdditionalShells, shell, composedVerticals } = preflight;
-    const configuredPrimary = (0, preflight_cjs_namespaceObject.createPrimaryShellDescriptor)({}, config);
-    const primaryRefsConfigured = Array.isArray(config.topology?.apps?.find((app)=>app?.id === external_descriptors_cjs_namespaceObject.shellApp.id)?.moduleFederation?.verticalRefs);
-    const primaryShell = {
-        ...configuredPrimary,
-        port: 'number' == typeof preflight.overlay.ports?.[configuredPrimary.id] ? preflight.overlay.ports[configuredPrimary.id] : configuredPrimary.port,
-        verticalRefs: primaryRefsConfigured ? configuredPrimary.verticalRefs : existingVerticals.filter(external_descriptors_cjs_namespaceObject.appEmitsBrowserUi).map((v)=>v.id)
-    };
+    const { scope, configPath, config, packageSource, enableTailwind, bridge, primaryShell, existingVerticals, existingAdditionalShells, shell } = preflight;
     const allAdditionalShells = [
         ...existingAdditionalShells,
         shell
     ];
-    const configuredDevPorts = (0, workspace_state_cjs_namespaceObject.configuredDevelopmentPorts)({
-        ...preflight.overlay.ports,
-        [shell.id]: shell.port
-    }, allAdditionalShells).toSorted((left, right)=>left - right);
+    const configuredDevPorts = (0, external_workspace_artifact_ownership_cjs_namespaceObject.workspaceDevelopmentPorts)([
+        primaryShell,
+        ...existingVerticals,
+        ...allAdditionalShells
+    ], preflight.overlay.ports);
     const previousApps = [
         primaryShell,
         ...existingVerticals,
@@ -165,39 +154,7 @@ function executeAddUltramodernShell(options, logicalWorkspaceRoot = options.work
     const compactWorkspace = (0, config_cjs_namespaceObject.normalizeWorkspaceInputs)(options.workspaceRoot, {
         config
     });
-    const previousDevPorts = existingAdditionalShells.length > 0 ? previousApps.map((app)=>app.port).toSorted((left, right)=>left - right) : void 0;
-    const { io: ownedIo } = (0, external_workspace_artifact_ownership_cjs_namespaceObject.preserveConsumerWorkspaceArtifacts)(options.workspaceRoot, [
-        ...(0, external_workspace_scripts_cjs_namespaceObject.createWorkspaceScriptArtifacts)({
-            shellOnly: 0 === existingVerticals.length,
-            hasBackendSurface: existingVerticals.some((app)=>Boolean(app.api)),
-            validationScript: (0, external_workspace_scripts_cjs_namespaceObject.createWorkspaceValidationScript)(scope, enableTailwind, existingVerticals)
-        }),
-        {
-            relativePath: "scripts/validate-ultramodern-workspace.mts",
-            generatedDataBinding: 'workspaceValidationContract',
-            content: (0, external_workspace_scripts_cjs_namespaceObject.createPackagedWorkspaceValidationScript)(scope, enableTailwind, existingVerticals, void 0, existingAdditionalShells, primaryShell, void 0, void 0, void 0, logicalWorkspaceRoot)
-        },
-        {
-            relativePath: 'zerops.yaml',
-            content: `${(0, external_zerops_cjs_namespaceObject.createZeropsYaml)(scope, previousApps)}\n`
-        },
-        {
-            relativePath: 'zerops.yaml',
-            content: `${(0, external_zerops_cjs_namespaceObject.createZeropsYaml)(scope, compactWorkspace.apps)}\n`
-        },
-        {
-            relativePath: 'tsconfig.json',
-            content: `${JSON.stringify((0, external_tsconfigs_cjs_namespaceObject.createRootTsConfig)(previousApps), null, 2)}\n`
-        },
-        ...previousApps.map((app)=>({
-                relativePath: `${app.directory}/modern.config.ts`,
-                content: (0, external_module_federation_cjs_namespaceObject.createAppModernConfig)(scope, app, 'shell' === app.kind ? (0, external_descriptors_cjs_namespaceObject.resolveRemoteRefs)(app, existingVerticals) : existingVerticals, enableTailwind, previousDevPorts)
-            })),
-        ...compactWorkspace.apps.map((app)=>({
-                relativePath: `${app.directory}/modern.config.ts`,
-                content: (0, external_module_federation_cjs_namespaceObject.createAppModernConfig)(scope, app, 'shell' === app.kind ? (0, external_descriptors_cjs_namespaceObject.resolveRemoteRefs)(app, compactWorkspace.verticals) : compactWorkspace.verticals, enableTailwind, existingAdditionalShells.length > 0 ? compactWorkspace.apps.map((app)=>app.port).toSorted((left, right)=>left - right) : void 0)
-            }))
-    ]);
+    const { io: ownedIo } = (0, external_workspace_artifact_ownership_cjs_namespaceObject.preserveConsumerWorkspaceArtifacts)(options.workspaceRoot, (0, external_workspace_artifact_ownership_cjs_namespaceObject.workspaceArtifactCandidates)(scope, previousApps, enableTailwind, compactWorkspace.apps));
     (0, external_write_app_cjs_namespaceObject.writeApp)(options.workspaceRoot, scope, shell, packageSource, enableTailwind, existingVerticals, bridge, configuredDevPorts);
     const shellsCollection = Array.isArray(config.shells) ? config.shells.filter((entry)=>entry?.id !== shell.id) : [];
     shellsCollection.push((0, external_shells_cjs_namespaceObject.createAdditionalShellConfigEntry)(scope, shell, existingVerticals));
@@ -210,13 +167,10 @@ function executeAddUltramodernShell(options, logicalWorkspaceRoot = options.work
         ...existingVerticals,
         ...allAdditionalShells
     ]), null, 2)}\n`);
-    (0, external_workspace_scripts_cjs_namespaceObject.writeGeneratedWorkspaceScripts)(options.workspaceRoot, scope, enableTailwind, existingVerticals, void 0, allAdditionalShells, primaryShell, {
+    (0, external_workspace_scripts_cjs_namespaceObject.writeGeneratedWorkspaceScripts)(options.workspaceRoot, existingVerticals, {
         io: {
-            ...ownedIo,
             writeGenerated: ownedIo.write
-        },
-        compactConfig: config,
-        developmentOverlay: preflight.overlay
+        }
     });
     ownedIo.write(external_node_path_default().join(options.workspaceRoot, 'zerops.yaml'), `${(0, external_zerops_cjs_namespaceObject.createZeropsYaml)(scope, [
         primaryShell,
@@ -244,71 +198,40 @@ function executeAddUltramodernShell(options, logicalWorkspaceRoot = options.work
     });
 }
 function planUltramodernShell(options) {
-    prepareAddUltramodernShell(options);
-    const tempRoot = external_node_fs_default().mkdtempSync(external_node_path_default().join(external_node_os_default().tmpdir(), 'um-shell-plan-'));
-    const copiedWorkspaceRoot = external_node_path_default().join(tempRoot, 'workspace');
-    const skippedDirectories = new Set([
-        '.git',
-        '.nx',
-        '.output',
-        'coverage',
-        'dist',
-        'node_modules'
-    ]);
-    try {
-        external_node_fs_default().cpSync(options.workspaceRoot, copiedWorkspaceRoot, {
-            recursive: true,
-            filter: (sourcePath)=>!skippedDirectories.has(external_node_path_default().basename(sourcePath))
-        });
-        const plannedResult = addUltramodernShell({
+    const preflight = prepareAddUltramodernShell(options);
+    let jsonMutations = [];
+    const plannedResult = (0, transaction_cjs_namespaceObject.runWorkspaceTransaction)(options.workspaceRoot, (stagingRoot)=>executeAddUltramodernShell({
             ...options,
-            workspaceRoot: copiedWorkspaceRoot
-        });
-        const shell = plannedResult.createdApps[0];
-        return {
-            ...plannedResult,
-            workspaceRoot: options.workspaceRoot,
-            dryRun: true,
-            selectedPort: shell?.port ?? 0,
-            moduleFederationRemote: {
-                id: shell?.id ?? '',
-                name: shell?.moduleFederationName ?? '',
-                manifestUrl: `http://localhost:${shell?.port ?? 0}/mf-manifest.json`
-            },
-            jsonMutations: [
-                {
-                    path: external_descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH,
-                    pointer: '/shells/-',
-                    description: `Register additional shell ${shell?.id}`
-                },
-                {
-                    path: 'package.json',
-                    pointer: "/scripts",
-                    description: "Enumerate all configured shells in workspace scripts"
-                },
-                {
-                    path: 'tsconfig.json',
-                    pointer: '/references',
-                    description: `Add ${shell?.id} to the root TS-Go build graph`
-                }
-            ],
-            shellDependencyChanges: [],
-            generatedContractChanges: [
-                {
-                    path: external_descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH,
-                    addedAppIds: [
-                        shell?.id ?? ''
-                    ],
-                    shellVerticalRefs: options.verticals ?? []
-                }
-            ]
-        };
-    } finally{
-        external_node_fs_default().rmSync(tempRoot, {
-            recursive: true,
-            force: true
-        });
-    }
+            workspaceRoot: stagingRoot
+        }, options.workspaceRoot), {
+        mode: 'preview',
+        inspectChanges: (changes)=>{
+            jsonMutations = (0, preview_cjs_namespaceObject.describeJsonChanges)(changes);
+        }
+    });
+    const shell = plannedResult.createdApps[0];
+    return {
+        ...plannedResult,
+        workspaceRoot: options.workspaceRoot,
+        dryRun: true,
+        selectedPort: shell?.port ?? 0,
+        moduleFederationRemote: {
+            id: shell?.id ?? '',
+            name: shell?.moduleFederationName ?? '',
+            manifestUrl: `http://localhost:${shell?.port ?? 0}/mf-manifest.json`
+        },
+        jsonMutations,
+        shellDependencyChanges: [],
+        generatedContractChanges: [
+            {
+                path: external_descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH,
+                addedAppIds: [
+                    shell?.id ?? ''
+                ],
+                shellVerticalRefs: preflight.shell.verticalRefs ?? []
+            }
+        ]
+    };
 }
 exports.addUltramodernShell = __webpack_exports__.addUltramodernShell;
 exports.planUltramodernShell = __webpack_exports__.planUltramodernShell;