@vdkit/cli 3.0.0 → 3.0.2

package/src/integrations/base-integration.js

@@ -329,7 +329,9 @@ export class BaseIntegration {
         break;
       case 'medium':
         detection.recommendations.push(`${name} appears to be configured`);
-        detection.recommendations.push('Consider optimizing .vdk/rules for better AI assistance');
+        detection.recommendations.push(
+          'Consider optimizing .vdk/blueprints/rules for better AI assistance'
+        );
         break;
       case 'high':
         detection.recommendations.push(`${name} is actively configured and being used`);

package/src/integrations/claude-code-integration.js

@@ -374,7 +374,7 @@ This project uses VDK CLI for AI assistant integration and follows specific patt
 - **Framework**: ${options.framework || 'Not detected'}
 
 ### Important Conventions
-- All AI rules are stored in \`.vdk/rules/\` directory
+- All AI rule artifacts are stored in \`.vdk/blueprints/rules/\` directory
 - Rules follow unified YAML frontmatter format
 - Project follows VDK CLI naming conventions
 - Memory persistence is enabled for context continuity
@@ -422,7 +422,7 @@ claudeCode:
     supports: false
   fileReferences:
     supports: true
-    autoInclude: ["CLAUDE.md", ".vdk/rules/", "package.json"]
+    autoInclude: ["CLAUDE.md", ".vdk/blueprints/rules/", "package.json"]
 
 permissions:
   allowedTools: ["Read", "Glob", "Grep"]
@@ -456,7 +456,7 @@ Analyze the current project using VDK CLI capabilities and provide actionable re
 ### File References
 Auto-included files:
 - \`@CLAUDE.md\` - Project context and conventions
-- \`@.vdk/rules/\` - Current VDK rules directory
+- \`@.vdk/blueprints/rules/\` - Current VDK rule artifacts directory
 - \`@package.json\` - Project dependencies
 
 ## Analysis Areas
@@ -467,7 +467,7 @@ Auto-included files:
    - Analyze technology stack and dependencies
 
 2. **Rule Status Review**
-   - Check existing VDK rules in \`.vdk/rules/\`
+  - Check existing VDK rules in \`.vdk/blueprints/rules/\`
    - Validate rule format and content
    - Identify missing or outdated rules
 
@@ -516,7 +516,7 @@ claudeCode:
     supports: false
   fileReferences:
     supports: true
-    autoInclude: ["CLAUDE.md", ".vdk/rules/", "package.json"]
+    autoInclude: ["CLAUDE.md", ".vdk/blueprints/rules/", "package.json"]
 
 permissions:
   allowedTools: ["Read", "Write", "Edit", "Bash(git:*)"]
@@ -604,7 +604,7 @@ claudeCode:
     supports: false
   fileReferences:
     supports: true
-    autoInclude: ["CLAUDE.md", ".vdk/rules/", "package.json"]
+    autoInclude: ["CLAUDE.md", ".vdk/blueprints/rules/", "package.json"]
   bashCommands:
     supports: true
     commands: ["git status", "git log --oneline -10"]

package/src/integrations/cursor-integration.js

@@ -256,7 +256,7 @@ temp/
 *.temp
 
 # VDK specific (comment out if you want AI to see these)
-# .vdk/rules/
+# .vdk/blueprints/rules/
 # vdk.config.json
 `;
 
@@ -424,7 +424,7 @@ Reference this rule with @vdk-integration when working with VDK CLI.
 
 ## Integration Features
 - **Automatic Detection**: VDK CLI detects Cursor configuration
-- **Rule Generation**: Creates Cursor-compatible .vdk/rules
+- **Rule Generation**: Creates Cursor-compatible .vdk/blueprints/rules
 - **MDC Format**: Proper metadata for rule activation
 - **Cross-IDE Compatibility**: Works with multiple AI assistants
 

package/src/integrations/generic-ai-integration.js

@@ -118,7 +118,7 @@ export class GenericAIIntegration extends BaseIntegration {
               }
             }
           }
-        } catch (_error) {
+        } catch {
           // Ignore file read errors
         }
       }
@@ -171,7 +171,7 @@ export class GenericAIIntegration extends BaseIntegration {
             }
           }
         }
-      } catch (_error) {
+      } catch {
         // Ignore package.json read errors
       }
     }
@@ -235,7 +235,7 @@ export class GenericAIIntegration extends BaseIntegration {
               detection.confidence = 'low';
             }
           }
-        } catch (_error) {
+        } catch {
           // Ignore directory read errors
         }
       }
@@ -265,7 +265,7 @@ export class GenericAIIntegration extends BaseIntegration {
         'VDK can help standardize AI tool configurations across your project'
       );
       detection.recommendations.push(
-        'Review .vdk/rules/ for AI assistant optimization opportunities'
+        'Review .vdk/blueprints/rules/ for AI assistant optimization opportunities'
       );
     } else {
       detection.recommendations.push('Well-configured AI setup detected');
@@ -283,10 +283,10 @@ export class GenericAIIntegration extends BaseIntegration {
   getConfigPaths() {
     return {
       projectConfig: path.join(this.projectPath, '.ai'),
-      rulesPath: path.join(this.projectPath, '.vdk', 'rules'),
+      rulesPath: path.join(this.projectPath, '.vdk', 'blueprints', 'rules'),
       configFile: path.join(this.projectPath, '.aiconfig.json'),
       aiConfig: path.join(this.projectPath, '.ai'),
-      vdkRules: path.join(this.projectPath, '.vdk', 'rules'),
+      vdkRules: path.join(this.projectPath, '.vdk', 'blueprints', 'rules'),
       aiConfigFiles: [
         path.join(this.projectPath, '.aiconfig.json'),
         path.join(this.projectPath, 'ai-config.json'),
@@ -319,8 +319,8 @@ export class GenericAIIntegration extends BaseIntegration {
         console.log('Setting up generic AI platform integration...');
       }
 
-      // Ensure .vdk/rules directory exists
-      const rulesPath = path.join(this.projectPath, '.vdk', 'rules');
+      // Ensure .vdk/blueprints/rules directory exists
+      const rulesPath = path.join(this.projectPath, '.vdk', 'blueprints', 'rules');
       await this.ensureDirectory(rulesPath);
 
       // Create basic AI configuration if none exists
@@ -364,7 +364,7 @@ This configuration was automatically generated by VDK to provide basic AI assist
 
 - AI assistants can use this configuration to better understand your project structure
 - Customize this file to include project-specific patterns and conventions
-- Add more specific rules in the .vdk/rules/ directory as needed
+- Add more specific rules in the .vdk/blueprints/rules/ directory as needed
 
 ## Generated
 

package/src/integrations/generic-ide-integration.js

@@ -170,7 +170,7 @@ export class GenericIDEIntegration extends BaseIntegration {
               break;
             }
           }
-        } catch (_error) {
+        } catch {
           // Ignore file read errors
         }
       }
@@ -295,7 +295,7 @@ export class GenericIDEIntegration extends BaseIntegration {
       if (verbose) {
         console.log('No IDEs detected - setting up generic configuration');
       }
-      // Set up generic .vdk/rules configuration
+      // Set up generic .vdk/blueprints/rules configuration
       await this.setupGenericConfiguration(options);
       return true;
     }
@@ -330,11 +330,11 @@ export class GenericIDEIntegration extends BaseIntegration {
   }
 
   /**
-   * Set up generic .vdk/rules configuration
+   * Set up generic .vdk/blueprints/rules configuration
    * @param {Object} options - Configuration options
    */
   async setupGenericConfiguration(options = {}) {
-    const genericRulesPath = path.join(this.projectPath, '.vdk', 'rules');
+    const genericRulesPath = path.join(this.projectPath, '.vdk', 'blueprints', 'rules');
     await this.ensureDirectory(genericRulesPath);
     await this.createInitialRules(genericRulesPath, 'generic', options);
   }
@@ -391,7 +391,7 @@ export class GenericIDEIntegration extends BaseIntegration {
     }
 
     // Sort by confidence and return the highest
-    const sorted = [...detectedIDEs].sort((a, b) => {
+    const sorted = [...detectedIDEs].toSorted((a, b) => {
       const confidenceOrder = { high: 3, medium: 2, low: 1, none: 0 };
       return confidenceOrder[b.confidence] - confidenceOrder[a.confidence];
     });

package/src/integrations/integration-manager.js

@@ -493,7 +493,7 @@ export class IntegrationManager {
 
     // Sort by project-specific config first, then confidence level
     const confidenceOrder = { high: 3, medium: 2, low: 1, none: 0 };
-    const sorted = [...activeIntegrations].sort((a, b) => {
+    const sorted = [...activeIntegrations].toSorted((a, b) => {
       // First priority: Project-specific config beats global config, regardless of confidence
       const aHasProjectConfig = a.detection?.hasProjectSpecificConfig;
       const bHasProjectConfig = b.detection?.hasProjectSpecificConfig;

package/src/integrations/jetbrains-integration.js

@@ -82,7 +82,7 @@ export class JetBrainsIntegration extends BaseIntegration {
           detection.confidence = 'medium';
         }
       }
-    } catch (_error) {
+    } catch {
       // Process detection failed - not critical
     }
 
@@ -165,7 +165,7 @@ export class JetBrainsIntegration extends BaseIntegration {
           return path.join(cacheDir, jetbrainsVersions[0], 'mcp');
         }
       }
-    } catch (_error) {
+    } catch {
       // Ignore errors in path detection
     }
 
@@ -193,7 +193,7 @@ export class JetBrainsIntegration extends BaseIntegration {
       }
 
       return [...new Set(jetbrainsProcesses)]; // Remove duplicates
-    } catch (_error) {
+    } catch {
       return [];
     }
   }

package/src/integrations/vscode-variants-integration.js

@@ -147,7 +147,7 @@ class VSCodeVariantIntegration extends BaseIntegration {
           detection.confidence = 'medium';
         }
       }
-    } catch (_error) {
+    } catch {
       // Process detection failed - not critical
     }
 
@@ -189,7 +189,7 @@ class VSCodeVariantIntegration extends BaseIntegration {
 
       const names = processNames[this.variant] || ['code'];
       return names.some(name => processes.includes(name));
-    } catch (_error) {
+    } catch {
       return false;
     }
   }

package/src/integrations/windsurf-integration.js

@@ -289,7 +289,7 @@ export class WindsurfContextIntegration extends BaseIntegration {
       },
       projectAwareness: {
         enabled: true,
-        includeFiles: ['README.md', 'package.json', '*.config.*', '.vdk/rules/**'],
+        includeFiles: ['README.md', 'package.json', '*.config.*', '.vdk/blueprints/rules/**'],
         excludePatterns: ['node_modules/**', 'dist/**', '*.log', '.git/**'],
       },
     };

package/src/integrations/zed-integration.js

@@ -53,7 +53,7 @@ export class ZedIntegration extends BaseIntegration {
         indicators.push('Zed process is currently running');
         if (confidence === 'none') confidence = 'medium';
       }
-    } catch (_error) {
+    } catch {
       // Process detection failed - not critical
     }
 
@@ -118,7 +118,7 @@ export class ZedIntegration extends BaseIntegration {
       return (
         processes.toLowerCase().includes('zed') || processes.toLowerCase().includes('zed-editor')
       );
-    } catch (_error) {
+    } catch {
       return false;
     }
   }

package/src/ir/README.md

@@ -26,7 +26,7 @@ VDK-CLI/src/ir/
 ### Base Platforms (index.js + generators.js)
 
 - **Claude Code** - Full support (.claude/, CLAUDE.md, agents, rules, commands, skills)
-- **Cursor** - MDC format, .cursorrules, glob patterns, activation modes
+- **Cursor** - MDC format in `.cursor/rules/*.mdc`, glob patterns, activation modes
 - **GitHub Copilot** - 3000 char limit with smart truncation
 - **Windsurf** - Rules and workflows
 
@@ -273,7 +273,7 @@ const { lossInfo } = irToCopilot(ir);
 - ✅ MDC (Markdown Component) format
 - ✅ Glob patterns for auto-attachment
 - ✅ Activation modes: always, auto-attached, agent-requested, manual
-- ✅ .cursorrules and .cursor/rules/\*.mdc
+- ✅ `.cursor/rules/*.mdc`
 - ❌ No agents
 - ❌ No settings
 

package/src/ir/generators.js

@@ -104,11 +104,10 @@ export function irToClaude(ir, _options = {}) {
  * @param {IntermediateRepresentation} ir - IR to convert
  * @param {Object} [options] - Generation options
  * @param {boolean} [options.useMDC=true] - Use MDC format for .cursor/rules/
- * @param {boolean} [options.singleFile=false] - Generate single .cursorrules file
  * @returns {{content: string, filePath: string, lossInfo: Array}}
  */
 export function irToCursor(ir, options = {}) {
-  const { useMDC = true, singleFile = false } = options;
+  const { useMDC = true } = options;
   const lossInfo = trackConversionLoss(ir, ir, 'cursor');
 
   // Track agent conversion (Cursor doesn't support agents)
@@ -122,9 +121,9 @@ export function irToCursor(ir, options = {}) {
   }
 
   let content = '';
-  const filePath = singleFile ? '.cursorrules' : `.cursor/rules/${sanitizeFileName(ir.name)}.mdc`;
+  const filePath = `.cursor/rules/${sanitizeFileName(ir.name)}.mdc`;
 
-  if (useMDC && !singleFile) {
+  if (useMDC) {
     // Generate MDC format
     const frontmatter = {};
     if (ir.description) frontmatter.description = ir.description;
@@ -240,7 +239,7 @@ function priorityTruncate(content, sections, maxLength) {
   }
 
   // Sort sections by priority
-  const sortedSections = [...sections].sort((a, b) => {
+  const sortedSections = [...sections].toSorted((a, b) => {
     const aTitle = a.title?.toLowerCase() || '';
     const bTitle = b.title?.toLowerCase() || '';
 

package/src/ir/index.js

@@ -416,12 +416,7 @@ export function detectPlatformFromPath(filePath) {
 
   if (normalizedPath.includes('.claude') || normalizedPath.includes('claude.md'))
     return 'claude-code';
-  if (
-    normalizedPath.includes('.cursor') ||
-    normalizedPath.includes('.cursorrules') ||
-    normalizedPath.endsWith('.mdc')
-  )
-    return 'cursor';
+  if (normalizedPath.includes('.cursor') || normalizedPath.endsWith('.mdc')) return 'cursor';
   if (normalizedPath.includes('copilot') || normalizedPath.includes('.github/copilot'))
     return 'github-copilot';
   if (normalizedPath.includes('.windsurf')) return 'windsurf';

package/src/ir/performance.js

@@ -99,7 +99,7 @@ function getFileHash(filePath) {
   try {
     const content = fs.readFileSync(filePath, 'utf8');
     return crypto.createHash('sha256').update(content).digest('hex').substring(0, 16);
-  } catch (_error) {
+  } catch {
     return null;
   }
 }
@@ -119,7 +119,7 @@ function getCachedFileStats(filePath) {
       if (stats.mtimeMs === cached.mtime && stats.size === cached.size) {
         return cached;
       }
-    } catch (_error) {
+    } catch {
       // File no longer exists or error reading
       fileStatsCache.delete(filePath);
       return null;
@@ -141,7 +141,7 @@ function getCachedFileStats(filePath) {
 
     fileStatsCache.set(filePath, fileStats);
     return fileStats;
-  } catch (_error) {
+  } catch {
     return null;
   }
 }

package/src/mcp/McpManager.js

@@ -35,7 +35,7 @@ export class McpManager {
         if (config.mcpServers) {
           this.configs.set(loc, config.mcpServers);
         }
-      } catch (_err) {
+      } catch {
         // Ignore missing files
       }
     }
@@ -82,7 +82,7 @@ export class McpManager {
     // Check common paths if none found
     if (ruleDirectories.length === 0) {
       const commonPaths = [
-        '.vdk/rules',
+        '.vdk/blueprints/rules',
         '.vscode/ai-rules',
         '.cursor/rules',
         '.claude/rules',
@@ -101,7 +101,7 @@ export class McpManager {
 
     // Create default if forced
     if (ruleDirectories.length === 0 && force) {
-      const defaultPath = path.join(projectPath, '.vdk/rules');
+      const defaultPath = path.join(projectPath, '.vdk/blueprints/rules');
       if (!existsSync(defaultPath)) {
         await fs.mkdir(defaultPath, { recursive: true });
       }

package/src/migration/AutoMigrator.js

@@ -22,7 +22,8 @@ import { MigrationBackup } from './core/MigrationBackup.js';
 export class AutoMigrator {
   constructor(projectPath) {
     this.projectPath = projectPath;
-    this.importPath = path.join(projectPath, '.vdk', 'import');
+    this.importPath = path.join(projectPath, '.vdk', 'migrate');
+    this.legacyImportPath = path.join(projectPath, '.vdk', 'import');
     this.projectScanner = new ProjectScanner({ projectPath: projectPath });
     this.technologyAnalyzer = new TechnologyAnalyzer({ verbose: false });
     this.patternDetector = new PatternDetector({ verbose: false });
@@ -46,11 +47,11 @@ export class AutoMigrator {
 
     try {
       // 1. Scan import directory for old rules
-      spinner.text = 'Scanning .vdk/import/ for AI rules...';
+      spinner.text = 'Scanning .vdk/migrate/ for AI rules...';
       const detectedRules = await this.detectImportedRules();
 
       if (detectedRules.length === 0) {
-        spinner.info('No rules found in .vdk/import/');
+        spinner.info('No rules found in .vdk/migrate/ (legacy: .vdk/import/)');
         this.showImportInstructions();
         return { success: false, reason: 'no_rules_found' };
       }
@@ -160,28 +161,34 @@ export class AutoMigrator {
    */
   async detectImportedRules() {
     const rules = [];
+    const seenFiles = new Set();
+    const candidatePaths = [this.importPath, this.legacyImportPath];
 
-    try {
-      await fs.access(this.importPath);
-    } catch {
-      // Import directory doesn't exist
-      return rules;
-    }
+    for (const candidatePath of candidatePaths) {
+      try {
+        await fs.access(candidatePath);
+      } catch {
+        continue;
+      }
 
-    try {
-      const importFiles = await fs.readdir(this.importPath, { withFileTypes: true });
-
-      for (const entry of importFiles) {
-        if (entry.isFile()) {
-          const filePath = path.join(this.importPath, entry.name);
-          const detectedRule = await this.detectRuleType(filePath);
-          if (detectedRule) {
-            rules.push(detectedRule);
+      try {
+        const importFiles = await fs.readdir(candidatePath, { withFileTypes: true });
+
+        for (const entry of importFiles) {
+          if (entry.isFile()) {
+            const filePath = path.join(candidatePath, entry.name);
+            if (seenFiles.has(filePath)) continue;
+
+            const detectedRule = await this.detectRuleType(filePath);
+            if (detectedRule) {
+              rules.push(detectedRule);
+              seenFiles.add(filePath);
+            }
           }
         }
+      } catch (error) {
+        console.warn(chalk.yellow(`Warning: Could not read import directory: ${error.message}`));
       }
-    } catch (error) {
-      console.warn(chalk.yellow(`Warning: Could not read import directory: ${error.message}`));
     }
 
     return rules;
@@ -597,14 +604,20 @@ export class AutoMigrator {
    * Clean up the import directory after successful migration
    */
   async cleanImportDirectory() {
-    try {
-      const files = await fs.readdir(this.importPath);
-      for (const file of files) {
-        await fs.unlink(path.join(this.importPath, file));
+    const candidatePaths = [this.importPath, this.legacyImportPath];
+
+    for (const candidatePath of candidatePaths) {
+      try {
+        const files = await fs.readdir(candidatePath);
+        for (const file of files) {
+          await fs.unlink(path.join(candidatePath, file));
+        }
+        await fs.rmdir(candidatePath);
+      } catch (error) {
+        if (error?.code !== 'ENOENT') {
+          console.warn(chalk.yellow(`Warning: Could not clean import directory: ${error.message}`));
+        }
       }
-      await fs.rmdir(this.importPath);
-    } catch (error) {
-      console.warn(chalk.yellow(`Warning: Could not clean import directory: ${error.message}`));
     }
   }
 
@@ -702,12 +715,13 @@ export class AutoMigrator {
   showImportInstructions() {
     console.log(chalk.cyan('\n📁 To migrate existing AI rules:'));
     console.log(chalk.gray('1. Create the import directory:'));
-    console.log(chalk.gray('   mkdir -p .vdk/import'));
+    console.log(chalk.gray('   mkdir -p .vdk/migrate'));
     console.log(chalk.gray('\n2. Copy your existing rule files:'));
-    console.log(chalk.gray('   cp .cursorrules .vdk/import/'));
-    console.log(chalk.gray('   cp .claude/memory.md .vdk/import/'));
-    console.log(chalk.gray('   cp .github/copilot-instructions.json .vdk/import/'));
-    console.log(chalk.gray('   cp .windsurf/rules.xml .vdk/import/'));
+    console.log(chalk.gray('   cp .cursorrules .vdk/migrate/'));
+    console.log(chalk.gray('   cp .claude/memory.md .vdk/migrate/'));
+    console.log(chalk.gray('   cp .github/copilot-instructions.json .vdk/migrate/'));
+    console.log(chalk.gray('   cp .windsurf/rules.xml .vdk/migrate/'));
+    console.log(chalk.gray('\n   # Legacy path .vdk/import/ is still supported during transition'));
     console.log(chalk.gray('\n3. Run migration:'));
     console.log(chalk.gray('   vdk migrate'));
   }

package/src/migration/converters/context-converter.js

@@ -27,7 +27,7 @@ export class ContextConverter {
    * @returns {Object} VDK blueprint or command
    */
   async convertClaudeCode(context) {
-    const { fileName, bodyContent, metadata, claudeSpecific } = context;
+    const { fileName, bodyContent, claudeSpecific } = context;
 
     // Determine if it's a command or blueprint
     const isCommand = claudeSpecific?.hasSlashCommands || fileName.includes('command');
@@ -105,7 +105,7 @@ export class ContextConverter {
    * @returns {Object} VDK blueprint
    */
   async convertGitHubCopilot(context) {
-    const { bodyContent, copilotSpecific } = context;
+    const { copilotSpecific } = context;
 
     const reviewType = copilotSpecific?.hasSecurityRules
       ? 'security'
@@ -290,7 +290,7 @@ export class ContextConverter {
    * @returns {Object} Memory blueprint
    */
   convertToMemoryBlueprint(context) {
-    const { bodyContent, sections } = context;
+    const {} = context;
 
     return this.convertToBlueprint(context, {
       category: 'core',

package/src/migration/converters/schema-v3-migrator.js

@@ -68,7 +68,7 @@ export class SchemaV3Migrator {
         }
       }
     } catch (error) {
-      throw new Error(`v3 migration failed: ${error.message}`);
+      throw new Error(`v3 migration failed: ${error.message}`, { cause: error });
     }
 
     return results;

package/src/migration/core/MigrationBackup.js

@@ -75,7 +75,7 @@ export class MigrationBackup {
 
       return this.migrationId;
     } catch (error) {
-      throw new Error(`Failed to create migration backup: ${error.message}`);
+      throw new Error(`Failed to create migration backup: ${error.message}`, { cause: error });
     }
   }
 
@@ -137,7 +137,7 @@ export class MigrationBackup {
 
       return { success: true, restoredCount, backupId };
     } catch (error) {
-      throw new Error(`Rollback failed: ${error.message}`);
+      throw new Error(`Rollback failed: ${error.message}`, { cause: error });
     }
   }
 
@@ -175,7 +175,7 @@ export class MigrationBackup {
                 path: path.join(this.backupDir, entry.name),
               });
             }
-          } catch (_error) {
+          } catch {
             // Skip invalid backup entries
             console.warn(chalk.yellow(`Warning: Invalid backup metadata for ${entry.name}`));
           }
@@ -183,7 +183,7 @@ export class MigrationBackup {
       }
 
       // Sort by timestamp (newest first)
-      return backups.sort((a, b) => new Date(b.timestamp) - new Date(a.timestamp));
+      return backups.toSorted((a, b) => new Date(b.timestamp) - new Date(a.timestamp));
     } catch (error) {
       console.warn(chalk.yellow(`Warning: Failed to list backups: ${error.message}`));
       return [];
@@ -263,7 +263,7 @@ export class MigrationBackup {
       }
 
       return true;
-    } catch (_error) {
+    } catch {
       return false;
     }
   }
@@ -286,24 +286,30 @@ export class MigrationBackup {
       });
     }
 
-    // VDK rules directory
-    const rulesDir = path.join(this.projectPath, '.vdk', 'rules');
+    // VDK rule artifacts directory
+    const rulesDir = path.join(this.projectPath, '.vdk', 'blueprints', 'rules');
     if (await this.fileExists(rulesDir)) {
       targets.push({
         type: 'directory',
         path: rulesDir,
-        relativePath: '.vdk/rules',
+        relativePath: '.vdk/blueprints/rules',
       });
     }
 
-    // VDK import directory (if it contains user data)
-    const importDir = path.join(this.projectPath, '.vdk', 'import');
-    if (await this.fileExists(importDir)) {
-      targets.push({
-        type: 'directory',
-        path: importDir,
-        relativePath: '.vdk/import',
-      });
+    // VDK migration staging directories (primary + legacy)
+    const migrationDirs = [
+      { path: path.join(this.projectPath, '.vdk', 'migrate'), relativePath: '.vdk/migrate' },
+      { path: path.join(this.projectPath, '.vdk', 'import'), relativePath: '.vdk/import' },
+    ];
+
+    for (const migrationDir of migrationDirs) {
+      if (await this.fileExists(migrationDir.path)) {
+        targets.push({
+          type: 'directory',
+          path: migrationDir.path,
+          relativePath: migrationDir.relativePath,
+        });
+      }
     }
 
     // IDE-specific configuration files that VDK might modify
@@ -498,7 +504,7 @@ export class MigrationBackup {
    * @private
    */
   async removeCurrentVDKFiles(options = {}) {
-    const filesToRemove = ['vdk.config.json', '.vdk/rules'];
+    const filesToRemove = ['vdk.config.json', '.vdk/blueprints/rules'];
 
     for (const relativePath of filesToRemove) {
       const fullPath = path.join(this.projectPath, relativePath);