@ykdz/template 0.0.31 → 0.0.33

package/node_modules/@ykdz/template-builtin-presets/dist/src/foundation.d.ts

@@ -1,3 +1,5 @@
+import type { CiDiagnosticArtifactDeclaration } from "#template-core/ci-diagnostic-artifact";
+import { type DevelopmentContainerToolLayerBuildArgument, type DevelopmentContainerToolLayerMount, type DevelopmentContainerToolLayerProbe, type PlannedDevelopmentContainerToolLayer } from "#template-core/development-container-tool-layer";
 import type { CheckEnvironmentNeed, DeploymentEnvironmentNeed } from "#template-core/module-graph";
 import { type PackageContribution } from "#template-core/package-contribution";
 import type { BuiltInPresetDefinition, GenerationContext } from "#template-core/preset-definition";
@@ -16,7 +18,7 @@ export type NextStepInstruction = {
 type GeneratedPackagePlanningRecord = {
     readonly path: string;
     readonly definitionName: string;
-    readonly planningContribution: "planInitialization" | "planPackageAddition";
+    readonly planningContribution: "foundationPlan" | "planInitialization" | "planPackageAddition";
 };
 type GenerationRecord = {
     readonly schemaVersion: 1;
@@ -33,8 +35,15 @@ export type GeneratedRepositoryPlan = {
     readonly generationRecord: GenerationRecord;
     readonly operations: readonly RenderOperation[];
     readonly reconciliation: readonly ProjectProjectionReconciliation[];
+    readonly developmentContainer: {
+        readonly toolLayers: readonly PlannedDevelopmentContainerToolLayer[];
+        readonly buildArguments: readonly DevelopmentContainerToolLayerBuildArgument[];
+        readonly mounts: readonly DevelopmentContainerToolLayerMount[];
+        readonly probes: readonly DevelopmentContainerToolLayerProbe[];
+    };
     readonly environmentNeeds: readonly CheckEnvironmentNeed[];
     readonly deploymentEnvironmentNeeds: readonly DeploymentEnvironmentNeed[];
+    readonly ciDiagnosticArtifacts: readonly CiDiagnosticArtifactDeclaration[];
     /** Structured manifests used to derive the generated Dependency Catalog. */
     readonly manifests: readonly Readonly<Record<string, unknown>>[];
     readonly dependencyCatalog: Readonly<Record<string, string>>;

package/node_modules/@ykdz/template-builtin-presets/dist/src/foundation.js

@@ -1,16 +1,18 @@
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import { composeCiDiagnosticArtifacts } from "#template-core/ci-diagnostic-artifact";
 import { collectGeneratedManifestCatalogReferences, selectTemplateDependencyCatalogEntries, } from "#template-core/dependency-catalog";
-import { browserTestToolLayer } from "#template-core/devcontainer";
+import { planDevelopmentContainerToolLayersSync, } from "#template-core/development-container-tool-layer";
 import { editorCustomizationForCapabilities, loadEditorCustomizationDeclarations, } from "#template-core/editor-customization";
 import { checkEnvironmentNeedFact, checkEnvironmentNeedFromFact, deploymentEnvironmentNeedFact, deploymentEnvironmentNeedFromFact, renderDeploymentCheckCommand, renderFixCommand, renderRootCheckCommand, } from "#template-core/module-graph";
 import { assertPackageContribution, } from "#template-core/package-contribution";
 import { assertProjectBlueprintV2, validateProjectBlueprintV2 as validateCoreProjectBlueprintV2, } from "#template-core/project-blueprint-v2";
-import { projectCheckWorkflowTemplateReplacements, projectDependabotTemplateReplacements, } from "#template-core/project-github";
+import { projectCheckWorkflowTemplateSource, projectCheckWorkflowTemplateReplacements, projectDependabotTemplateReplacements, } from "#template-core/project-github";
 import { planExplicitProjectLinks } from "#template-core/project-linking-v2";
 import { resolveTemplateSource, } from "#template-core/renderer";
 import { rustBinDefinition } from "./rust-bin/definition.js";
+import { typescriptConfigContribution, typescriptConfigPackageDefinition, typescriptConfigPackageName, } from "./shared/typescript.js";
 import { vuePnpmDependencyOverrides } from "./shared/vue.js";
 import { templateSources } from "./template-sources.js";
 import { tsCliDefinition } from "./ts-cli/definition.js";
@@ -188,7 +190,7 @@ function readGenerationRecord(options) {
         if (!isRecord(item) ||
             typeof item.path !== "string" ||
             typeof item.definitionName !== "string" ||
-            !["planInitialization", "planPackageAddition"].includes(String(item.planningContribution))) {
+            !["foundationPlan", "planInitialization", "planPackageAddition"].includes(String(item.planningContribution))) {
             throw new Error(`Package Addition requires valid package planning facts at .template/generation.json packages[${index}]`);
         }
         packages.push(item);
@@ -219,6 +221,13 @@ function readGenerationRecord(options) {
     return generationRecord;
 }
 function assertGenerationRecordFoundationConsistency(options) {
+    const configDefinition = typescriptConfigPackageDefinition(options.context);
+    const foundationRecords = options.generationRecord.packages.filter((record) => record.planningContribution === "foundationPlan");
+    if (foundationRecords.length !== 1 ||
+        foundationRecords[0].definitionName !== "foundation" ||
+        foundationRecords[0].path !== configDefinition.path) {
+        throw new Error("Package Addition Generation Record must contain exactly one Foundation TypeScript configuration provenance record");
+    }
     const initialRecords = options.generationRecord.packages.filter((record) => record.planningContribution === "planInitialization");
     if (initialRecords.length === 0) {
         throw new Error(`Package Addition Generation Record preset ${options.generationRecord.preset} has no initial Package provenance`);
@@ -370,7 +379,10 @@ function readExistingPackageAdditionState(options) {
     const generationRecord = readGenerationRecord(options);
     const persistedEnvironmentNeeds = readPersistedEnvironmentNeeds(options.context.targetDir);
     const manifestTruthByPackagePath = new Map();
-    const contributions = generationRecord.packages.map((record) => {
+    const contributions = generationRecord.packages.flatMap((record) => {
+        if (record.planningContribution === "foundationPlan") {
+            return [];
+        }
         const expectedDefinition = options.blueprint.packages.find((definition) => definition.path === record.path);
         const definition = builtInPresetRegistry.require(record.definitionName);
         let candidates;
@@ -397,7 +409,7 @@ function readExistingPackageAdditionState(options) {
         if (contribution === undefined) {
             throw new Error(`Generation Record cannot reproduce Package Definition ${expectedDefinition.name} at ${expectedDefinition.path}`);
         }
-        return contribution;
+        return [contribution];
     });
     for (const packagePath of new Set(options.manifestTruthPackagePaths ?? [])) {
         const expectedDefinition = options.blueprint.packages.find((definition) => definition.path === packagePath);
@@ -460,95 +472,277 @@ function turboBoundaryTagsForContributions(contributions) {
     }
     return [...selectedTags];
 }
-function devcontainerDockerfileOperations(options) {
-    const hasBrowserTests = options.environmentNeeds.some((need) => need.kind === "playwright-browser-assets");
-    const hasShellChecks = options.environmentNeeds.some((need) => need.kind === "shellcheck-command");
-    const browserLayer = hasBrowserTests ? browserTestToolLayer() : undefined;
-    return [
-        {
-            kind: "writeTextTemplate",
-            source: templateSources.foundation,
-            from: "devcontainer.json",
-            to: ".devcontainer/devcontainer.json",
-            replacements: {
-                PROJECT_NAME: options.context.projectName,
-                NODE_LTS_MAJOR: options.context.toolchain.nodeLtsMajor,
-                PACKAGE_MANAGER_PIN: options.context.toolchain.packageManagerPin,
-                PLAYWRIGHT_CLI_PACKAGE: browserLayer?.playwrightCliPackage ?? "unused",
+function contributedDevcontainerComposition(options) {
+    const layerPlan = planDevelopmentContainerToolLayersSync({
+        baseLayer: {
+            identity: "node-pnpm",
+            dockerfile: {
+                source: templateSources.sharedDevcontainer,
+                from: "node-pnpm.Dockerfile",
             },
-        },
-        {
-            kind: "writeTextFromFragments",
-            to: ".devcontainer/Dockerfile",
-            fragments: [
+            buildArguments: [
                 {
-                    source: templateSources.sharedDevcontainer,
-                    from: "node-pnpm.Dockerfile",
+                    name: "NODE_VERSION",
+                    value: options.context.toolchain.nodeLtsMajor,
+                },
+                {
+                    name: "PACKAGE_MANAGER_PIN",
+                    value: options.context.toolchain.packageManagerPin,
+                },
+            ],
+            mounts: [
+                {
+                    identity: "pnpm-store",
+                    type: "volume",
+                    source: "${devcontainerId}-pnpm-store",
+                    target: "/pnpm/store",
                 },
-                ...(browserLayer === undefined
-                    ? []
-                    : [
-                        {
-                            source: templateSources.sharedDevcontainer,
-                            from: "browser-test.Dockerfile",
-                        },
-                    ]),
-                ...(hasShellChecks
-                    ? [
-                        {
-                            source: templateSources.sharedDevcontainer,
-                            from: "shellcheck.Dockerfile",
-                        },
-                    ]
-                    : []),
             ],
         },
+        layers: options.layers,
+    });
+    return {
+        operations: [
+            {
+                kind: "writeTextTemplate",
+                source: templateSources.foundation,
+                from: "devcontainer.json",
+                to: ".devcontainer/devcontainer.json",
+                replacements: {
+                    PROJECT_NAME: options.context.projectName,
+                    NODE_LTS_MAJOR: options.context.toolchain.nodeLtsMajor,
+                    PACKAGE_MANAGER_PIN: options.context.toolchain.packageManagerPin,
+                },
+            },
+            {
+                kind: "mergeJson",
+                to: ".devcontainer/devcontainer.json",
+                value: {
+                    build: {
+                        args: Object.fromEntries(layerPlan.buildArguments.map((argument) => [
+                            argument.name,
+                            argument.value,
+                        ])),
+                    },
+                    ...(layerPlan.mounts.length === 0
+                        ? {}
+                        : {
+                            mounts: layerPlan.mounts.map(({ identity: _identity, ...mount }) => mount),
+                        }),
+                },
+            },
+            {
+                kind: "writeTextFromFragments",
+                to: ".devcontainer/Dockerfile",
+                validation: "development-container-dockerfile",
+                fragments: layerPlan.layers.map((layer) => layer.dockerfile),
+            },
+        ],
+        mountIdentitySet: {
+            location: "/mounts",
+            identity: {
+                kind: "projection",
+                members: layerPlan.mounts.map(({ identity, target, }) => ({
+                    identity,
+                    match: { target },
+                })),
+                fallback: { fields: ["target"] },
+            },
+        },
+        toolLayers: layerPlan.layers,
+        buildArguments: layerPlan.buildArguments,
+        mounts: layerPlan.mounts,
+        probes: layerPlan.probes,
+    };
+}
+function contributedFoundationTemplateFileOperations(contributions) {
+    const byIdentity = new Map();
+    const outputOwners = new Map();
+    for (const file of contributions.flatMap((contribution) => contribution.foundation.templateFiles ?? [])) {
+        const previous = byIdentity.get(file.identity);
+        if (previous !== undefined) {
+            const previousFingerprint = JSON.stringify({
+                source: resolveTemplateSource(previous.source, previous.from),
+                from: previous.from,
+                to: previous.to,
+                replacements: previous.replacements ?? {},
+            });
+            const fingerprint = JSON.stringify({
+                source: resolveTemplateSource(file.source, file.from),
+                from: file.from,
+                to: file.to,
+                replacements: file.replacements ?? {},
+            });
+            if (fingerprint !== previousFingerprint) {
+                throw new Error(`Foundation Template File identity ${file.identity} has conflicting descriptors`);
+            }
+            continue;
+        }
+        const outputOwner = outputOwners.get(file.to);
+        if (outputOwner !== undefined) {
+            throw new Error(`Foundation Template File output ${file.to} is declared by both ${outputOwner} and ${file.identity}`);
+        }
+        byIdentity.set(file.identity, file);
+        outputOwners.set(file.to, file.identity);
+    }
+    return [...byIdentity.values()]
+        .toSorted((left, right) => left.identity.localeCompare(right.identity))
+        .map((file) => ({
+        kind: "writeTextTemplate",
+        source: file.source,
+        from: file.from,
+        to: file.to,
+        replacements: { ...file.replacements },
+    }));
+}
+function assertCompatibleRustToolchainFacts(contributions) {
+    const facts = contributions.flatMap((contribution) => {
+        const rust = contribution.foundation.toolchains.rust;
+        return rust === undefined
+            ? []
+            : [
+                JSON.stringify({
+                    toolchain: rust.toolchain,
+                    components: [...new Set(rust.components)].toSorted(),
+                }),
+            ];
+    });
+    if (new Set(facts).size > 1) {
+        throw new Error("Foundation requires compatible Rust toolchain facts");
+    }
+}
+function composeDependencyMaintenancePolicy(contributions) {
+    const ecosystems = [
+        ...new Set(contributions.flatMap((contribution) => contribution.foundation.dependencyMaintenance.ecosystems)),
     ];
+    const directories = {};
+    const extraDirectories = {};
+    for (const ecosystem of ecosystems) {
+        const candidates = [
+            ...new Set(contributions.flatMap((contribution) => {
+                const policy = contribution.foundation.dependencyMaintenance;
+                const primary = policy.directories?.[ecosystem];
+                return [
+                    ...(primary === undefined ? [] : [primary]),
+                    ...(policy.extraDirectories?.[ecosystem] ?? []),
+                ];
+            })),
+        ];
+        const [primary, ...extra] = candidates;
+        if (primary !== undefined)
+            directories[ecosystem] = primary;
+        if (extra.length > 0)
+            extraDirectories[ecosystem] = extra;
+    }
+    return {
+        ecosystems,
+        ...(Object.keys(directories).length === 0 ? {} : { directories }),
+        ...(Object.keys(extraDirectories).length === 0 ? {} : { extraDirectories }),
+        interval: "weekly",
+    };
 }
 function foundationPlan(options) {
     assertProjectBlueprintV2(options.blueprint);
+    const configDefinition = typescriptConfigPackageDefinition(options.context);
+    const persistedConfigDefinition = options.blueprint.packages.find((definition) => definition.name === configDefinition.name ||
+        definition.path === configDefinition.path);
+    if (persistedConfigDefinition === undefined ||
+        !packageDefinitionsEqual(persistedConfigDefinition, configDefinition)) {
+        throw new Error("Project Blueprint must contain the Foundation TypeScript configuration Package Definition");
+    }
+    const initialProjectLinkPlan = planExplicitProjectLinks({
+        blueprint: options.blueprint,
+        contributions: options.contributions,
+        ...(options.manifestTruthByPackagePath === undefined
+            ? {}
+            : {
+                manifestTruthByPackagePath: options.manifestTruthByPackagePath,
+            }),
+    });
+    const injectedProviderNames = new Set([...initialProjectLinkPlan.manifestPatchesByPackagePath.values()].flatMap((patch) => Object.entries(patch.dependenciesMeta)
+        .filter(([, metadata]) => metadata.injected)
+        .map(([name]) => name)));
+    const configPackageName = typescriptConfigPackageName(options.context);
+    const packageContributions = options.contributions.map((contribution) => {
+        const ownsTypeScriptConfig = contribution.operations.some((operation) => "to" in operation &&
+            operation.to === `${contribution.definition.path}/tsconfig.json`);
+        if (!ownsTypeScriptConfig)
+            return contribution;
+        const dependencyField = injectedProviderNames.has(contribution.definition.name)
+            ? "dependencies"
+            : "devDependencies";
+        const existingDependencies = contribution.manifest[dependencyField];
+        return {
+            ...contribution,
+            manifest: {
+                ...contribution.manifest,
+                [dependencyField]: {
+                    ...(isRecord(existingDependencies) ? existingDependencies : {}),
+                    [configPackageName]: "workspace:*",
+                },
+            },
+        };
+    });
+    const configContribution = typescriptConfigContribution(options.context);
+    const contributions = [configContribution, ...packageContributions];
     const generationRecord = options.generationRecord ?? {
         schemaVersion: 1,
         preset: options.definition.metadata.name,
         templateVersion: "0.0.0",
         toolchain: options.context.toolchain,
-        packages: options.contributions.map((contribution) => ({
-            path: contribution.definition.path,
-            definitionName: options.definition.metadata.name,
-            planningContribution: options.mode === "initialization"
-                ? "planInitialization"
-                : "planPackageAddition",
-        })),
+        packages: [
+            ...options.contributions.map((contribution) => ({
+                path: contribution.definition.path,
+                definitionName: options.definition.metadata.name,
+                planningContribution: options.mode === "initialization"
+                    ? "planInitialization"
+                    : "planPackageAddition",
+            })),
+            {
+                path: configDefinition.path,
+                definitionName: "foundation",
+                planningContribution: "foundationPlan",
+            },
+        ],
     };
-    const environmentNeeds = uniqueEnvironmentNeeds(options.contributions.flatMap((item) => item.environmentNeeds));
+    const environmentNeeds = uniqueEnvironmentNeeds(contributions.flatMap((item) => item.environmentNeeds));
     const deploymentEnvironmentNeeds = uniqueEnvironmentNeeds([
         ...(options.existingDeploymentEnvironmentNeeds ?? []),
-        ...options.contributions.flatMap((item) => item.deploymentEnvironmentNeeds ?? []),
+        ...contributions.flatMap((item) => item.deploymentEnvironmentNeeds ?? []),
     ]);
     const persistedEnvironmentNeeds = {
         schemaVersion: 1,
         check: environmentNeeds.map(checkEnvironmentNeedFact),
         deployment: deploymentEnvironmentNeeds.map(deploymentEnvironmentNeedFact),
     };
-    const hasDeploymentTask = options.contributions.some((contribution) => {
+    const hasDeploymentTask = contributions.some((contribution) => {
         const scripts = contribution.manifest.scripts;
         return (typeof scripts === "object" &&
             scripts !== null &&
             typeof scripts.deployment === "string");
     });
-    const packagePaths = options.contributions.map((contribution) => contribution.definition.path);
-    if (new Set(packagePaths).size !== packagePaths.length)
+    const contributionPackagePaths = contributions.map((contribution) => contribution.definition.path);
+    if (new Set(contributionPackagePaths).size !== contributionPackagePaths.length)
         throw new Error("Package Contributions must have unique Package Paths");
-    const packageNames = options.contributions.map((contribution) => contribution.definition.name);
+    const blueprintPackagePaths = options.blueprint.packages.map((definition) => definition.path);
+    if (contributionPackagePaths.length !== blueprintPackagePaths.length ||
+        contributionPackagePaths.some((packagePath) => !blueprintPackagePaths.includes(packagePath))) {
+        throw new Error("Package Contributions must exactly match Project Blueprint Package Paths");
+    }
+    const packageNames = contributions.map((contribution) => contribution.definition.name);
     if (new Set(packageNames).size !== packageNames.length)
         throw new Error("Package Contributions must have unique package names");
-    const rustToolchain = options.contributions
-        .map((contribution) => contribution.foundation.toolchains.rust)
-        .find((toolchain) => toolchain !== undefined);
-    if (options.contributions.some((contribution) => contribution.foundation.toolchains.rust !== undefined &&
-        contribution.foundation.toolchains.rust !== rustToolchain)) {
-        throw new Error("Foundation requires one coordinated Rust toolchain");
-    }
+    const ciDiagnosticArtifactDeclarations = contributions.flatMap((contribution) => contribution.ciDiagnosticArtifacts ?? []);
+    const ciDiagnosticArtifacts = composeCiDiagnosticArtifacts({
+        packagePaths: blueprintPackagePaths,
+        declarations: ciDiagnosticArtifactDeclarations,
+    });
+    assertCompatibleRustToolchainFacts(contributions);
+    const contributedToolLayers = contributions.flatMap((contribution) => contribution.foundation.developmentContainerToolLayers ?? []);
+    const developmentContainer = contributedDevcontainerComposition({
+        context: options.context,
+        layers: contributedToolLayers,
+    });
     const workspacePackageGlobs = [
         "apps/*",
         "packages/*",
@@ -556,20 +750,13 @@ function foundationPlan(options) {
             ...options.blueprint.packages
                 .map((definition) => `${definition.path.split("/")[0]}/*`)
                 .filter((glob) => glob !== "apps/*" && glob !== "packages/*"),
-            ...options.contributions
+            ...contributions
                 .flatMap((contribution) => contribution.foundation.workspacePackageGlobs ?? [])
                 .filter((glob) => glob !== "apps/*" && glob !== "packages/*"),
         ]),
     ];
-    const editorCustomization = editorCustomizationForCapabilities(options.contributions.flatMap((contribution) => contribution.foundation.editorCapabilities), loadEditorCustomizationDeclarations(resolveTemplateSource(templateSources.editorCustomization, "capabilities.json")));
-    const dependencyMaintenancePolicy = {
-        ecosystems: [
-            ...new Set(options.contributions.flatMap((contribution) => contribution.foundation.dependencyMaintenance.ecosystems)),
-        ],
-        directories: Object.assign({}, ...options.contributions.map((contribution) => contribution.foundation.dependencyMaintenance.directories ?? {})),
-        extraDirectories: Object.assign({}, ...options.contributions.map((contribution) => contribution.foundation.dependencyMaintenance.extraDirectories ?? {})),
-        interval: "weekly",
-    };
+    const editorCustomization = editorCustomizationForCapabilities(contributions.flatMap((contribution) => contribution.foundation.editorCapabilities), loadEditorCustomizationDeclarations(resolveTemplateSource(templateSources.editorCustomization, "capabilities.json")));
+    const dependencyMaintenancePolicy = composeDependencyMaintenancePolicy(contributions);
     const rootManifest = {
         name: options.context.projectName,
         version: "0.0.0",
@@ -600,7 +787,7 @@ function foundationPlan(options) {
         packageManager: options.context.toolchain.packageManagerPin,
     };
     const dependencyCatalog = selectTemplateDependencyCatalogEntries(collectGeneratedManifestCatalogReferences([
-        ...options.contributions.map((contribution) => contribution.manifest),
+        ...contributions.map((contribution) => contribution.manifest),
         rootManifest,
     ]));
     const dependencyOverrides = {
@@ -634,17 +821,29 @@ function foundationPlan(options) {
                 ].join("\n"),
         },
     };
-    const workflowOperation = {
-        kind: "writeTextTemplate",
-        source: templateSources.foundation,
-        from: ".github/workflows/check.dynamic.template",
-        to: ".github/workflows/check.yml",
-        replacements: projectCheckWorkflowTemplateReplacements({
-            environment: { needs: environmentNeeds },
-            deploymentEnvironmentNeeds,
-            hasDeploymentTask,
-        }),
-    };
+    const workflowTemplateSource = projectCheckWorkflowTemplateSource({
+        packagePaths: blueprintPackagePaths,
+        deploymentEnvironmentNeeds,
+        hasDeploymentTask,
+        diagnosticArtifacts: ciDiagnosticArtifacts,
+    });
+    const workflowOperation = ciDiagnosticArtifacts.length === 0
+        ? {
+            kind: "copyFile",
+            source: templateSources.foundation,
+            from: workflowTemplateSource,
+            to: ".github/workflows/check.yml",
+        }
+        : {
+            kind: "writeTextTemplate",
+            source: templateSources.foundation,
+            from: workflowTemplateSource,
+            to: ".github/workflows/check.yml",
+            replacements: projectCheckWorkflowTemplateReplacements({
+                packagePaths: blueprintPackagePaths,
+                diagnosticArtifacts: ciDiagnosticArtifacts,
+            }),
+        };
     const workflowOperations = [
         workflowOperation,
         {
@@ -655,16 +854,8 @@ function foundationPlan(options) {
             replacements: projectDependabotTemplateReplacements(dependencyMaintenancePolicy),
         },
     ];
-    const projectLinkPlan = planExplicitProjectLinks({
-        blueprint: options.blueprint,
-        contributions: options.contributions,
-        ...(options.manifestTruthByPackagePath === undefined
-            ? {}
-            : {
-                manifestTruthByPackagePath: options.manifestTruthByPackagePath,
-            }),
-    });
-    const turboBoundaryTags = turboBoundaryTagsForContributions(options.contributions);
+    const projectLinkPlan = initialProjectLinkPlan;
+    const turboBoundaryTags = turboBoundaryTagsForContributions(contributions);
     const initializationFoundationOperations = [
         {
             kind: "writeJson",
@@ -741,64 +932,8 @@ function foundationPlan(options) {
             to: ".vscode/settings.json",
             value: editorCustomization.settings,
         },
-        ...(rustToolchain === undefined
-            ? [
-                ...devcontainerDockerfileOperations({
-                    context: options.context,
-                    environmentNeeds,
-                }),
-            ]
-            : [
-                {
-                    kind: "writeTextTemplate",
-                    source: templateSources.foundation,
-                    from: "rust/rust-toolchain.toml",
-                    to: "rust-toolchain.toml",
-                    replacements: { RUST_TOOLCHAIN: rustToolchain.toolchain },
-                },
-                {
-                    kind: "writeTextTemplate",
-                    source: templateSources.foundation,
-                    from: "rust/devcontainer/devcontainer.json",
-                    to: ".devcontainer/devcontainer.json",
-                    replacements: {
-                        PROJECT_NAME: options.context.projectName,
-                        NODE_LTS_MAJOR: options.context.toolchain.nodeLtsMajor,
-                        PACKAGE_MANAGER_PIN: options.context.toolchain.packageManagerPin,
-                        RUST_TOOLCHAIN: rustToolchain.toolchain,
-                    },
-                },
-                {
-                    kind: "writeTextFromFragments",
-                    to: ".devcontainer/Dockerfile",
-                    fragments: [
-                        {
-                            source: templateSources.sharedDevcontainer,
-                            from: "node-pnpm.Dockerfile",
-                        },
-                        {
-                            source: templateSources.foundation,
-                            from: "rust/devcontainer/rust.Dockerfile",
-                        },
-                        ...(environmentNeeds.some((need) => need.kind === "playwright-browser-assets")
-                            ? [
-                                {
-                                    source: templateSources.sharedDevcontainer,
-                                    from: "browser-test.Dockerfile",
-                                },
-                            ]
-                            : []),
-                        ...(environmentNeeds.some((need) => need.kind === "shellcheck-command")
-                            ? [
-                                {
-                                    source: templateSources.sharedDevcontainer,
-                                    from: "shellcheck.Dockerfile",
-                                },
-                            ]
-                            : []),
-                    ],
-                },
-            ]),
+        ...developmentContainer.operations,
+        ...contributedFoundationTemplateFileOperations(contributions),
         ...workflowOperations,
         {
             kind: "writeJson",
@@ -843,7 +978,15 @@ function foundationPlan(options) {
     };
     const withProvenance = (operation, provenance) => ({ ...operation, provenance });
     const operations = [
-        ...(options.renderContributions ?? options.contributions)
+        ...(options.renderContributions === undefined
+            ? contributions
+            : options.renderContributions.map((renderContribution) => {
+                const enriched = packageContributions.find((candidate) => candidate.definition.path === renderContribution.definition.path);
+                if (enriched === undefined) {
+                    throw new Error(`Foundation cannot render unknown Package Contribution ${renderContribution.definition.path}`);
+                }
+                return enriched;
+            }))
             .map((item) => assertPackageContribution(item, {
             definitionName: options.definition.metadata.name,
             planner: options.mode === "addition"
@@ -865,7 +1008,11 @@ function foundationPlan(options) {
     ];
     const reconciliation = [
         { path: "turbo.json", driver: "structured" },
-        { path: ".devcontainer/devcontainer.json", driver: "structured" },
+        {
+            path: ".devcontainer/devcontainer.json",
+            driver: "structured",
+            identitySets: [developmentContainer.mountIdentitySet],
+        },
         {
             path: ".vscode/extensions.json",
             driver: "structured",
@@ -890,24 +1037,36 @@ function foundationPlan(options) {
         generationRecord,
         operations,
         reconciliation,
+        developmentContainer: {
+            toolLayers: developmentContainer.toolLayers,
+            buildArguments: developmentContainer.buildArguments,
+            mounts: developmentContainer.mounts,
+            probes: developmentContainer.probes,
+        },
         environmentNeeds,
         deploymentEnvironmentNeeds,
-        manifests: [
-            ...options.contributions.map((item) => item.manifest),
-            rootManifest,
-        ],
+        ciDiagnosticArtifacts,
+        manifests: [...contributions.map((item) => item.manifest), rootManifest],
         dependencyCatalog,
         dependencyMaintenancePolicy,
         nextStepInstructions: [
             { display: "pnpm install" },
-            ...environmentNeeds.map((need) => ({ display: need.nextStep.display })),
             { display: "pnpm run fix" },
             { display: "pnpm run check" },
         ],
     };
 }
 export function planGeneratedRepositoryInitialization(options) {
-    const blueprint = options.definition.blueprint(options.context);
+    const presetBlueprint = options.definition.blueprint(options.context);
+    const configDefinition = typescriptConfigPackageDefinition(options.context);
+    if (presetBlueprint.packages.some((definition) => definition.name === configDefinition.name ||
+        definition.path === configDefinition.path)) {
+        throw new Error("Preset Blueprint must not redefine the Foundation TypeScript configuration Package Definition");
+    }
+    const blueprint = {
+        ...presetBlueprint,
+        packages: [...presetBlueprint.packages, configDefinition],
+    };
     const contributions = options.definition.planInitializationContributions?.(options.context) ?? [options.definition.planInitialization(options.context)];
     return foundationPlan({
         definition: options.definition,