fix(ai-scaffolding): fix MCP config merge bugs and add multi-tool recipe generation

Summary:
Address code review issues in MCP config merge implementation:
- Fix race condition: await in-flight config writes before cleanup on server close
- Add TOML marker ordering validation (startIdx < endIdx guard)
- Use Promise.allSettled in writeMcpConfigs so one tool failure doesn't block others
- Add missing cancelled check in prompts.ts between gitInit and aiTools prompts
- Fix vite.config template to use valid TS placeholder with chef:mcp anchor
- Add bracket tracking in build-assets.mjs for chef:mcp array replacement
- Add 4 new test cases for merge/unmerge edge cases (sibling keys, wrong marker
  order, user content preservation)

Also includes the multi-tool AI scaffolding feature: CLI --ai-tools flag,
per-tool recipe generation (cursor, copilot, codex, agents), and bundle support.

Reviewed By: zjm-meta

Differential Revision: D94132897

fbshipit-source-id: e28c62edde51b3a6cc2ce94f4d17d7952d23f466

Author: felixtrz

packages/create/src/cli.ts

@@ -30,7 +30,7 @@ import {
 import { MSE_MIN_VERSION } from './mse-config.js';
 import { scaffoldProject } from './scaffold.js';
 import { resolveSource, SDK_PACKAGES_DIR } from './source.js';
-import { MSEInstallResult, PromptResult, TriState, VariantId } from './types.js';
+import { MSEInstallResult, PromptResult, TriState, VariantId, AiTool } from './types.js';
 import { VERSION, NODE_ENGINE } from './version.js';
 
 type CliOptions = {
@@ -46,6 +46,7 @@ type CliOptions = {
   physics?: boolean;
   sceneUnderstanding?: boolean;
   environmentRaycast?: boolean;
+  aiTools?: string;
 };
 
 async function main() {
@@ -112,6 +113,7 @@ IWSDK Create CLI v${VERSION}\nNode ${process.version}`;
     .option('--no-scene-understanding', 'Disable scene understanding')
     .option('--environment-raycast', 'Enable environment raycast (AR mode)', true)
     .option('--no-environment-raycast', 'Disable environment raycast')
+    .option('--ai-tools <tools>', 'AI tools to configure (comma-separated: claude,cursor,copilot,codex; or "none")', 'claude,cursor,copilot,codex')
     .action((n: string | undefined, opts: CliOptions) => {
       nameArg = n;
       cliOpts = opts;
@@ -169,6 +171,7 @@ IWSDK Create CLI v${VERSION}\nNode ${process.version}`;
       '--physics', '--no-physics',
       '--scene-understanding', '--no-scene-understanding',
       '--environment-raycast', '--no-environment-raycast',
+      '--ai-tools',
     ];
     const hasExplicitFlags = process.argv.some((arg) =>
       explicitFlags.includes(arg),
@@ -202,6 +205,12 @@ IWSDK Create CLI v${VERSION}\nNode ${process.version}`;
       const workflow = metaspatial ? 'metaspatial' : 'manual';
       const variantId = `${mode}-${workflow}-${language}` as VariantId;
 
+      const validAiTools = ['claude', 'cursor', 'copilot', 'codex'] as const;
+      const rawAiTools = (cliOpts.aiTools || 'claude,cursor,copilot,codex').split(',').map((t) => t.trim());
+      const aiTools = rawAiTools.includes('none')
+        ? []
+        : rawAiTools.filter((t): t is AiTool => validAiTools.includes(t as AiTool));
+
       const locomotionEnabled =
         mode === 'vr' ? (cliOpts.locomotion ?? true) : false;
 
@@ -255,6 +264,7 @@ IWSDK Create CLI v${VERSION}\nNode ${process.version}`;
               : false,
         },
         gitInit: cliOpts.git ?? true,
+        aiTools,
         xrFeatureStates:
           mode === 'ar'
             ? {
@@ -356,6 +366,13 @@ IWSDK Create CLI v${VERSION}\nNode ${process.version}`;
       }
       const xrLiteral = `{ ${entries.join(', ')} }`;
       resolvedRecipe.edits['@xrFeaturesStr'] = xrLiteral;
+
+      // MCP tool selection for vite.config.ts
+      const mcpToolsLiteral = res.aiTools.length > 0
+        ? `[${res.aiTools.map((t) => `'${t}'`).join(', ')}]`
+        : `['claude', 'cursor', 'copilot', 'codex']`;
+      resolvedRecipe.edits['@mcpToolsStr'] = mcpToolsLiteral;
+
       const outDir = join(process.cwd(), res.name);
 
       // Check if target directory already exists and is non-empty
@@ -369,20 +386,70 @@ IWSDK Create CLI v${VERSION}\nNode ${process.version}`;
         );
       }
 
-      // Try to load the Claude Code configuration recipe
-      let claudeRecipe: Recipe | null = null;
-      try {
-        const rawClaudeRecipe = await source.fetchRecipe(
-          'base-claude-config.recipe.json',
-        );
-        claudeRecipe = source.resolveRecipeUrls(rawClaudeRecipe);
-      } catch {
-        // Not yet published — skip silently
+      // Load AI tool configuration recipes based on user selection
+      const aiRecipes: Recipe[] = [];
+
+      if (res.aiTools.length > 0) {
+        // AGENTS.md recipe (loaded when any AI tool is selected — universal baseline)
+        try {
+          const rawAgentsRecipe = await source.fetchRecipe(
+            'base-agents-config.recipe.json',
+          );
+          aiRecipes.push(source.resolveRecipeUrls(rawAgentsRecipe));
+        } catch {
+          // Not yet published — skip silently
+        }
+      }
+
+      // Claude Code recipe (conditional)
+      if (res.aiTools.includes('claude')) {
+        try {
+          const rawClaudeRecipe = await source.fetchRecipe(
+            'base-claude-config.recipe.json',
+          );
+          aiRecipes.push(source.resolveRecipeUrls(rawClaudeRecipe));
+        } catch {
+          // Not yet published — skip silently
+        }
+      }
+
+      // Cursor recipe (conditional)
+      if (res.aiTools.includes('cursor')) {
+        try {
+          const rawCursorRecipe = await source.fetchRecipe(
+            'base-cursor-config.recipe.json',
+          );
+          aiRecipes.push(source.resolveRecipeUrls(rawCursorRecipe));
+        } catch {
+          // Not yet published — skip silently
+        }
+      }
+
+      // Copilot recipe (conditional)
+      if (res.aiTools.includes('copilot')) {
+        try {
+          const rawCopilotRecipe = await source.fetchRecipe(
+            'base-copilot-config.recipe.json',
+          );
+          aiRecipes.push(source.resolveRecipeUrls(rawCopilotRecipe));
+        } catch {
+          // Not yet published — skip silently
+        }
+      }
+
+      // Codex recipe (conditional)
+      if (res.aiTools.includes('codex')) {
+        try {
+          const rawCodexRecipe = await source.fetchRecipe(
+            'base-codex-config.recipe.json',
+          );
+          aiRecipes.push(source.resolveRecipeUrls(rawCodexRecipe));
+        } catch {
+          // Not yet published — skip silently
+        }
       }
 
-      const recipes: Recipe[] = claudeRecipe
-        ? [resolvedRecipe, claudeRecipe]
-        : [resolvedRecipe];
+      const recipes: Recipe[] = [resolvedRecipe, ...aiRecipes];
       await scaffoldProject(recipes, outDir);
 
       // Git init

packages/create/src/prompts.ts

@@ -7,7 +7,7 @@
 
 import prompts from 'prompts';
 import { installMSE } from './mse-installer.js';
-import { MSEInstallResult, PromptResult, TriState, VariantId } from './types.js';
+import { MSEInstallResult, PromptResult, TriState, VariantId, AiTool } from './types.js';
 
 export async function promptFlow(nameArg?: string): Promise<PromptResult> {
   let cancelled = false;
@@ -40,6 +40,31 @@ export async function promptFlow(nameArg?: string): Promise<PromptResult> {
     throw new Error('Input cancelled');
   }
 
+  const { aiTools } = await prompts(
+    {
+      type: 'multiselect',
+      name: 'aiTools',
+      message: 'Which AI coding tools do you use?',
+      choices: [
+        { title: 'Claude Code (Anthropic)', value: 'claude', selected: true },
+        { title: 'Cursor', value: 'cursor' },
+        { title: 'GitHub Copilot', value: 'copilot' },
+        { title: 'OpenAI Codex', value: 'codex' },
+        { title: 'None', value: 'none' },
+      ],
+      hint: '- Space to select, Enter to confirm',
+    },
+    { onCancel },
+  );
+  if (cancelled) {
+    throw new Error('Input cancelled');
+  }
+
+  // If "none" is selected, clear all other selections
+  const resolvedAiTools: AiTool[] = (aiTools as string[])?.includes('none')
+    ? []
+    : ((aiTools as AiTool[]) || []);
+
   const { language, mode } = await prompts(
     [
       {
@@ -254,9 +279,9 @@ export async function promptFlow(nameArg?: string): Promise<PromptResult> {
             title: 'Yes (Install Meta Spatial Editor if needed)',
             value: true,
           },
-          { title: 'No (Can change later)', value: false },
+          { title: 'Skip for now (can change later)', value: false },
         ],
-        initial: 0,
+        initial: 1,
       },
       { onCancel },
     );
@@ -300,6 +325,10 @@ export async function promptFlow(nameArg?: string): Promise<PromptResult> {
     { onCancel },
   );
 
+  if (cancelled) {
+    throw new Error('Input cancelled');
+  }
+
   const kind = metaspatial ? 'metaspatial' : 'manual';
   const id = `${mode}-${kind}-${language}` as VariantId;
   return {
@@ -319,6 +348,7 @@ export async function promptFlow(nameArg?: string): Promise<PromptResult> {
       environmentRaycastEnabled: !!environmentRaycastEnabled,
     },
     gitInit,
+    aiTools: resolvedAiTools,
     xrFeatureStates,
     actionItems,
     prerequisites,

packages/create/src/types.ts

@@ -8,6 +8,7 @@
 export type VariantId =
   `${'vr' | 'ar'}-${'manual' | 'metaspatial'}-${'ts' | 'js'}`;
 export type TriState = 'no' | 'optional' | 'required';
+export type AiTool = 'claude' | 'cursor' | 'copilot' | 'codex';
 
 /**
  * Platform type for MSE installation detection
@@ -54,6 +55,7 @@ export type PromptResult = {
     environmentRaycastEnabled: boolean; // AR-relevant, no room scanning required
   };
   gitInit: boolean;
+  aiTools: AiTool[];
   xrFeatureStates: Record<string, TriState>;
   actionItems?: ActionItem[];
   prerequisites?: ActionItem[];