@cannbot-ai/install-helper 1.2.0-beta.1 → 1.2.0-beta.3

package/dist/index.js

@@ -2081,6 +2081,8 @@ var init_constants = __esm({
 // src/ui/wizard.ts
 var wizard_exports = {};
 __export(wizard_exports, {
+  decodePluginChoice: () => decodePluginChoice,
+  encodePluginChoice: () => encodePluginChoice,
   runWizard: () => runWizard,
   selectToolWithDetection: () => selectToolWithDetection,
   stepLevel: () => stepLevel
@@ -2099,6 +2101,14 @@ async function selectToolWithDetection() {
   if (result === CANCEL) return "cancel";
   return result;
 }
+function encodePluginChoice(id, source) {
+  return source === "cannbot" ? `cannbot::${id}` : `skills::${id}`;
+}
+function decodePluginChoice(value) {
+  if (value.startsWith("cannbot::")) return { id: value.slice("cannbot::".length), source: "cannbot" };
+  if (value.startsWith("skills::")) return { id: value.slice("skills::".length), source: "skills" };
+  return { id: value, source: "skills" };
+}
 async function runWizard() {
   const config = readConfig();
   logger.blank();
@@ -2273,7 +2283,7 @@ async function stepPlugins(tool, level) {
     const badge = p.source === "cannbot" ? chalk3.magenta(" [cannbot]") : "";
     return {
       name: `> ${chalk3.cyan(p.displayName)}${badge}${suffix}`,
-      value: p.id,
+      value: encodePluginChoice(p.id, p.source),
       description: p.description
     };
   });
@@ -2295,7 +2305,10 @@ async function stepPlugins(tool, level) {
 async function stepConfirm(tool, level, plugins) {
   printBoxTitle(t("wizard_step_4_title"));
   const allPlugins = getAllPlugins();
-  const selectedPlugins = plugins.map((id) => allPlugins.find((p) => p.id === id));
+  const selectedPlugins = plugins.map((value) => {
+    const { id, source } = decodePluginChoice(value);
+    return allPlugins.find((p) => p.id === id && (p.source ?? "skills") === source);
+  });
   const displayPath = getConfigRoot(tool, level);
   const toolName = getToolDisplayName(tool);
   const levelText = level === "project" ? "project" : "global";
@@ -4563,6 +4576,14 @@ async function runDelegate(args, target) {
     };
   }
 }
+function installerSupportsBundledFlag() {
+  try {
+    const binSource = readFileSync12(getCannbotBinPath(), "utf-8");
+    return binSource.includes('"--bundled"');
+  } catch {
+    return false;
+  }
+}
 async function delegateInstall(options) {
   const { pluginId, tool, level } = options;
   const target = resolve2(options.target || process.cwd());
@@ -4606,7 +4627,7 @@ async function delegateInstall(options) {
   }
   result.warnings.push(...migrateSymlinkedInstructions(target, tool));
   let run = await runDelegate(["install", pluginId, "--tool", tool, "--target", target], target);
-  const hitRenameGap = !run.ok && (run.stdout.includes(`plugin not found: ${pluginId}`) || run.stderr.includes(`plugin not found: ${pluginId}`));
+  const hitRenameGap = !run.ok && installerSupportsBundledFlag() && (run.stdout.includes(`plugin not found: ${pluginId}`) || run.stderr.includes(`plugin not found: ${pluginId}`));
   if (hitRenameGap) {
     result.warnings.push(t("cannbot_bundled_fallback"));
     run = await runDelegate(
@@ -4668,7 +4689,7 @@ async function delegateInstall(options) {
   return result;
 }
 async function installPluginRouted(options) {
-  const isCannbot = options.source === "cannbot" || options.plugin?.source === "cannbot";
+  const isCannbot = options.source === "cannbot" || options.source !== "skills" && options.plugin?.source === "cannbot";
   if (isCannbot) {
     return delegateInstall({
       pluginId: options.pluginId,
@@ -5420,14 +5441,20 @@ async function pluginInstallFlow() {
     return "done";
   }
   const allPlugins = getAllPlugins();
-  const selectedPlugins = answers.plugins.map(
-    (id) => allPlugins.find((p) => p.id === id)
-  );
+  const selected = answers.plugins.map((value) => {
+    const { id, source } = decodePluginChoice(value);
+    return {
+      id,
+      source,
+      plugin: allPlugins.find((p) => p.id === id && (p.source ?? "skills") === source)
+    };
+  });
   const total = answers.plugins.length;
   const results = [];
-  for (let i = 0; i < answers.plugins.length; i++) {
-    const pluginId = answers.plugins[i];
-    const plugin = selectedPlugins[i];
+  for (let i = 0; i < selected.length; i++) {
+    const pluginId = selected[i].id;
+    const source = selected[i].source;
+    const plugin = selected[i].plugin;
     const displayName = plugin?.displayName || pluginId;
     const progress = `[${i + 1}/${total}]`;
     const pluginSpinner = createSpinner(`${progress} ${t("install_progress")} ${displayName}...`);
@@ -5437,7 +5464,8 @@ async function pluginInstallFlow() {
       tool: answers.tool,
       level: answers.level,
       repoPath,
-      plugin
+      plugin,
+      source
     });
     if (result.success) {
       pluginSpinner.succeed(
@@ -5456,7 +5484,7 @@ async function pluginInstallFlow() {
   }
   const summary = results.map((result, index) => ({
     pluginId: result.pluginId,
-    displayName: selectedPlugins[index]?.displayName || result.pluginId,
+    displayName: selected[index]?.plugin?.displayName || result.pluginId,
     success: result.success,
     skillsCount: result.skillsCount,
     agentsCount: result.agentsCount
@@ -6216,7 +6244,7 @@ async function installPlugins(pluginIds, tool, level, repoPath, installPath, yes
     const progress = `[${i + 1}/${total}]`;
     const spinner = createSpinner(`${progress} ${t("install_progress")} ${pluginId}...`);
     spinner.start();
-    const plugin = findPlugin(pluginId);
+    const plugin = findPlugin(pluginId, { source });
     const result = await installPluginRouted({
       pluginId,
       tool,
@@ -6796,12 +6824,13 @@ async function updateCommand(pluginNames, options) {
     }
     for (const name of pluginNames) {
       const cannbotMatches = cannbotInstalled.filter((e) => e.id === name);
-      const plugin = findPlugin(name);
-      if (cannbotMatches.length === 0 && !plugin) {
+      const legacyPlugin = findPlugin(name, { source: "skills" });
+      const anyPlugin = findPlugin(name);
+      if (cannbotMatches.length === 0 && !legacyPlugin && !anyPlugin) {
         logger.error(`${t("error_plugin_not_found")}: ${name}`);
         continue;
       }
-      const legacyMatches = cannbotMatches.length === 0 && plugin && plugin.source !== "cannbot" ? installed.filter((p) => p.id === plugin.id) : [];
+      const legacyMatches = cannbotMatches.length === 0 && legacyPlugin ? installed.filter((p) => p.id === legacyPlugin.id) : [];
       const matches = [
         ...cannbotMatches.map((e) => ({ pluginId: e.id, tool: e.tool, level: "project", source: "cannbot" })),
         ...legacyMatches.map((p) => ({ pluginId: p.id, tool: p.tool, level: p.level, source: "skills" }))
@@ -6813,7 +6842,8 @@ async function updateCommand(pluginNames, options) {
           targets.push(match);
         }
       } else {
-        logger.warn(`${plugin?.displayName || name} ${t("error_not_installed")}, ${t("update_skipped")}`);
+        const displayName = cannbotMatches.length ? cannbotMatches[0].id : legacyPlugin?.displayName || anyPlugin?.displayName || name;
+        logger.warn(`${displayName} ${t("error_not_installed")}, ${t("update_skipped")}`);
       }
     }
   }
@@ -6833,12 +6863,11 @@ async function updateCommand(pluginNames, options) {
       );
     }
   }
-  const allPlugins = getAllPlugins();
   const results = [];
   const total = targets.length;
   for (let i = 0; i < targets.length; i++) {
     const target = targets[i];
-    const plugin = allPlugins.find((p) => p.id === target.pluginId);
+    const plugin = findPlugin(target.pluginId, { source: target.source });
     const displayName = plugin?.displayName || target.pluginId;
     const progress = `[${i + 1}/${total}]`;
     const pluginSpinner = createSpinner(`${progress} ${t("update_updating")} ${displayName}...`);
@@ -6866,8 +6895,9 @@ async function updateCommand(pluginNames, options) {
     }
     results.push(result);
   }
-  const summary = results.map((result) => {
-    const plugin = allPlugins.find((p) => p.id === result.pluginId);
+  const summary = results.map((result, index) => {
+    const source = targets[index]?.source;
+    const plugin = source ? findPlugin(result.pluginId, { source }) : void 0;
     return {
       pluginId: result.pluginId,
       displayName: plugin?.displayName || result.pluginId,