universal-dev-standards 3.5.1-beta.17 → 3.5.1-beta.19

package/bundled/skills/claude-code/commands/update.md

@@ -77,7 +77,7 @@ Always include **Skip** option: Don't update at this time.
 - Option 1: "更新至 Beta (建議)" - "更新標準至 3.5.1-beta.15 版本（🟡 功能大致完成）"
 - Option 2: "暫時跳過" - "目前不進行更新，維持現有版本"
 
-### Step 3: Execute | 步驟 3：執行
+### Step 3: Execute Update | 步驟 3：執行更新
 
 **If Update Now selected:**
 ```bash
@@ -89,39 +89,93 @@ uds update --yes
 uds update --beta --yes
 ```
 
-### Step 4: Install Skills/Commands | 步驟 4：安裝 Skills/Commands
+### Step 4: Check Skills/Commands Status | 步驟 4：檢查 Skills/Commands 狀態
 
-After update completes, check if Skills/Commands need installation.
+After update completes, the CLI automatically detects missing or outdated Skills/Commands.
 
-更新完成後，檢查是否需要安裝 Skills/Commands。
+更新完成後，CLI 會自動偵測缺少或過時的 Skills/Commands。
 
-**Check installation status:**
+**Important:** The CLI uses file-based detection (`getInstalledSkillsInfoForAgent`) to check actual installation status, not just manifest records.
 
-1. Read `.standards/manifest.json` to get `aiTools` list and `skills.installed` status
-2. Check if Skills are installed for each configured AI tool
-3. Check if Commands are installed for tools that support them (opencode, copilot, gemini-cli, roo-code)
+**重要：** CLI 使用檔案實際存在檢測，而非僅讀取 manifest 記錄。
 
-**If missing Skills/Commands detected**, use AskUserQuestion:
+#### Handling Missing Skills | 處理缺少的 Skills
+
+If missing Skills are detected for configured AI tools, CLI shows checkbox selection:
+
+如果偵測到已配置 AI 工具缺少 Skills，CLI 會顯示多選介面：
+
+```
+Skills not yet installed for these AI tools:
+  • Claude Code
+  • OpenCode
+
+? Select AI tools to install Skills for: (Press <space> to select)
+❯ ◯ Claude Code
+  ◯ OpenCode
+  ──────────────
+  ◯ Skip Skills installation
+```
+
+**After tool selection, prompt for installation level:**
 
 | Option | Description |
 |--------|-------------|
-| **Install All (Recommended)** | Install Skills + Commands for all configured tools |
-| **Skills Only** | Install only Skills |
-| **Commands Only** | Install only Commands |
-| **Skip** | Don't install at this time |
+| **Project level** | Install to `.claude/skills/`, `.opencode/skill/`, etc. |
+| **User level** | Install to `~/.claude/skills/`, `~/.opencode/skill/`, etc. |
+
+#### Handling Outdated Skills | 處理過時的 Skills
+
+If installed Skills have older version than latest, CLI shows update prompt:
+
+如果已安裝的 Skills 版本比最新版本舊，CLI 會顯示更新提示：
+
+```
+Skills updates available for these AI tools:
+  • Claude Code (project: .claude/skills/)
+      3.4.0 → 3.5.1
+
+? Select AI tools to update Skills for: (Press <space> to select)
+❯ ◉ Claude Code (project) 3.4.0 → 3.5.1
+  ──────────────
+  ◯ Skip Skills update
+```
+
+#### Handling Missing Commands | 處理缺少的 Commands
+
+Similar checkbox selection for Commands:
+
+```
+Slash commands not yet installed for these AI tools:
+  • OpenCode → .opencode/commands/
+  • GitHub Copilot → .github/commands/
+
+? Select AI tools to install Commands for: (Press <space> to select)
+❯ ◉ OpenCode (.opencode/commands/)
+  ◉ GitHub Copilot (.github/commands/)
+  ──────────────
+  ◯ Skip Commands installation
+```
 
-**Based on user selection, execute:**
+#### Declined Features Handling | 拒絕功能處理
 
-| Selection | Command |
-|-----------|---------|
-| Install All | `uds configure --type skills --ai-tool <tool>` for each tool, then `uds configure --type commands --ai-tool <tool>` |
-| Skills Only | `uds configure --type skills --ai-tool <tool>` for each tool |
-| Commands Only | `uds configure --type commands --ai-tool <tool>` for each tool |
-| Skip | No action needed |
+**Important:** The CLI tracks user's declined choices in `manifest.declinedFeatures`.
 
-**Note**: The `--ai-tool` option allows non-interactive installation for specific tools.
+**重要：** CLI 會在 `manifest.declinedFeatures` 中追蹤用戶拒絕的選項。
 
-Explain the results and any next steps to the user.
+- Tools that user previously declined will NOT be shown in subsequent prompts
+- Users can reinstall declined features via `/config skills` or `/config commands`
+- Declining is remembered per-tool (e.g., declining Skills for OpenCode doesn't affect Claude Code)
+
+用戶之前拒絕的工具不會在後續提示中顯示。可透過 `/config skills` 或 `/config commands` 重新安裝。
+
+### Step 5: Explain Results | 步驟 5：說明結果
+
+After all operations complete, explain:
+1. What was updated (standards version, file count)
+2. Skills/Commands installation results
+3. Any errors encountered
+4. Next steps (restart AI tool if Skills were installed)
 
 ## Quick Mode | 快速模式
 
@@ -131,8 +185,12 @@ When invoked with `--yes` or specific options, skip interactive questions:
 /update --yes           # Update without confirmation
 /update --beta --yes    # Update to beta version
 /update --offline       # Skip npm registry check
+/update --skills        # Update Skills only
+/update --commands      # Update Commands only
 ```
 
+**Note:** In `--yes` mode, CLI shows hints about available Skills/Commands but does NOT auto-install them (conservative behavior).
+
 ## Options Reference | 選項參考
 
 | Option | Description | 說明 |
@@ -140,12 +198,17 @@ When invoked with `--yes` or specific options, skip interactive questions:
 | `--yes`, `-y` | Skip confirmation prompt | 跳過確認提示 |
 | `--offline` | Skip npm registry check | 跳過 npm registry 檢查 |
 | `--beta` | Check for beta version updates | 檢查 beta 版本更新 |
+| `--skills` | Update Skills only | 僅更新 Skills |
+| `--commands` | Update Commands only | 僅更新 Commands |
+| `--integrations-only` | Regenerate integration files only | 僅重新產生整合檔案 |
+| `--sync-refs` | Sync integration file references | 同步整合檔案參考 |
+| `--standards-only` | Update standards without integrations | 僅更新標準，不更新整合 |
 
 ## What Gets Updated | 更新內容
 
 - Standard files in `.standards/` directory
 - Extension files (language, framework, locale)
-- Integration files (`.cursorrules`, etc.)
+- Integration files (`.cursorrules`, `CLAUDE.md`, etc.)
 - Version info in `manifest.json`
 
 ## Skills Update | Skills 更新
@@ -166,7 +229,11 @@ Skills are managed separately:
 **"Already up to date"**
 - No action needed; standards are current
 
+**"Skills previously declined"**
+- Run `/config skills` to reinstall declined Skills
+
 ## Reference | 參考
 
 - CLI documentation: `uds update --help`
 - Check command: [/check](./check.md)
+- Config command: [/config](./config.md)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "universal-dev-standards",
-  "version": "3.5.1-beta.17",
+  "version": "3.5.1-beta.19",
   "description": "CLI tool for adopting Universal Development Standards",
   "keywords": [
     "documentation",

package/src/commands/check.js

@@ -693,18 +693,21 @@ function displaySkillsStatus(manifest, projectPath, msg) {
   }
 
   // Check for Marketplace installation (Claude Code specific)
+  // Dynamically detect marketplace installation regardless of manifest
   const hasClaudeCode = aiTools.includes('claude-code');
+  const marketplaceInfo = getMarketplaceSkillsInfo();
+  const hasMarketplaceSkills = marketplaceInfo?.installed;
+
   const location = manifest.skills?.location || '';
-  const isMarketplace = location === 'marketplace' ||
+  const isMarketplaceInManifest = location === 'marketplace' ||
     location.includes('plugins/cache') ||
     location.includes('plugins\\cache');
 
-  if (isMarketplace && hasClaudeCode) {
+  // Show marketplace status if actually installed (not just manifest)
+  if (hasMarketplaceSkills && hasClaudeCode) {
     console.log(chalk.green(`  ${msg.skillsViaMarketplace}`));
 
-    // Try to get actual version from marketplace
-    const marketplaceInfo = getMarketplaceSkillsInfo();
-    if (marketplaceInfo && marketplaceInfo.version && marketplaceInfo.version !== 'unknown') {
+    if (marketplaceInfo.version && marketplaceInfo.version !== 'unknown') {
       console.log(chalk.gray(`    ${t().commands.common.version}: ${marketplaceInfo.version}`));
       if (marketplaceInfo.lastUpdated) {
         const updateDate = marketplaceInfo.lastUpdated.split('T')[0];
@@ -732,7 +735,7 @@ function displaySkillsStatus(manifest, projectPath, msg) {
     const userSkillsInfo = getInstalledSkillsInfoForAgent(tool, 'user', projectPath);
 
     // Check if using marketplace for Claude Code
-    const usingMarketplace = isMarketplace && tool === 'claude-code';
+    const usingMarketplace = (hasMarketplaceSkills || isMarketplaceInManifest) && tool === 'claude-code';
 
     if (projectSkillsInfo?.installed || userSkillsInfo?.installed || usingMarketplace) {
       console.log(chalk.green(`    ✓ Skills ${msg.installed || 'installed'}:`));
@@ -1425,8 +1428,12 @@ function getSkillsStatusSummary(manifest, projectPath) {
   const parts = [];
 
   // Check for Marketplace installation (Claude Code specific)
+  // Dynamically detect marketplace installation regardless of manifest
+  const marketplaceInfo = getMarketplaceSkillsInfo();
+  const hasMarketplaceSkills = marketplaceInfo?.installed;
+
   const location = manifest.skills?.location || '';
-  const isMarketplace = location === 'marketplace' ||
+  const isMarketplaceInManifest = location === 'marketplace' ||
     location.includes('plugins/cache') ||
     location.includes('plugins\\cache');
 
@@ -1435,7 +1442,7 @@ function getSkillsStatusSummary(manifest, projectPath) {
     if (!config || !config.supportsSkills) continue;
 
     const displayName = getAgentDisplayName(tool);
-    const usingMarketplace = isMarketplace && tool === 'claude-code';
+    const usingMarketplace = (hasMarketplaceSkills || isMarketplaceInManifest) && tool === 'claude-code';
 
     if (usingMarketplace) {
       parts.push(chalk.green(`${displayName} ✓`));

package/src/commands/configure.js

@@ -44,6 +44,7 @@ import {
   writeIntegrationFile,
   getToolFilePath
 } from '../utils/integration-generator.js';
+import { getMarketplaceSkillsInfo } from '../utils/github.js';
 import { t } from '../i18n/messages.js';
 import { regenerateIntegrations } from './update.js';
 
@@ -562,8 +563,21 @@ async function handleSkillsConfiguration(manifest, projectPath, msg, common, spe
     return;
   }
 
+  // Get declined skills from manifest
+  const declinedSkills = manifest.declinedFeatures?.skills || [];
+
+  // Check if Skills are installed via marketplace (Claude Code only)
+  const marketplaceInfo = getMarketplaceSkillsInfo();
+  const hasMarketplaceSkills = marketplaceInfo?.installed;
+
   // Show current Skills status
   console.log(chalk.cyan(msg.currentSkillsStatus || 'Current Skills status:'));
+
+  // Show marketplace status if applicable
+  if (hasMarketplaceSkills && aiTools.includes('claude-code')) {
+    console.log(chalk.green(`  ✓ ${msg.viaMarketplace || 'Via Marketplace'}: ${marketplaceInfo.version || 'installed'}`));
+  }
+
   for (const tool of aiTools) {
     const config = getAgentConfig(tool);
     if (!config?.supportsSkills) continue;
@@ -580,23 +594,48 @@ async function handleSkillsConfiguration(manifest, projectPath, msg, common, spe
       if (projectInfo?.installed) {
         console.log(chalk.gray(`    - Project: ${projectInfo.version || 'installed'}`));
       }
+    } else if (declinedSkills.includes(tool)) {
+      console.log(chalk.yellow(`  ⊘ ${displayName}: ${msg.previouslyDeclined || 'Previously declined'}`));
+    } else if (hasMarketplaceSkills && tool === 'claude-code') {
+      // Claude Code has marketplace skills but no file-based installation
+      console.log(chalk.cyan(`  ◎ ${displayName}: ${msg.marketplaceOnly || 'Marketplace only (no local files)'}`));
     } else {
       console.log(chalk.gray(`  ○ ${displayName}: ${msg.notInstalled || 'Not installed'}`));
     }
   }
+
+  // Show marketplace coexistence note if user might want to install local files
+  if (hasMarketplaceSkills && aiTools.includes('claude-code')) {
+    console.log();
+    console.log(chalk.cyan(`  ℹ ${msg.marketplaceCoexistNote || 'Note: File-based installation will coexist with Marketplace version'}`));
+  }
   console.log();
 
+  // Build menu choices
+  const menuChoices = [
+    { name: msg.installSkills || 'Install/Update Skills', value: 'install' }
+  ];
+
+  // Add reinstall declined option if there are declined skills
+  if (declinedSkills.length > 0) {
+    menuChoices.push({
+      name: msg.reinstallDeclinedSkills || 'Reinstall declined Skills',
+      value: 'reinstall_declined'
+    });
+  }
+
+  menuChoices.push(
+    { name: msg.viewStatus || 'View status only', value: 'view' },
+    { name: common.cancel || 'Cancel', value: 'cancel' }
+  );
+
   // Ask what action to take
   const { action } = await inquirer.default.prompt([
     {
       type: 'list',
       name: 'action',
       message: msg.skillsAction || 'What would you like to do?',
-      choices: [
-        { name: msg.installSkills || 'Install/Update Skills', value: 'install' },
-        { name: msg.viewStatus || 'View status only', value: 'view' },
-        { name: common.cancel || 'Cancel', value: 'cancel' }
-      ]
+      choices: menuChoices
     }
   ]);
 
@@ -605,6 +644,63 @@ async function handleSkillsConfiguration(manifest, projectPath, msg, common, spe
     return;
   }
 
+  // Handle reinstall declined action
+  if (action === 'reinstall_declined') {
+    // Get only the declined tools that support skills
+    const declinedToolsWithSupport = declinedSkills.filter(tool => {
+      const config = getAgentConfig(tool);
+      return config?.supportsSkills;
+    });
+
+    if (declinedToolsWithSupport.length === 0) {
+      console.log(chalk.gray(msg.noChanges || 'No changes made'));
+      return;
+    }
+
+    // Prompt for installation level
+    const { skillsLevel } = await inquirer.default.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'
+    }]);
+
+    const installations = declinedToolsWithSupport.map(agent => ({
+      agent,
+      location: skillsLevel
+    }));
+
+    // Install Skills
+    const spinner = ora(msg.installingSkills || 'Installing Skills...').start();
+    const result = await installSkillsToMultipleAgents(installations, null, projectPath);
+    spinner.stop();
+
+    if (result.success) {
+      console.log(chalk.green(msg.skillsInstallSuccess || 'Skills installed successfully'));
+      console.log(chalk.gray(`  ${msg.totalInstalled || 'Total installed'}: ${result.totalInstalled}`));
+    } else {
+      console.log(chalk.yellow(msg.skillsInstallPartial || 'Skills installed with some issues'));
+      if (result.totalErrors > 0) {
+        console.log(chalk.red(`  ${msg.errors || 'Errors'}: ${result.totalErrors}`));
+      }
+    }
+
+    // Update manifest - clear declined status for installed tools
+    manifest.skills = manifest.skills || {};
+    manifest.skills.installations = installations;
+    if (manifest.declinedFeatures?.skills) {
+      manifest.declinedFeatures.skills = manifest.declinedFeatures.skills.filter(
+        tool => !declinedToolsWithSupport.includes(tool)
+      );
+    }
+    writeManifest(manifest, projectPath);
+    return;
+  }
+
   // Use unified installation prompt
   const installations = await promptSkillsInstallLocation(aiTools);
   if (installations.length === 0) {
@@ -692,6 +788,9 @@ async function handleCommandsConfiguration(manifest, projectPath, msg, common, s
     return;
   }
 
+  // Get declined commands from manifest
+  const declinedCommands = manifest.declinedFeatures?.commands || [];
+
   // Show current Commands status
   console.log(chalk.cyan(msg.currentCommandsStatus || 'Current Commands status:'));
   for (const tool of commandSupportedTools) {
@@ -700,23 +799,42 @@ async function handleCommandsConfiguration(manifest, projectPath, msg, common, s
 
     if (commandsInfo?.installed) {
       console.log(chalk.green(`  ✓ ${displayName}: ${commandsInfo.count} ${msg.commandsInstalled || 'commands'}`));
+    } else if (declinedCommands.includes(tool)) {
+      console.log(chalk.yellow(`  ⊘ ${displayName}: ${msg.previouslyDeclined || 'Previously declined'}`));
     } else {
       console.log(chalk.gray(`  ○ ${displayName}: ${msg.notInstalled || 'Not installed'}`));
     }
   }
   console.log();
 
+  // Build menu choices
+  const menuChoices = [
+    { name: msg.installCommands || 'Install/Update Commands', value: 'install' }
+  ];
+
+  // Add reinstall declined option if there are declined commands
+  const declinedCommandsWithSupport = declinedCommands.filter(tool =>
+    commandSupportedTools.includes(tool)
+  );
+  if (declinedCommandsWithSupport.length > 0) {
+    menuChoices.push({
+      name: msg.reinstallDeclinedCommands || 'Reinstall declined Commands',
+      value: 'reinstall_declined'
+    });
+  }
+
+  menuChoices.push(
+    { name: msg.viewStatus || 'View status only', value: 'view' },
+    { name: common.cancel || 'Cancel', value: 'cancel' }
+  );
+
   // Ask what action to take
   const { action } = await inquirer.default.prompt([
     {
       type: 'list',
       name: 'action',
       message: msg.commandsAction || 'What would you like to do?',
-      choices: [
-        { name: msg.installCommands || 'Install/Update Commands', value: 'install' },
-        { name: msg.viewStatus || 'View status only', value: 'view' },
-        { name: common.cancel || 'Cancel', value: 'cancel' }
-      ]
+      choices: menuChoices
     }
   ]);
 
@@ -725,6 +843,40 @@ async function handleCommandsConfiguration(manifest, projectPath, msg, common, s
     return;
   }
 
+  // Handle reinstall declined action
+  if (action === 'reinstall_declined') {
+    if (declinedCommandsWithSupport.length === 0) {
+      console.log(chalk.gray(msg.noChanges || 'No changes made'));
+      return;
+    }
+
+    // Install Commands
+    const spinner = ora(msg.installingCommands || 'Installing Commands...').start();
+    const result = await installCommandsToMultipleAgents(declinedCommandsWithSupport, null, projectPath);
+    spinner.stop();
+
+    if (result.success) {
+      console.log(chalk.green(msg.commandsInstallSuccess || 'Commands installed successfully'));
+      console.log(chalk.gray(`  ${msg.totalInstalled || 'Total installed'}: ${result.totalInstalled}`));
+    } else {
+      console.log(chalk.yellow(msg.commandsInstallPartial || 'Commands installed with some issues'));
+      if (result.totalErrors > 0) {
+        console.log(chalk.red(`  ${msg.errors || 'Errors'}: ${result.totalErrors}`));
+      }
+    }
+
+    // Update manifest - clear declined status for installed tools
+    manifest.commands = manifest.commands || {};
+    manifest.commands.installations = declinedCommandsWithSupport;
+    if (manifest.declinedFeatures?.commands) {
+      manifest.declinedFeatures.commands = manifest.declinedFeatures.commands.filter(
+        tool => !declinedCommandsWithSupport.includes(tool)
+      );
+    }
+    writeManifest(manifest, projectPath);
+    return;
+  }
+
   // Use unified installation prompt
   const selectedAgents = await promptCommandsInstallation(commandSupportedTools);
   if (selectedAgents.length === 0) {

package/src/commands/update.js

@@ -30,6 +30,7 @@ import {
   getSkillsDirForAgent,
   getCommandsDirForAgent
 } from '../config/ai-agent-paths.js';
+import { getMarketplaceSkillsInfo } from '../utils/github.js';
 
 /**
  * Compare two semantic versions
@@ -422,7 +423,7 @@ export async function updateCommand(options) {
     if (missingSkills.length > 0 || outdatedSkills.length > 0 || missingCommands.length > 0) {
       if (!options.yes) {
         // Interactive mode: prompt user to install/update
-        const { installSkills, updateSkills, installCommands } = await promptNewFeatureInstallation(
+        const { installSkills, updateSkills, installCommands, declinedSkills, declinedCommands } = await promptNewFeatureInstallation(
           missingSkills,
           outdatedSkills,
           missingCommands
@@ -509,8 +510,39 @@ export async function updateCommand(options) {
           }
         }
 
-        // Write updated manifest if anything was installed or updated
-        if (installSkills.length > 0 || updateSkills.length > 0 || installCommands.length > 0) {
+        // Update declined features in manifest
+        if (declinedSkills.length > 0 || declinedCommands.length > 0) {
+          if (!manifest.declinedFeatures) manifest.declinedFeatures = {};
+
+          // Merge with existing declined items (avoid duplicates)
+          if (declinedSkills.length > 0) {
+            const existing = manifest.declinedFeatures.skills || [];
+            manifest.declinedFeatures.skills = [...new Set([...existing, ...declinedSkills])];
+          }
+
+          if (declinedCommands.length > 0) {
+            const existing = manifest.declinedFeatures.commands || [];
+            manifest.declinedFeatures.commands = [...new Set([...existing, ...declinedCommands])];
+          }
+        }
+
+        // Remove from declined list if user decided to install this time
+        if (installSkills.length > 0 && manifest.declinedFeatures?.skills) {
+          const installedAgents = installSkills.map(s => s.agent);
+          manifest.declinedFeatures.skills = manifest.declinedFeatures.skills.filter(
+            agent => !installedAgents.includes(agent)
+          );
+        }
+        if (installCommands.length > 0 && manifest.declinedFeatures?.commands) {
+          manifest.declinedFeatures.commands = manifest.declinedFeatures.commands.filter(
+            agent => !installCommands.includes(agent)
+          );
+        }
+
+        // Write updated manifest if anything was installed, updated, or declined
+        const hasChanges = installSkills.length > 0 || updateSkills.length > 0 ||
+          installCommands.length > 0 || declinedSkills.length > 0 || declinedCommands.length > 0;
+        if (hasChanges) {
           writeManifest(manifest, projectPath);
         }
       } else {
@@ -1035,6 +1067,10 @@ function checkNewFeatures(projectPath, manifest, latestSkillsVersion) {
     return { missingSkills: [], outdatedSkills: [], missingCommands: [] };
   }
 
+  // Get declined features from manifest (to exclude from prompts)
+  const declinedSkills = manifest.declinedFeatures?.skills || [];
+  const declinedCommands = manifest.declinedFeatures?.commands || [];
+
   const missingSkills = [];
   const outdatedSkills = [];
   const missingCommands = [];
@@ -1056,7 +1092,8 @@ function checkNewFeatures(projectPath, manifest, latestSkillsVersion) {
       // (manifest records can be stale if user deleted the directory)
       const hasSkills = projectInfo?.installed || userInfo?.installed || usingMarketplace;
 
-      if (!hasSkills) {
+      // Skip if user previously declined this tool's skills
+      if (!hasSkills && !declinedSkills.includes(tool)) {
         missingSkills.push({
           agent: tool,
           displayName: getAgentDisplayName(tool),
@@ -1089,7 +1126,8 @@ function checkNewFeatures(projectPath, manifest, latestSkillsVersion) {
       // Only trust actual file existence, not manifest records
       const hasCommands = cmdInfo?.installed;
 
-      if (!hasCommands) {
+      // Skip if user previously declined this tool's commands
+      if (!hasCommands && !declinedCommands.includes(tool)) {
         missingCommands.push({
           agent: tool,
           displayName: getAgentDisplayName(tool),
@@ -1107,14 +1145,14 @@ function checkNewFeatures(projectPath, manifest, latestSkillsVersion) {
  * @param {Array} missingSkills - Array of {agent, displayName, paths}
  * @param {Array} outdatedSkills - Array of {agent, displayName, paths, currentVersion, latestVersion, level, path}
  * @param {Array} missingCommands - Array of {agent, displayName, path}
- * @returns {Promise<{installSkills: Array, updateSkills: Array, installCommands: Array}>}
+ * @returns {Promise<{installSkills: Array, updateSkills: Array, installCommands: Array, declinedSkills: Array, declinedCommands: Array}>}
  */
 async function promptNewFeatureInstallation(missingSkills, outdatedSkills, missingCommands) {
   const msg = t().commands.update;
 
   // If nothing to do, return empty
   if (missingSkills.length === 0 && outdatedSkills.length === 0 && missingCommands.length === 0) {
-    return { installSkills: [], updateSkills: [], installCommands: [] };
+    return { installSkills: [], updateSkills: [], installCommands: [], declinedSkills: [], declinedCommands: [] };
   }
 
   console.log();
@@ -1123,22 +1161,42 @@ async function promptNewFeatureInstallation(missingSkills, outdatedSkills, missi
   console.log(chalk.cyan('━'.repeat(50)));
   console.log();
 
-  const result = { installSkills: [], updateSkills: [], installCommands: [] };
+  const result = { installSkills: [], updateSkills: [], installCommands: [], declinedSkills: [], declinedCommands: [] };
 
   // Handle missing Skills with checkbox selection
   if (missingSkills.length > 0) {
+    // Check if Skills are already installed via marketplace (Claude Code only)
+    const marketplaceInfo = getMarketplaceSkillsInfo();
+    const hasMarketplaceSkills = marketplaceInfo?.installed;
+
     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}`));
+      // Show marketplace hint for Claude Code if applicable
+      if (hasMarketplaceSkills && skill.agent === 'claude-code') {
+        console.log(chalk.gray(`  • ${skill.displayName} ${chalk.cyan(`(${msg.alreadyViaMarketplace || 'already via Marketplace'})`)}`));
+      } else {
+        console.log(chalk.gray(`  • ${skill.displayName}`));
+      }
+    }
+
+    // Show marketplace coexistence warning if applicable
+    if (hasMarketplaceSkills && missingSkills.some(s => s.agent === 'claude-code')) {
+      console.log();
+      console.log(chalk.cyan(`  ℹ ${msg.marketplaceCoexistNote || 'Note: File-based installation will coexist with Marketplace version'}`));
     }
     console.log();
 
     // Build checkbox choices
-    const skillChoices = missingSkills.map(skill => ({
-      name: skill.displayName,
-      value: skill.agent,
-      checked: true  // Default checked for opt-out behavior
-    }));
+    const skillChoices = missingSkills.map(skill => {
+      const isClaudeWithMarketplace = hasMarketplaceSkills && skill.agent === 'claude-code';
+      return {
+        name: isClaudeWithMarketplace
+          ? `${skill.displayName} ${chalk.cyan(`(${msg.alreadyViaMarketplace || 'already via Marketplace'})`)}`
+          : skill.displayName,
+        value: skill.agent,
+        checked: !isClaudeWithMarketplace  // Default unchecked if already via marketplace
+      };
+    });
 
     // Add skip option
     skillChoices.push(new inquirer.Separator());
@@ -1164,6 +1222,12 @@ async function promptNewFeatureInstallation(missingSkills, outdatedSkills, missi
     // Filter out skip and handle selection
     const filteredSkillAgents = selectedSkillAgents.filter(a => a !== '__skip__');
 
+    // Track declined skills (user explicitly skipped or deselected)
+    const skippedSkillAgents = missingSkills
+      .map(s => s.agent)
+      .filter(agent => !filteredSkillAgents.includes(agent));
+    result.declinedSkills = skippedSkillAgents;
+
     if (filteredSkillAgents.length > 0) {
       // Prompt for installation level
       const { skillsLevel } = await inquirer.prompt([{
@@ -1279,7 +1343,14 @@ async function promptNewFeatureInstallation(missingSkills, outdatedSkills, missi
     }]);
 
     // Filter out skip
-    result.installCommands = selectedCommandAgents.filter(a => a !== '__skip__');
+    const filteredCommandAgents = selectedCommandAgents.filter(a => a !== '__skip__');
+    result.installCommands = filteredCommandAgents;
+
+    // Track declined commands (user explicitly skipped or deselected)
+    const skippedCommandAgents = missingCommands
+      .map(c => c.agent)
+      .filter(agent => !filteredCommandAgents.includes(agent));
+    result.declinedCommands = skippedCommandAgents;
   }
 
   return result;