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

package/README.md

@@ -101,18 +101,18 @@ install-helper install --list                            # 查看所有可用 Sk
 |------|------|
 | `--tool <tool>` | 指定 AI 工具（opencode, claude, trae, cursor, codex, copilot, codearts） |
 | `--level <level>` | 安装级别（project, global），默认 project |
-| `--source <source>` | 同名插件的安装来源（cannbot, skills）：默认 cannbot 仓新代实现优先，`--source skills` 强制安装本仓旧版 |
+| `--source <source>` | 同名插件的安装来源（cannbot, skills）：默认 cannbot 仓插件优先，`--source skills` 强制安装 cannbot-skills 仓旧版 |
 | `--all` `-a` | 安装全部 Skills |
 | `--list` | 按类别列出所有可用 Skills |
 | `--yes` `-y` | 跳过所有确认提示 |
 
-### 安装 cannbot 仓新一代插件（双源）
+### 安装 cannbot 仓插件（双源）
 
-插件编排已拆分至 [cannbot 仓](https://gitcode.com/cann/cannbot)（`ops-direct-invoke` v3、`ascendc-st-design`、`model-infer-optimize`、`ops-registry-invoke` 等新一代插件）。install-helper 以**委托转发**方式兼容其安装方式：自动托管 `@cannbot-plugin/cannbot` 安装器（npm 拉取到 `~/.cannbot/installers/cannbot`，按通道 + TTL 自动刷新），安装时委托其执行，产物布局（`.agents/skills`、标记块 AGENTS.md、`.cannbot/plugins/` 资产、`cannbot-plugin.json` 注册表）与 `npx @cannbot-plugin/cannbot install` 直装**完全一致**。
+插件编排已拆分至 [cannbot 仓](https://gitcode.com/cann/cannbot)（`ops-direct-invoke` v3、`ascendc-st-design`、`model-infer-optimize`、`ops-registry-invoke` 等 cannbot 仓插件）。install-helper 以**委托转发**方式兼容其安装方式：自动托管 `@cannbot-plugin/cannbot` 安装器（npm 拉取到 `~/.cannbot/installers/cannbot`，按通道 + TTL 自动刷新），安装时委托其执行，产物布局（`.agents/skills`、标记块 AGENTS.md、`.cannbot/plugins/` 资产、`cannbot-plugin.json` 注册表）与 `npx @cannbot-plugin/cannbot install` 直装**完全一致**。
 
 ```bash
-install-helper install ops-direct-invoke --tool opencode   # cannbot 新代实现（默认）
-install-helper install ops-direct-invoke --source skills --tool opencode  # 本仓旧版
+install-helper install ops-direct-invoke --tool opencode   # cannbot 仓插件（默认）
+install-helper install ops-direct-invoke --source skills --tool opencode  # cannbot-skills 仓旧版
 install-helper update ops-direct-invoke                    # 更新 = 重新委托安装
 install-helper uninstall ops-direct-invoke                 # 按 cannbot-plugin.json 注册表精确卸载
 ```

package/dist/config/repository.yaml

@@ -28,7 +28,7 @@ pluginDirs:
 
 scanCacheTtlHours: 24
 
-# cannbot 仓（https://gitcode.com/cann/cannbot）新一代插件的安装器托管配置。
+# cannbot 仓（https://gitcode.com/cann/cannbot）插件的安装器托管配置。
 # install-helper 以委托转发方式安装 cannbot 型插件：按通道将
 # @cannbot-plugin/cannbot 安装到 ~/.cannbot/installers/cannbot，
 # 超过 ttlHours 后自动按通道刷新。

package/dist/index.js

@@ -112,6 +112,7 @@ var init_zh_CN = __esm({
       error_skill_not_found: "\u672A\u5728\u6CE8\u518C\u8868\u4E2D\u627E\u5230 Skill",
       error_source_not_found: "\u672A\u627E\u5230\u6E90\u6587\u4EF6: {path}",
       error_script_not_found: "\u672A\u627E\u5230\u5B89\u88C5\u811A\u672C: {path}",
+      error_cannbot_requires_delegation: "\u63D2\u4EF6 {plugin} \u4E3A cannbot \u4ED3\u59D4\u6258\u5B89\u88C5\u6E90\uFF0C\u987B\u7ECF installPluginRouted \u8DEF\u7531\u5B89\u88C5\uFF08\u5185\u90E8\u8DEF\u7531\u9519\u8BEF\uFF0C\u8BF7\u63D0 Issue \u53CD\u9988\uFF09",
       error_unknown: "\u672A\u77E5\u9519\u8BEF",
       error_not_installed: "\u672A\u5B89\u88C5",
       error_no_shell: "\u672A\u627E\u5230 bash \u6216 sh\uFF0C\u65E0\u6CD5\u6267\u884C\u5B89\u88C5\u811A\u672C\u3002\u8BF7\u5B89\u88C5 Git Bash \u6216 WSL",
@@ -363,6 +364,7 @@ var init_en_US = __esm({
       error_skill_not_found: "Skill not found in registry",
       error_source_not_found: "Source not found: {path}",
       error_script_not_found: "Script not found: {path}",
+      error_cannbot_requires_delegation: "Plugin {plugin} is a cannbot-source entry and must be installed via installPluginRouted delegation (internal routing error \u2014 please report an issue)",
       error_unknown: "Unknown error",
       error_not_installed: "Not installed",
       error_no_shell: "bash or sh not found, cannot execute install script. Please install Git Bash or WSL",
@@ -2911,7 +2913,7 @@ function createRepositoryManager(customPath) {
 
 // src/core/cannbot-delegate.ts
 import { existsSync as existsSync17, readFileSync as readFileSync12, writeFileSync as writeFileSync5, copyFileSync as copyFileSync3, unlinkSync as unlinkSync6, readdirSync as readdirSync8 } from "fs";
-import { join as join16, resolve as resolve2 } from "path";
+import { join as join16, resolve as resolve3 } from "path";
 import { execa as execa6 } from "execa";
 
 // src/core/cannbot-installer.ts
@@ -3152,7 +3154,7 @@ async function ensureCannbotDiscovery() {
 
 // src/core/cannbot-registry.ts
 import { existsSync as existsSync13, readFileSync as readFileSync9, readdirSync as readdirSync6, rmSync as rmSync3, rmdirSync, unlinkSync as unlinkSync4, lstatSync as lstatSync2, writeFileSync as writeFileSync3 } from "fs";
-import { join as join12, resolve, sep as sep2, dirname as dirname6 } from "path";
+import { join as join12, resolve as resolve2, sep as sep2, dirname as dirname6 } from "path";
 
 // src/core/record.ts
 init_paths();
@@ -3161,38 +3163,88 @@ init_fs_helpers();
 init_logger();
 init_i18n();
 import { existsSync as existsSync12, mkdirSync as mkdirSync5, readFileSync as readFileSync8, unlinkSync as unlinkSync3, readdirSync as readdirSync5 } from "fs";
-import { join as join11 } from "path";
+import { join as join11, resolve } from "path";
+var LEGACY_LOCATION_KEY = "__legacy__";
 function getInstallsDir() {
   return join11(getCannbotConfigDir(), "installs");
 }
 function getRecordPath(pluginId) {
   return join11(getInstallsDir(), `${pluginId}.json`);
 }
-function readRecord(pluginId) {
+function locationKey(loc) {
+  return `${loc.tool}:${loc.level}:${resolve(loc.installPath)}`;
+}
+function readStore(pluginId) {
   const recordPath = getRecordPath(pluginId);
   if (!existsSync12(recordPath)) {
     return null;
   }
+  let parsed;
   try {
-    const content = readFileSync8(recordPath, "utf-8");
-    return JSON.parse(content);
+    parsed = JSON.parse(readFileSync8(recordPath, "utf-8"));
   } catch {
     logger.warn(t("record_corrupted").replace("{file}", recordPath));
     return null;
   }
+  const store = parsed;
+  if (store && typeof store === "object" && "locations" in store && store.locations) {
+    return { version: 2, locations: store.locations };
+  }
+  const legacy = parsed;
+  if (legacy && typeof legacy === "object" && typeof legacy.pluginId === "string") {
+    const key = legacy.tool && legacy.level && legacy.installPath ? locationKey(legacy) : LEGACY_LOCATION_KEY;
+    return { version: 2, locations: { [key]: legacy } };
+  }
+  logger.warn(t("record_corrupted").replace("{file}", recordPath));
+  return null;
 }
-function writeRecord(record) {
+function writeStore(pluginId, store) {
   const installsDir = getInstallsDir();
   if (!existsSync12(installsDir)) {
     mkdirSync5(installsDir, { recursive: true });
   }
-  const recordPath = getRecordPath(record.pluginId);
-  atomicWriteFileSync(recordPath, JSON.stringify(record, null, 2));
+  atomicWriteFileSync(getRecordPath(pluginId), JSON.stringify(store, null, 2));
 }
-function deleteRecord(pluginId) {
+function readRecords(pluginId) {
+  const store = readStore(pluginId);
+  return store ? Object.values(store.locations) : [];
+}
+var byLatest = (a, b) => (b.installTime || "").localeCompare(a.installTime || "");
+function readRecord(pluginId) {
+  const records = readRecords(pluginId);
+  if (records.length === 0) {
+    return null;
+  }
+  const cwd = resolve(process.cwd());
+  const localMatch = records.filter((r) => r.level === "project" && resolve(r.installPath) === cwd).sort(byLatest);
+  if (localMatch.length > 0) return localMatch[0];
+  const globalMatch = records.filter((r) => r.level === "global").sort(byLatest);
+  if (globalMatch.length > 0) return globalMatch[0];
+  return [...records].sort(byLatest)[0];
+}
+function writeRecord(record) {
+  const store = readStore(record.pluginId) ?? { version: 2, locations: {} };
+  store.locations[locationKey(record)] = record;
+  writeStore(record.pluginId, store);
+}
+function deleteRecord(pluginId, where) {
   const recordPath = getRecordPath(pluginId);
-  if (existsSync12(recordPath)) {
+  if (!existsSync12(recordPath)) {
+    return;
+  }
+  if (!where) {
+    unlinkSync3(recordPath);
+    return;
+  }
+  const store = readStore(pluginId);
+  if (!store) {
+    return;
+  }
+  delete store.locations[locationKey(where)];
+  if (Object.keys(store.locations).length === 0) {
     unlinkSync3(recordPath);
+  } else {
+    writeStore(pluginId, store);
   }
 }
 function scanInstalledFiles(pluginId, displayName, tool, level, installPath, configRoot, manifest, externalRepoNames, configRootConfigLink) {
@@ -3443,7 +3495,7 @@ function toInstalledEntry(target, registryPath, record) {
   };
 }
 function scanCannbotInstalled(target) {
-  const root = resolve(target || process.cwd());
+  const root = resolve2(target || process.cwd());
   const installed = [];
   for (const tool of CANNBOT_SUPPORTED_TOOLS) {
     const result = readCannbotRegistry(root, tool);
@@ -3469,7 +3521,7 @@ function countMarkerBlocks(content, pluginName) {
   return content.split(start).length - 1;
 }
 function removeIfSafe(pathToRemove, allowedBase) {
-  const resolved = resolve(pathToRemove);
+  const resolved = resolve2(pathToRemove);
   if (resolved !== allowedBase && !resolved.startsWith(allowedBase + sep2)) {
     return "skipped";
   }
@@ -3486,8 +3538,8 @@ function removeIfSafe(pathToRemove, allowedBase) {
   }
 }
 function removeEmptyDirUpward(dirPath, stopAt) {
-  let current = resolve(dirPath);
-  const stop = resolve(stopAt);
+  let current = resolve2(dirPath);
+  const stop = resolve2(stopAt);
   let removedAny = false;
   while (current.startsWith(stop + sep2)) {
     try {
@@ -3503,7 +3555,7 @@ function removeEmptyDirUpward(dirPath, stopAt) {
   return removedAny;
 }
 function cleanHookSettings(hookSettingsPath, target, pluginId) {
-  const resolved = resolve(target, hookSettingsPath);
+  const resolved = resolve2(target, hookSettingsPath);
   if (!existsSync13(resolved)) return;
   let settings;
   try {
@@ -3616,7 +3668,7 @@ function uninstallCannbotPlugin(pluginId, target) {
     removedDirs: 0,
     errors: []
   };
-  const root = resolve(target || process.cwd());
+  const root = resolve2(target || process.cwd());
   let read = null;
   let record;
   for (const tool of CANNBOT_SUPPORTED_TOOLS) {
@@ -3650,7 +3702,7 @@ function uninstallCannbotPlugin(pluginId, target) {
   }
   if (record.instructions) {
     const instructionsPath = join12(root, record.instructions);
-    const resolved = resolve(instructionsPath);
+    const resolved = resolve2(instructionsPath);
     if (resolved.startsWith(allowedBase + sep2) && existsSync13(resolved)) {
       try {
         const content = readFileSync9(resolved, "utf-8");
@@ -3734,16 +3786,21 @@ function uninstallCannbotPlugin(pluginId, target) {
 }
 function findOrphanedDelegatedRecords(target) {
   const orphans = [];
-  const installed = new Set(scanCannbotInstalled(target).map((e) => e.id));
   const installsDir = join12(getCannbotConfigDir(), "installs");
   if (!existsSync13(installsDir)) return orphans;
   for (const file of readdirSync6(installsDir)) {
     if (!file.endsWith(".json") || file === "skills.json") continue;
     const pluginId = file.replace(/\.json$/, "");
     try {
-      const rec = JSON.parse(readFileSync9(join12(installsDir, file), "utf-8"));
-      if (rec?.kind !== "delegated") continue;
-      if (!installed.has(pluginId)) {
+      const records = readRecords(pluginId);
+      const delegated = records.filter((r) => r?.kind === "delegated");
+      if (delegated.length === 0) continue;
+      const isOrphan = delegated.some((rec) => {
+        const recTarget = rec.installPath || target;
+        const installedThere = new Set(scanCannbotInstalled(recTarget).map((e) => e.id));
+        return !installedThere.has(pluginId);
+      });
+      if (isOrphan) {
         orphans.push(pluginId);
       }
     } catch {
@@ -3757,7 +3814,7 @@ init_registry();
 init_manifest();
 init_paths();
 import { existsSync as existsSync16, readFileSync as readFileSync11 } from "fs";
-import { join as join15, basename as basename2 } from "path";
+import { join as join15, basename as basename2, isAbsolute } from "path";
 import { execa as execa5, execaSync as execaSync2 } from "execa";
 
 // src/core/backup.ts
@@ -3884,10 +3941,7 @@ function readAllRecords() {
   const records = [];
   const plugins = getAllPlugins();
   for (const plugin of plugins) {
-    const record = readRecord(plugin.id);
-    if (record) {
-      records.push(record);
-    }
+    records.push(...readRecords(plugin.id));
   }
   return records;
 }
@@ -4281,7 +4335,7 @@ function scriptSupportsTool(scriptPath, tool) {
   }
 }
 async function installPlugin(opts) {
-  const plugin = getPluginById(opts.pluginId);
+  const plugin = opts.plugin ?? getPluginById(opts.pluginId);
   if (!plugin) {
     return {
       success: false,
@@ -4292,7 +4346,17 @@ async function installPlugin(opts) {
       warnings: []
     };
   }
-  const pluginDir = join15(opts.repoPath, plugin.dir);
+  if (plugin.source === "cannbot") {
+    return {
+      success: false,
+      pluginId: opts.pluginId,
+      skillsCount: 0,
+      agentsCount: 0,
+      errors: [t("error_cannbot_requires_delegation").replace("{plugin}", plugin.displayName)],
+      warnings: []
+    };
+  }
+  const pluginDir = isAbsolute(plugin.dir) ? plugin.dir : join15(opts.repoPath, plugin.dir);
   const cwd = opts.installPath || process.cwd();
   const configRoot = getConfigRoot(opts.tool, opts.level, opts.installPath);
   const agentsFile = join15(configRoot, getAgentsFileName(opts.tool));
@@ -4586,7 +4650,7 @@ function installerSupportsBundledFlag() {
 }
 async function delegateInstall(options) {
   const { pluginId, tool, level } = options;
-  const target = resolve2(options.target || process.cwd());
+  const target = resolve3(options.target || process.cwd());
   const displayName = options.displayName || pluginId;
   const result = {
     success: false,
@@ -4713,7 +4777,7 @@ init_constants();
 init_logger();
 init_i18n();
 import { existsSync as existsSync18, mkdirSync as mkdirSync7, symlinkSync as symlinkSync2, readdirSync as readdirSync9, rmSync as rmSync5, realpathSync as realpathSync2, readlinkSync as readlinkSync2, cpSync as cpSync2 } from "fs";
-import { join as join17, dirname as dirname7, basename as basename3, isAbsolute } from "path";
+import { join as join17, dirname as dirname7, basename as basename3, isAbsolute as isAbsolute2 } from "path";
 import { select as select3, checkbox, Separator as Separator2 } from "@inquirer/prompts";
 import chalk5 from "chalk";
 import Table from "cli-table3";
@@ -5232,7 +5296,7 @@ function listAllSkills() {
 }
 function resolveSkillSourcePath(skill, repoPath) {
   if (skill.filePath) {
-    const absPath = isAbsolute(skill.filePath) ? skill.filePath : join17(repoPath, skill.filePath);
+    const absPath = isAbsolute2(skill.filePath) ? skill.filePath : join17(repoPath, skill.filePath);
     if (existsSync18(absPath)) {
       return dirname7(absPath);
     }
@@ -5319,7 +5383,9 @@ function printEnhancedSummary(results, tool, configRoot) {
     ""
   ];
   if (successResults.length === 1) {
-    const plugin = findPlugin(successResults[0].pluginId);
+    const plugin = findPlugin(successResults[0].pluginId, {
+      source: successResults[0].source
+    });
     const docsPath = plugin ? `${plugin.dir}/quickstart.md` : `${successResults[0].pluginId}/quickstart.md`;
     lines.push(
       `  ${chalk6.dim(t("install_enhanced_docs"))}: ${chalk6.dim(docsPath)}`
@@ -5487,7 +5553,8 @@ async function pluginInstallFlow() {
     displayName: selected[index]?.plugin?.displayName || result.pluginId,
     success: result.success,
     skillsCount: result.skillsCount,
-    agentsCount: result.agentsCount
+    agentsCount: result.agentsCount,
+    source: selected[index]?.source
   }));
   printInstallSummary(summary);
   const configRoot = getConfigRoot(answers.tool, answers.level);
@@ -6087,6 +6154,9 @@ async function installCommand(names, options) {
           logger.info(`${t("install_to")}: ${chalk10.cyan(getSkillsRoot(tool2, level2))}`);
           logger.info(`${t("start_to_use").replace("{tool}", chalk10.green(tool2))}`);
           logger.blank();
+          if (failCount > 0) {
+            process.exitCode = 1;
+          }
           return;
         }
       }
@@ -6123,6 +6193,7 @@ async function installCommand(names, options) {
       logger.step(`  ${p.id}${badge} (${p.aliases.join(", ")})`);
     }
     logger.info(`${t("available_skills")}: ${chalk10.cyan("install-helper install --list")}`);
+    process.exitCode = 1;
     return;
   }
   let tool;
@@ -6176,7 +6247,6 @@ async function installCommand(names, options) {
         spinner.fail(t("repo_clone_failed").replace("{error}", error instanceof Error ? error.message : t("error_unknown")).replace("{url}", "").replace("{dir}", ""));
         return;
       }
-      const allPlugins = getAllPlugins();
       const results = await installPlugins(
         pluginsToInstall,
         tool,
@@ -6187,17 +6257,21 @@ async function installCommand(names, options) {
         source
       );
       const summary = results.map((result) => {
-        const plugin = allPlugins.find((p) => p.id === result.pluginId);
+        const plugin = findPlugin(result.pluginId, { source });
         return {
           pluginId: result.pluginId,
           displayName: plugin?.displayName || result.pluginId,
           success: result.success,
           skillsCount: result.skillsCount,
-          agentsCount: result.agentsCount
+          agentsCount: result.agentsCount,
+          source: plugin?.source
         };
       });
       printInstallSummary(summary);
       printEnhancedSummary(summary, tool, configRoot);
+      if (results.some((r) => !r.success)) {
+        process.exitCode = 1;
+      }
     }
   }
   if (skills.length > 0) {
@@ -6234,6 +6308,9 @@ async function installCommand(names, options) {
     logger.info(`${t("install_to")}: ${chalk10.cyan(getSkillsRoot(tool, level))}`);
     logger.info(`${t("start_to_use").replace("{tool}", chalk10.green(tool))}`);
     logger.blank();
+    if (failCount > 0) {
+      process.exitCode = 1;
+    }
   }
 }
 async function installPlugins(pluginIds, tool, level, repoPath, installPath, yes, source) {
@@ -6274,7 +6351,7 @@ async function installPlugins(pluginIds, tool, level, repoPath, installPath, yes
 // src/commands/uninstall.ts
 init_registry();
 import { existsSync as existsSync21, unlinkSync as unlinkSync8, rmdirSync as rmdirSync2, readdirSync as readdirSync11, readFileSync as readFileSync15 } from "fs";
-import { resolve as resolve3, basename as basename4, sep as sep3, join as join20 } from "path";
+import { resolve as resolve4, basename as basename4, sep as sep3, join as join20 } from "path";
 import chalk11 from "chalk";
 import { select as select5, checkbox as checkbox2, Separator as Separator4, confirm as confirm3 } from "@inquirer/prompts";
 init_config();
@@ -6674,13 +6751,13 @@ async function uninstallPluginById(pluginId, batchMode) {
     return;
   }
   logger.info(`${t("uninstall_in_progress")} ${plugin.displayName}...`);
-  const configRoot = getConfigRoot(record.tool, record.level);
-  const allowedBases = [resolve3(configRoot), resolve3(record.installPath)];
+  const configRoot = record.configRoot;
+  const allowedBases = [resolve4(configRoot), resolve4(record.installPath)];
   if (record.tool === "codex") {
-    allowedBases.push(resolve3(getSkillsRoot(record.tool, record.level, record.installPath)));
+    allowedBases.push(resolve4(getSkillsRoot(record.tool, record.level, record.installPath)));
   }
   const isSafePath = (p) => {
-    const resolved = resolve3(p);
+    const resolved = resolve4(p);
     return allowedBases.some((base) => resolved === base || resolved.startsWith(base + sep3));
   };
   let removedFiles = 0;
@@ -6708,7 +6785,7 @@ async function uninstallPluginById(pluginId, batchMode) {
   const sortedDirs = [...record.directories].filter(isSafePath).sort((a, b) => b.length - a.length);
   for (const dirPath of sortedDirs) {
     try {
-      if (resolve3(dirPath) === resolve3(configRoot)) {
+      if (resolve4(dirPath) === resolve4(configRoot)) {
         continue;
       }
       if (existsSync21(dirPath)) {
@@ -6725,7 +6802,7 @@ async function uninstallPluginById(pluginId, batchMode) {
   }
   if (record.tool === "codex") {
     try {
-      const agentsRoot = resolve3(getSkillsRoot(record.tool, record.level, record.installPath), "..");
+      const agentsRoot = resolve4(getSkillsRoot(record.tool, record.level, record.installPath), "..");
       if (existsSync21(agentsRoot) && readdirSync11(agentsRoot).length === 0) {
         rmdirSync2(agentsRoot);
         logger.step(`  ${t("uninstall_clean_empty_dir")}: ${basename4(agentsRoot)}/`);
@@ -6734,7 +6811,11 @@ async function uninstallPluginById(pluginId, batchMode) {
     } catch {
     }
   }
-  deleteRecord(plugin.id);
+  deleteRecord(plugin.id, {
+    tool: record.tool,
+    level: record.level,
+    installPath: record.installPath
+  });
   removeInstalledPlugin(plugin.id);
   const backups = findBackups(configRoot);
   const otherBackups = backups.filter((b) => b.pluginId !== pluginId);