@bleedingdev/modern-js-ultramodern-create 3.9.0-ultramodern.2 → 3.9.0-ultramodern.21

package/dist/esm/ultramodern-workspace/add-shell.js

@@ -1,51 +1,49 @@
 import node_fs from "node:fs";
-import node_os from "node:os";
 import node_path from "node:path";
-import { DEVELOPMENT_OVERLAY_PATH, TOPOLOGY_PATH } from "./add-vertical/constants.js";
-import { createPrimaryShellDescriptor } from "./add-vertical/preflight.js";
-import { verticalsFromTopology } from "./add-vertical/topology.js";
+import { normalizeWorkspaceInputs } from "../ultramodern-tooling/config.js";
+import { DEVELOPMENT_OVERLAY_PATH, OWNERSHIP_PATH, TOPOLOGY_PATH } from "./add-vertical/constants.js";
+import { readRequiredJsonObject } from "./add-vertical/preflight.js";
+import { describeJsonChanges } from "./add-vertical/preview.js";
+import { updateRootWorkspaceScripts } from "./add-vertical/shell-files.js";
+import { ownershipEntry } from "./add-vertical/topology.js";
 import { runWorkspaceTransaction } from "./add-vertical/transaction.js";
-import { assertGlobalPortUniqueness, configuredDevelopmentPorts, existingBridgeConfig, existingPackageSource, existingTailwindEnabled, nextAvailablePort } from "./add-vertical/workspace-state.js";
-import { ULTRAMODERN_CONFIG_PATH, appEmitsBrowserUi, shellApp } from "./descriptors.js";
-import { formatGeneratedWorkspaceFiles, readJsonFile, writeFileReplacing, writeJsonFile } from "./fs-io.js";
+import { assertGlobalPortUniqueness, nextAvailablePort, workspaceOperationSettings } from "./add-vertical/workspace-state.js";
+import { appEmitsBrowserUi, resolveRemoteRefs, shellApp } from "./descriptors.js";
+import { formatGeneratedWorkspaceFiles, writeJsonFile } from "./fs-io.js";
 import { createFileSnapshot, createGenerationResult, diffFileSnapshots } from "./generation-result.js";
-import { assertUniqueTailwindPrefixes, toPackageScope } from "./naming.js";
-import { createRootPackageJson } from "./package-json.js";
-import { FIRST_ADDITIONAL_SHELL_PORT, PRIMARY_SHELL_ID, assertValidShellName, createAdditionalShellConfigEntry, createShellDescriptor, resolveConfiguredAdditionalShells } from "./shells.js";
+import { createAppModernConfig } from "./module-federation.js";
+import { assertUniqueTailwindPrefixes, packageName, toPackageScope } from "./naming.js";
+import { createCloudflareDeployContract } from "./policy.js";
+import { FIRST_ADDITIONAL_SHELL_PORT, PRIMARY_SHELL_ID, assertValidShellName, createShellDescriptor, shellDeliveryUnitBlock } from "./shells.js";
 import { createRootTsConfig } from "./tsconfigs.js";
-import { isRecord } from "./types.js";
+import { preserveConsumerWorkspaceArtifacts, workspaceArtifactCandidates, workspaceDevelopmentPorts } from "./workspace-artifact-ownership.js";
 import { writeGeneratedWorkspaceScripts } from "./workspace-scripts.js";
-import { rewriteAppModernConfig, writeApp } from "./write-app.js";
+import { writeApp } from "./write-app.js";
 import { createZeropsYaml } from "./zerops.js";
-function readRequiredJsonObject(filePath) {
-    if (!node_fs.existsSync(filePath)) throw new Error(`Missing UltraModern workspace file: ${filePath}`);
-    const value = readJsonFile(filePath);
-    if (!isRecord(value)) throw new Error(`UltraModern workspace file must contain a JSON object: ${filePath}`);
-    return value;
-}
 function prepareAddUltramodernShell(options) {
     const name = assertValidShellName(options.name);
-    const configPath = node_path.join(options.workspaceRoot, ULTRAMODERN_CONFIG_PATH);
     const overlayPath = node_path.join(options.workspaceRoot, DEVELOPMENT_OVERLAY_PATH);
     const topologyPath = node_path.join(options.workspaceRoot, TOPOLOGY_PATH);
+    const ownershipPath = node_path.join(options.workspaceRoot, OWNERSHIP_PATH);
     const rootPackage = readRequiredJsonObject(node_path.join(options.workspaceRoot, 'package.json'));
-    const config = readRequiredJsonObject(configPath);
     const overlay = readRequiredJsonObject(overlayPath);
     const topology = readRequiredJsonObject(topologyPath);
+    const ownership = readRequiredJsonObject(ownershipPath);
     overlay.ports ??= {};
     const scope = toPackageScope(String(rootPackage.name ?? node_path.basename(options.workspaceRoot)));
-    const packageSource = existingPackageSource(options.workspaceRoot, options.modernVersion, options.packageSource);
-    const enableTailwind = options.enableTailwind ?? existingTailwindEnabled(options.workspaceRoot);
-    const bridge = existingBridgeConfig(options.workspaceRoot);
-    const existingVerticals = verticalsFromTopology(topology, overlay.ports);
-    const existingAdditionalShells = resolveConfiguredAdditionalShells(config);
+    const workspace = normalizeWorkspaceInputs(options.workspaceRoot, {
+        topology,
+        overlay
+    });
+    const { packageSource, enableTailwind, bridge } = workspaceOperationSettings(options, workspace.config);
+    const { primaryShell: resolvedPrimaryShell, verticals: existingVerticals, additionalShells: existingAdditionalShells } = workspace;
+    const primaryShell = resolvedPrimaryShell;
     const shellId = `shell-${name}`;
     if (shellId === PRIMARY_SHELL_ID || existingAdditionalShells.some((existing)=>existing.id === shellId)) throw new Error(`Shell "${shellId}" already exists in this workspace.`);
     if (node_fs.existsSync(node_path.join(options.workspaceRoot, `apps/${shellId}`))) throw new Error(`Refusing to overwrite existing path: apps/${shellId}`);
-    const overlayPorts = overlay.ports ?? {};
     const portsWithPrimary = {
-        ...overlayPorts,
-        [shellApp.id]: 'number' == typeof overlayPorts[shellApp.id] ? overlayPorts[shellApp.id] : shellApp.port
+        ...overlay.ports,
+        [primaryShell.id]: primaryShell.port
     };
     assertGlobalPortUniqueness(portsWithPrimary, existingAdditionalShells);
     const shell = createShellDescriptor(name, nextAvailablePort(portsWithPrimary, existingAdditionalShells, FIRST_ADDITIONAL_SHELL_PORT));
@@ -71,17 +69,20 @@ function prepareAddUltramodernShell(options) {
     ]);
     return {
         scope,
-        configPath,
+        topologyPath,
+        ownershipPath,
         overlayPath,
-        config,
+        config: workspace.config,
+        topology,
+        ownership,
         overlay,
         packageSource,
         enableTailwind,
         bridge,
+        primaryShell,
         existingVerticals,
         existingAdditionalShells,
-        shell,
-        composedVerticals
+        shell
     };
 }
 function addUltramodernShell(options) {
@@ -93,43 +94,74 @@ function addUltramodernShell(options) {
 function executeAddUltramodernShell(options, logicalWorkspaceRoot = options.workspaceRoot) {
     const beforeFiles = createFileSnapshot(options.workspaceRoot);
     const preflight = prepareAddUltramodernShell(options);
-    const { scope, configPath, config, packageSource, enableTailwind, bridge, existingVerticals, existingAdditionalShells, shell, composedVerticals } = preflight;
-    const configuredPrimary = createPrimaryShellDescriptor({}, config);
-    const primaryRefsConfigured = Array.isArray(config.topology?.apps?.find((app)=>app?.id === shellApp.id)?.moduleFederation?.verticalRefs);
-    const primaryShell = {
-        ...configuredPrimary,
-        verticalRefs: primaryRefsConfigured ? configuredPrimary.verticalRefs : existingVerticals.filter(appEmitsBrowserUi).map((v)=>v.id)
-    };
+    const { scope, topologyPath, ownershipPath, topology, ownership, config, packageSource, enableTailwind, bridge, primaryShell, existingVerticals, existingAdditionalShells, shell } = preflight;
     const allAdditionalShells = [
         ...existingAdditionalShells,
         shell
     ];
-    const configuredDevPorts = configuredDevelopmentPorts({
-        ...preflight.overlay.ports,
-        [shell.id]: shell.port
-    }, allAdditionalShells).toSorted((left, right)=>left - right);
-    writeApp(options.workspaceRoot, scope, shell, packageSource, enableTailwind, composedVerticals, bridge, configuredDevPorts);
-    const shellsCollection = Array.isArray(config.shells) ? config.shells.filter((entry)=>entry?.id !== shell.id) : [];
-    shellsCollection.push(createAdditionalShellConfigEntry(scope, shell, existingVerticals));
-    config.shells = shellsCollection;
-    writeJsonFile(configPath, config);
-    for (const app of [
+    const configuredDevPorts = workspaceDevelopmentPorts([
+        primaryShell,
+        ...existingVerticals,
+        ...allAdditionalShells
+    ], preflight.overlay.ports);
+    const previousApps = [
         primaryShell,
         ...existingVerticals,
         ...existingAdditionalShells
-    ])rewriteAppModernConfig(options.workspaceRoot, scope, app, existingVerticals, enableTailwind, configuredDevPorts);
-    const rootPackagePath = node_path.join(options.workspaceRoot, 'package.json');
-    const rootPackage = readJsonFile(rootPackagePath);
-    const generatedRootPackage = createRootPackageJson(scope, packageSource, existingVerticals, bridge, allAdditionalShells);
-    rootPackage.scripts = generatedRootPackage.scripts;
-    writeJsonFile(rootPackagePath, rootPackage);
-    writeJsonFile(node_path.join(options.workspaceRoot, 'tsconfig.json'), createRootTsConfig([
+    ];
+    const { io: ownedIo } = preserveConsumerWorkspaceArtifacts(options.workspaceRoot, workspaceArtifactCandidates(scope, previousApps, enableTailwind, previousApps));
+    writeApp(options.workspaceRoot, scope, shell, packageSource, enableTailwind, existingVerticals, bridge, configuredDevPorts);
+    topology.shells ??= [];
+    topology.shells.push({
+        id: shell.id,
+        kind: 'shell',
+        package: packageName(scope, shell.packageSuffix),
+        path: shell.directory,
+        displayName: shell.displayName,
+        portEnv: shell.portEnv,
+        verticalRefs: shell.verticalRefs,
+        moduleFederation: {
+            role: 'host',
+            name: shell.mfName,
+            verticalRefs: shell.verticalRefs,
+            remotes: resolveRemoteRefs(shell, existingVerticals).map((remote)=>({
+                    id: remote.id,
+                    name: remote.mfName,
+                    manifestUrl: `http://localhost:${remote.port}/mf-manifest.json`
+                })),
+            ssr: true,
+            sharedContractVersion: 'mf-ssr-contract-v1'
+        },
+        deliveryUnit: shellDeliveryUnitBlock(scope, shell),
+        cloudflare: createCloudflareDeployContract(scope, shell),
+        ownership: shell.ownership
+    });
+    writeJsonFile(topologyPath, topology);
+    ownership.owners ??= [];
+    ownership.owners.push(ownershipEntry(scope, shell));
+    writeJsonFile(ownershipPath, ownership);
+    preflight.overlay.ports[shell.id] = shell.port;
+    writeJsonFile(preflight.overlayPath, preflight.overlay);
+    const newPackagePath = node_path.join(options.workspaceRoot, shell.directory, 'package.json');
+    const newPackage = readRequiredJsonObject(newPackagePath);
+    newPackage.dependencies = {
+        ...newPackage.dependencies,
+        ...config.inheritedWorkspaceDependencies
+    };
+    writeJsonFile(newPackagePath, newPackage);
+    for (const app of previousApps)ownedIo.write(node_path.join(options.workspaceRoot, app.directory, 'modern.config.ts'), createAppModernConfig(scope, app, 'shell' === app.kind ? resolveRemoteRefs(app, existingVerticals) : existingVerticals, enableTailwind, configuredDevPorts));
+    updateRootWorkspaceScripts(options.workspaceRoot, scope, packageSource, existingVerticals, bridge, allAdditionalShells, existingVerticals, primaryShell, existingAdditionalShells);
+    ownedIo.write(node_path.join(options.workspaceRoot, 'tsconfig.json'), `${JSON.stringify(createRootTsConfig([
         primaryShell,
         ...existingVerticals,
         ...allAdditionalShells
-    ]));
-    writeGeneratedWorkspaceScripts(options.workspaceRoot, scope, enableTailwind, existingVerticals, void 0, allAdditionalShells, primaryShell);
-    writeFileReplacing(options.workspaceRoot, 'zerops.yaml', `${createZeropsYaml(scope, [
+    ]), null, 2)}\n`);
+    writeGeneratedWorkspaceScripts(options.workspaceRoot, {
+        io: {
+            writeGenerated: ownedIo.write
+        }
+    });
+    ownedIo.write(node_path.join(options.workspaceRoot, 'zerops.yaml'), `${createZeropsYaml(scope, [
         primaryShell,
         ...existingVerticals,
         ...allAdditionalShells
@@ -155,70 +187,39 @@ function executeAddUltramodernShell(options, logicalWorkspaceRoot = options.work
     });
 }
 function planUltramodernShell(options) {
-    prepareAddUltramodernShell(options);
-    const tempRoot = node_fs.mkdtempSync(node_path.join(node_os.tmpdir(), 'um-shell-plan-'));
-    const copiedWorkspaceRoot = node_path.join(tempRoot, 'workspace');
-    const skippedDirectories = new Set([
-        '.git',
-        '.nx',
-        '.output',
-        'coverage',
-        'dist',
-        'node_modules'
-    ]);
-    try {
-        node_fs.cpSync(options.workspaceRoot, copiedWorkspaceRoot, {
-            recursive: true,
-            filter: (sourcePath)=>!skippedDirectories.has(node_path.basename(sourcePath))
-        });
-        const plannedResult = addUltramodernShell({
+    const preflight = prepareAddUltramodernShell(options);
+    let jsonMutations = [];
+    const plannedResult = 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: 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: ULTRAMODERN_CONFIG_PATH,
-                    addedAppIds: [
-                        shell?.id ?? ''
-                    ],
-                    shellVerticalRefs: options.verticals ?? []
-                }
-            ]
-        };
-    } finally{
-        node_fs.rmSync(tempRoot, {
-            recursive: true,
-            force: true
-        });
-    }
+            workspaceRoot: stagingRoot
+        }, options.workspaceRoot), {
+        mode: 'preview',
+        inspectChanges: (changes)=>{
+            jsonMutations = 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: 'topology/reference-topology.json',
+                addedAppIds: [
+                    shell?.id ?? ''
+                ],
+                shellVerticalRefs: preflight.shell.verticalRefs ?? []
+            }
+        ]
+    };
 }
 export { addUltramodernShell, planUltramodernShell };

package/dist/esm/ultramodern-workspace/add-vertical/execute.js

@@ -1,21 +1,24 @@
+import node_fs from "node:fs";
 import node_path from "node:path";
+import { normalizeWorkspaceInputs, preserveUnknownProjectionFields, reconcileGeneratedOverlayUrls } from "../../ultramodern-tooling/config.js";
 import { rpcPath } from "../api/rpc.js";
 import { createServerExecutionOverlay } from "../backend-federation.js";
+import { createDevelopmentOverlay } from "../contracts.js";
 import { createDeliveryUnitRecord, deliveryUnitContractBlock } from "../delivery-unit.js";
-import { ULTRAMODERN_CONFIG_PATH, appEmitsBrowserUi, appHasApi, createModuleFederationRemoteContracts, resolveApiPrefix, resolveApiProtocol, shellApp } from "../descriptors.js";
-import { formatGeneratedWorkspaceFiles, writeFileReplacing, writeJsonFile } from "../fs-io.js";
+import { appEmitsBrowserUi, appHasApi, createModuleFederationRemoteContracts, resolveApiPrefix, resolveApiProtocol, resolveRemoteRefs } from "../descriptors.js";
+import { formatGeneratedWorkspaceFiles, writeJsonFile } from "../fs-io.js";
 import { createFileSnapshot, createGenerationResult, diffFileSnapshots } from "../generation-result.js";
+import { createAppModernConfig } from "../module-federation.js";
 import { runCodeSmithOverlays } from "../overlays.js";
 import { createRootTsConfig } from "../package-json.js";
+import { preserveConsumerWorkspaceArtifacts, workspaceArtifactCandidates, workspaceDevelopmentPorts } from "../workspace-artifact-ownership.js";
 import { writeGeneratedWorkspaceScripts } from "../workspace-scripts.js";
-import { rewriteAppModernConfig } from "../write-app.js";
-import { createCompactUltramodernConfig, writeApp } from "../write-workspace.js";
+import { writeApp } from "../write-workspace.js";
 import { createZeropsYaml } from "../zerops.js";
 import { prepareAddUltramodernVertical } from "./preflight.js";
 import { rewriteShellAppFiles, updateRootWorkspaceScripts } from "./shell-files.js";
 import { ownershipEntry, verticalTopologyEntry } from "./topology.js";
 import { runWorkspaceTransaction } from "./transaction.js";
-import { configuredDevelopmentPorts } from "./workspace-state.js";
 function addUltramodernVertical(options) {
     return runWorkspaceTransaction(options.workspaceRoot, (stagingRoot)=>executeAddUltramodernVertical({
             ...options,
@@ -24,7 +27,24 @@ function addUltramodernVertical(options) {
 }
 function executeAddUltramodernVertical(options, logicalWorkspaceRoot = options.workspaceRoot) {
     const beforeFiles = createFileSnapshot(options.workspaceRoot);
-    const { scope, topologyPath, ownershipPath, overlayPath, topology, ownership, overlay, packageSource, enableTailwind, bridge, primaryShell, additionalShells, targetShell, targetVerticals, vertical, updatedVerticals } = prepareAddUltramodernVertical(options);
+    const { scope, config, topologyPath, ownershipPath, overlayPath, topology, ownership, overlay, packageSource, enableTailwind, bridge, primaryShell, additionalShells, targetShell, targetVerticals, vertical, updatedVerticals } = prepareAddUltramodernVertical(options);
+    const previousTailwind = config.features?.tailwind !== false;
+    const existingVerticals = updatedVerticals.filter((app)=>app.id !== vertical.id);
+    const existingIds = new Set(existingVerticals.map((app)=>app.id));
+    const previousProjection = (apps)=>apps.map((app)=>app.id === targetShell.id ? {
+                ...app,
+                verticalRefs: app.verticalRefs?.filter((id)=>existingIds.has(id))
+            } : app);
+    const previousApps = normalizeWorkspaceInputs(options.workspaceRoot, {
+        topology,
+        overlay
+    }).apps;
+    const previousDevPorts = workspaceDevelopmentPorts(previousApps);
+    const { io: ownedIo } = preserveConsumerWorkspaceArtifacts(options.workspaceRoot, workspaceArtifactCandidates(scope, previousProjection(previousApps), previousTailwind, previousProjection([
+        primaryShell,
+        ...existingVerticals,
+        ...additionalShells
+    ])));
     const nextTargetShell = {
         ...targetShell,
         verticalRefs: targetVerticals.filter(appEmitsBrowserUi).map((remote)=>remote.id)
@@ -34,27 +54,56 @@ function executeAddUltramodernVertical(options, logicalWorkspaceRoot = options.w
         verticalRefs: nextTargetShell.verticalRefs
     } : primaryShell;
     const nextAdditionalShells = additionalShells.map((shell)=>shell.id === nextTargetShell.id ? nextTargetShell : shell);
-    const configuredDevPorts = nextAdditionalShells.length > 0 ? configuredDevelopmentPorts({
-        ...overlay.ports,
-        [primaryShell.id]: primaryShell.port,
-        [vertical.id]: vertical.port
-    }, nextAdditionalShells).toSorted((left, right)=>left - right) : void 0;
+    const configuredDevPorts = workspaceDevelopmentPorts([
+        nextPrimaryShell,
+        ...updatedVerticals,
+        ...nextAdditionalShells
+    ], overlay.ports);
     writeApp(options.workspaceRoot, scope, vertical, packageSource, enableTailwind, updatedVerticals, bridge, configuredDevPorts);
+    const newPackagePath = node_path.join(options.workspaceRoot, vertical.directory, 'package.json');
+    const newPackage = JSON.parse(node_fs.readFileSync(newPackagePath, 'utf-8'));
+    newPackage.dependencies = {
+        ...newPackage.dependencies,
+        ...config.inheritedWorkspaceDependencies
+    };
+    writeJsonFile(newPackagePath, newPackage);
     if (targetShell.id === primaryShell.id) {
         topology.shell ??= {};
-        topology.shell.deliveryUnit = deliveryUnitContractBlock(createDeliveryUnitRecord(scope, shellApp));
+        topology.shell.deliveryUnit = {
+            ...deliveryUnitContractBlock(createDeliveryUnitRecord(scope, primaryShell)),
+            ...primaryShell.deliveryUnit,
+            ...topology.shell.deliveryUnit
+        };
         topology.shell.verticalRefs = nextTargetShell.verticalRefs;
         topology.shell.moduleFederation ??= {};
-        topology.shell.moduleFederation.remotes = createModuleFederationRemoteContracts(nextPrimaryShell, updatedVerticals).map((remote)=>({
+        topology.shell.moduleFederation.remotes = preserveAuthoredRemoteUrls(topology.shell.moduleFederation.remotes, createModuleFederationRemoteContracts({
+            ...primaryShell,
+            verticalRefs: primaryShell.verticalRefs?.filter((id)=>existingIds.has(id))
+        }, existingVerticals), createModuleFederationRemoteContracts(nextPrimaryShell, updatedVerticals)).map((remote)=>({
                 id: remote.id,
                 name: remote.name,
                 manifestUrl: remote.manifestUrl
             }));
     }
     topology.verticals ??= [];
+    topology.verticals = topology.verticals.map((entry)=>{
+        const app = existingVerticals.find((app)=>app.id === entry.id);
+        if (!app) return entry;
+        const projected = verticalTopologyEntry(scope, app, updatedVerticals);
+        return {
+            ...entry,
+            moduleFederation: preserveUnknownProjectionFields(entry.moduleFederation, projected.moduleFederation),
+            ...projected.backendFederation ? {
+                backendFederation: preserveUnknownProjectionFields(entry.backendFederation, projected.backendFederation)
+            } : {}
+        };
+    });
     topology.verticals.push(verticalTopologyEntry(scope, vertical));
     ownership.owners ??= [];
     ownership.owners.push(ownershipEntry(scope, vertical));
+    const projectedOverlay = createDevelopmentOverlay(scope, existingVerticals);
+    Object.assign(overlay, reconcileGeneratedOverlayUrls(overlay, createDevelopmentOverlay(scope, previousApps.filter((app)=>'shell' !== app.kind)), projectedOverlay));
+    overlay.serverExecution = preserveUnknownProjectionFields(overlay.serverExecution, projectedOverlay.serverExecution);
     overlay.ports[vertical.id] = vertical.port;
     overlay.manifests ??= {};
     if (appEmitsBrowserUi(vertical)) overlay.manifests[vertical.id] = `http://localhost:${vertical.port}/mf-manifest.json`;
@@ -68,13 +117,20 @@ function executeAddUltramodernVertical(options, logicalWorkspaceRoot = options.w
     writeJsonFile(topologyPath, topology);
     writeJsonFile(ownershipPath, ownership);
     writeJsonFile(overlayPath, overlay);
-    writeJsonFile(node_path.join(options.workspaceRoot, ULTRAMODERN_CONFIG_PATH), createCompactUltramodernConfig(scope, options.modernVersion, packageSource, [
-        {
-            ...nextPrimaryShell
-        },
-        ...updatedVerticals
-    ], enableTailwind, bridge, nextAdditionalShells, nextPrimaryShell));
-    writeFileReplacing(options.workspaceRoot, 'zerops.yaml', `${createZeropsYaml(scope, [
+    if (targetShell.id !== primaryShell.id) {
+        topology.shells = (topology.shells ?? []).map((entry)=>entry.id === nextTargetShell.id ? updateShellComposition(entry, {
+                verticalRefs: nextTargetShell.verticalRefs,
+                moduleFederation: {
+                    verticalRefs: nextTargetShell.verticalRefs,
+                    remotes: preserveAuthoredRemoteUrls(entry.moduleFederation?.remotes, createModuleFederationRemoteContracts({
+                        ...targetShell,
+                        verticalRefs: targetShell.verticalRefs?.filter((id)=>existingIds.has(id))
+                    }, existingVerticals), createModuleFederationRemoteContracts(nextTargetShell, updatedVerticals))
+                }
+            }) : entry);
+        writeJsonFile(topologyPath, topology);
+    }
+    ownedIo.write(node_path.join(options.workspaceRoot, 'zerops.yaml'), `${createZeropsYaml(scope, [
         nextPrimaryShell,
         ...updatedVerticals,
         ...nextAdditionalShells
@@ -82,20 +138,29 @@ function executeAddUltramodernVertical(options, logicalWorkspaceRoot = options.w
     for (const shellToRefresh of [
         nextPrimaryShell,
         ...nextAdditionalShells
-    ])rewriteShellAppFiles(options.workspaceRoot, scope, packageSource, enableTailwind, updatedVerticals, bridge, shellToRefresh.id === nextTargetShell.id ? nextTargetShell : shellToRefresh, configuredDevPorts);
-    writeGeneratedWorkspaceScripts(options.workspaceRoot, scope, enableTailwind, updatedVerticals, void 0, nextAdditionalShells, nextPrimaryShell);
-    updateRootWorkspaceScripts(options.workspaceRoot, scope, packageSource, updatedVerticals, bridge, nextAdditionalShells);
-    writeJsonFile(node_path.join(options.workspaceRoot, 'tsconfig.json'), createRootTsConfig([
+    ])rewriteShellAppFiles(options.workspaceRoot, scope, packageSource, enableTailwind, updatedVerticals, bridge, shellToRefresh.id === nextTargetShell.id ? nextTargetShell : shellToRefresh, configuredDevPorts, {
+        shell: previousProjection(previousApps).find((app)=>app.id === shellToRefresh.id),
+        remotes: existingVerticals,
+        devPorts: previousDevPorts,
+        enableTailwind: previousTailwind
+    });
+    writeGeneratedWorkspaceScripts(options.workspaceRoot, {
+        io: {
+            writeGenerated: ownedIo.write
+        }
+    });
+    updateRootWorkspaceScripts(options.workspaceRoot, scope, packageSource, updatedVerticals, bridge, nextAdditionalShells, existingVerticals, nextPrimaryShell);
+    ownedIo.write(node_path.join(options.workspaceRoot, 'tsconfig.json'), `${JSON.stringify(createRootTsConfig([
         nextPrimaryShell,
         ...updatedVerticals,
         ...nextAdditionalShells
-    ]));
+    ]), null, 2)}\n`);
     if (configuredDevPorts) {
         for (const app of [
             nextPrimaryShell,
             ...updatedVerticals,
             ...nextAdditionalShells
-        ])if (app.id !== vertical.id && app.id !== nextTargetShell.id) rewriteAppModernConfig(options.workspaceRoot, scope, app, updatedVerticals, enableTailwind, configuredDevPorts);
+        ])if (app.id !== vertical.id && app.id !== nextTargetShell.id) ownedIo.write(node_path.join(options.workspaceRoot, app.directory, 'modern.config.ts'), createAppModernConfig(scope, app, 'shell' === app.kind ? resolveRemoteRefs(app, updatedVerticals) : updatedVerticals, enableTailwind, configuredDevPorts));
     }
     const preliminaryAfterFiles = createFileSnapshot(options.workspaceRoot);
     const preliminaryDiff = diffFileSnapshots(beforeFiles, preliminaryAfterFiles);
@@ -135,4 +200,31 @@ function executeAddUltramodernVertical(options, logicalWorkspaceRoot = options.w
         rewrittenPaths
     });
 }
-export { addUltramodernVertical };
+function updateShellComposition(current, generated) {
+    const previousRemotes = Array.isArray(current.moduleFederation?.remotes) ? current.moduleFederation.remotes : [];
+    return {
+        ...current,
+        ...Array.isArray(generated.verticalRefs) ? {
+            verticalRefs: generated.verticalRefs
+        } : {},
+        moduleFederation: {
+            ...current.moduleFederation,
+            verticalRefs: generated.moduleFederation.verticalRefs,
+            remotes: generated.moduleFederation.remotes.map((remote)=>({
+                    ...previousRemotes.find((previous)=>previous.id === remote.id),
+                    ...remote
+                }))
+        }
+    };
+}
+function preserveAuthoredRemoteUrls(current, previousGenerated, nextGenerated) {
+    return nextGenerated.map((remote)=>{
+        const previous = Array.isArray(current) ? current.find((entry)=>entry.id === remote.id) : void 0;
+        const generated = previousGenerated.find((entry)=>entry.id === remote.id);
+        return previous?.manifestUrl && previous.manifestUrl !== generated?.manifestUrl ? {
+            ...remote,
+            manifestUrl: previous.manifestUrl
+        } : remote;
+    });
+}
+export { addUltramodernVertical, executeAddUltramodernVertical };