universal-dev-standards 3.5.1-beta.1 → 3.5.1-beta.11

package/src/commands/update.js

@@ -26,6 +26,7 @@ import {
 } from '../utils/skills-installer.js';
 import {
   getAgentDisplayName,
+  getAgentConfig,
   getSkillsDirForAgent,
   getCommandsDirForAgent
 } from '../config/ai-agent-paths.js';
@@ -404,6 +405,83 @@ export async function updateCommand(options) {
     }
   }
 
+  // Check for new features (Skills/Commands) not yet installed
+  if (!options.standardsOnly) {
+    const { missingSkills, missingCommands } = checkNewFeatures(projectPath, manifest);
+
+    if (missingSkills.length > 0 || missingCommands.length > 0) {
+      if (!options.yes) {
+        // Interactive mode: prompt user to install
+        const { installSkills, installCommands } = await promptNewFeatureInstallation(
+          missingSkills,
+          missingCommands
+        );
+
+        // Install Skills if user agreed
+        if (installSkills.length > 0) {
+          const skillSpinner = ora(msg.installingNewSkills || 'Installing Skills...').start();
+          const skillResult = await installSkillsToMultipleAgents(installSkills, null, projectPath);
+
+          // Update manifest
+          if (!manifest.skills) manifest.skills = {};
+          manifest.skills.installed = true;
+          manifest.skills.version = repoInfo.skills.version;
+          manifest.skills.installations = [
+            ...(manifest.skills.installations || []),
+            ...installSkills
+          ];
+
+          if (skillResult.totalErrors === 0) {
+            skillSpinner.succeed((msg.newSkillsInstalled || 'Installed Skills for {count} AI tools')
+              .replace('{count}', installSkills.length));
+          } else {
+            skillSpinner.warn((msg.newSkillsInstalledWithErrors || 'Installed Skills with {errors} errors')
+              .replace('{errors}', skillResult.totalErrors));
+          }
+        }
+
+        // Install Commands if user agreed
+        if (installCommands.length > 0) {
+          const cmdSpinner = ora(msg.installingNewCommands || 'Installing commands...').start();
+          const cmdResult = await installCommandsToMultipleAgents(installCommands, null, projectPath);
+
+          // Update manifest
+          if (!manifest.commands) manifest.commands = {};
+          manifest.commands.installed = true;
+          manifest.commands.installations = [
+            ...(manifest.commands.installations || []),
+            ...installCommands
+          ];
+
+          if (cmdResult.totalErrors === 0) {
+            cmdSpinner.succeed((msg.newCommandsInstalled || 'Installed commands for {count} AI tools')
+              .replace('{count}', installCommands.length));
+          } else {
+            cmdSpinner.warn((msg.newCommandsInstalledWithErrors || 'Installed commands with {errors} errors')
+              .replace('{errors}', cmdResult.totalErrors));
+          }
+        }
+
+        // Write updated manifest if anything was installed
+        if (installSkills.length > 0 || installCommands.length > 0) {
+          writeManifest(manifest, projectPath);
+        }
+      } else {
+        // --yes mode: show hint but don't auto-install (conservative behavior)
+        console.log();
+        console.log(chalk.cyan(msg.newFeaturesAvailableHint || 'Note: New features available for your AI tools'));
+        if (missingSkills.length > 0) {
+          const toolNames = missingSkills.map(s => s.displayName).join(', ');
+          console.log(chalk.gray(`  • Skills (${toolNames}): run "uds update --skills" or "uds init" to install`));
+        }
+        if (missingCommands.length > 0) {
+          const toolNames = missingCommands.map(c => c.displayName).join(', ');
+          console.log(chalk.gray(`  • Commands (${toolNames}): run "uds update --commands" or "uds init" to install`));
+        }
+      }
+    }
+  }
+
   // Skills update reminder
   if (manifest.skills?.installed) {
     const skillsVersion = repoInfo.skills.version;
@@ -835,3 +913,196 @@ async function updateCommandsOnly(projectPath, manifest) {
   console.log();
   process.exit(0);
 }
+
+/**
+ * Check manifest.aiTools and detect missing Skills/Commands
+ * @param {string} projectPath - Project path
+ * @param {Object} manifest - Manifest object
+ * @returns {{missingSkills: Array, missingCommands: Array}}
+ */
+function checkNewFeatures(projectPath, manifest) {
+  const aiTools = manifest.aiTools || [];
+
+  if (aiTools.length === 0) {
+    return { missingSkills: [], missingCommands: [] };
+  }
+
+  const missingSkills = [];
+  const missingCommands = [];
+
+  for (const tool of aiTools) {
+    const config = getAgentConfig(tool);
+    if (!config) continue;
+
+    // Check Skills support
+    if (config.supportsSkills && config.skills) {
+      // Check if skills are installed for this agent
+      const projectInfo = getInstalledSkillsInfoForAgent(tool, 'project', projectPath);
+      const userInfo = getInstalledSkillsInfoForAgent(tool, 'user');
+
+      // Check if already in manifest.skills.installations
+      const existingInstallations = manifest.skills?.installations || [];
+      const isInManifest = existingInstallations.some(
+        inst => inst.agent === tool || (inst.agent === 'claude-code' && tool === 'claude-code')
+      );
+
+      // Check if using marketplace (Claude Code only)
+      const usingMarketplace = manifest.skills?.location === 'marketplace' && tool === 'claude-code';
+
+      const hasSkills = projectInfo?.installed || userInfo?.installed || isInManifest || usingMarketplace;
+
+      if (!hasSkills) {
+        missingSkills.push({
+          agent: tool,
+          displayName: getAgentDisplayName(tool),
+          paths: config.skills
+        });
+      }
+    }
+
+    // Check Commands support
+    if (config.commands !== null && config.commands) {
+      const cmdInfo = getInstalledCommandsForAgent(tool, projectPath);
+
+      // Check if already in manifest.commands.installations
+      const existingCmdInstallations = manifest.commands?.installations || [];
+      const isInCmdManifest = existingCmdInstallations.includes(tool);
+
+      const hasCommands = cmdInfo?.installed || isInCmdManifest;
+
+      if (!hasCommands) {
+        missingCommands.push({
+          agent: tool,
+          displayName: getAgentDisplayName(tool),
+          path: config.commands.project
+        });
+      }
+    }
+  }
+
+  return { missingSkills, missingCommands };
+}
+
+/**
+ * Prompt user to install new features discovered during update
+ * @param {Array} missingSkills - Array of {agent, displayName, paths}
+ * @param {Array} missingCommands - Array of {agent, displayName, path}
+ * @returns {Promise<{installSkills: Array, installCommands: Array}>}
+ */
+async function promptNewFeatureInstallation(missingSkills, missingCommands) {
+  const msg = t().commands.update;
+
+  // If nothing missing, return empty
+  if (missingSkills.length === 0 && missingCommands.length === 0) {
+    return { installSkills: [], installCommands: [] };
+  }
+
+  console.log();
+  console.log(chalk.cyan('━'.repeat(50)));
+  console.log(chalk.cyan.bold(msg.newFeaturesAvailable || 'New Features Available'));
+  console.log(chalk.cyan('━'.repeat(50)));
+  console.log();
+
+  const result = { installSkills: [], installCommands: [] };
+
+  // Handle missing Skills with checkbox selection
+  if (missingSkills.length > 0) {
+    console.log(chalk.yellow(msg.skillsNotInstalledFor || 'Skills not yet installed for these AI tools:'));
+    for (const skill of missingSkills) {
+      console.log(chalk.gray(`  • ${skill.displayName}`));
+    }
+    console.log();
+
+    // Build checkbox choices
+    const skillChoices = missingSkills.map(skill => ({
+      name: skill.displayName,
+      value: skill.agent,
+      checked: true  // Default checked for opt-out behavior
+    }));
+
+    // Add skip option
+    skillChoices.push(new inquirer.Separator());
+    skillChoices.push({
+      name: chalk.gray(msg.skipSkillsInstallation || 'Skip Skills installation'),
+      value: '__skip__'
+    });
+
+    const { selectedSkillAgents } = await inquirer.prompt([{
+      type: 'checkbox',
+      name: 'selectedSkillAgents',
+      message: msg.selectSkillsToInstall || 'Select AI tools to install Skills for:',
+      choices: skillChoices,
+      validate: (answer) => {
+        // If skip is selected, ensure it's the only selection
+        if (answer.includes('__skip__') && answer.length > 1) {
+          return msg.skipValidationError || 'Cannot select Skip with other options';
+        }
+        return true;
+      }
+    }]);
+
+    // Filter out skip and handle selection
+    const filteredSkillAgents = selectedSkillAgents.filter(a => a !== '__skip__');
+
+    if (filteredSkillAgents.length > 0) {
+      // Prompt for installation level
+      const { skillsLevel } = await inquirer.prompt([{
+        type: 'list',
+        name: 'skillsLevel',
+        message: msg.skillsLevelQuestion || 'Where should Skills be installed?',
+        choices: [
+          { name: `${msg.projectLevel || 'Project level'} (.claude/skills/, etc.)`, value: 'project' },
+          { name: `${msg.userLevel || 'User level'} (~/.claude/skills/, etc.)`, value: 'user' }
+        ],
+        default: 'project'
+      }]);
+
+      result.installSkills = filteredSkillAgents.map(agent => ({
+        agent,
+        level: skillsLevel
+      }));
+    }
+    console.log();
+  }
+
+  // Handle missing Commands with checkbox selection
+  if (missingCommands.length > 0) {
+    console.log(chalk.yellow(msg.commandsNotInstalledFor || 'Slash commands not yet installed for these AI tools:'));
+    for (const cmd of missingCommands) {
+      console.log(chalk.gray(`  • ${cmd.displayName} → ${cmd.path}`));
+    }
+    console.log();
+
+    // Build checkbox choices
+    const commandChoices = missingCommands.map(cmd => ({
+      name: `${cmd.displayName} ${chalk.gray(`(${cmd.path})`)}`,
+      value: cmd.agent,
+      checked: true  // Default checked for opt-out behavior
+    }));
+
+    // Add skip option
+    commandChoices.push(new inquirer.Separator());
+    commandChoices.push({
+      name: chalk.gray(msg.skipCommandsInstallation || 'Skip Commands installation'),
+      value: '__skip__'
+    });
+
+    const { selectedCommandAgents } = await inquirer.prompt([{
+      type: 'checkbox',
+      name: 'selectedCommandAgents',
+      message: msg.selectCommandsToInstall || 'Select AI tools to install Commands for:',
+      choices: commandChoices,
+      validate: (answer) => {
+        if (answer.includes('__skip__') && answer.length > 1) {
+          return msg.skipValidationError || 'Cannot select Skip with other options';
+        }
+        return true;
+      }
+    }]);
+
+    // Filter out skip
+    result.installCommands = selectedCommandAgents.filter(a => a !== '__skip__');
+  }
+
+  return result;
+}

package/src/i18n/messages.js

@@ -594,7 +594,17 @@ export const messages = {
         runNpmUpdate: 'Run: npm update -g universal-dev-standards',
         // Final status
         projectCompliant: '✓ Project is compliant with standards',
-        issuesDetected: '⚠ Some issues detected. Review above for details.'
+        issuesDetected: '⚠ Some issues detected. Review above for details.',
+        // Installation prompts
+        offerSkillsInstallation: 'Skills Installation',
+        offerCommandsInstallation: 'Commands Installation',
+        selectSkillsToInstall: 'Select AI tools to install Skills for:',
+        selectCommandsToInstall: 'Select AI tools to install Commands for:',
+        skipInstallation: 'Skip',
+        skillsInstalledSuccess: 'Installed Skills for {count} AI tools',
+        commandsInstalledSuccess: 'Installed commands for {count} AI tools',
+        // Read-only hint
+        missingSkillsHint: 'Tip: Run `uds update` to install missing Skills/Commands'
       },
 
       // init command (commands/init.js)
@@ -744,7 +754,28 @@ export const messages = {
         categoriesChanged: 'Categories: {old} → {new}',
         failedToUpdate: '✗ Failed to update {path}: {error}',
         updatedCount: '✓ Updated {count} integration file(s)',
-        skippedCount: 'Skipped {count} file(s) (already in sync or not found)'
+        skippedCount: 'Skipped {count} file(s) (already in sync or not found)',
+        // New features discovery
+        newFeaturesAvailable: 'New Features Available',
+        newFeaturesAvailableHint: 'Note: New features available for your AI tools',
+        skillsNotInstalledFor: 'Skills not yet installed for these AI tools:',
+        commandsNotInstalledFor: 'Slash commands not yet installed for these AI tools:',
+        installSkillsNow: 'Would you like to install Skills for these AI tools?',
+        installCommandsNow: 'Would you like to install slash commands for these AI tools?',
+        selectSkillsToInstall: 'Select AI tools to install Skills for:',
+        selectCommandsToInstall: 'Select AI tools to install Commands for:',
+        skipSkillsInstallation: 'Skip Skills installation',
+        skipCommandsInstallation: 'Skip Commands installation',
+        skipValidationError: 'Cannot select Skip with other options',
+        skillsLevelQuestion: 'Where should Skills be installed?',
+        projectLevel: 'Project level',
+        userLevel: 'User level',
+        installingNewSkills: 'Installing Skills...',
+        installingNewCommands: 'Installing commands...',
+        newSkillsInstalled: 'Installed Skills for {count} AI tools',
+        newSkillsInstalledWithErrors: 'Installed Skills with {errors} errors',
+        newCommandsInstalled: 'Installed commands for {count} AI tools',
+        newCommandsInstalledWithErrors: 'Installed commands with {errors} errors'
       },
 
       // configure command
@@ -1403,7 +1434,17 @@ export const messages = {
         runNpmUpdate: '執行：npm update -g universal-dev-standards',
         // Final status
         projectCompliant: '✓ 專案符合標準',
-        issuesDetected: '⚠ 偵測到一些問題。請檢視上方詳情。'
+        issuesDetected: '⚠ 偵測到一些問題。請檢視上方詳情。',
+        // Installation prompts
+        offerSkillsInstallation: 'Skills 安裝',
+        offerCommandsInstallation: '斜線命令安裝',
+        selectSkillsToInstall: '選擇要安裝 Skills 的 AI 工具：',
+        selectCommandsToInstall: '選擇要安裝斜線命令的 AI 工具：',
+        skipInstallation: '跳過',
+        skillsInstalledSuccess: '已為 {count} 個 AI 工具安裝 Skills',
+        commandsInstalledSuccess: '已為 {count} 個 AI 工具安裝斜線命令',
+        // Read-only hint
+        missingSkillsHint: '提示：執行 `uds update` 安裝缺少的 Skills/斜線命令'
       },
 
       // init command (commands/init.js)
@@ -1553,7 +1594,28 @@ export const messages = {
         categoriesChanged: '分類：{old} → {new}',
         failedToUpdate: '✗ 更新 {path} 失敗：{error}',
         updatedCount: '✓ 已更新 {count} 個整合檔案',
-        skippedCount: '已跳過 {count} 個檔案（已同步或找不到）'
+        skippedCount: '已跳過 {count} 個檔案（已同步或找不到）',
+        // New features discovery
+        newFeaturesAvailable: '發現新功能',
+        newFeaturesAvailableHint: '提示：您的 AI 工具有新功能可用',
+        skillsNotInstalledFor: '以下 AI 工具尚未安裝 Skills：',
+        commandsNotInstalledFor: '以下 AI 工具尚未安裝斜線命令：',
+        installSkillsNow: '是否要為這些 AI 工具安裝 Skills？',
+        installCommandsNow: '是否要為這些 AI 工具安裝斜線命令？',
+        selectSkillsToInstall: '選擇要安裝 Skills 的 AI 工具：',
+        selectCommandsToInstall: '選擇要安裝斜線命令的 AI 工具：',
+        skipSkillsInstallation: '跳過 Skills 安裝',
+        skipCommandsInstallation: '跳過斜線命令安裝',
+        skipValidationError: '選擇「跳過」時不能同時選擇其他選項',
+        skillsLevelQuestion: 'Skills 要安裝到哪裡？',
+        projectLevel: '專案層級',
+        userLevel: '使用者層級',
+        installingNewSkills: '安裝 Skills 中...',
+        installingNewCommands: '安裝斜線命令中...',
+        newSkillsInstalled: '已為 {count} 個 AI 工具安裝 Skills',
+        newSkillsInstalledWithErrors: '安裝 Skills 時發生 {errors} 個錯誤',
+        newCommandsInstalled: '已為 {count} 個 AI 工具安裝斜線命令',
+        newCommandsInstalledWithErrors: '安裝斜線命令時發生 {errors} 個錯誤'
       },
 
       // configure command
@@ -1908,14 +1970,71 @@ export const messages = {
       // init command
       init: {
         title: '通用开发标准 - 初始化',
-        alreadyInitialized: '⚠ 此项目已经初始化标准。',
+        alreadyInitialized: '⚠ 此项目已初始化标准。',
         useUpdateOrDelete: '使用 `uds update` 更新，或删除 .standards/ 重新初始化。',
-        success: '✓ 标准初始化成功！',
-        filesCopied: '{count} 文件已复制到项目',
-        nextSteps: '下一步：',
+        // Detection
+        detectingProject: '正在检测项目特性...',
+        analysisComplete: '项目分析完成',
+        languages: '编程语言',
+        frameworks: '框架',
+        aiTools: 'AI 工具',
+        // Skills status
+        skillsStatus: 'Skills 状态：',
+        projectLevel: '项目级别',
+        userLevel: '用户级别',
+        notInstalled: '未安装',
+        noSkillsDetected: '未检测到 Skills 安装',
+        // Integration
+        integrationConfig: '集成配置：',
+        sharedRuleConfig: '所有选中的工具将共享相同的规则配置。',
+        // Config summary
+        configSummary: '配置摘要：',
+        standardsScope: '标准范围',
+        standardsScopeLean: '精简（Skills 处理其余）',
+        standardsScopeComplete: '完整',
+        contentModeLabel: '内容模式',
+        contentModeFull: '完整嵌入',
+        contentModeIndex: '标准（推荐）',
+        contentModeMinimal: '最小（仅核心）',
+        locale: '地区设置',
+        localeDefault: '默认（英文）',
+        integrations: '集成',
+        skillsLabel: 'Skills',
+        skillsMarketplace: 'Plugin Marketplace（由 Claude Code 管理）',
+        skillsInstallTo: '安装/更新到 {location}',
+        skillsUsingExisting: '使用现有（{location}）',
+        gitWorkflow: 'Git 工作流',
+        mergeStrategy: '合并策略',
+        commitLanguage: '提交消息语言',
+        testLevels: '测试级别',
+        // Prompts
+        proceedInstall: '继续安装？',
+        installCancelled: '安装已取消。',
+        // Spinners
+        copyingStandards: '正在复制标准...',
+        copiedStandards: '已复制 {count} 个标准文件',
+        copyingExtensions: '正在复制扩展...',
+        copiedExtensions: '已复制 {count} 个扩展文件',
+        generatingIntegrations: '正在生成集成文件...',
+        generatedIntegrations: '已生成 {count} 个集成文件',
+        generatingClaudeMd: '正在生成 CLAUDE.md...',
+        generatedClaudeMd: '已生成 CLAUDE.md',
+        couldNotGenerateClaudeMd: '无法生成 CLAUDE.md',
+        installingSkills: '正在安装 Claude Code Skills...',
+        installedSkills: '已安装 {count} 个 Skills 到 {locations}',
+        installedSkillsWithErrors: '已安装 {count} 个 Skills，有 {errors} 个错误',
+        // Success
+        initializedSuccess: '✓ 标准初始化成功！',
+        filesCopied: '已复制 {count} 个文件到项目',
+        skillsUsingMarketplace: 'Skills：使用 Plugin Marketplace 安装',
+        skillsInstalledTo: '已安装 {count} 个 Skills 到 {locations}',
+        manifestCreated: 'Manifest 已创建于 .standards/manifest.json',
+        errorsOccurred: '⚠ 发生 {count} 个错误：',
+        // Next steps
+        nextSteps: '后续步骤：',
         reviewDirectory: '1. 查看 .standards/ 目录',
         addToVcs: '2. 将 .standards/ 添加到版本控制',
-        restartClaude: '3. 重启 Claude Code 加载新 Skills',
+        restartClaude: '3. 重启 Claude Code 以加载新 Skills',
         runCheck: '执行 `uds check` 验证采用状态'
       },
 
@@ -2058,7 +2177,17 @@ export const messages = {
         runNpmUpdate: '执行：npm update -g universal-dev-standards',
         // Final status
         projectCompliant: '✓ 项目符合标准',
-        issuesDetected: '⚠ 检测到一些问题。详情请查看上文。'
+        issuesDetected: '⚠ 检测到一些问题。详情请查看上文。',
+        // Installation prompts
+        offerSkillsInstallation: 'Skills 安装',
+        offerCommandsInstallation: '斜线命令安装',
+        selectSkillsToInstall: '选择要安装 Skills 的 AI 工具：',
+        selectCommandsToInstall: '选择要安装斜线命令的 AI 工具：',
+        skipInstallation: '跳过',
+        skillsInstalledSuccess: '已为 {count} 个 AI 工具安装 Skills',
+        commandsInstalledSuccess: '已为 {count} 个 AI 工具安装斜线命令',
+        // Read-only hint
+        missingSkillsHint: '提示：执行 `uds update` 安装缺少的 Skills/斜线命令'
       },
 
       // update command
@@ -2137,7 +2266,28 @@ export const messages = {
         categoriesChanged: '类别：{old} → {new}',
         failedToUpdate: '✗ 更新 {path} 失败：{error}',
         updatedCount: '✓ 已更新 {count} 个集成文件',
-        skippedCount: '跳过 {count} 个文件（已同步或未找到）'
+        skippedCount: '跳过 {count} 个文件（已同步或未找到）',
+        // New features discovery
+        newFeaturesAvailable: '发现新功能',
+        newFeaturesAvailableHint: '提示：您的 AI 工具有新功能可用',
+        skillsNotInstalledFor: '以下 AI 工具尚未安装 Skills：',
+        commandsNotInstalledFor: '以下 AI 工具尚未安装斜线命令：',
+        installSkillsNow: '是否要为这些 AI 工具安装 Skills？',
+        installCommandsNow: '是否要为这些 AI 工具安装斜线命令？',
+        selectSkillsToInstall: '选择要安装 Skills 的 AI 工具：',
+        selectCommandsToInstall: '选择要安装斜线命令的 AI 工具：',
+        skipSkillsInstallation: '跳过 Skills 安装',
+        skipCommandsInstallation: '跳过斜线命令安装',
+        skipValidationError: '选择「跳过」时不能同时选择其他选项',
+        skillsLevelQuestion: 'Skills 要安装到哪里？',
+        projectLevel: '项目级别',
+        userLevel: '用户级别',
+        installingNewSkills: '正在安装 Skills...',
+        installingNewCommands: '正在安装斜线命令...',
+        newSkillsInstalled: '已为 {count} 个 AI 工具安装 Skills',
+        newSkillsInstalledWithErrors: '安装 Skills 时发生 {errors} 个错误',
+        newCommandsInstalled: '已为 {count} 个 AI 工具安装斜线命令',
+        newCommandsInstalledWithErrors: '安装斜线命令时发生 {errors} 个错误'
       },
 
       // configure command

package/src/utils/copier.js

@@ -6,8 +6,35 @@ import { downloadStandard, downloadIntegration } from './github.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
+// CLI package root (where package.json is located)
+const CLI_ROOT = join(__dirname, '../..');
+
+// Bundled files directory (for npm-installed CLI)
+const BUNDLED_ROOT = join(CLI_ROOT, 'bundled');
+
 // Root of the universal-dev-standards repository (for local development)
-const REPO_ROOT = join(__dirname, '../../..');
+const REPO_ROOT = join(CLI_ROOT, '..');
+
+/**
+ * Get the source file path, checking bundled first, then repo root
+ * @param {string} sourcePath - Relative path (e.g., 'core/anti-hallucination.md')
+ * @returns {string|null} Absolute path to source file, or null if not found
+ */
+function getSourcePath(sourcePath) {
+  // Priority 1: Bundled files (for npm-installed CLI)
+  const bundledPath = join(BUNDLED_ROOT, sourcePath);
+  if (existsSync(bundledPath)) {
+    return bundledPath;
+  }
+
+  // Priority 2: Repository root (for local development)
+  const repoPath = join(REPO_ROOT, sourcePath);
+  if (existsSync(repoPath)) {
+    return repoPath;
+  }
+
+  return null;
+}
 
 /**
  * Copy a standard file to the target project
@@ -18,7 +45,6 @@ const REPO_ROOT = join(__dirname, '../../..');
  * @returns {Promise<Object>} Result with success status and copied path
  */
 export async function copyStandard(sourcePath, targetDir, projectPath) {
-  const source = join(REPO_ROOT, sourcePath);
   const targetFolder = join(projectPath, targetDir);
   const targetFile = join(targetFolder, basename(sourcePath));
 
@@ -27,8 +53,9 @@ export async function copyStandard(sourcePath, targetDir, projectPath) {
     mkdirSync(targetFolder, { recursive: true });
   }
 
-  // Try local copy first
-  if (existsSync(source)) {
+  // Try local copy first (bundled or repo)
+  const source = getSourcePath(sourcePath);
+  if (source) {
     try {
       copyFileSync(source, targetFile);
       return {
@@ -46,7 +73,18 @@ export async function copyStandard(sourcePath, targetDir, projectPath) {
   }
 
   // Fall back to downloading from GitHub
-  return downloadStandard(sourcePath, targetDir, projectPath);
+  const result = await downloadStandard(sourcePath, targetDir, projectPath);
+
+  // If download failed, provide a more helpful error message
+  if (!result.success && result.error?.includes('404')) {
+    return {
+      success: false,
+      error: `File not available: ${sourcePath}. This may be a beta version issue - try updating the CLI first.`,
+      path: null
+    };
+  }
+
+  return result;
 }
 
 /**
@@ -58,7 +96,6 @@ export async function copyStandard(sourcePath, targetDir, projectPath) {
  * @returns {Promise<Object>} Result
  */
 export async function copyIntegration(sourcePath, targetPath, projectPath) {
-  const source = join(REPO_ROOT, sourcePath);
   const target = join(projectPath, targetPath);
 
   // Ensure target directory exists
@@ -67,8 +104,9 @@ export async function copyIntegration(sourcePath, targetPath, projectPath) {
     mkdirSync(targetDir, { recursive: true });
   }
 
-  // Try local copy first
-  if (existsSync(source)) {
+  // Try local copy first (bundled or repo)
+  const source = getSourcePath(sourcePath);
+  if (source) {
     try {
       copyFileSync(source, target);
       return {
@@ -86,7 +124,18 @@ export async function copyIntegration(sourcePath, targetPath, projectPath) {
   }
 
   // Fall back to downloading from GitHub
-  return downloadIntegration(sourcePath, targetPath, projectPath);
+  const result = await downloadIntegration(sourcePath, targetPath, projectPath);
+
+  // If download failed, provide a more helpful error message
+  if (!result.success && result.error?.includes('404')) {
+    return {
+      success: false,
+      error: `File not available: ${sourcePath}. This may be a beta version issue - try updating the CLI first.`,
+      path: null
+    };
+  }
+
+  return result;
 }
 
 /**
@@ -135,9 +184,13 @@ export function isInitialized(projectPath) {
 }
 
 /**
- * Get the repository root path
+ * Get the repository root path (bundled or repo, whichever is available)
  * @returns {string} Repository root path
  */
 export function getRepoRoot() {
+  // Prefer bundled files for npm-installed CLI
+  if (existsSync(join(BUNDLED_ROOT, 'core'))) {
+    return BUNDLED_ROOT;
+  }
   return REPO_ROOT;
 }