@cannbot-ai/install-helper 1.1.6-beta.6 → 1.1.6-beta.7

package/dist/index.js

@@ -849,6 +849,7 @@ var init_zh_CN = __esm({
       uninstall_type_skill: "\u5378\u8F7D Skills",
       uninstall_type_plugin: "\u5378\u8F7D Plugins",
       uninstall_checkbox_hint: "\u52FE\u9009=\u4FDD\u7559\uFF0C\u53D6\u6D88\u52FE\u9009=\u5378\u8F7D",
+      uninstall_checkbox_hint_select: "\u52FE\u9009\u8981\u5378\u8F7D\u7684\u9879\uFF0C\u4E0D\u9009\u6309\u56DE\u8F66\u53EF\u8FD4\u56DE",
       uninstall_uncheck_all: "\u5378\u8F7D\u5168\u90E8",
       uninstall_confirm_count: "\u786E\u8BA4\u5378\u8F7D\uFF08{count} \u4E2A\u5C06\u5378\u8F7D\uFF09",
       uninstall_no_installed: "\u6CA1\u6709\u5DF2\u5B89\u88C5\u7684 Skills \u6216 Plugins",
@@ -1071,6 +1072,7 @@ var init_en_US = __esm({
       uninstall_type_skill: "Uninstall Skills",
       uninstall_type_plugin: "Uninstall Plugins",
       uninstall_checkbox_hint: "Checked = keep, unchecked = uninstall",
+      uninstall_checkbox_hint_select: "Check items to uninstall, press enter without selection to go back",
       uninstall_uncheck_all: "Uninstall all",
       uninstall_confirm_count: "Confirm uninstall ({count} will be removed)",
       uninstall_no_installed: "No installed Skills or Plugins",
@@ -3841,6 +3843,55 @@ async function interactiveSkillUnselect(tool, level) {
     logger.warn(t("uninstall_no_installed_skills"));
     return "back";
   }
+  if (installedSkills.length <= 15) {
+    return await flatSkillUnselect(installedSkills);
+  }
+  return await categorySkillUnselect(installedSkills);
+}
+async function flatSkillUnselect(installedSkills) {
+  const categories = getAllCategories();
+  const installedSet = new Set(installedSkills);
+  const skillChoices = [
+    ...installedSkills.map((skillId) => {
+      const skill = findSkill(skillId);
+      const cat = categories.find((c) => c.skills.some((s) => s.id === skillId));
+      const catName = cat ? cat.name : "";
+      const desc = skill?.description || "";
+      return {
+        name: `${chalk5.cyan(skillId)}${catName ? chalk5.dim(` [${catName}]`) : ""}`,
+        value: skillId,
+        checked: false,
+        description: desc
+      };
+    })
+  ];
+  printBoxTitle(t("uninstall_interactive_title"));
+  logger.info(chalk5.dim(`  ${t("uninstall_checkbox_hint_select")}`));
+  logger.blank();
+  showOperationHints(true);
+  const selected = await checkbox({
+    message: t("uninstall_select_items"),
+    choices: skillChoices,
+    loop: false,
+    instructions: false,
+    theme: checkboxTheme,
+    pageSize: 20
+  });
+  if (selected.length === 0) {
+    logger.info(t("uninstall_nothing_to_uninstall"));
+    return "back";
+  }
+  const confirmed = await confirm({
+    message: t("uninstall_confirm_prompt").replace("{count}", chalk5.bold(String(selected.length))),
+    default: false
+  });
+  if (!confirmed) return "cancel";
+  return {
+    toUninstall: selected,
+    toKeep: installedSkills.filter((id) => !selected.includes(id))
+  };
+}
+async function categorySkillUnselect(installedSkills) {
   const allCategories = getAllCategories();
   const installedSet = new Set(installedSkills);
   const categoriesWithInstalled = allCategories.map((cat) => ({
@@ -3857,14 +3908,13 @@ async function interactiveSkillUnselect(tool, level) {
       skills: uncategorized.map((id) => ({ id, description: "", source: "", filePath: "" }))
     });
   }
-  let keptSet = new Set(installedSkills);
+  const uninstallSet = /* @__PURE__ */ new Set();
   let step = 0;
   let selectedCategoryId = "";
   while (true) {
     switch (step) {
       case 0: {
-        const toUninstallCount = installedSkills.length - keptSet.size;
-        const titleSuffix = toUninstallCount > 0 ? `${t("wizard_step_3_skill_title")}\uFF08${t("uninstall_marked_count").replace("{count}", String(toUninstallCount))}\uFF09` : t("wizard_step_3_skill_title");
+        const titleSuffix = uninstallSet.size > 0 ? `${t("wizard_step_3_skill_title")}\uFF08${t("uninstall_marked_count").replace("{count}", String(uninstallSet.size))}\uFF09` : t("wizard_step_3_skill_title");
         printBoxTitle(titleSuffix);
         const categoryChoices = [
           {
@@ -3873,16 +3923,15 @@ async function interactiveSkillUnselect(tool, level) {
           },
           new Separator2("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"),
           ...categoriesWithInstalled.map((cat) => {
-            const catKeptCount = cat.skills.filter((s) => keptSet.has(s.id)).length;
-            const catUninstallCount = cat.skills.length - catKeptCount;
-            const suffix = catUninstallCount > 0 ? chalk5.yellow(` (${catUninstallCount} to uninstall)`) : "";
+            const catSelectedCount = cat.skills.filter((s) => uninstallSet.has(s.id)).length;
+            const suffix = catSelectedCount > 0 ? chalk5.yellow(` (${catSelectedCount} selected)`) : "";
             return {
               name: `> ${cat.name} (${cat.skills.length} skills)${suffix}`,
               value: cat.id
             };
           }),
           new Separator2("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"),
-          ...toUninstallCount > 0 ? [{ name: `>> ${t("uninstall_confirm_count").replace("{count}", String(toUninstallCount))}`, value: "uninstall" }] : [],
+          ...uninstallSet.size > 0 ? [{ name: `>> ${t("uninstall_confirm_count").replace("{count}", String(uninstallSet.size))}`, value: "uninstall" }] : [],
           { name: "<- " + t("wizard_back"), value: BACK },
           { name: "x  " + t("wizard_cancel"), value: CANCEL }
         ];
@@ -3897,27 +3946,27 @@ async function interactiveSkillUnselect(tool, level) {
         if (selectedCategoryId === BACK) return "back";
         if (selectedCategoryId === CANCEL) return "cancel";
         if (selectedCategoryId === UNSELECT_ALL) {
-          keptSet = /* @__PURE__ */ new Set();
-          const toUninstall = [...installedSkills];
+          for (const id of installedSkills) {
+            uninstallSet.add(id);
+          }
           const confirmed = await confirm({
-            message: t("uninstall_confirm_prompt").replace("{count}", chalk5.bold(String(toUninstall.length))),
+            message: t("uninstall_confirm_prompt").replace("{count}", chalk5.bold(String(installedSkills.length))),
             default: false
           });
           if (!confirmed) return "cancel";
-          return { toUninstall, toKeep: [] };
+          return { toUninstall: [...uninstallSet], toKeep: [] };
         }
         if (selectedCategoryId === "uninstall") {
-          const toUninstall = installedSkills.filter((id) => !keptSet.has(id));
-          if (toUninstall.length === 0) {
+          if (uninstallSet.size === 0) {
             logger.info(t("uninstall_nothing_to_uninstall"));
             return "back";
           }
           const confirmed = await confirm({
-            message: t("uninstall_confirm_prompt").replace("{count}", chalk5.bold(String(toUninstall.length))),
+            message: t("uninstall_confirm_prompt").replace("{count}", chalk5.bold(String(uninstallSet.size))),
             default: false
           });
           if (!confirmed) return "cancel";
-          return { toUninstall, toKeep: [...keptSet] };
+          return { toUninstall: [...uninstallSet], toKeep: installedSkills.filter((id) => !uninstallSet.has(id)) };
         }
         step = 1;
         break;
@@ -3927,26 +3976,26 @@ async function interactiveSkillUnselect(tool, level) {
         if (!category) return "back";
         printBoxTitle(t("wizard_step_4_skill_title").replace("{category}", category.name));
         const categorySkillIds = new Set(category.skills.map((s) => s.id));
-        const keptInCategory = new Set([...keptSet].filter((id) => categorySkillIds.has(id)));
+        const selectedInCategory = new Set([...uninstallSet].filter((id) => categorySkillIds.has(id)));
         const skillChoices = [
           {
             name: `>> ${t("uninstall_uncheck_all_category")}`,
             value: SELECT_ALL_CATEGORY,
-            checked: keptInCategory.size === 0,
+            checked: selectedInCategory.size === category.skills.length,
             description: t("uninstall_uncheck_all_category")
           },
           new Separator2("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"),
           ...category.skills.map((skill) => {
-            const isKept = keptInCategory.has(skill.id);
+            const isSelected = selectedInCategory.has(skill.id);
             return {
               name: `${chalk5.cyan(skill.id)}`,
               value: skill.id,
-              checked: isKept,
+              checked: isSelected,
               description: skill.description || ""
             };
           })
         ];
-        logger.info(chalk5.dim(`  ${t("uninstall_checkbox_hint")}`));
+        logger.info(chalk5.dim(`  ${t("uninstall_checkbox_hint_select")}`));
         logger.blank();
         showOperationHints(true);
         const selectedSkills = await checkbox({
@@ -3957,20 +4006,20 @@ async function interactiveSkillUnselect(tool, level) {
           theme: checkboxTheme,
           pageSize: 15
         });
-        let keptInCat;
+        let selectedInCat;
         if (selectedSkills.includes(SELECT_ALL_CATEGORY)) {
-          keptInCat = [];
+          selectedInCat = category.skills.map((s) => s.id);
         } else {
-          keptInCat = selectedSkills.filter((id) => id !== SELECT_ALL_CATEGORY);
+          selectedInCat = selectedSkills.filter((id) => id !== SELECT_ALL_CATEGORY);
         }
         for (const id of categorySkillIds) {
-          if (keptInCat.includes(id)) {
-            keptSet.add(id);
+          if (selectedInCat.includes(id)) {
+            uninstallSet.add(id);
           } else {
-            keptSet.delete(id);
+            uninstallSet.delete(id);
           }
         }
-        const toUninstallCount = installedSkills.length - keptSet.size;
+        const toUninstallCount = uninstallSet.size;
         const action = await select3({
           message: toUninstallCount > 0 ? t("uninstall_continue_or_confirm").replace("{count}", String(toUninstallCount)) : t("wizard_no_selection"),
           choices: toUninstallCount > 0 ? [
@@ -3988,17 +4037,16 @@ async function interactiveSkillUnselect(tool, level) {
           theme: selectTheme
         });
         if (action === "uninstall") {
-          const toUninstall = installedSkills.filter((id) => !keptSet.has(id));
-          if (toUninstall.length === 0) {
+          if (uninstallSet.size === 0) {
             logger.info(t("uninstall_nothing_to_uninstall"));
             return "back";
           }
           const confirmed = await confirm({
-            message: t("uninstall_confirm_prompt").replace("{count}", chalk5.bold(String(toUninstall.length))),
+            message: t("uninstall_confirm_prompt").replace("{count}", chalk5.bold(String(uninstallSet.size))),
             default: false
           });
           if (!confirmed) return "cancel";
-          return { toUninstall, toKeep: [...keptSet] };
+          return { toUninstall: [...uninstallSet], toKeep: installedSkills.filter((id) => !uninstallSet.has(id)) };
         }
         if (action === CONTINUE_SELECT) {
           step = 0;
@@ -5051,24 +5099,64 @@ async function uninstallRecent(tool, level, yes) {
 async function uninstallInteractive(defaultTool, defaultLevel) {
   let tool = defaultTool;
   let level = defaultLevel;
-  const typeChoices = [
-    { name: `> ${t("uninstall_type_skill")}`, value: "skill" },
-    { name: `> ${t("uninstall_type_plugin")}`, value: "plugin" },
-    new Separator4("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"),
-    { name: "x  " + t("wizard_cancel"), value: "cancel" }
-  ];
-  showOperationHints();
-  const uninstallType = await select5({
-    message: t("uninstall_select_type"),
-    choices: typeChoices,
-    loop: false,
-    theme: selectTheme
-  });
-  if (uninstallType === "cancel") {
-    logger.info(t("init_cancelled"));
+  const allInstalledPlugins = scanInstalled();
+  const toolsWithPlugins = new Set(allInstalledPlugins.map((p) => `${p.tool}:${p.level}`));
+  const toolsWithSkills = /* @__PURE__ */ new Set();
+  for (const t2 of ["opencode", "claude", "trae", "cursor", "copilot", "codearts"]) {
+    for (const l of ["project", "global"]) {
+      const ip = l === "project" ? process.cwd() : getConfigRoot(t2, l);
+      const skills = getInstalledSkills(t2, l, ip);
+      if (skills.length > 0) {
+        toolsWithSkills.add(`${t2}:${l}`);
+      }
+    }
+  }
+  const hasSkills = toolsWithSkills.size > 0;
+  const hasPlugins = toolsWithPlugins.size > 0;
+  if (!hasSkills && !hasPlugins) {
+    logger.warn(t("uninstall_no_installed"));
     return;
   }
-  if (!process.env.INSTALL_HELPER_TOOL) {
+  let uninstallType;
+  if (hasSkills && hasPlugins) {
+    printBoxTitle(t("uninstall_interactive_title"));
+    const skillCount = [...toolsWithSkills].reduce((sum, key) => {
+      const [t2, l] = key.split(":");
+      const ip = l === "project" ? process.cwd() : getConfigRoot(t2, l);
+      return sum + getInstalledSkills(t2, l, ip).length;
+    }, 0);
+    const pluginCount = allInstalledPlugins.length;
+    const typeChoices = [
+      { name: `> ${t("uninstall_type_skill")} (${skillCount})`, value: "skill" },
+      { name: `> ${t("uninstall_type_plugin")} (${pluginCount})`, value: "plugin" },
+      new Separator4("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"),
+      { name: "x  " + t("wizard_cancel"), value: "cancel" }
+    ];
+    showOperationHints();
+    const choice = await select5({
+      message: t("uninstall_select_type"),
+      choices: typeChoices,
+      loop: false,
+      theme: selectTheme
+    });
+    if (choice === "cancel") {
+      logger.info(t("init_cancelled"));
+      return;
+    }
+    uninstallType = choice;
+  } else if (hasSkills) {
+    uninstallType = "skill";
+  } else {
+    uninstallType = "plugin";
+  }
+  const relevantKeys = uninstallType === "skill" ? toolsWithSkills : toolsWithPlugins;
+  const toolsWithContent = /* @__PURE__ */ new Set();
+  for (const key of relevantKeys) {
+    toolsWithContent.add(key.split(":")[0]);
+  }
+  if (toolsWithContent.size === 1) {
+    tool = [...toolsWithContent][0];
+  } else if (!process.env.INSTALL_HELPER_TOOL) {
     const detected = await selectToolWithDetection();
     if (detected === "back" || detected === "cancel") {
       logger.info(t("init_cancelled"));
@@ -5076,7 +5164,16 @@ async function uninstallInteractive(defaultTool, defaultLevel) {
     }
     tool = detected;
   }
-  if (!process.env.INSTALL_HELPER_LEVEL) {
+  const levelsWithContent = /* @__PURE__ */ new Set();
+  for (const key of relevantKeys) {
+    const [t2, l] = key.split(":");
+    if (t2 === tool) {
+      levelsWithContent.add(l);
+    }
+  }
+  if (levelsWithContent.size === 1) {
+    level = [...levelsWithContent][0];
+  } else if (!process.env.INSTALL_HELPER_LEVEL) {
     const { stepLevel: stepLevel2 } = await Promise.resolve().then(() => (init_wizard(), wizard_exports));
     const levelResult = await stepLevel2();
     if (levelResult === "__back__" || levelResult === "__cancel__") {
@@ -5114,12 +5211,12 @@ async function interactivePluginUninstall(tool, level) {
     ...installed.map((inst) => ({
       name: `${chalk11.cyan(inst.displayName)} ${chalk11.dim(`(${inst.id})`)}`,
       value: inst.id,
-      checked: true,
+      checked: false,
       description: `${inst.skillsCount} skills, ${inst.agentsCount} agents`
     }))
   ];
   printBoxTitle(t("uninstall_interactive_title"));
-  logger.info(chalk11.dim(`  ${t("uninstall_checkbox_hint")}`));
+  logger.info(chalk11.dim(`  ${t("uninstall_checkbox_hint_select")}`));
   logger.blank();
   showOperationHints(true);
   const selected = await checkbox2({
@@ -5130,13 +5227,13 @@ async function interactivePluginUninstall(tool, level) {
     theme: checkboxTheme,
     pageSize: 15
   });
-  const toUninstall = installed.filter((inst) => !selected.includes(inst.id));
+  const toUninstall = installed.filter((inst) => selected.includes(inst.id));
   if (toUninstall.length === 0) {
     logger.info(t("uninstall_nothing_to_uninstall"));
     return;
   }
   const confirmed = await confirm3({
-    message: t("uninstall_confirm_count").replace("{count}", chalk11.bold(String(toUninstall.length))),
+    message: t("uninstall_confirm_prompt").replace("{count}", chalk11.bold(String(toUninstall.length))),
     default: false
   });
   if (!confirmed) {