@ryuenn3123/agentic-senior-core 2.0.24 → 2.0.26

package/lib/cli/commands/optimize.mjs

@@ -119,7 +119,17 @@ export async function runOptimizeCommand(targetDirectoryArgument, optimizeOption
     ? onboardingReport.selectedProfile
     : 'balanced';
   const selectedStackFileName = normalizeMarkdownFileName(onboardingReport.selectedStack, 'typescript.md');
+  const selectedAdditionalStackFileNames = Array.isArray(onboardingReport.selectedAdditionalStacks)
+    ? onboardingReport.selectedAdditionalStacks
+      .map((stackFileName) => normalizeMarkdownFileName(stackFileName, ''))
+      .filter((stackFileName) => stackFileName && stackFileName !== selectedStackFileName)
+    : [];
   const selectedBlueprintFileName = normalizeMarkdownFileName(onboardingReport.selectedBlueprint, 'api-nextjs.md');
+  const selectedAdditionalBlueprintFileNames = Array.isArray(onboardingReport.selectedAdditionalBlueprints)
+    ? onboardingReport.selectedAdditionalBlueprints
+      .map((blueprintFileName) => normalizeMarkdownFileName(blueprintFileName, ''))
+      .filter((blueprintFileName) => blueprintFileName && blueprintFileName !== selectedBlueprintFileName)
+    : [];
   const includeCiGuardrails = typeof onboardingReport.ciGuardrailsEnabled === 'boolean'
     ? onboardingReport.ciGuardrailsEnabled
     : true;
@@ -128,7 +138,9 @@ export async function runOptimizeCommand(targetDirectoryArgument, optimizeOption
     targetDirectoryPath: resolvedTargetDirectoryPath,
     selectedProfileName,
     selectedStackFileName,
+    selectedAdditionalStackFileNames,
     selectedBlueprintFileName,
+    selectedAdditionalBlueprintFileNames,
     includeCiGuardrails,
   });
 

package/lib/cli/commands/upgrade.mjs

@@ -119,17 +119,35 @@ export async function runUpgradeCommand(targetDirectoryArgument, upgradeOptions
       ? existingOnboardingReport.selectedStack
       : projectDetection.recommendedStackFileName || 'typescript.md';
 
+    const selectedAdditionalStackFileNames = Array.isArray(existingOnboardingReport?.selectedAdditionalStacks)
+      ? Array.from(new Set(existingOnboardingReport.selectedAdditionalStacks.filter(
+        (stackFileName) => stackFileNames.includes(stackFileName) && stackFileName !== selectedStackFileName
+      )))
+      : Array.from(new Set((projectDetection.secondaryStackFileNames || []).filter(
+        (stackFileName) => stackFileNames.includes(stackFileName) && stackFileName !== selectedStackFileName
+      )));
+
     const selectedBlueprintFileName = blueprintFileNames.includes(existingOnboardingReport?.selectedBlueprint)
       ? existingOnboardingReport.selectedBlueprint
       : BLUEPRINT_RECOMMENDATIONS[selectedStackFileName] || 'api-nextjs.md';
 
+    const selectedAdditionalBlueprintFileNames = Array.isArray(existingOnboardingReport?.selectedAdditionalBlueprints)
+      ? Array.from(new Set(existingOnboardingReport.selectedAdditionalBlueprints.filter(
+        (blueprintFileName) => blueprintFileNames.includes(blueprintFileName) && blueprintFileName !== selectedBlueprintFileName
+      )))
+      : Array.from(new Set(selectedAdditionalStackFileNames
+        .map((stackFileName) => BLUEPRINT_RECOMMENDATIONS[stackFileName] || null)
+        .filter((blueprintFileName) => blueprintFileName && blueprintFileName !== selectedBlueprintFileName)));
+
     const includeCiGuardrails = typeof existingOnboardingReport?.ciGuardrailsEnabled === 'boolean'
       ? existingOnboardingReport.ciGuardrailsEnabled
       : true;
 
     const selectedSkillDomainNames = inferSkillDomainNamesFromSelection(
       selectedStackFileName,
-      selectedBlueprintFileName
+      selectedBlueprintFileName,
+      selectedAdditionalStackFileNames,
+      selectedAdditionalBlueprintFileNames
     );
     const compatibilityWarnings = await evaluateSkillDomainCompatibility(
       resolvedTargetDirectoryPath,
@@ -154,7 +172,9 @@ export async function runUpgradeCommand(targetDirectoryArgument, upgradeOptions
       targetDirectoryPath: resolvedTargetDirectoryPath,
       selectedProfileName,
       selectedStackFileName,
+      selectedAdditionalStackFileNames,
       selectedBlueprintFileName,
+      selectedAdditionalBlueprintFileNames,
       includeCiGuardrails,
     });
 
@@ -166,7 +186,13 @@ export async function runUpgradeCommand(targetDirectoryArgument, upgradeOptions
     console.log(`- Target directory: ${resolvedTargetDirectoryPath}`);
     console.log(`- Profile: ${toTitleCase(selectedProfileName)}`);
     console.log(`- Stack: ${toTitleCase(selectedStackFileName)}`);
+    if (selectedAdditionalStackFileNames.length > 0) {
+      console.log(`- Additional stacks: ${selectedAdditionalStackFileNames.map((stackFileName) => toTitleCase(stackFileName)).join(', ')}`);
+    }
     console.log(`- Blueprint: ${toTitleCase(selectedBlueprintFileName)}`);
+    if (selectedAdditionalBlueprintFileNames.length > 0) {
+      console.log(`- Additional blueprints: ${selectedAdditionalBlueprintFileNames.map((blueprintFileName) => toTitleCase(blueprintFileName)).join(', ')}`);
+    }
     console.log(`- CI/CD guardrails: ${includeCiGuardrails ? 'enabled' : 'disabled'}`);
     console.log(`- Existing rules lines: ${currentRuleLineCount}`);
     console.log(`- Planned rules lines: ${plannedRuleLineCount}`);
@@ -213,12 +239,15 @@ export async function runUpgradeCommand(targetDirectoryArgument, upgradeOptions
         selectedProfileName,
         selectedProfilePack: existingOnboardingReport?.selectedProfilePack || null,
         selectedStackFileName,
+        selectedAdditionalStackFileNames,
         selectedBlueprintFileName,
+        selectedAdditionalBlueprintFileNames,
         includeCiGuardrails,
         setupDurationMs,
         projectDetection,
         selectedSkillDomains: selectedSkillDomainNames,
         compatibilityWarnings,
+        runtimeEnvironment: existingOnboardingReport?.runtimeEnvironment || null,
         operationMode: 'upgrade',
       });
 

package/lib/cli/compiler.mjs

@@ -9,6 +9,7 @@ import {
   CLI_VERSION,
   POLICY_FILE_NAME,
   SKILL_PLATFORM_INDEX_PATH,
+  BLUEPRINT_RECOMMENDATIONS,
 } from './constants.mjs';
 
 import {
@@ -38,12 +39,15 @@ export async function writeOnboardingReport({
   selectedProfilePack,
   selectedPreset,
   selectedStackFileName,
+  selectedAdditionalStackFileNames = [],
   selectedBlueprintFileName,
+  selectedAdditionalBlueprintFileNames = [],
   includeCiGuardrails,
   setupDurationMs,
   projectDetection,
   selectedSkillDomains = [],
   compatibilityWarnings = [],
+  runtimeEnvironment = null,
   operationMode = 'init',
 }) {
   const onboardingReportPath = path.join(targetDirectoryPath, '.agent-context', 'state', 'onboarding-report.json');
@@ -60,14 +64,23 @@ export async function writeOnboardingReport({
       : null,
     selectedPreset,
     selectedStack: selectedStackFileName,
+    selectedAdditionalStacks: selectedAdditionalStackFileNames,
     selectedBlueprint: selectedBlueprintFileName,
+    selectedAdditionalBlueprints: selectedAdditionalBlueprintFileNames,
     ciGuardrailsEnabled: includeCiGuardrails,
     setupDurationMs,
     selectedSkillDomains,
     compatibilityWarnings,
+    runtimeEnvironment,
     autoDetection: {
       recommendedStack: projectDetection.recommendedStackFileName,
+      recommendedAdditionalStacks: projectDetection.secondaryStackFileNames || [],
       recommendedBlueprint: projectDetection.recommendedBlueprintFileName,
+      recommendedAdditionalBlueprints: Array.isArray(projectDetection.secondaryStackFileNames)
+        ? projectDetection.secondaryStackFileNames
+          .map((secondaryStackFileName) => BLUEPRINT_RECOMMENDATIONS[secondaryStackFileName] || null)
+          .filter(Boolean)
+        : [],
       confidenceLabel: projectDetection.confidenceLabel,
       confidenceScore: projectDetection.confidenceScore,
       confidenceGap: projectDetection.confidenceGap,
@@ -94,7 +107,9 @@ export async function buildCompiledRulesContent({
   targetDirectoryPath,
   selectedProfileName,
   selectedStackFileName,
+  selectedAdditionalStackFileNames = [],
   selectedBlueprintFileName,
+  selectedAdditionalBlueprintFileNames = [],
   includeCiGuardrails,
 }) {
   const resolvedTargetDirectoryPath = path.resolve(targetDirectoryPath);
@@ -102,7 +117,20 @@ export async function buildCompiledRulesContent({
   const selectedStacksDirectoryPath = path.join(resolvedTargetDirectoryPath, '.agent-context', 'stacks');
   const selectedBlueprintsDirectoryPath = path.join(resolvedTargetDirectoryPath, '.agent-context', 'blueprints');
   const skillPlatformIndex = JSON.parse(await fs.readFile(SKILL_PLATFORM_INDEX_PATH, 'utf8'));
-  const selectedSkillDomainNames = inferSkillDomainNamesFromSelection(selectedStackFileName, selectedBlueprintFileName);
+  const normalizedAdditionalStackFileNames = Array.isArray(selectedAdditionalStackFileNames)
+    ? Array.from(new Set(selectedAdditionalStackFileNames.filter((stackFileName) => stackFileName && stackFileName !== selectedStackFileName)))
+    : [];
+  const normalizedAdditionalBlueprintFileNames = Array.isArray(selectedAdditionalBlueprintFileNames)
+    ? Array.from(new Set(selectedAdditionalBlueprintFileNames.filter(
+      (blueprintFileName) => blueprintFileName && blueprintFileName !== selectedBlueprintFileName
+    )))
+    : [];
+  const selectedSkillDomainNames = inferSkillDomainNamesFromSelection(
+    selectedStackFileName,
+    selectedBlueprintFileName,
+    normalizedAdditionalStackFileNames,
+    normalizedAdditionalBlueprintFileNames
+  );
 
   const universalRuleFileNames = await collectFileNames(selectedRulesDirectoryPath);
   const contextBlocks = [];
@@ -166,6 +194,16 @@ export async function buildCompiledRulesContent({
     ].join('\n')
   );
 
+  if (normalizedAdditionalStackFileNames.length > 0) {
+    contextBlocks.push(
+      [
+        '## LAYER 2B: ADDITIONAL STACK PROFILES',
+        'This project uses multiple stacks. Load all additional stack profiles below:',
+        ...normalizedAdditionalStackFileNames.map((stackFileName, stackIndex) => `${stackIndex + 1}. .agent-context/stacks/${stackFileName}`),
+      ].join('\n')
+    );
+  }
+
   const blueprintFilePath = path.join(selectedBlueprintsDirectoryPath, selectedBlueprintFileName);
   const blueprintContent = await fs.readFile(blueprintFilePath, 'utf8');
   const blueprintSummary = firstMarkdownHeading(blueprintContent, selectedBlueprintFileName);
@@ -178,6 +216,18 @@ export async function buildCompiledRulesContent({
     ].join('\n')
   );
 
+  if (normalizedAdditionalBlueprintFileNames.length > 0) {
+    contextBlocks.push(
+      [
+        '## LAYER 3A: ADDITIONAL BLUEPRINT PROFILES',
+        'This project uses multiple architecture blueprints. Load all additional blueprint profiles below:',
+        ...normalizedAdditionalBlueprintFileNames.map(
+          (blueprintFileName, blueprintIndex) => `${blueprintIndex + 1}. .agent-context/blueprints/${blueprintFileName}`
+        ),
+      ].join('\n')
+    );
+  }
+
   if (includeCiGuardrails) {
     contextBlocks.push(
       [
@@ -300,7 +350,9 @@ export async function compileDynamicContext({
   targetDirectoryPath,
   selectedProfileName,
   selectedStackFileName,
+  selectedAdditionalStackFileNames = [],
   selectedBlueprintFileName,
+  selectedAdditionalBlueprintFileNames = [],
   includeCiGuardrails,
 }) {
   const resolvedTargetDirectoryPath = path.resolve(targetDirectoryPath);
@@ -308,7 +360,9 @@ export async function compileDynamicContext({
     targetDirectoryPath: resolvedTargetDirectoryPath,
     selectedProfileName,
     selectedStackFileName,
+    selectedAdditionalStackFileNames,
     selectedBlueprintFileName,
+    selectedAdditionalBlueprintFileNames,
     includeCiGuardrails,
   });
 

package/lib/cli/constants.mjs

@@ -160,6 +160,89 @@ export const PROFILE_PRESETS = {
   },
 };
 
+export const PROJECT_SCOPE_CHOICES = [
+  {
+    key: 'api-service',
+    label: 'API service',
+  },
+  {
+    key: 'web-application',
+    label: 'Web application',
+  },
+  {
+    key: 'mobile-app',
+    label: 'Mobile app',
+  },
+  {
+    key: 'cli-tool',
+    label: 'CLI tool',
+  },
+  {
+    key: 'library-sdk',
+    label: 'Library / SDK',
+  },
+  {
+    key: 'other',
+    label: 'Other',
+  },
+];
+
+export const PROJECT_SCOPE_STACK_FILTERS = {
+  'api-service': ['typescript.md', 'python.md', 'go.md', 'java.md', 'php.md', 'csharp.md', 'ruby.md', 'rust.md'],
+  'web-application': ['typescript.md', 'python.md', 'go.md', 'java.md', 'php.md', 'csharp.md', 'ruby.md', 'rust.md'],
+  'mobile-app': ['react-native.md', 'flutter.md'],
+  'cli-tool': ['typescript.md', 'python.md', 'go.md', 'rust.md', 'ruby.md', 'java.md', 'csharp.md'],
+  'library-sdk': ['typescript.md', 'python.md', 'go.md', 'rust.md', 'java.md', 'csharp.md', 'php.md', 'ruby.md'],
+  other: null,
+};
+
+export const WEB_FRONTEND_STACK_CANDIDATES = ['typescript.md'];
+
+export const WEB_BACKEND_STACK_CANDIDATES = [
+  'typescript.md',
+  'python.md',
+  'go.md',
+  'java.md',
+  'php.md',
+  'csharp.md',
+  'ruby.md',
+  'rust.md',
+];
+
+export const WEB_FRONTEND_BLUEPRINT_CANDIDATES = [
+  'api-nextjs.md',
+];
+
+export const WEB_BACKEND_BLUEPRINT_CANDIDATES = [
+  'nestjs-logic.md',
+  'fastapi-service.md',
+  'go-service.md',
+  'spring-boot-api.md',
+  'laravel-api.md',
+  'aspnet-api.md',
+  'graphql-grpc-api.md',
+  'api-nextjs.md',
+];
+
+export const RUNTIME_ENVIRONMENT_CHOICES = [
+  {
+    key: 'linux-wsl',
+    label: 'Linux / WSL',
+  },
+  {
+    key: 'windows',
+    label: 'Windows',
+  },
+  {
+    key: 'linux',
+    label: 'Linux',
+  },
+  {
+    key: 'macos',
+    label: 'macOS',
+  },
+];
+
 export const entryPointFiles = [
   '.cursorrules',
   '.windsurfrules',

package/lib/cli/detector.mjs

@@ -133,6 +133,7 @@ export async function detectProjectContext(targetDirectoryPath) {
     return {
       hasExistingProjectFiles,
       recommendedStackFileName: null,
+      secondaryStackFileNames: [],
       recommendedBlueprintFileName: null,
       confidenceLabel: null,
       confidenceScore: 0,
@@ -164,6 +165,10 @@ export async function detectProjectContext(targetDirectoryPath) {
     confidenceScore: Number(detectionCandidate.confidenceScore.toFixed(2)),
     evidence: detectionCandidate.evidence,
   }));
+  const secondaryStackFileNames = rankedCandidates
+    .slice(1)
+    .filter((rankedCandidate) => (strongestCandidate.confidenceScore - rankedCandidate.confidenceScore) < 0.08)
+    .map((rankedCandidate) => rankedCandidate.stackFileName);
   const detectionReasoning = isAmbiguous
     ? `Top signal ${toTitleCase(strongestCandidate.stackFileName)} is close to ${toTitleCase(secondStrongestCandidate.stackFileName)} (confidence gap ${confidenceGap}).`
     : `Top signal ${toTitleCase(strongestCandidate.stackFileName)} won with confidence ${strongestCandidate.confidenceScore.toFixed(2)} from markers: ${strongestCandidate.evidence.join(', ') || 'none'}.`;
@@ -171,6 +176,7 @@ export async function detectProjectContext(targetDirectoryPath) {
   return {
     hasExistingProjectFiles,
     recommendedStackFileName: strongestCandidate.stackFileName,
+    secondaryStackFileNames,
     recommendedBlueprintFileName: BLUEPRINT_RECOMMENDATIONS[strongestCandidate.stackFileName] || null,
     confidenceLabel,
     confidenceScore: strongestCandidate.confidenceScore,
@@ -194,7 +200,11 @@ export function buildDetectionSummary(projectDetection) {
     ? ` Confidence gap: ${projectDetection.confidenceGap}.`
     : '';
 
-  return `This folder looks like ${toTitleCase(projectDetection.recommendedStackFileName)} with ${projectDetection.confidenceLabel} confidence based on ${readableEvidence}.${confidenceGapSummary}`;
+  const secondaryStacksSummary = projectDetection.secondaryStackFileNames?.length
+    ? ` Secondary stack signals: ${projectDetection.secondaryStackFileNames.map((stackFileName) => toTitleCase(stackFileName)).join(', ')}.`
+    : '';
+
+  return `This folder looks like ${toTitleCase(projectDetection.recommendedStackFileName)} with ${projectDetection.confidenceLabel} confidence based on ${readableEvidence}.${confidenceGapSummary}${secondaryStacksSummary}`;
 }
 
 export function formatDetectionCandidates(rankedCandidates) {

package/lib/cli/project-scaffolder.mjs

@@ -22,7 +22,7 @@ const PROJECT_DOC_FILE_NAMES = [
   'flow-overview.md',
 ];
 
-export const PROJECT_DOC_TEMPLATE_VERSION = '1.1.0';
+export const PROJECT_DOC_TEMPLATE_VERSION = '1.2.0';
 
 const DOMAIN_CHOICES = [
   'API service',
@@ -50,6 +50,13 @@ const AUTH_CHOICES = [
   'Other',
 ];
 
+const DOCKER_STRATEGY_CHOICES = [
+  'No Docker (run services directly)',
+  'Docker for development only',
+  'Docker for production only',
+  'Docker for both development and production',
+];
+
 const DISCOVERY_MODE_CHOICES = [
   'Quick mode (mostly choices, fastest)',
   'Detailed mode (type your own answers)',
@@ -101,6 +108,100 @@ const FEATURE_PRESET_MAP = {
   ],
 };
 
+function parseBooleanLikeValue(rawValue) {
+  const normalizedValue = String(rawValue || '').trim().toLowerCase();
+  if (['true', 'yes', 'y', '1'].includes(normalizedValue)) {
+    return true;
+  }
+
+  if (['false', 'no', 'n', '0'].includes(normalizedValue)) {
+    return false;
+  }
+
+  return null;
+}
+
+function resolveDockerStrategy({ dockerStrategy, useDocker, useDockerDevelopment, useDockerProduction }) {
+  if (typeof dockerStrategy === 'string' && dockerStrategy.trim().length > 0) {
+    const normalizedDockerStrategy = dockerStrategy.trim().toLowerCase();
+    const directMatch = DOCKER_STRATEGY_CHOICES.find(
+      (dockerStrategyChoice) => dockerStrategyChoice.toLowerCase() === normalizedDockerStrategy
+    );
+
+    if (directMatch) {
+      return directMatch;
+    }
+  }
+
+  const normalizedUseDocker = typeof useDocker === 'boolean' ? useDocker : parseBooleanLikeValue(useDocker);
+  const normalizedUseDockerDevelopment = typeof useDockerDevelopment === 'boolean'
+    ? useDockerDevelopment
+    : parseBooleanLikeValue(useDockerDevelopment);
+  const normalizedUseDockerProduction = typeof useDockerProduction === 'boolean'
+    ? useDockerProduction
+    : parseBooleanLikeValue(useDockerProduction);
+
+  if (normalizedUseDocker === false) {
+    return DOCKER_STRATEGY_CHOICES[0];
+  }
+
+  if (normalizedUseDockerDevelopment === true && normalizedUseDockerProduction === true) {
+    return DOCKER_STRATEGY_CHOICES[3];
+  }
+
+  if (normalizedUseDockerDevelopment === true && normalizedUseDockerProduction !== true) {
+    return DOCKER_STRATEGY_CHOICES[1];
+  }
+
+  if (normalizedUseDockerProduction === true && normalizedUseDockerDevelopment !== true) {
+    return DOCKER_STRATEGY_CHOICES[2];
+  }
+
+  if (normalizedUseDocker === true) {
+    return DOCKER_STRATEGY_CHOICES[3];
+  }
+
+  return DOCKER_STRATEGY_CHOICES[0];
+}
+
+function parseDockerStrategy(dockerStrategy) {
+  const normalizedDockerStrategy = String(dockerStrategy || '').toLowerCase();
+
+  if (normalizedDockerStrategy.includes('both development and production')) {
+    return {
+      dockerStrategy: DOCKER_STRATEGY_CHOICES[3],
+      hasDocker: true,
+      useDockerDevelopment: true,
+      useDockerProduction: true,
+    };
+  }
+
+  if (normalizedDockerStrategy.includes('development only')) {
+    return {
+      dockerStrategy: DOCKER_STRATEGY_CHOICES[1],
+      hasDocker: true,
+      useDockerDevelopment: true,
+      useDockerProduction: false,
+    };
+  }
+
+  if (normalizedDockerStrategy.includes('production only')) {
+    return {
+      dockerStrategy: DOCKER_STRATEGY_CHOICES[2],
+      hasDocker: true,
+      useDockerDevelopment: false,
+      useDockerProduction: true,
+    };
+  }
+
+  return {
+    dockerStrategy: DOCKER_STRATEGY_CHOICES[0],
+    hasDocker: false,
+    useDockerDevelopment: false,
+    useDockerProduction: false,
+  };
+}
+
 async function askFeatureList(userInterface) {
   console.log('\nList your key features (one per line, press Enter to finish):');
 
@@ -184,7 +285,15 @@ export async function runProjectDiscovery(userInterface, options = {}) {
   }
 
   if (!projectName) {
-    projectName = (await userInterface.question('Project name: ')).trim();
+    const projectNamePrompt = defaultProjectName
+      ? `Project name (press Enter to use folder name: ${defaultProjectName}): `
+      : 'Project name: ';
+
+    projectName = (await userInterface.question(projectNamePrompt)).trim();
+
+    if (!projectName && defaultProjectName) {
+      projectName = defaultProjectName;
+    }
   }
 
   if (!projectName) {
@@ -245,6 +354,42 @@ export async function runProjectDiscovery(userInterface, options = {}) {
     authStrategy = (await userInterface.question('Describe your auth setup: ')).trim() || 'Custom auth';
   }
 
+  let dockerStrategy = DOCKER_STRATEGY_CHOICES[0];
+  if (isQuickMode) {
+    dockerStrategy = await askChoice(
+      'Containerization strategy:',
+      DOCKER_STRATEGY_CHOICES,
+      userInterface
+    );
+  } else {
+    const useDocker = await askYesNo(
+      'Use Docker for this project (development and/or production)?',
+      userInterface,
+      false
+    );
+
+    if (useDocker) {
+      const useDockerDevelopment = await askYesNo(
+        'Use Docker for development workflow?',
+        userInterface,
+        true
+      );
+      const useDockerProduction = await askYesNo(
+        'Use Docker for production runtime/build?',
+        userInterface,
+        true
+      );
+
+      dockerStrategy = resolveDockerStrategy({
+        useDocker,
+        useDockerDevelopment,
+        useDockerProduction,
+      });
+    }
+  }
+
+  const parsedDockerStrategy = parseDockerStrategy(dockerStrategy);
+
   let features = [];
   if (isQuickMode) {
     const selectedFeaturePreset = await askChoice(
@@ -289,6 +434,9 @@ export async function runProjectDiscovery(userInterface, options = {}) {
     primaryDomain,
     databaseChoice,
     authStrategy,
+    dockerStrategy: parsedDockerStrategy.dockerStrategy,
+    useDockerDevelopment: parsedDockerStrategy.useDockerDevelopment,
+    useDockerProduction: parsedDockerStrategy.useDockerProduction,
     features,
     additionalContext,
   };
@@ -335,6 +483,13 @@ export function resolveDocumentManifest(discoveryAnswers) {
 export function buildTemplateContext(discoveryAnswers, initContext) {
   const hasDatabase = !discoveryAnswers.databaseChoice.toLowerCase().startsWith('none');
   const hasAuth = !discoveryAnswers.authStrategy.toLowerCase().startsWith('none');
+  const additionalStackFileNames = Array.isArray(initContext.additionalStackFileNames)
+    ? initContext.additionalStackFileNames
+    : [];
+  const additionalBlueprintFileNames = Array.isArray(initContext.additionalBlueprintFileNames)
+    ? initContext.additionalBlueprintFileNames
+    : [];
+  const parsedDockerStrategy = parseDockerStrategy(discoveryAnswers.dockerStrategy);
 
   const baseUrlMap = {
     'API service': 'http://localhost:3000',
@@ -354,14 +509,34 @@ export function buildTemplateContext(discoveryAnswers, initContext) {
     additionalContext: discoveryAnswers.additionalContext,
     stackFileName: initContext.stackFileName,
     stackDisplayName: toTitleCase(initContext.stackFileName),
+    additionalStackFileNames,
+    additionalStackDisplayNames: additionalStackFileNames.length > 0
+      ? additionalStackFileNames.map((stackFileName) => toTitleCase(stackFileName))
+      : null,
     blueprintFileName: initContext.blueprintFileName,
     blueprintDisplayName: toTitleCase(initContext.blueprintFileName),
+    additionalBlueprintFileNames,
+    additionalBlueprintDisplayNames: additionalBlueprintFileNames.length > 0
+      ? additionalBlueprintFileNames.map((blueprintFileName) => toTitleCase(blueprintFileName))
+      : null,
+    runtimeEnvironmentKey: initContext.runtimeEnvironmentKey || 'linux',
+    runtimeEnvironmentLabel: initContext.runtimeEnvironmentLabel || 'Linux',
     cliVersion: CLI_VERSION,
     templateVersion: PROJECT_DOC_TEMPLATE_VERSION,
     generatedAt: new Date().toISOString(),
     generatedDate: new Date().toISOString().split('T')[0],
     hasDatabase,
     hasAuth,
+    hasDocker: parsedDockerStrategy.hasDocker,
+    dockerStrategy: parsedDockerStrategy.dockerStrategy,
+    useDockerDevelopment: parsedDockerStrategy.useDockerDevelopment,
+    useDockerProduction: parsedDockerStrategy.useDockerProduction,
+    dockerDevelopmentGuidance: parsedDockerStrategy.useDockerDevelopment
+      ? '- Development containers are required: optimize for fast rebuilds, bind mounts, and debug-friendly startup.'
+      : '',
+    dockerProductionGuidance: parsedDockerStrategy.useDockerProduction
+      ? '- Production containers are required: use multi-stage builds, non-root runtime, and minimal image footprint.'
+      : '',
     baseUrl: baseUrlMap[discoveryAnswers.primaryDomain] || 'http://localhost:3000',
   };
 }
@@ -587,6 +762,12 @@ export async function loadProjectConfig(configFilePath) {
     primaryDomain: configEntries.primaryDomain || configEntries.domain || 'API service',
     databaseChoice: configEntries.databaseChoice || configEntries.database || 'None (stateless service)',
     authStrategy: configEntries.authStrategy || configEntries.auth || 'None (public service)',
+    dockerStrategy: resolveDockerStrategy({
+      dockerStrategy: configEntries.dockerStrategy || configEntries.containerStrategy,
+      useDocker: configEntries.useDocker,
+      useDockerDevelopment: configEntries.useDockerDevelopment || configEntries.dockerDevelopment,
+      useDockerProduction: configEntries.useDockerProduction || configEntries.dockerProduction,
+    }),
     features: Array.isArray(configEntries.features) ? configEntries.features : [],
     additionalContext: configEntries.additionalContext || configEntries.context || 'No additional context provided.',
     docsLang: configEntries.docsLang || configEntries.docsLanguage || 'en',