Merge ae3dc2ce01 into eeebf152af

tools/cli/lib/prompts.js

@@ -166,30 +166,6 @@ async function multiselect(options) {
   return result;
 }
 
-/**
- * Grouped multi-select prompt for categorized options
- * @param {Object} options - Prompt options
- * @param {string} options.message - The question to ask
- * @param {Object} options.options - Object mapping group names to arrays of choices
- * @param {Array} [options.initialValues] - Array of initially selected values
- * @param {boolean} [options.required=false] - Whether at least one must be selected
- * @param {boolean} [options.selectableGroups=false] - Whether groups can be selected as a whole
- * @returns {Promise<Array>} Array of selected values
- */
-async function groupMultiselect(options) {
-  const clack = await getClack();
-
-  const result = await clack.groupMultiselect({
-    message: options.message,
-    options: options.options,
-    initialValues: options.initialValues,
-    required: options.required || false,
-  });
-
-  await handleCancel(result);
-  return result;
-}
-
 /**
  * Confirm prompt (replaces Inquirer 'confirm' type)
  * @param {Object} options - Prompt options
@@ -421,7 +397,6 @@ module.exports = {
   spinner,
   select,
   multiselect,
-  groupMultiselect,
   confirm,
   text,
   password,

tools/cli/lib/ui.js

@@ -442,14 +442,13 @@ class UI {
     const preferredIdes = ideManager.getPreferredIdes();
     const otherIdes = ideManager.getOtherIdes();
 
-    // Build grouped options object for groupMultiselect
-    const groupedOptions = {};
+    // Build IDE choices array with separators
+    const ideChoices = [];
     const processedIdes = new Set();
-    const initialValues = [];
 
     // First, add previously configured IDEs at the top, marked with ✅
     if (configuredIdes.length > 0) {
-      const configuredGroup = [];
+      ideChoices.push(new choiceUtils.Separator('── Previously Configured ──'));
       for (const ideValue of configuredIdes) {
         // Skip empty or invalid IDE values
         if (!ideValue || typeof ideValue !== 'string') {
@@ -462,41 +461,44 @@ class UI {
         const ide = preferredIde || otherIde;
 
         if (ide) {
-          configuredGroup.push({
-            label: `${ide.name} ✅`,
+          ideChoices.push({
+            name: `${ide.name} ✅`,
             value: ide.value,
+            checked: true, // Previously configured IDEs are checked by default
           });
           processedIdes.add(ide.value);
-          initialValues.push(ide.value); // Pre-select configured IDEs
         } else {
           // Warn about unrecognized IDE (but don't fail)
           console.log(chalk.yellow(`⚠️  Previously configured IDE '${ideValue}' is no longer available`));
         }
       }
-      if (configuredGroup.length > 0) {
-        groupedOptions['Previously Configured'] = configuredGroup;
-      }
     }
 
     // Add preferred tools (excluding already processed)
     const remainingPreferred = preferredIdes.filter((ide) => !processedIdes.has(ide.value));
     if (remainingPreferred.length > 0) {
-      groupedOptions['Recommended Tools'] = remainingPreferred.map((ide) => {
-        processedIdes.add(ide.value);
-        return {
-          label: `${ide.name} ⭐`,
+      ideChoices.push(new choiceUtils.Separator('── Recommended Tools ──'));
+      for (const ide of remainingPreferred) {
+        ideChoices.push({
+          name: `${ide.name} ⭐`,
           value: ide.value,
-        };
-      });
+          checked: false,
+        });
+        processedIdes.add(ide.value);
+      }
     }
 
     // Add other tools (excluding already processed)
     const remainingOther = otherIdes.filter((ide) => !processedIdes.has(ide.value));
     if (remainingOther.length > 0) {
-      groupedOptions['Additional Tools'] = remainingOther.map((ide) => ({
-        label: ide.name,
-        value: ide.value,
-      }));
+      ideChoices.push(new choiceUtils.Separator('── Additional Tools ──'));
+      for (const ide of remainingOther) {
+        ideChoices.push({
+          name: ide.name,
+          value: ide.value,
+          checked: false,
+        });
+      }
     }
 
     let selectedIdes = [];
@@ -504,10 +506,9 @@ class UI {
 
     // Loop until user selects at least one tool OR explicitly confirms no tools
     while (!userConfirmedNoTools) {
-      selectedIdes = await prompts.groupMultiselect({
+      selectedIdes = await prompts.multiselect({
         message: `Select tools to configure ${chalk.dim('(↑/↓ navigate, SPACE select, ENTER confirm)')}:`,
-        options: groupedOptions,
-        initialValues: initialValues.length > 0 ? initialValues : undefined,
+        choices: ideChoices,
         required: false,
       });