ccsetup 1.2.0 → 1.2.1

package/bin/create-project.js

@@ -3,10 +3,6 @@
 const fs = require('fs');
 const path = require('path');
 const readline = require('readline');
-const RepositoryScanner = require('../lib/scanner');
-const ContextGenerator = require('../lib/contextGenerator');
-const ContextMerger = require('../lib/contextMerger');
-const ProgressReporter = require('../lib/progressReporter');
 const TemplateCatalog = require('../lib/templates/catalog');
 const TemplateFilter = require('../lib/templates/filter');
 const TemplateSearch = require('../lib/templates/search');
@@ -14,12 +10,6 @@ const TemplateSearch = require('../lib/templates/search');
 // Parse CLI arguments
 const args = process.argv.slice(2);
 
-// Handle scan subcommand
-if (args[0] === 'scan') {
-  require('./scan.js');
-  return;
-}
-
 const flags = {
   force: false,
   dryRun: false,
@@ -29,8 +19,6 @@ const flags = {
   agents: false,
   browseAgents: false,
   browse: false,
-  scanContext: false,
-  scanOnly: false,
   prompt: null
 };
 
@@ -55,10 +43,6 @@ for (let i = 0; i < args.length; i++) {
     flags.browseAgents = true;
   } else if (arg === '--browse') {
     flags.browse = true;
-  } else if (arg === '--scan-context') {
-    flags.scanContext = true;
-  } else if (arg === '--scan-only') {
-    flags.scanOnly = true;
   } else if (arg === '--install-hooks') {
     flags.installHooks = true;
   } else if (!arg.startsWith('-')) {
@@ -70,15 +54,12 @@ for (let i = 0; i < args.length; i++) {
 if (flags.help) {
   console.log(`
 Usage: ccsetup [project-name] [options]
-       ccsetup scan [path] [options]
 
 Commands:
-  ccsetup              Interactive mode - choose full setup or scan-only
+  ccsetup              Interactive mode
   ccsetup <name>       Create a new Claude Code project
-  ccsetup scan         Advanced repository scanning (see 'ccsetup scan --help')
 
 Options:
-  --scan-only          Skip project setup, only scan and create/update CLAUDE.md ⭐
   --force, -f          Skip all prompts and overwrite existing files
   --dry-run, -d        Show what would be done without making changes
   --agents             Interactive agent selection mode
@@ -86,32 +67,15 @@ Options:
   --no-agents          Skip agent selection entirely
   --browse-agents      Copy all agents to /agents folder for browsing
   --browse             Enhanced template browsing and selection interface
-  --scan-context       Scan repository and add context to CLAUDE.md
   --help, -h           Show this help message
 
 Advanced:
   --install-hooks      Install workflow selection hook to .claude/hooks (optional, power users only)
 
-Quick Start:
-  npx ccsetup              # Interactive mode - choose what to do
-  npx ccsetup --scan-only  # Just scan and create CLAUDE.md ⭐
-  npx ccsetup my-project   # Full project setup
-
-Scan-Only Mode ⭐:
-  Perfect for existing projects! Analyzes your codebase and creates/updates
-  CLAUDE.md with project context without modifying your project structure.
-  
 Examples:
-  ccsetup --scan-only           # Scan current directory only
-  ccsetup . --scan-only         # Same as above
-  ccsetup --scan-only --force   # Skip confirmation prompts
-  ccsetup --scan-only --dry-run # Preview what would happen
-
-Full Setup Examples:
-  ccsetup                      # Interactive setup in current directory
-  ccsetup my-project           # Create in new directory
-  ccsetup . --scan-context     # Full setup with context scanning
-  ccsetup my-app --all-agents  # Include all agents automatically
+  npx ccsetup              # Interactive setup in current directory
+  npx ccsetup my-project   # Create in new directory
+  npx ccsetup my-app --all-agents  # Include all agents automatically
 `);
   process.exit(0);
 }
@@ -132,202 +96,8 @@ function validateProjectName(name) {
   return true;
 }
 
-async function scanRepositoryForContext(projectPath) {
-  try {
-    const progressReporter = new ProgressReporter();
-    console.log('🔍 Scanning repository for project context...');
-    
-    const scanner = new RepositoryScanner(projectPath);
-    const scanResults = await scanner.scan(progressReporter);
-    
-    const contextGenerator = new ContextGenerator(scanResults);
-    const context = contextGenerator.generate();
-    const structuredSections = contextGenerator.generateStructuredSections();
-    
-    console.log('\n📊 Detected project details:');
-    if (context.overview) {
-      console.log(`   ${context.overview}`);
-    }
-    
-    if (context.techStack && context.techStack.frameworks && context.techStack.frameworks.length > 0) {
-      console.log(`   Framework: ${context.techStack.frameworks.join(', ')}`);
-    }
-    
-    if (context.commands && Object.keys(context.commands).length > 0) {
-      const totalCommands = Object.values(context.commands).reduce((sum, cmds) => sum + cmds.length, 0);
-      console.log(`   Commands: ${totalCommands} available scripts`);
-    }
-    
-    if (context.patterns && Object.keys(context.patterns).length > 0) {
-      const totalPatterns = Object.values(context.patterns).reduce((sum, patterns) => sum + patterns.length, 0);
-      console.log(`   Patterns: ${totalPatterns} detected architectural patterns`);
-    }
-    
-    return {
-      scanResults,
-      contextGenerator,
-      structuredSections,
-      formattedContext: contextGenerator.formatForClaude()
-    };
-  } catch (error) {
-    console.warn(`⚠️  Repository scanning failed: ${error.message}`);
-    console.log('   Continuing with standard setup...\n');
-    return null;
-  }
-}
-
-async function previewAndConfirmContext(formattedContext) {
-  console.log('\n📝 Generated context preview:');
-  console.log('━'.repeat(60));
-  console.log(formattedContext);
-  console.log('━'.repeat(60));
-  
-  // Use inquirer instead of readline prompt
-  const selectModule = await import('@inquirer/select');
-  const select = selectModule.default;
-  const response = await select({
-    message: 'Would you like to add this context to CLAUDE.md?',
-    choices: [
-      { name: 'Yes', value: 'y' },
-      { name: 'No', value: 'n' },
-      { name: 'Edit', value: 'edit' }
-    ],
-    default: 'y'
-  });
-  return response;
-}
-
-async function shouldScanRepository() {
-  console.log('\n🔍 Existing project files detected.');
-  // Use inquirer instead of readline prompt
-  const confirmModule = await import('@inquirer/confirm');
-  const confirm = confirmModule.default;
-  const response = await confirm({
-    message: 'Would you like to scan the repository to add project context to CLAUDE.md?',
-    default: true
-  });
-  return response;
-}
-
-async function mergeContextIntelligently(existingContent, repositoryContext, strategy = 'smart') {
-  try {
-    // Handle replace strategy
-    if (strategy === 'replace') {
-      console.log('   Replacing with new scan results...');
-      // Get template and apply context
-      const templatePath = path.join(__dirname, '..', 'template', 'CLAUDE.md');
-      let template = '';
-      if (fs.existsSync(templatePath)) {
-        template = fs.readFileSync(templatePath, 'utf8');
-      } else {
-        template = `# Claude Code Project Instructions
-
-## Project Overview
-[Project description will be added here]
-
-## Key Objectives
-[Project objectives will be added here]
-
-## Additional Notes
-[Any other important information for Claude to know about this project]
-`;
-      }
-      return await applyContextToTemplate(template, repositoryContext, 'append');
-    }
-    
-    // Use structured sections for intelligent merge, fall back to formatted context
-    let contextToMerge = repositoryContext.formattedContext;
-    
-    if (repositoryContext.structuredSections && 
-        typeof repositoryContext.structuredSections === 'object' && 
-        Object.keys(repositoryContext.structuredSections).length > 0) {
-      contextToMerge = repositoryContext.structuredSections;
-      console.log('   📊 Using intelligent merge with structured sections');
-    } else {
-      console.log('   📝 Using fallback merge with formatted content');
-    }
-    const merger = new ContextMerger(existingContent, contextToMerge);
-    const changes = merger.getChangesSummary();
-    
-    if (!changes.hasChanges) {
-      console.log('   ✅ Context is already up to date');
-      return existingContent;
-    }
-    
-    console.log('\n   📊 Merge Analysis:');
-    if (changes.added > 0) console.log(`     + ${changes.added} new sections`);
-    if (changes.modified > 0) console.log(`     ~ ${changes.modified} updated sections`);
-    if (changes.unchanged > 0) console.log(`     ✓ ${changes.unchanged} preserved sections`);
-    
-    const mergedContent = await merger.merge(strategy);
-    
-    if (typeof mergedContent === 'string') {
-      const existingHeader = merger.extractHeaderContent();
-      return existingHeader + '\n\n' + mergedContent;
-    }
-    
-    return mergedContent;
-  } catch (error) {
-    // Re-throw specific errors that should stop the process
-    if (error.message === 'Interactive merge cancelled' || 
-        error.message === 'Missing required dependency') {
-      throw error;
-    }
-    
-    console.warn(`   ⚠️  Merge failed: ${error.message}`);
-    console.log('   📝 Falling back to simple append...');
-    
-    // Fall back to formatted context for simple append
-    const newContext = repositoryContext.formattedContext;
-    const additionalNotesMarker = '## Additional Notes';
-    const additionalNotesIdx = existingContent.indexOf(additionalNotesMarker);
-    
-    if (additionalNotesIdx === -1) {
-      return existingContent.trimEnd() + '\n\n' + additionalNotesMarker + '\n\n' + newContext.trim() + '\n';
-    } else {
-      const insertIdx = existingContent.indexOf('\n', additionalNotesIdx) + 1;
-      return existingContent.substring(0, insertIdx) + '\n' + newContext.trim() + '\n' + existingContent.substring(insertIdx);
-    }
-  }
-}
-
-async function applyContextToTemplate(templateContent, repositoryContext, conflictStrategy) {
-  const contextContent = repositoryContext.formattedContext;
-  const additionalNotesMarker = '## Additional Notes';
-  const placeholderContent = '[Any other important information for Claude to know about this project]';
-  
-  if (templateContent.includes(additionalNotesMarker)) {
-    if (templateContent.includes(placeholderContent)) {
-      return templateContent.replace(placeholderContent, contextContent.trim());
-    } else {
-      const sections = templateContent.split(additionalNotesMarker);
-      if (sections.length >= 2) {
-        return sections[0] + additionalNotesMarker + contextContent + '\n';
-      }
-    }
-  }
-  
-  return templateContent + contextContent;
-}
-
 // Validate conflicting flags
 function validateFlags() {
-  // Scan-only conflicts
-  if (flags.scanOnly) {
-    const conflictingFlags = [];
-    if (flags.allAgents) conflictingFlags.push('--all-agents');
-    if (flags.noAgents) conflictingFlags.push('--no-agents');
-    if (flags.browseAgents) conflictingFlags.push('--browse-agents');
-    if (flags.browse) conflictingFlags.push('--browse');
-    if (flags.agents) conflictingFlags.push('--agents');
-    
-    if (conflictingFlags.length > 0) {
-      console.error(`Error: --scan-only cannot be used with ${conflictingFlags.join(', ')}`);
-      console.log('Tip: --scan-only skips all agent-related operations');
-      process.exit(1);
-    }
-  }
-  
   // Existing validations
   if (flags.allAgents && flags.noAgents) {
     console.error('Error: Cannot use --all-agents and --no-agents together');
@@ -359,6 +129,7 @@ if (projectName !== '.') {
 
 const targetDir = path.resolve(process.cwd(), projectName);
 const templateDir = path.join(__dirname, '..', 'template');
+const VALID_AI_PROVIDERS = new Set(['claude', 'codex', 'both']);
 
 // Create readline interface only if needed
 let rl = null;
@@ -409,6 +180,72 @@ function validateAgentFile(file) {
   return true;
 }
 
+function includesClaude(provider) {
+  return provider === 'claude' || provider === 'both';
+}
+
+function includesCodex(provider) {
+  return provider === 'codex' || provider === 'both';
+}
+
+function getEnvBoolean(name) {
+  const value = process.env[name];
+  if (value == null || value === '') return null;
+
+  const normalized = value.toLowerCase().trim();
+  if (['1', 'true', 'yes', 'y'].includes(normalized)) return true;
+  if (['0', 'false', 'no', 'n'].includes(normalized)) return false;
+  return null;
+}
+
+function getConfiguredAiProvider() {
+  const envValue = process.env.CCSETUP_AI_PROVIDER;
+  if (!envValue) return null;
+
+  const normalized = envValue.toLowerCase().trim();
+  if (!VALID_AI_PROVIDERS.has(normalized)) {
+    throw new Error(`Invalid CCSETUP_AI_PROVIDER value: ${envValue}`);
+  }
+
+  return normalized;
+}
+
+async function selectAiProvider() {
+  const envProvider = getConfiguredAiProvider();
+  if (envProvider) {
+    return envProvider;
+  }
+
+  if (flags.force || flags.dryRun) {
+    return 'claude';
+  }
+
+  const selectModule = await import('@inquirer/select');
+  const select = selectModule.default;
+
+  return select({
+    message: 'Which AI setup would you like to generate for this project?',
+    choices: [
+      {
+        name: 'Claude Code',
+        value: 'claude',
+        description: 'Copy CLAUDE.md and the .claude project setup'
+      },
+      {
+        name: 'Codex CLI',
+        value: 'codex',
+        description: 'Copy AGENTS.md plus project-local Codex skills'
+      },
+      {
+        name: 'Both',
+        value: 'both',
+        description: 'Copy both Claude Code and Codex project assets'
+      }
+    ],
+    default: 'claude'
+  });
+}
+
 // Function to check if Claude Code is installed
 function checkClaudeCode() {
   const claudeDir = path.join(targetDir, '.claude');
@@ -604,6 +441,36 @@ async function initializeClaudeDirectory(selectedAgentFiles, conflictStrategy, d
       }
     }
 
+    // Copy template/hooks/ to .claude/hooks/ (all hook directories)
+    const templateHooksDir = path.join(templateDir, 'hooks');
+    if (fs.existsSync(templateHooksDir)) {
+      const claudeHooksDir = path.join(claudeDir, 'hooks');
+      const hookDirs = fs.readdirSync(templateHooksDir).filter(d => {
+        return fs.statSync(path.join(templateHooksDir, d)).isDirectory();
+      });
+
+      for (const hookName of hookDirs) {
+        const hookSrcDir = path.join(templateHooksDir, hookName);
+        const hookDestDir = path.join(claudeHooksDir, hookName);
+        const hookFile = path.join(hookSrcDir, 'index.js');
+
+        if (fs.existsSync(hookFile)) {
+          if (!fs.existsSync(path.join(hookDestDir, 'index.js'))) {
+            if (!dryRun) {
+              fs.mkdirSync(hookDestDir, { recursive: true });
+              fs.copyFileSync(hookFile, path.join(hookDestDir, 'index.js'));
+            }
+            createdItems.push(`.claude/hooks/${hookName}/index.js`);
+            if (dryRun) {
+              console.log(`  ✨ Would copy: .claude/hooks/${hookName}/index.js`);
+            }
+          } else {
+            skippedItems.push(`.claude/hooks/${hookName}/index.js`);
+          }
+        }
+      }
+    }
+
     // Copy selected agents to .claude/agents
     const templateAgentsDir = path.join(templateDir, '.claude', 'agents');
     let copiedAgents = 0;
@@ -692,6 +559,126 @@ async function initializeClaudeDirectory(selectedAgentFiles, conflictStrategy, d
   }
 }
 
+async function initializeCodexDirectory(conflictStrategy, dryRun) {
+  const codexDir = path.join(targetDir, '.codex');
+  const skillsDir = path.join(codexDir, 'skills');
+  const templateCodexDir = path.join(templateDir, '.codex');
+  const createdItems = [];
+  const skippedItems = [];
+
+  function copyCodexFile(src, dest, relativePath) {
+    if (!fs.existsSync(src)) {
+      return;
+    }
+
+    if (!fs.existsSync(dest)) {
+      if (!dryRun) {
+        fs.mkdirSync(path.dirname(dest), { recursive: true });
+        fs.copyFileSync(src, dest);
+      }
+      createdItems.push(relativePath);
+      if (dryRun) {
+        console.log(`  ✨ Would copy: ${relativePath}`);
+      }
+      return;
+    }
+
+    if (conflictStrategy === 'overwrite') {
+      if (!dryRun) {
+        fs.copyFileSync(src, dest);
+      }
+      if (dryRun) {
+        console.log(`  ♻️  Would replace: ${relativePath}`);
+      }
+      createdItems.push(relativePath);
+      return;
+    }
+
+    if (conflictStrategy === 'rename') {
+      const ext = path.extname(dest);
+      const baseName = path.basename(dest, ext);
+      const dirName = path.dirname(dest);
+      let newDest = path.join(dirName, `${baseName}-ccsetup${ext}`);
+      let counter = 1;
+      while (fs.existsSync(newDest)) {
+        newDest = path.join(dirName, `${baseName}-ccsetup-${counter}${ext}`);
+        counter++;
+      }
+      if (!dryRun) {
+        fs.copyFileSync(src, newDest);
+      }
+      createdItems.push(path.relative(targetDir, newDest));
+      if (dryRun) {
+        console.log(`  📄 Would create: ${path.relative(targetDir, newDest)}`);
+      }
+      return;
+    }
+
+    skippedItems.push(relativePath);
+    if (dryRun) {
+      console.log(`  ⏭️  Would skip: ${relativePath}`);
+    }
+  }
+
+  try {
+    if (!fs.existsSync(codexDir)) {
+      if (!dryRun) {
+        fs.mkdirSync(codexDir, { recursive: true });
+      }
+      createdItems.push('.codex/');
+      if (dryRun) {
+        console.log('  📁 Would create directory: .codex/');
+      }
+    } else {
+      skippedItems.push('.codex/');
+    }
+
+    if (!fs.existsSync(skillsDir)) {
+      if (!dryRun) {
+        fs.mkdirSync(skillsDir, { recursive: true });
+      }
+      createdItems.push('.codex/skills/');
+      if (dryRun) {
+        console.log('  📁 Would create directory: .codex/skills/');
+      }
+    } else {
+      skippedItems.push('.codex/skills/');
+    }
+
+    const templateSkillsDir = path.join(templateCodexDir, 'skills');
+    if (fs.existsSync(templateSkillsDir)) {
+      const skillDirs = fs.readdirSync(templateSkillsDir, { withFileTypes: true }).filter(entry => entry.isDirectory());
+      for (const entry of skillDirs) {
+        const srcDir = path.join(templateSkillsDir, entry.name);
+        const skillFileSrc = path.join(srcDir, 'SKILL.md');
+
+        if (!fs.existsSync(skillFileSrc)) {
+          continue;
+        }
+
+        const destDir = path.join(skillsDir, entry.name);
+        const skillFileDest = path.join(destDir, 'SKILL.md');
+
+        if (!fs.existsSync(destDir)) {
+          if (!dryRun) {
+            fs.mkdirSync(destDir, { recursive: true });
+          }
+          createdItems.push(`.codex/skills/${entry.name}/`);
+          if (dryRun) {
+            console.log(`  📁 Would create directory: .codex/skills/${entry.name}/`);
+          }
+        }
+
+        copyCodexFile(skillFileSrc, skillFileDest, `.codex/skills/${entry.name}/SKILL.md`);
+      }
+    }
+
+    return { createdItems, skippedItems };
+  } catch (error) {
+    throw new Error(`Failed to initialize .codex directory: ${error.message}`);
+  }
+}
+
 // Function to parse agent frontmatter
 function parseAgentFrontmatter(filePath) {
   try {
@@ -1014,441 +1001,11 @@ async function installClaudeHooks() {
 
 // Setup mode selection function
 async function selectSetupMode() {
-  // Direct flag handling
   if (flags.installHooks) return 'install-hooks';
-  if (flags.scanOnly) return 'scan-only';
   if (flags.agents) return 'agents-only';
-  if (flags.force || flags.browseAgents || flags.allAgents || flags.noAgents) return 'full';
-  
-  // Skip selection if already in a specific mode
-  if (projectName !== '.' || flags.scanContext) return 'full';
-  
-  // Interactive selection for bare 'npx ccsetup'
-  console.log('Welcome to ccsetup! 🎉\n');
-  console.log('This tool helps you set up and maintain your Claude Code project.');
-  console.log('Let\'s analyze your repository and create the perfect CLAUDE.md file.\n');
-  
-  // Check if CLAUDE.md exists to provide context
-  const claudeMdExists = fs.existsSync(path.join(process.cwd(), 'CLAUDE.md'));
-  if (claudeMdExists) {
-    console.log('📋 Existing CLAUDE.md detected in this directory.\n');
-  } else {
-    console.log('📄 No CLAUDE.md found. Let\'s create one!\n');
-  }
-  
-  // Dynamic import for ESM module
-  const selectModule = await import('@inquirer/select');
-  const select = selectModule.default;
-  
-  const mode = await select({
-    message: claudeMdExists ? 
-      'CLAUDE.md exists. How would you like to proceed?' : 
-      'What would you like to do?',
-    choices: claudeMdExists ? [
-      {
-        name: 'Smart Merge - Keep my content, add new findings',
-        value: 'scan-smart',
-        description: 'Preserves your customizations while adding newly detected information'
-      },
-      {
-        name: 'Replace - Fresh scan, replace existing',
-        value: 'scan-replace',
-        description: 'Creates a brand new CLAUDE.md from your current codebase'
-      },
-      {
-        name: 'Full Setup - Add agents and project structure',
-        value: 'full',
-        description: 'Creates the complete Claude Code boilerplate structure with agents, docs, tickets, and plans'
-      }
-    ] : [
-      {
-        name: '🚀 Quick Start - Just create CLAUDE.md',
-        value: 'scan-smart',
-        description: 'Scans your code and creates CLAUDE.md with project context'
-      },
-      {
-        name: '🏗️  Full Setup - Complete Claude Code structure',
-        value: 'full',
-        description: 'Creates CLAUDE.md plus agents, docs, tickets, and plans'
-      }
-    ]
-  });
-  
-  return mode;
-}
-
-// Validate scan-only environment
-async function validateScanOnlyEnvironment() {
-  // Check directory exists and is accessible
-  try {
-    await fs.promises.access(targetDir, fs.constants.R_OK | fs.constants.W_OK);
-  } catch (error) {
-    let message = 'Cannot access target directory';
-    let suggestion = 'Check directory permissions';
-    
-    if (error.code === 'ENOENT') {
-      message = 'Target directory does not exist';
-      suggestion = 'Create the directory first or check the path';
-    } else if (error.code === 'EACCES') {
-      message = 'Permission denied accessing target directory';
-      suggestion = 'Run with appropriate permissions or use sudo';
-    } else if (error.code === 'ENOTDIR') {
-      message = 'Target path is not a directory';
-      suggestion = 'Specify a valid directory path';
-    }
-    
-    return {
-      valid: false,
-      message,
-      suggestion
-    };
-  }
-  
-  // Check if CLAUDE.md exists and is writable
-  const claudeMdPath = path.join(targetDir, 'CLAUDE.md');
-  if (fs.existsSync(claudeMdPath)) {
-    try {
-      await fs.promises.access(claudeMdPath, fs.constants.R_OK | fs.constants.W_OK);
-    } catch (error) {
-      return {
-        valid: false,
-        message: 'Cannot access existing CLAUDE.md file',
-        suggestion: 'Check file permissions or run with appropriate access rights'
-      };
-    }
-  }
-  
-  // Check if directory is empty (warning only)
-  const files = await fs.promises.readdir(targetDir);
-  const hasFiles = files.some(f => !f.startsWith('.') && f !== 'node_modules');
-  
-  if (!hasFiles && projectName === '.') {
-    console.log('⚠️  Warning: Current directory appears to be empty.');
-    console.log('   Scan results may be limited.\n');
-  }
-  
-  return { valid: true };
+  return 'full';
 }
 
-// Get CLAUDE.md template
-async function getClaudeMdTemplate() {
-  const templatePath = path.join(__dirname, '..', 'template', 'CLAUDE.md');
-  try {
-    return await fs.promises.readFile(templatePath, 'utf8');
-  } catch (error) {
-    // Fallback to minimal template
-    return `# Claude Code Project Instructions
-
-## Project Overview
-[Project description will be added here]
-
-## Key Objectives
-[Project objectives will be added here]
-
-## Additional Notes
-[Any other important information for Claude to know about this project]
-`;
-  }
-}
-
-// Scan-only mode implementation
-async function scanOnlyMode(defaultMergeStrategy = 'smart') {
-  console.log('\n🔍 Repository Scan Mode\n');
-  
-  // Provide context based on merge strategy
-  switch (defaultMergeStrategy) {
-    case 'smart':
-      console.log('Smart Merge Mode');
-      console.log('Intelligently merges new findings with your existing CLAUDE.md');
-      console.log('Preserves your customizations while adding newly detected information\n');
-      break;
-    case 'replace':
-      console.log('Replace Mode');
-      console.log('Creates a brand new CLAUDE.md from your current codebase');
-      console.log('Perfect for: Starting fresh or major project restructuring\n');
-      break;
-  }
-  
-  console.log('This will analyze your repository and update CLAUDE.md with:');
-  console.log('  • Project structure and organization');
-  console.log('  • Technology stack and dependencies');
-  console.log('  • Available commands and scripts');
-  console.log('  • Architectural patterns detected');
-  console.log('  • Important context for Claude\n');
-  
-  // Validate environment
-  const validation = await validateScanOnlyEnvironment();
-  if (!validation.valid) {
-    console.error(`❌ ${validation.message}`);
-    if (validation.suggestion) {
-      console.log(`💡 ${validation.suggestion}`);
-    }
-    return;
-  }
-  
-  // Confirmation prompt (unless --force)
-  if (!flags.force && !flags.dryRun) {
-    // Create readline interface if needed
-    if (!rl) {
-      rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout
-      });
-    }
-    
-    // Use inquirer instead of readline prompt
-    const confirmModule = await import('@inquirer/confirm');
-    const confirm = confirmModule.default;
-    const shouldContinue = await confirm({
-      message: 'Continue?',
-      default: true
-    });
-    if (!shouldContinue) {
-      console.log('Setup cancelled.');
-      if (rl) rl.close();
-      return;
-    }
-  }
-  
-  // Check if directory has meaningful files
-  const files = await fs.promises.readdir(targetDir);
-  const hasFiles = files.some(f => !f.startsWith('.') && f !== 'node_modules');
-  
-  // Perform repository scan
-  let repositoryContext = null;
-  try {
-    repositoryContext = await scanRepositoryForContext(targetDir);
-  } catch (error) {
-    console.error('❌ Repository scanning failed:', error.message);
-    if (rl) rl.close();
-    return;
-  }
-  
-  if (!repositoryContext) {
-    // Handle empty directory case
-    if (!hasFiles && projectName === '.') {
-      console.log('📝 Since the directory is empty, would you like to:');
-      console.log('1) Create a minimal CLAUDE.md with basic template');
-      console.log('2) Cancel and run full setup instead');
-      
-      // Use inquirer instead of readline prompt
-      const selectModule = await import('@inquirer/select');
-      const select = selectModule.default;
-      const choice = await select({
-        message: 'Choose an option:',
-        choices: [
-          { name: '1) Continue with minimal context', value: '1' },
-          { name: '2) Cancel and run full setup instead', value: '2' }
-        ]
-      });
-      
-      if (choice === '2') {
-        console.log('\n💡 Run `npx ccsetup` without --scan-only for full project setup.');
-        if (rl) rl.close();
-        return;
-      }
-      
-      // Continue with minimal context
-      repositoryContext = {
-        formattedContext: `
-## Additional Notes
-
-This project directory was empty when scanned. 
-Please update this file with relevant project information as you develop.
-
-### Getting Started
-- Add project description above
-- Define key objectives
-- Document important conventions
-- Update as the project evolves
-`
-      };
-    } else {
-      console.log('❌ Unable to generate context from repository.');
-      console.log('💡 Tip: Make sure you\'re in a valid project directory.');
-      if (rl) rl.close();
-      return;
-    }
-  }
-  
-  // Preview and confirm context
-  if (!flags.force && !flags.dryRun) {
-    const confirmResult = await previewAndConfirmContext(repositoryContext.formattedContext);
-    if (confirmResult === 'n' || confirmResult === 'no') {
-      console.log('✅ Setup cancelled.');
-      if (rl) rl.close();
-      return;
-    }
-  }
-  
-  // Handle CLAUDE.md creation/update
-  const claudeMdPath = path.join(targetDir, 'CLAUDE.md');
-  const exists = fs.existsSync(claudeMdPath);
-  let backupPath = null;
-  let mergeStrategy = 'smart'; // Default merge strategy
-  
-  try {
-    if (exists) {
-      // Update existing CLAUDE.md
-      if (!flags.force && !flags.dryRun) {
-        console.log('\n📋 Existing CLAUDE.md detected!');
-        
-        // Use the default merge strategy if provided
-        if (defaultMergeStrategy === 'replace') {
-          console.log('This will replace your existing CLAUDE.md with a fresh scan.');
-          console.log('   Your current content will be backed up first.');
-          const confirmModule = await import('@inquirer/confirm');
-          const confirm = confirmModule.default;
-          const shouldProceed = await confirm({
-            message: 'Proceed with replacement?',
-            default: false
-          });
-          if (!shouldProceed) {
-            console.log('Cancelled.');
-            if (rl) rl.close();
-            return;
-          }
-          mergeStrategy = 'replace';
-        } else {
-          console.log('The scan will:');
-          console.log('  • Preserve all your existing content');
-          console.log('  • Add new findings from the scan');
-          console.log('  • Create an automatic backup');
-
-          const confirmModule = await import('@inquirer/confirm');
-          const confirm = confirmModule.default;
-          const shouldContinue = await confirm({
-            message: 'Continue with smart merge?',
-            default: true
-          });
-          if (!shouldContinue) {
-            console.log('Update cancelled.');
-            if (rl) rl.close();
-            return;
-          }
-          mergeStrategy = 'smart';
-        }
-      } else {
-        mergeStrategy = defaultMergeStrategy;
-      }
-      
-      console.log('\n📄 Updating existing CLAUDE.md...');
-      
-      if (!flags.dryRun) {
-        // Check file size before processing
-        const stats = fs.statSync(claudeMdPath);
-        if (stats.size > 1024 * 1024) { // 1MB
-          console.warn('⚠️  Warning: CLAUDE.md is large (>1MB). Processing may take longer.');
-        }
-        
-        let existingContent;
-        try {
-          existingContent = fs.readFileSync(claudeMdPath, 'utf8');
-        } catch (error) {
-          throw new Error(`Failed to read existing CLAUDE.md: ${error.message}`);
-        }
-        
-        // Validate content
-        if (!existingContent) {
-          console.warn('⚠️  Warning: Existing CLAUDE.md appears to be empty.');
-        }
-        
-        // Create backup first
-        backupPath = `${claudeMdPath}.backup.${Date.now()}`;
-        try {
-          fs.writeFileSync(backupPath, existingContent);
-          console.log(`📦 Backup created: ${path.basename(backupPath)}`);
-        } catch (error) {
-          throw new Error(`Failed to create backup: ${error.message}`);
-        }
-        
-        // Use intelligent merge with backup
-        let updatedContent;
-        try {
-          updatedContent = await mergeContextIntelligently(existingContent, repositoryContext, mergeStrategy);
-        } catch (mergeError) {
-          if (mergeError.message === 'Interactive merge cancelled') {
-            console.log('💾 Your original CLAUDE.md is unchanged.');
-            console.log(`📦 Scan results backup: ${path.basename(backupPath)}`);
-            if (rl) rl.close();
-            return;
-          } else if (mergeError.message === 'Missing required dependency') {
-            console.error('Please install missing dependencies and try again.');
-            if (rl) rl.close();
-            return;
-          }
-          throw mergeError;
-        }
-        
-        try {
-          fs.writeFileSync(claudeMdPath, updatedContent, 'utf8');
-        } catch (error) {
-          // Restore from backup if write fails
-          try {
-            fs.writeFileSync(claudeMdPath, existingContent, 'utf8');
-            console.error('❌ Failed to update CLAUDE.md. Original content restored.');
-          } catch (restoreError) {
-            console.error('❌ Critical: Failed to update AND restore CLAUDE.md!');
-            console.error(`💾 Your content is safe in: ${path.basename(backupPath)}`);
-          }
-          throw new Error(`Failed to write updated content: ${error.message}`);
-        }
-        
-        console.log('✅ CLAUDE.md updated successfully!\n');
-        
-        // Provide feedback based on merge strategy used
-        if (mergeStrategy === 'smart') {
-          console.log('   Smart merge completed');
-          console.log('   - Your customizations preserved');
-          console.log('   - New findings integrated');
-        } else if (mergeStrategy === 'replace') {
-          console.log('   Replace completed');
-          console.log('   - New CLAUDE.md generated from current codebase');
-        }
-        
-        console.log(`   📦 Backup saved: ${path.basename(backupPath)}`);
-        console.log('   💡 Review the updated content and delete backup when satisfied');
-      } else {
-        console.log('  Would update: CLAUDE.md (dry-run mode)');
-      }
-    } else {
-      // Create new CLAUDE.md
-      console.log('\n📄 Creating CLAUDE.md...');
-      
-      if (!flags.dryRun) {
-        const template = await getClaudeMdTemplate();
-        const enhanced = await applyContextToTemplate(template, repositoryContext, 'append');
-        fs.writeFileSync(claudeMdPath, enhanced, 'utf8');
-        console.log('✅ CLAUDE.md created with project context!');
-      } else {
-        console.log('  Would create: CLAUDE.md (dry-run mode)');
-      }
-    }
-    
-    // Show next steps
-    console.log('\nNext steps:');
-    console.log('1. Review the updated Additional Notes section in CLAUDE.md');
-    console.log('2. Move any important context to appropriate sections');
-    if (exists && backupPath && !flags.dryRun) {
-      console.log(`3. Delete the backup file once satisfied: ${path.basename(backupPath)}`);
-      console.log('4. Run `ccsetup scan` anytime to refresh context');
-    } else if (exists) {
-      console.log('3. Run `ccsetup scan` anytime to refresh context');
-    } else {
-      console.log('3. Add project-specific instructions and guidelines');
-      console.log('4. Run `npx ccsetup` for full setup if you need agents and project structure');
-      console.log('5. Run `ccsetup scan` anytime to refresh context');
-    }
-    
-  } catch (error) {
-    console.error('❌ Error handling CLAUDE.md:', error.message);
-    if (exists && !flags.dryRun) {
-      console.log('💡 Your original CLAUDE.md is safe. Check for backup files if needed.');
-    }
-  } finally {
-    if (rl) rl.close();
-  }
-}
 
 // Dynamic import for ESM module
 async function importCheckbox() {
@@ -1862,29 +1419,27 @@ async function main() {
       await installClaudeHooks();
       return;
     }
-    
-    if (setupMode === 'scan-only' || setupMode === 'scan-smart' || setupMode === 'scan-replace') {
-      // Close readline if open
-      if (rl) {
-        rl.close();
-        rl = null;
-      }
 
-      // Set appropriate flags based on mode
-      flags.scanOnly = true;
-      if (setupMode === 'scan-replace') {
-        flags.mergeStrategy = 'replace';
-      } else {
-        flags.mergeStrategy = 'smart';
-      }
-      
-      await scanOnlyMode(flags.mergeStrategy);
-      return;
+    if (!flags.force && !flags.dryRun && rl) {
+      rl.close();
+      rl = null;
     }
 
+    const aiProvider = await selectAiProvider();
+    
     // Handle --agents and --browse flags for agent selection only
     if (flags.agents || flags.browse) {
+      if (!includesClaude(aiProvider)) {
+        console.log('Claude agent selection is only available for Claude Code setup.');
+        console.log('Re-run full setup to generate Codex assets.\n');
+        process.exit(0);
+      }
+
       console.log('🤖 Interactive Agent Selection\n');
+
+      if (aiProvider === 'both') {
+        console.log('This step configures Claude Code agents only. Codex assets are created during full setup.\n');
+      }
       
       let selectedAgentFiles = [];
       
@@ -1943,6 +1498,13 @@ async function main() {
       process.exit(0);
     }
 
+    if (!flags.force && !flags.dryRun && !rl) {
+      rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+      });
+    }
+
     // Additional path validation
     const normalizedTarget = path.normalize(targetDir);
     const normalizedCwd = path.normalize(process.cwd());
@@ -1957,8 +1519,12 @@ async function main() {
     }
 
     // Check for Claude Code installation
-    const claudeStatus = checkClaudeCode();
-    if (projectName === '.') {
+    const claudeStatus = includesClaude(aiProvider) ? checkClaudeCode() : {
+      isInstalled: false,
+      hasClaudeDir: false,
+      hasClaudeCodeFile: false
+    };
+    if (includesClaude(aiProvider) && projectName === '.') {
       if (flags.dryRun) {
         console.log('⚠️  Note: Claude Code detection skipped in dry-run mode for current directory\n');
       } else if (!claudeStatus.isInstalled && !claudeStatus.hasClaudeDir) {
@@ -1992,7 +1558,12 @@ async function main() {
 
     // Escape targetDir for safe display
     const safeTargetDir = targetDir.replace(/[^\w\s\-./\\:]/g, '');
-    console.log(`${flags.dryRun ? 'Would create' : 'Creating'} Claude Code project in ${safeTargetDir}...`);
+    const projectLabel = aiProvider === 'both'
+      ? 'Claude Code + Codex'
+      : aiProvider === 'codex'
+        ? 'Codex'
+        : 'Claude Code';
+    console.log(`${flags.dryRun ? 'Would create' : 'Creating'} ${projectLabel} project in ${safeTargetDir}...`);
 
     if (projectName !== '.') {
       if (!fs.existsSync(targetDir)) {
@@ -2013,8 +1584,8 @@ async function main() {
       }
 
       // Check Claude Code in new directory after creation
-      const newDirClaudeStatus = checkClaudeCode();
-      if (!flags.dryRun && !newDirClaudeStatus.isInstalled) {
+      const newDirClaudeStatus = includesClaude(aiProvider) ? checkClaudeCode() : { isInstalled: true };
+      if (includesClaude(aiProvider) && !flags.dryRun && !newDirClaudeStatus.isInstalled) {
         console.log('\n⚠️  Note: Claude Code is not initialized in the new project directory.');
         console.log('After setup, remember to:');
         console.log(`1. cd ${JSON.stringify(projectName)}`);
@@ -2029,7 +1600,9 @@ async function main() {
   // Group conflicts by category
   const conflictsByCategory = {
     'CLAUDE.md': [],
+    'AGENTS.md': [],
     'agents': [],
+    'codex': [],
     'docs': [],
     'plans': [],
     'tickets': []
@@ -2038,7 +1611,9 @@ async function main() {
   // Store conflict strategies per category
   const conflictStrategies = {
     'CLAUDE.md': 'skip',
+    'AGENTS.md': 'skip',
     'agents': 'skip',
+    'codex': 'skip',
     'docs': 'skip',
     'plans': 'skip',
     'tickets': 'skip'
@@ -2050,7 +1625,10 @@ async function main() {
   
 
   // Determine which agents to include
-  if (flags.noAgents) {
+  if (!includesClaude(aiProvider)) {
+    selectedAgentFiles = [];
+    console.log('\n⏭️  Skipping Claude agents for Codex-only setup');
+  } else if (flags.noAgents) {
     selectedAgentFiles = [];
     console.log('\n⏭️  Skipping agent selection (--no-agents flag)');
   } else if (flags.browseAgents) {
@@ -2089,7 +1667,7 @@ async function main() {
           description: 'Use the enhanced interface with categories, tags, and search'
         },
         {
-          name: '📚 Copy All Agents - Get all 50+ agents to explore',
+          name: '📚 Copy All Agents - Get all 8 agents to explore',
           value: 'browse',
           description: 'Copies all agents to /agents folder for manual review'
         },
@@ -2131,7 +1709,7 @@ async function main() {
     // In dry-run mode, show what would happen
     console.log(`\nWould prompt for agent selection mode`);
     console.log(`Would then prompt for agent selection from ${availableAgents.length} available agents`);
-    selectedAgentFiles = availableAgents.map(a => a.file).filter(validateAgentFile); // Include all for scanning purposes
+    selectedAgentFiles = availableAgents.map(a => a.file).filter(validateAgentFile); // Include all for dry-run preview
   }
 
   function scanTemplate(src, dest, relativePath = '', skipAgents = false) {
@@ -2157,6 +1735,10 @@ async function main() {
         if (path.basename(src) === '.claude') {
           return; // Don't process .claude directory in regular template scan
         }
+
+        if (path.basename(src) === '.codex') {
+          return; // Don't process .codex directory in regular template scan
+        }
         
         // Skip hooks directory - hooks should only be installed to .claude/hooks via --install-hooks
         if (path.basename(src) === 'hooks') {
@@ -2264,6 +1846,14 @@ async function main() {
           );
         });
       } else {
+        if (
+          (!includesClaude(aiProvider) && relativePath === 'CLAUDE.md') ||
+          (!includesCodex(aiProvider) && relativePath === 'AGENTS.md') ||
+          (!includesCodex(aiProvider) && relativePath === path.join('docs', 'codex-setup.md'))
+        ) {
+          return;
+        }
+
         allItems.push({ 
           src, 
           dest, 
@@ -2278,8 +1868,12 @@ async function main() {
           // Categorize the conflict
           if (relativePath === 'CLAUDE.md') {
             conflictsByCategory['CLAUDE.md'].push(relativePath);
+          } else if (relativePath === 'AGENTS.md') {
+            conflictsByCategory['AGENTS.md'].push(relativePath);
           } else if (relativePath.startsWith('agents/')) {
             conflictsByCategory['agents'].push(relativePath);
+          } else if (relativePath.startsWith('.codex/')) {
+            conflictsByCategory['codex'].push(relativePath);
           } else if (relativePath.startsWith('docs/')) {
             conflictsByCategory['docs'].push(relativePath);
           } else if (relativePath.startsWith('plans/')) {
@@ -2296,29 +1890,40 @@ async function main() {
 
   scanTemplate(templateDir, targetDir, '', true);
 
-  // Handle repository scanning for context
-  let repositoryContext = null;
-  if (flags.scanContext || (!flags.dryRun && projectName === '.' && !flags.force)) {
-    const hasExistingFiles = allItems.some(item => item.exists);
-    
-    if (hasExistingFiles || flags.scanContext) {
-      if (flags.scanContext || (!flags.force && await shouldScanRepository())) {
-        repositoryContext = await scanRepositoryForContext(targetDir);
-        
-        if (repositoryContext && !flags.dryRun) {
-          const confirmResult = await previewAndConfirmContext(repositoryContext.formattedContext);
-          
-          if (confirmResult === 'n' || confirmResult === 'no') {
-            repositoryContext = null;
-            console.log('✅ Skipping context addition to CLAUDE.md');
-          } else if (confirmResult === 'edit') {
-            console.log('📝 Context editing not yet implemented. Using generated context as-is.');
-          }
+  function scanCodexConflicts() {
+    if (!includesCodex(aiProvider)) {
+      return;
+    }
+
+    const templateCodexDir = path.join(templateDir, '.codex');
+    if (!fs.existsSync(templateCodexDir)) {
+      return;
+    }
+
+    function walk(srcDir, relBase = '.codex') {
+      const entries = fs.readdirSync(srcDir, { withFileTypes: true });
+      for (const entry of entries) {
+        const src = path.join(srcDir, entry.name);
+        const relativePath = path.join(relBase, entry.name);
+        const dest = path.join(targetDir, relativePath);
+
+        if (entry.isDirectory()) {
+          walk(src, relativePath);
+          continue;
+        }
+
+        if (fs.existsSync(dest)) {
+          fileConflicts.push(relativePath);
+          conflictsByCategory['codex'].push(relativePath);
         }
       }
     }
+
+    walk(templateCodexDir);
   }
 
+  scanCodexConflicts();
+
   // Handle force flag
   if (flags.force) {
     // Set all strategies to overwrite
@@ -2342,7 +1947,9 @@ async function main() {
         // Ask for resolution strategy for each category with conflicts
         const categories = [
           { key: 'CLAUDE.md', name: 'CLAUDE.md', emoji: '📄' },
+          { key: 'AGENTS.md', name: 'AGENTS.md', emoji: '🧭' },
           { key: 'agents', name: 'Agents', emoji: '🤖' },
+          { key: 'codex', name: 'Codex', emoji: '🧠' },
           { key: 'docs', name: 'Documentation', emoji: '📚' },
           { key: 'plans', name: 'Plans', emoji: '📋' },
           { key: 'tickets', name: 'Tickets', emoji: '🎫' }
@@ -2373,17 +1980,17 @@ async function main() {
             
             // Strategy will always be valid when using select, no need for validation
             
-            if (strategy === 'overwrite' && category.key === 'CLAUDE.md') {
+            if (strategy === 'overwrite' && (category.key === 'CLAUDE.md' || category.key === 'AGENTS.md')) {
               // Use inquirer instead of readline prompt
               const confirmModule = await import('@inquirer/confirm');
               const confirm = confirmModule.default;
               const shouldOverwrite = await confirm({
-                message: '⚠️  Are you sure you want to overwrite CLAUDE.md? This will lose your project instructions!',
+                message: `⚠️  Are you sure you want to overwrite ${category.key}? This will lose your project instructions!`,
                 default: false
               });
               if (!shouldOverwrite) {
                 conflictStrategies[category.key] = 'skip';
-                console.log('Keeping existing CLAUDE.md');
+                console.log(`Keeping existing ${category.key}`);
                 continue;
               }
             }
@@ -2418,8 +2025,12 @@ async function main() {
           let strategy = 'skip'; // default
           if (item.relativePath === 'CLAUDE.md') {
             strategy = conflictStrategies['CLAUDE.md'];
+          } else if (item.relativePath === 'AGENTS.md') {
+            strategy = conflictStrategies['AGENTS.md'];
           } else if (item.relativePath.startsWith('agents/')) {
             strategy = conflictStrategies['agents'];
+          } else if (item.relativePath.startsWith('.codex/')) {
+            strategy = conflictStrategies['codex'];
           } else if (item.relativePath.startsWith('docs/')) {
             strategy = conflictStrategies['docs'];
           } else if (item.relativePath.startsWith('plans/')) {
@@ -2451,26 +2062,10 @@ async function main() {
             console.log(`  📄 ${flags.dryRun ? 'Would create' : 'Created'}: ${path.relative(targetDir, newDest)}`);
           } else if (strategy === 'overwrite') {
             if (!flags.dryRun) {
-              // Handle CLAUDE.md with context injection on overwrite
-              if (item.relativePath === 'CLAUDE.md' && repositoryContext) {
-                const templateContent = fs.readFileSync(item.src, 'utf8');
-                const enhancedContent = await applyContextToTemplate(
-                  templateContent, 
-                  repositoryContext,
-                  'append'
-                );
-                fs.writeFileSync(item.dest, enhancedContent, 'utf8');
-                console.log(`  ♻️  Replaced CLAUDE.md with project context`);
-              } else {
-                fs.copyFileSync(item.src, item.dest);
-                console.log(`  ♻️  Replaced: ${item.relativePath}`);
-              }
+              fs.copyFileSync(item.src, item.dest);
+              console.log(`  ♻️  Replaced: ${item.relativePath}`);
             } else {
-              if (item.relativePath === 'CLAUDE.md' && repositoryContext) {
-                console.log(`  ♻️  Would replace: ${item.relativePath} (with project context)`);
-              } else {
-                console.log(`  ♻️  Would replace: ${item.relativePath}`);
-              }
+              console.log(`  ♻️  Would replace: ${item.relativePath}`);
             }
             overwrittenCount++;
           }
@@ -2482,25 +2077,9 @@ async function main() {
               fs.mkdirSync(destDir, { recursive: true });
             }
             
-            // Handle CLAUDE.md with context injection
-            if (item.relativePath === 'CLAUDE.md' && repositoryContext) {
-              const templateContent = fs.readFileSync(item.src, 'utf8');
-              const enhancedContent = await applyContextToTemplate(
-                templateContent, 
-                repositoryContext,
-                'append'
-              );
-              fs.writeFileSync(item.dest, enhancedContent, 'utf8');
-              console.log(`  ✨ Created CLAUDE.md with project context`);
-            } else {
-              fs.copyFileSync(item.src, item.dest);
-            }
+            fs.copyFileSync(item.src, item.dest);
           } else {
-            if (item.relativePath === 'CLAUDE.md' && repositoryContext) {
-              console.log(`  ✨ Would copy: ${item.relativePath} (with project context)`);
-            } else {
-              console.log(`  ✨ Would copy: ${item.relativePath}`);
-            }
+            console.log(`  ✨ Would copy: ${item.relativePath}`);
           }
           copiedCount++;
         }
@@ -2517,32 +2096,42 @@ async function main() {
     }
   }
 
-  // Initialize .claude directory and copy agents
+  // Initialize provider-specific directories
   let claudeInitResult = null;
-  // Always initialize .claude directory structure (it will handle existing directories)
-  console.log(`\n🔧 ${claudeStatus.hasClaudeDir ? 'Updating' : 'Initializing'} .claude directory structure...`);
-  claudeInitResult = await initializeClaudeDirectory(selectedAgentFiles, conflictStrategies['agents'], flags.dryRun);
-  
-  if (claudeInitResult.createdItems.length > 0) {
-    console.log(`  ✅ Created ${claudeInitResult.createdItems.length} items in .claude directory`);
-  }
-  if (claudeInitResult.copiedAgents > 0) {
-    console.log(`  🤖 Copied ${claudeInitResult.copiedAgents} agents to .claude/agents`);
+  let codexInitResult = null;
+  if (includesClaude(aiProvider)) {
+    console.log(`\n🔧 ${claudeStatus.hasClaudeDir ? 'Updating' : 'Initializing'} .claude directory structure...`);
+    claudeInitResult = await initializeClaudeDirectory(selectedAgentFiles, conflictStrategies['agents'], flags.dryRun);
+    
+    if (claudeInitResult.createdItems.length > 0) {
+      console.log(`  ✅ Created ${claudeInitResult.createdItems.length} items in .claude directory`);
+    }
+    if (claudeInitResult.copiedAgents > 0) {
+      console.log(`  🤖 Copied ${claudeInitResult.copiedAgents} agents to .claude/agents`);
+    }
+    if (claudeInitResult.skippedAgents > 0) {
+      console.log(`  ⏭️  Skipped ${claudeInitResult.skippedAgents} existing agents in .claude/agents`);
+    }
   }
-  if (claudeInitResult.skippedAgents > 0) {
-    console.log(`  ⏭️  Skipped ${claudeInitResult.skippedAgents} existing agents in .claude/agents`);
+
+  if (includesCodex(aiProvider)) {
+    console.log(`\n🔧 ${fs.existsSync(path.join(targetDir, '.codex')) ? 'Updating' : 'Initializing'} .codex directory structure...`);
+    codexInitResult = await initializeCodexDirectory(conflictStrategies['codex'], flags.dryRun);
+    if (codexInitResult.createdItems.length > 0) {
+      console.log(`  ✅ Created ${codexInitResult.createdItems.length} items in .codex directory`);
+    }
   }
 
-  console.log(`\n✅ Claude Code project ${flags.dryRun ? 'would be' : ''} created successfully!`);
+  console.log(`\n✅ ${projectLabel} project ${flags.dryRun ? 'would be ' : ''}created successfully!`);
   
   // Show summary of what happened
-  if (fileConflicts.length > 0 || copiedCount > 0 || selectedAgentFiles.length > 0 || claudeInitResult) {
+  if (fileConflicts.length > 0 || copiedCount > 0 || selectedAgentFiles.length > 0 || claudeInitResult || codexInitResult) {
     console.log('\n📊 Summary:');
     if (copiedCount > 0) console.log(`  ✨ ${copiedCount} new files ${flags.dryRun ? 'would be' : ''} copied`);
     if (skippedCount > 0) console.log(`  ⏭️  ${skippedCount} existing files ${flags.dryRun ? 'would be' : ''} kept unchanged`);
     if (renamedCount > 0) console.log(`  📄 ${renamedCount} template files ${flags.dryRun ? 'would be' : ''} saved with -ccsetup suffix`);
     if (overwrittenCount > 0) console.log(`  ♻️  ${overwrittenCount} files ${flags.dryRun ? 'would be' : ''} replaced with template versions`);
-    if (!flags.noAgents && !flags.dryRun) {
+    if (includesClaude(aiProvider) && !flags.noAgents && !flags.dryRun) {
       if (flags.browseAgents) {
         const agentCount = availableAgents.length;
         console.log(`  📚 ${agentCount} agent${agentCount === 1 ? '' : 's'} ${flags.dryRun ? 'would be' : ''} copied to /agents for browsing`);
@@ -2554,8 +2143,8 @@ async function main() {
     if (claudeInitResult && claudeInitResult.createdItems.length > 0) {
       console.log(`  📁 ${claudeInitResult.createdItems.length} items created in .claude directory`);
     }
-    if (repositoryContext && !flags.dryRun) {
-      console.log(`  🔍 Project context automatically added to CLAUDE.md`);
+    if (codexInitResult && codexInitResult.createdItems.length > 0) {
+      console.log(`  🧠 ${codexInitResult.createdItems.length} items created in .codex directory`);
     }
   }
   
@@ -2565,15 +2154,21 @@ async function main() {
       // Escape project name to prevent command injection
       const escapedProjectName = JSON.stringify(projectName);
       console.log(`  cd ${escapedProjectName}`);
-      const finalClaudeStatus = checkClaudeCode();
-      if (!finalClaudeStatus.isInstalled) {
+      const finalClaudeStatus = includesClaude(aiProvider) ? checkClaudeCode() : { isInstalled: true };
+      if (includesClaude(aiProvider) && !finalClaudeStatus.isInstalled) {
         console.log('  claude init    # Initialize Claude Code in the project');
       }
     }
-    console.log('  1. Edit CLAUDE.md to add your project-specific instructions');
-    console.log('  2. Update docs/ROADMAP.md with your project goals');
-    console.log('  3. Update docs/agent-orchestration.md to define agent workflows');
-    console.log('  4. Start creating tickets in the tickets/ directory');
+    if (includesClaude(aiProvider)) {
+      console.log('  1. Edit CLAUDE.md to add your project-specific instructions');
+    }
+    if (includesCodex(aiProvider)) {
+      console.log(`  ${includesClaude(aiProvider) ? '2' : '1'}. Edit AGENTS.md to add your Codex project instructions`);
+      console.log(`  ${includesClaude(aiProvider) ? '3' : '2'}. Review docs/codex-setup.md for Codex setup guidance`);
+    }
+    console.log(`  ${includesClaude(aiProvider) && includesCodex(aiProvider) ? '4' : includesCodex(aiProvider) ? '3' : '2'}. Update docs/ROADMAP.md with your project goals`);
+    console.log(`  ${includesClaude(aiProvider) && includesCodex(aiProvider) ? '5' : includesCodex(aiProvider) ? '4' : '3'}. Update docs/agent-orchestration.md to define agent workflows`);
+    console.log(`  ${includesClaude(aiProvider) && includesCodex(aiProvider) ? '6' : includesCodex(aiProvider) ? '5' : '4'}. Start creating tickets in the tickets/ directory`);
     
     if (flags.browseAgents) {
       console.log('\n📚 Agent Browse Mode:');
@@ -2589,8 +2184,13 @@ async function main() {
       console.log('   You can compare them with your existing files or copy sections you need');
     }
     
+    if (includesCodex(aiProvider)) {
+      console.log('\n🧠 Codex skills copied to .codex/skills/');
+      console.log('  Use them from this project alongside AGENTS.md and docs/codex-setup.md');
+    }
+
     // Ask user if they want the workflow selector hook
-    if (setupMode === 'full' && !flags.dryRun) {
+    if (includesClaude(aiProvider) && setupMode === 'full' && !flags.dryRun) {
       const claudeDir = path.join(targetDir, '.claude');
       if (fs.existsSync(claudeDir)) {
         try {
@@ -2688,4 +2288,4 @@ main().catch(err => {
     rl.close();
   }
   process.exit(1);
-});
+});