universal-dev-standards 4.2.0 → 5.0.0-beta.10

package/src/prompts/init.js

@@ -1,12 +1,75 @@
 import inquirer from 'inquirer';
 import chalk from 'chalk';
 import os from 'os';
-import { t } from '../i18n/messages.js';
+import { t, setLanguage, detectLanguage } from '../i18n/messages.js';
 import {
   getAgentConfig,
   getAgentDisplayName
 } from '../config/ai-agent-paths.js';
-import { getMarketplaceSkillsInfo } from '../utils/github.js';
+import { patchCheckboxInstructions } from '../utils/inquirer-patch.js';
+
+// Apply inquirer checkbox patch to properly support instructions: false
+// This allows us to show translated checkbox hints instead of the default English text
+patchCheckboxInstructions();
+
+/**
+ * Prompt for display language (first prompt in init flow)
+ * This sets the language for CLI messages and AI Agent instructions.
+ *
+ * The prompt uses bilingual format since we don't know user's preferred
+ * language at this point. After selection, the CLI language switches
+ * immediately for all subsequent prompts.
+ *
+ * @returns {Promise<string>} Selected language code ('en', 'zh-tw', or 'zh-cn')
+ */
+export async function promptDisplayLanguage() {
+  // Detect system language for smart default
+  const systemLang = detectLanguage(null);
+
+  // Use the message from current (initial) language - which is bilingual by design
+  const msg = t().displayLanguage;
+
+  console.log();
+  console.log(chalk.cyan(msg.title));
+  console.log(chalk.gray(`  ${msg.description}`));
+  console.log(chalk.gray(`  ${t().listHint}`));
+  console.log();
+
+  const { language } = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'language',
+      message: msg.question,
+      suffix: ' ',
+      choices: [
+        {
+          name: `English ${chalk.gray('(Default for international teams)')}`,
+          value: 'en'
+        },
+        {
+          name: `繁體中文 ${chalk.gray('(Traditional Chinese)')}`,
+          value: 'zh-tw'
+        },
+        {
+          name: `简体中文 ${chalk.gray('(Simplified Chinese)')}`,
+          value: 'zh-cn'
+        }
+      ],
+      default: systemLang
+    }
+  ]);
+
+  // Immediately switch language for all subsequent prompts
+  setLanguage(language);
+
+  // Show confirmation in the selected language
+  const selectedMsg = t().displayLanguage;
+  console.log();
+  console.log(chalk.gray(selectedMsg.explanations[language]));
+  console.log();
+
+  return language;
+}
 
 /**
  * Prompt for AI tools being used
@@ -15,10 +78,12 @@ import { getMarketplaceSkillsInfo } from '../utils/github.js';
  */
 export async function promptAITools(detected = {}) {
   const msg = t().aiTools;
+  const checkboxHint = t().checkboxHint;
 
   console.log();
   console.log(chalk.cyan(msg.title));
   console.log(chalk.gray(`  ${msg.description}`));
+  console.log(chalk.gray(`  ${checkboxHint}`));
   console.log();
 
   const { tools } = await inquirer.prompt([
@@ -26,14 +91,14 @@ export async function promptAITools(detected = {}) {
       type: 'checkbox',
       name: 'tools',
       message: msg.question,
+      suffix: ' ',
+      instructions: false,  // Hide default English hint, we show translated hint above
       choices: [
-        new inquirer.Separator(chalk.gray(msg.separators.dynamicSkills)),
         {
-          name: `${chalk.green('Claude Code')} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices.claudeCode}`,
+          name: `Claude Code ${chalk.gray('(CLAUDE.md)')}`,
           value: 'claude-code',
           checked: detected.claudeCode || false
         },
-        new inquirer.Separator(chalk.gray(msg.separators.staticRules)),
         {
           name: `Cursor ${chalk.gray('(.cursorrules)')}`,
           value: 'cursor',
@@ -55,38 +120,31 @@ export async function promptAITools(detected = {}) {
           checked: detected.copilot || false
         },
         {
-          name: `Google Antigravity ${chalk.gray('(INSTRUCTIONS.md)')} - Gemini Agent`,
+          name: `Google Antigravity ${chalk.gray('(INSTRUCTIONS.md)')}`,
           value: 'antigravity',
           checked: detected.antigravity || false
         },
-        new inquirer.Separator(chalk.gray(msg.separators.agentsMd)),
         {
-          name: `OpenAI Codex ${chalk.gray('(AGENTS.md)')} - OpenAI Codex CLI`,
+          name: `OpenAI Codex ${chalk.gray('(AGENTS.md)')}`,
           value: 'codex',
           checked: detected.codex || false
         },
         {
-          name: `OpenCode ${chalk.gray('(AGENTS.md)')} - Open-source AI coding agent`,
+          name: `OpenCode ${chalk.gray('(AGENTS.md)')}`,
           value: 'opencode',
           checked: detected.opencode || false
         },
-        new inquirer.Separator(chalk.gray(msg.separators.gemini)),
         {
-          name: `Gemini CLI ${chalk.gray('(GEMINI.md)')} - Google Gemini CLI`,
+          name: `Gemini CLI ${chalk.gray('(GEMINI.md)')}`,
           value: 'gemini-cli',
           checked: detected.geminiCli || false
-        },
-        new inquirer.Separator(),
-        {
-          name: chalk.gray(msg.choices.none),
-          value: 'none'
         }
       ]
     }
   ]);
 
-  // Filter out 'none' and separators
-  const filtered = tools.filter(tool => tool !== 'none' && typeof tool === 'string');
+  // Filter out separators (keep only string values)
+  const filtered = tools.filter(tool => typeof tool === 'string');
   return filtered;
 }
 
@@ -108,34 +166,36 @@ export async function promptSkillsInstallLocation(selectedTools = []) {
     return [];
   }
 
+  // Check if Claude Code is selected (for marketplace info)
+  const hasClaudeCode = skillsTools.includes('claude-code');
+
+  // Get translated checkbox hint
+  const checkboxHint = t().checkboxHint;
+  const marketplaceMsg = t().marketplaceInstall || {};
+
   console.log();
   console.log(chalk.cyan(msg.title));
   console.log(chalk.gray(`  ${msg.description}`));
+  console.log(chalk.gray(`  ${checkboxHint}`));
 
-  // Check Claude Code Marketplace status
-  const hasClaudeCode = skillsTools.includes('claude-code');
+  // Show Marketplace info for Claude Code (not as a selectable option)
   if (hasClaudeCode) {
-    const marketplaceInfo = getMarketplaceSkillsInfo();
-    if (marketplaceInfo && marketplaceInfo.version) {
-      console.log();
-      console.log(chalk.yellow(`  ⚠ ${msg.marketplaceWarning}`));
-      console.log(chalk.gray(`    ${msg.coexistNote}`));
-    }
+    console.log();
+    console.log(chalk.yellow(`  💡 ${marketplaceMsg.claudeCodeTip || 'Claude Code can be installed via Marketplace:'}`));
+    console.log(chalk.white('     /plugin install universal-dev-standards@asia-ostrich'));
+    console.log(chalk.gray(`     → ${msg.choices.marketplace}`));
+  }
+
+  // Show git sharing hint for project-level installation
+  if (msg.gitSharingHint) {
+    console.log();
+    console.log(chalk.gray(`  💡 ${msg.gitSharingHint}`));
   }
   console.log();
 
   // Build choices dynamically based on selected tools
   const choices = [];
 
-  // Add Marketplace option for Claude Code (recommended)
-  if (hasClaudeCode) {
-    choices.push({
-      name: `${chalk.green('Plugin Marketplace')} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices.marketplace}`,
-      value: 'marketplace'
-    });
-    choices.push(new inquirer.Separator(chalk.gray(msg.separatorFileInstall)));
-  }
-
   // Add options for each agent
   for (const tool of skillsTools) {
     const config = getAgentConfig(tool);
@@ -154,42 +214,22 @@ export async function promptSkillsInstallLocation(selectedTools = []) {
     });
   }
 
-  // Add skip option
-  choices.push(new inquirer.Separator());
-  choices.push({
-    name: `${chalk.gray('Skip')} - ${msg.choices.none}`,
-    value: 'none'
-  });
-
   const { locations } = await inquirer.prompt([
     {
       type: 'checkbox',
       name: 'locations',
       message: msg.questionMulti,
+      suffix: ' ',
       choices,
-      validate: (answer) => {
-        // If 'none' is selected, ensure it's the only selection
-        if (answer.includes('none') && answer.length > 1) {
-          return msg.validationNoMix;
-        }
-        return true;
-      }
+      instructions: false  // Hide default English hint, we show translated hint above
     }
   ]);
 
-  // Handle 'none' selection
-  if (locations.includes('none') || locations.length === 0) {
+  // Handle empty selection (user chose to skip)
+  if (locations.length === 0) {
     return [];
   }
 
-  // Handle marketplace selection
-  if (locations.includes('marketplace')) {
-    console.log();
-    console.log(chalk.gray(msg.explanations?.marketplace || '透過 Claude Code Marketplace 安裝，自動更新'));
-    console.log();
-    return [{ agent: 'claude-code', level: 'marketplace' }];
-  }
-
   // Parse selections into agent:level pairs
   const installations = locations
     .filter(loc => loc !== 'none' && loc !== 'marketplace')
@@ -214,6 +254,7 @@ export async function promptSkillsInstallLocation(selectedTools = []) {
  */
 export async function promptCommandsInstallation(selectedTools = []) {
   const msg = t().commandsInstallation || {};
+  const checkboxHint = t().checkboxHint;
 
   // Filter to only commands-supported tools
   const commandsSupportedTools = selectedTools.filter(tool => {
@@ -228,6 +269,13 @@ export async function promptCommandsInstallation(selectedTools = []) {
   console.log();
   console.log(chalk.cyan(msg.title));
   console.log(chalk.gray(`  ${msg.description}`));
+  console.log(chalk.gray(`  ${checkboxHint}`));
+
+  // Show git sharing hint for project-level installation
+  if (msg.gitSharingHint) {
+    console.log();
+    console.log(chalk.gray(`  💡 ${msg.gitSharingHint}`));
+  }
   console.log();
 
   // Build choices dynamically - User Level + Project Level for each agent
@@ -253,37 +301,24 @@ export async function promptCommandsInstallation(selectedTools = []) {
     });
   }
 
-  // Add skip option
-  choices.push(new inquirer.Separator());
-  choices.push({
-    name: chalk.gray(msg.choices.skip),
-    value: 'none'
-  });
-
   const { locations } = await inquirer.prompt([
     {
       type: 'checkbox',
       name: 'locations',
       message: msg.questionMulti || msg.question,
+      suffix: ' ',
       choices,
-      validate: (answer) => {
-        if (answer.includes('none') && answer.length > 1) {
-          return msg.validationNoMix || 'Cannot select "Skip" with other options';
-        }
-        return true;
-      }
+      instructions: false  // Hide default English hint, we show translated hint above
     }
   ]);
 
-  // Handle 'none' selection
-  if (locations.includes('none') || locations.length === 0) {
+  // Handle empty selection (user chose to skip)
+  if (locations.length === 0) {
     return [];
   }
 
   // Parse selections into agent:level pairs
-  const installations = locations
-    .filter(loc => loc !== 'none')
-    .map(loc => {
+  const installations = locations.map(loc => {
       const [agent, level] = loc.split(':');
       return { agent, level };
     });
@@ -390,11 +425,14 @@ export async function promptSkillsUpdate(projectInfo, userInfo, latestVersion) {
     value: 'none'
   });
 
+  console.log(chalk.gray(`  ${t().listHint}`));
+
   const { action } = await inquirer.prompt([
     {
       type: 'list',
       name: 'action',
       message: msg.question,
+      suffix: ' ',
       choices,
       default: needsUpdate.length === 2 ? 'both' : needsUpdate[0]
     }
@@ -432,6 +470,7 @@ export async function promptStandardsScope(hasSkills) {
   console.log(chalk.cyan(msg.title));
   console.log(chalk.gray(`  ${msg.description}`));
   console.log(chalk.gray(`  ${msg.description2}`));
+  console.log(chalk.gray(`  ${t().listHint}`));
   console.log();
 
   const { scope } = await inquirer.prompt([
@@ -439,13 +478,14 @@ export async function promptStandardsScope(hasSkills) {
       type: 'list',
       name: 'scope',
       message: msg.question,
+      suffix: ' ',
       choices: [
         {
-          name: `${chalk.green('Lean')} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices.minimal}`,
+          name: `${chalk.green(msg.labels.minimal)} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices.minimal}`,
           value: 'minimal'
         },
         {
-          name: `${chalk.blue('Complete')} - ${msg.choices.full}`,
+          name: `${chalk.blue(msg.labels.full)} - ${msg.choices.full}`,
           value: 'full'
         }
       ],
@@ -479,6 +519,7 @@ export async function promptFormat() {
   console.log();
   console.log(chalk.cyan(msg.title));
   console.log(chalk.gray(`  ${msg.description}`));
+  console.log(chalk.gray(`  ${t().listHint}`));
   console.log();
 
   const { format } = await inquirer.prompt([
@@ -486,17 +527,18 @@ export async function promptFormat() {
       type: 'list',
       name: 'format',
       message: msg.question,
+      suffix: ' ',
       choices: [
         {
-          name: `${chalk.green('Compact')} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices.ai}`,
+          name: `${chalk.green(msg.labels.ai)} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices.ai}`,
           value: 'ai'
         },
         {
-          name: `${chalk.blue('Detailed')} - ${msg.choices.human}`,
+          name: `${chalk.blue(msg.labels.human)} - ${msg.choices.human}`,
           value: 'human'
         },
         {
-          name: `${chalk.yellow('Both')} ${chalk.gray(`(${t().advanced})`)} - ${msg.choices.both}`,
+          name: `${chalk.yellow(msg.labels.both)} ${chalk.gray(`(${t().advanced})`)} - ${msg.choices.both}`,
           value: 'both'
         }
       ],
@@ -528,6 +570,7 @@ export async function promptGitWorkflow() {
   console.log();
   console.log(chalk.cyan(msg.title));
   console.log(chalk.gray(`  ${msg.description}`));
+  console.log(chalk.gray(`  ${t().listHint}`));
   console.log();
 
   const { workflow } = await inquirer.prompt([
@@ -535,6 +578,7 @@ export async function promptGitWorkflow() {
       type: 'list',
       name: 'workflow',
       message: msg.question,
+      suffix: ' ',
       choices: [
         {
           name: `${chalk.green('GitHub Flow')} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices['github-flow']}`,
@@ -579,6 +623,7 @@ export async function promptMergeStrategy() {
   console.log();
   console.log(chalk.cyan(msg.title));
   console.log(chalk.gray(`  ${msg.description}`));
+  console.log(chalk.gray(`  ${t().listHint}`));
   console.log();
 
   const { strategy } = await inquirer.prompt([
@@ -586,6 +631,7 @@ export async function promptMergeStrategy() {
       type: 'list',
       name: 'strategy',
       message: msg.question,
+      suffix: ' ',
       choices: [
         {
           name: `${chalk.green('Squash Merge')} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices.squash}`,
@@ -616,35 +662,51 @@ export async function promptMergeStrategy() {
 
 /**
  * Prompt for commit message language
- * @returns {Promise<string>} Selected language ID
+ *
+ * The bilingual option is only shown when displayLanguage is Chinese (zh-tw or zh-cn),
+ * as bilingual commits are primarily useful for Chinese-speaking teams who want both
+ * English and Chinese in their commit messages.
+ *
+ * @param {string} displayLanguage - Display language ('en', 'zh-tw', or 'zh-cn')
+ * @returns {Promise<string>} Selected language ID: 'english', 'traditional-chinese', or 'bilingual'
  */
-export async function promptCommitLanguage() {
+export async function promptCommitLanguage(displayLanguage = 'en') {
   const msg = t().commitLanguage;
 
   console.log();
   console.log(chalk.cyan(msg.title));
   console.log(chalk.gray(`  ${msg.description}`));
+  console.log(chalk.gray(`  ${t().listHint}`));
   console.log();
 
+  // Build choices - bilingual option only for Chinese display languages
+  const choices = [
+    {
+      name: `${chalk.green(msg.labels.english)} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices.english}`,
+      value: 'english'
+    },
+    {
+      name: `${chalk.blue(msg.labels.chinese)} - ${msg.choices.chinese}`,
+      value: 'traditional-chinese'
+    }
+  ];
+
+  // Only show bilingual option for Chinese display languages
+  // When zh-cn is selected, bilingual will use Simplified Chinese in the generated content
+  if (displayLanguage === 'zh-tw' || displayLanguage === 'zh-cn') {
+    choices.push({
+      name: `${chalk.yellow(msg.labels.bilingual)} - ${msg.choices.bilingual}`,
+      value: 'bilingual'
+    });
+  }
+
   const { language } = await inquirer.prompt([
     {
       type: 'list',
       name: 'language',
       message: msg.question,
-      choices: [
-        {
-          name: `${chalk.green(msg.labels.english)} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices.english}`,
-          value: 'english'
-        },
-        {
-          name: `${chalk.blue(msg.labels.chinese)} - ${msg.choices.chinese}`,
-          value: 'traditional-chinese'
-        },
-        {
-          name: `${chalk.yellow(msg.labels.bilingual)} - ${msg.choices.bilingual}`,
-          value: 'bilingual'
-        }
-      ],
+      suffix: ' ',
+      choices,
       default: 'english'
     }
   ]);
@@ -670,6 +732,7 @@ export async function promptTestLevels() {
   console.log(chalk.cyan(msg.title));
   console.log(chalk.gray(`  ${msg.description}`));
   console.log(chalk.gray(`  ${msg.description2}`));
+  console.log(chalk.gray(`  ${t().checkboxHint}`));
   console.log();
 
   const { levels } = await inquirer.prompt([
@@ -677,6 +740,8 @@ export async function promptTestLevels() {
       type: 'checkbox',
       name: 'levels',
       message: msg.question,
+      suffix: ' ',
+      instructions: false,
       choices: [
         {
           name: `Unit Testing ${chalk.gray('(70%)')} - ${msg.choices.unit}`,
@@ -716,17 +781,14 @@ export async function promptTestLevels() {
 
 /**
  * Prompt for all standard options
+ *
  * @param {number} level - Adoption level
+ * @param {string} displayLanguage - Display language for bilingual commit option filtering
  * @returns {Promise<Object>} Selected options
  */
-export async function promptStandardOptions(level) {
+export async function promptStandardOptions(level, displayLanguage = 'en') {
   const options = {};
 
-  console.log();
-  console.log(chalk.cyan('Standard Options:'));
-  console.log(chalk.gray('  Configure your preferred options for each standard'));
-  console.log();
-
   // Git workflow options (level 2+)
   if (level >= 2) {
     options.workflow = await promptGitWorkflow();
@@ -734,7 +796,8 @@ export async function promptStandardOptions(level) {
   }
 
   // Commit message options (level 1+)
-  options.commit_language = await promptCommitLanguage();
+  // Pass displayLanguage to filter bilingual option
+  options.commit_language = await promptCommitLanguage(displayLanguage);
 
   // Testing options (level 2+)
   if (level >= 2) {
@@ -751,11 +814,14 @@ export async function promptStandardOptions(level) {
 export async function promptInstallMode() {
   const msg = t().installMode;
 
+  console.log(chalk.gray(`  ${t().listHint}`));
+
   const { mode } = await inquirer.prompt([
     {
       type: 'list',
       name: 'mode',
       message: msg.question,
+      suffix: ' ',
       choices: [
         {
           name: `${chalk.green('Skills Mode')} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices.skills}`,
@@ -791,11 +857,14 @@ export async function promptSkillsUpgrade(installedVersion, latestVersion) {
     ? `v${installedVersion} → v${latestVersion}`
     : `unknown → v${latestVersion}`;
 
+  console.log(chalk.gray(`  ${t().listHint}`));
+
   const { action } = await inquirer.prompt([
     {
       type: 'list',
       name: 'action',
       message: `Skills detected (${versionDisplay}). What would you like to do?`,
+      suffix: ' ',
       choices: [
         {
           name: `${chalk.green('Upgrade')} - Update to latest version`,
@@ -833,6 +902,7 @@ export async function promptLevel() {
   console.log();
   console.log(chalk.cyan(msg.title));
   console.log(chalk.gray(`  ${msg.description}`));
+  console.log(chalk.gray(`  ${t().listHint}`));
   console.log();
 
   const { level } = await inquirer.prompt([
@@ -840,21 +910,22 @@ export async function promptLevel() {
       type: 'list',
       name: 'level',
       message: msg.question,
+      suffix: ' ',
       choices: [
         {
-          name: `${chalk.blue('Level 1: Starter')} - ${msg.choices[1]}`,
+          name: `${chalk.blue(msg.labels[1])} - ${msg.choices[1]}`,
           value: 1
         },
         {
-          name: `${chalk.green('Level 2: Professional')} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices[2]}`,
+          name: `${chalk.green(msg.labels[2])} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices[2]}`,
           value: 2
         },
         {
-          name: `${chalk.yellow('Level 3: Complete')} - ${msg.choices[3]}`,
+          name: `${chalk.yellow(msg.labels[3])} - ${msg.choices[3]}`,
           value: 3
         }
       ],
-      default: 2
+      default: 1
     }
   ]);
 
@@ -887,11 +958,15 @@ export async function promptLanguage(detected) {
     return null;
   }
 
+  console.log(chalk.gray(`  ${t().checkboxHint}`));
+
   const { languages } = await inquirer.prompt([
     {
       type: 'checkbox',
       name: 'languages',
       message: 'Detected language(s). Select style guides to include:',
+      suffix: ' ',
+      instructions: false,
       choices
     }
   ]);
@@ -915,11 +990,15 @@ export async function promptFramework(detected) {
     return null;
   }
 
+  console.log(chalk.gray(`  ${t().checkboxHint}`));
+
   const { frameworks } = await inquirer.prompt([
     {
       type: 'checkbox',
       name: 'frameworks',
       message: 'Detected framework(s). Select patterns to include:',
+      suffix: ' ',
+      instructions: false,
       choices
     }
   ]);
@@ -937,6 +1016,7 @@ export async function promptLocale() {
       type: 'confirm',
       name: 'useLocale',
       message: 'Use Traditional Chinese (繁體中文) locale?',
+      suffix: ' ',
       default: false
     }
   ]);
@@ -974,11 +1054,15 @@ export async function promptIntegrations(detected) {
     checked: detected.copilot || false
   });
 
+  console.log(chalk.gray(`  ${t().checkboxHint}`));
+
   const { integrations } = await inquirer.prompt([
     {
       type: 'checkbox',
       name: 'integrations',
       message: 'Select AI tool integrations:',
+      suffix: ' ',
+      instructions: false,
       choices
     }
   ]);
@@ -997,6 +1081,7 @@ export async function promptConfirm(message) {
       type: 'confirm',
       name: 'confirmed',
       message,
+      suffix: ' ',
       default: true
     }
   ]);
@@ -1030,6 +1115,7 @@ export async function promptContentMode() {
   console.log(chalk.cyan(msg.title));
   console.log(chalk.gray(`  ${msg.description}`));
   console.log(chalk.gray(`  ${msg.description2}`));
+  console.log(chalk.gray(`  ${t().listHint}`));
   console.log();
 
   const { mode } = await inquirer.prompt([
@@ -1037,17 +1123,18 @@ export async function promptContentMode() {
       type: 'list',
       name: 'mode',
       message: msg.question,
+      suffix: ' ',
       choices: [
         {
-          name: `${chalk.green('Standard')} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices.index}`,
+          name: `${chalk.green(msg.labels.index)} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices.index}`,
           value: 'index'
         },
         {
-          name: `${chalk.blue('Full Embed')} - ${msg.choices.full}`,
+          name: `${chalk.blue(msg.labels.full)} - ${msg.choices.full}`,
           value: 'full'
         },
         {
-          name: `${chalk.gray('Minimal')} - ${msg.choices.minimal}`,
+          name: `${chalk.gray(msg.labels.minimal)} - ${msg.choices.minimal}`,
           value: 'minimal'
         }
       ],
@@ -1112,6 +1199,7 @@ export async function promptManageAITools(currentTools = []) {
   console.log();
   console.log(chalk.cyan(msg.title));
   console.log(chalk.gray(`  ${msg.currentlyInstalled} ${currentTools.length > 0 ? currentTools.join(', ') : msg.none}`));
+  console.log(chalk.gray(`  ${t().listHint}`));
   console.log();
 
   const { action } = await inquirer.prompt([
@@ -1119,6 +1207,7 @@ export async function promptManageAITools(currentTools = []) {
       type: 'list',
       name: 'action',
       message: msg.question,
+      suffix: ' ',
       choices: [
         { name: msg.choices.add, value: 'add' },
         { name: msg.choices.remove, value: 'remove' },
@@ -1161,11 +1250,15 @@ export async function promptManageAITools(currentTools = []) {
       return { action: 'cancel', tools: [] };
     }
 
+    console.log(chalk.gray(`  ${t().checkboxHint}`));
+
     const { toolsToAdd } = await inquirer.prompt([
       {
         type: 'checkbox',
         name: 'toolsToAdd',
         message: msg.selectToAdd,
+        suffix: ' ',
+        instructions: false,
         choices: availableTools
       }
     ]);
@@ -1187,11 +1280,15 @@ export async function promptManageAITools(currentTools = []) {
       };
     });
 
+    console.log(chalk.gray(`  ${t().checkboxHint}`));
+
     const { toolsToRemove } = await inquirer.prompt([
       {
         type: 'checkbox',
         name: 'toolsToRemove',
         message: msg.selectToRemove,
+        suffix: ' ',
+        instructions: false,
         choices: installedChoices
       }
     ]);
@@ -1209,10 +1306,12 @@ export async function promptManageAITools(currentTools = []) {
  */
 export async function promptAdoptionLevel(currentLevel) {
   const msg = t().adoptionLevelConfig;
+  const levelLabels = t().level.labels;
 
   console.log();
   console.log(chalk.cyan(msg.title));
   console.log(chalk.gray(`  ${msg.currentLevel} ${currentLevel}`));
+  console.log(chalk.gray(`  ${t().listHint}`));
   console.log();
 
   const { level } = await inquirer.prompt([
@@ -1220,17 +1319,18 @@ export async function promptAdoptionLevel(currentLevel) {
       type: 'list',
       name: 'level',
       message: msg.question,
+      suffix: ' ',
       choices: [
         {
-          name: `${chalk.blue('Level 1: Starter')} - ${msg.choices[1]}`,
+          name: `${chalk.blue(levelLabels[1])} - ${msg.choices[1]}`,
           value: 1
         },
         {
-          name: `${chalk.green('Level 2: Professional')} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices[2]}`,
+          name: `${chalk.green(levelLabels[2])} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices[2]}`,
           value: 2
         },
         {
-          name: `${chalk.yellow('Level 3: Complete')} - ${msg.choices[3]}`,
+          name: `${chalk.yellow(levelLabels[3])} - ${msg.choices[3]}`,
           value: 3
         }
       ],
@@ -1260,16 +1360,11 @@ export async function promptContentModeChange(currentMode) {
   const msg = t().contentMode;
   const changeMsg = t().contentModeChange;
 
-  const modeLabels = {
-    index: 'Standard',
-    full: 'Full Embed',
-    minimal: 'Minimal'
-  };
-
   console.log();
   console.log(chalk.cyan(msg.title));
-  console.log(chalk.gray(`  ${changeMsg.currentMode} ${modeLabels[currentMode] || currentMode || 'minimal'}`));
+  console.log(chalk.gray(`  ${changeMsg.currentMode} ${msg.labels[currentMode] || currentMode || msg.labels.minimal}`));
   console.log(chalk.gray(`  ${msg.description2}`));
+  console.log(chalk.gray(`  ${t().listHint}`));
   console.log();
 
   const { mode } = await inquirer.prompt([
@@ -1277,17 +1372,18 @@ export async function promptContentModeChange(currentMode) {
       type: 'list',
       name: 'mode',
       message: msg.question,
+      suffix: ' ',
       choices: [
         {
-          name: `${chalk.green('Standard')} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices.index}`,
+          name: `${chalk.green(msg.labels.index)} ${chalk.gray(`(${t().recommended})`)} - ${msg.choices.index}`,
           value: 'index'
         },
         {
-          name: `${chalk.blue('Full Embed')} - ${msg.choices.full}`,
+          name: `${chalk.blue(msg.labels.full)} - ${msg.choices.full}`,
           value: 'full'
         },
         {
-          name: `${chalk.gray('Minimal')} - ${msg.choices.minimal}`,
+          name: `${chalk.gray(msg.labels.minimal)} - ${msg.choices.minimal}`,
           value: 'minimal'
         }
       ],
@@ -1315,6 +1411,7 @@ export async function promptMethodology() {
   console.log(chalk.cyan(msg.title));
   console.log(chalk.yellow(`  ${msg.experimental}`));
   console.log(chalk.gray(`  ${msg.description}`));
+  console.log(chalk.gray(`  ${t().listHint}`));
   console.log();
 
   const { methodology } = await inquirer.prompt([
@@ -1322,26 +1419,27 @@ export async function promptMethodology() {
       type: 'list',
       name: 'methodology',
       message: msg.question,
+      suffix: ' ',
       choices: [
         {
-          name: `${chalk.red('TDD')} ${chalk.gray(`- ${msg.choices.tdd}`)}`,
+          name: `${chalk.red(msg.labels.tdd)} ${chalk.gray(`- ${msg.choices.tdd}`)}`,
           value: 'tdd'
         },
         {
-          name: `${chalk.green('BDD')} ${chalk.gray(`- ${msg.choices.bdd}`)}`,
+          name: `${chalk.green(msg.labels.bdd)} ${chalk.gray(`- ${msg.choices.bdd}`)}`,
           value: 'bdd'
         },
         {
-          name: `${chalk.blue('SDD')} ${chalk.gray(`- ${msg.choices.sdd}`)}`,
+          name: `${chalk.blue(msg.labels.sdd)} ${chalk.gray(`- ${msg.choices.sdd}`)}`,
           value: 'sdd'
         },
         {
-          name: `${chalk.yellow('ATDD')} ${chalk.gray(`- ${msg.choices.atdd}`)}`,
+          name: `${chalk.yellow(msg.labels.atdd)} ${chalk.gray(`- ${msg.choices.atdd}`)}`,
           value: 'atdd'
         },
         new inquirer.Separator(),
         {
-          name: `${chalk.gray('None')} - ${msg.choices.none}`,
+          name: `${chalk.gray(msg.labels.none)} - ${msg.choices.none}`,
           value: null
         }
       ],