@cannbot-ai/install-helper 0.0.2-beta.55 → 0.0.2-beta.57

package/bin/install-helper.js

@@ -33,7 +33,7 @@ if (pkgName) {
     const binaryPath = join(dirname(pkgPath), binaryName);
     if (existsSync(binaryPath)) {
       const child = spawn(binaryPath, args, { stdio: "inherit" });
-      child.on("exit", (code) => process.exit(code || 0));
+      child.on("exit", (code, signal) => { process.exit(code ?? (signal ? 1 : 0)); });
       child.on("error", () => runJSFallback());
       return;
     }
@@ -46,7 +46,7 @@ function runJSFallback() {
   const jsPath = join(__dirname, "..", "dist", "index.js");
   if (existsSync(jsPath)) {
     const child = spawn(process.execPath, [jsPath, ...args], { stdio: "inherit" });
-    child.on("exit", (code) => process.exit(code || 0));
+    child.on("exit", (code, signal) => { process.exit(code ?? (signal ? 1 : 0)); });
     child.on("error", () => {
       console.error("install-helper: failed to run");
       process.exit(1);

package/dist/index.js

@@ -88,6 +88,7 @@ var zh_CN_default = {
   error_script_not_found: "\u672A\u627E\u5230\u5B89\u88C5\u811A\u672C: {path}",
   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",
   error_symlink_windows: "\u521B\u5EFA\u7B26\u53F7\u94FE\u63A5\u5931\u8D25\uFF0C\u8BF7\u4EE5\u7BA1\u7406\u5458\u8EAB\u4EFD\u8FD0\u884C\u6216\u5F00\u542F Windows \u5F00\u53D1\u8005\u6A21\u5F0F",
   quick_start: "\u542F\u52A8\u547D\u4EE4",
   quick_start_hint: "\u8BD5\u8BD5\u8F93\u5165: \u5E2E\u6211\u5F00\u53D1\u4E00\u4E2A Abs \u7B97\u5B50",
@@ -270,6 +271,7 @@ var en_US_default = {
   error_script_not_found: "Script not found: {path}",
   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",
   error_symlink_windows: "Failed to create symlink, please run as administrator or enable Windows Developer Mode",
   quick_start: "Launch command",
   quick_start_hint: "Try: help me develop an Abs operator",
@@ -2269,8 +2271,10 @@ function loadRepoUrl() {
 var REPO_URL = loadRepoUrl();
 var RepositoryManager = class {
   repoPath;
+  customPath;
   constructor(customPath) {
     this.repoPath = customPath;
+    this.customPath = customPath;
   }
   async ensureRepo() {
     if (this.repoPath && this.isValidRepo(this.repoPath)) {
@@ -2296,7 +2300,10 @@ var RepositoryManager = class {
   }
   async ensureRepoAndScan() {
     const repoPath = await this.ensureRepo();
-    await this.updateRepo();
+    const isUserProvided = !!this.customPath || !!process.env.CANNBOT_REPO_PATH;
+    if (!isUserProvided) {
+      await this.updateRepo();
+    }
     mergeDynamicPlugins(repoPath);
     const cache = readScanCache();
     if (cache && cache.repoCommit === getCurrentCommit(repoPath)) {
@@ -2366,8 +2373,8 @@ function createRepositoryManager(customPath) {
 
 // src/core/installer.ts
 import { existsSync as existsSync13 } from "fs";
-import { join as join12 } from "path";
-import { execa as execa4 } from "execa";
+import { join as join12, basename as basename2 } from "path";
+import { execa as execa4, execaSync } from "execa";
 
 // src/core/record.ts
 import { existsSync as existsSync10, mkdirSync as mkdirSync4, readFileSync as readFileSync7, unlinkSync as unlinkSync2 } from "fs";
@@ -2405,7 +2412,7 @@ function deleteRecord(pluginId) {
     unlinkSync2(recordPath);
   }
 }
-function scanInstalledFiles(pluginId, displayName, tool, level, installPath, configRoot, manifest) {
+function scanInstalledFiles(pluginId, displayName, tool, level, installPath, configRoot, manifest, externalRepoNames) {
   const files = [];
   const directories = [];
   if (manifest) {
@@ -2450,7 +2457,7 @@ function scanInstalledFiles(pluginId, displayName, tool, level, installPath, con
   if (existsSync10(configFilePath)) {
     files.push(configFilePath);
   }
-  const repoLinks = ["asc-devkit", "pypto", "tilelang-ascend", "cann-recipes-infer", "cann-samples"];
+  const repoLinks = externalRepoNames && externalRepoNames.length > 0 ? externalRepoNames : ["asc-devkit", "pypto", "tilelang-ascend", "cann-recipes-infer", "cann-samples"];
   for (const repoName of repoLinks) {
     const repoLinkPath = join9(installPath, repoName);
     if (isSymlink(repoLinkPath)) {
@@ -2700,7 +2707,7 @@ async function showRestorePrompt(backups) {
 }
 
 // src/core/plugin-installer.ts
-import { existsSync as existsSync12, mkdirSync as mkdirSync5, symlinkSync, unlinkSync as unlinkSync4, realpathSync, copyFileSync as copyFileSync2, cpSync, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync12, mkdirSync as mkdirSync5, symlinkSync, unlinkSync as unlinkSync4, realpathSync, copyFileSync as copyFileSync2, cpSync, writeFileSync as writeFileSync3, rmSync } from "fs";
 import { join as join11, basename } from "path";
 import { execa as execa3 } from "execa";
 function installLink(source, target) {
@@ -2734,17 +2741,22 @@ function installConfigFile(pluginDir, configFile, tool, level, configRoot, insta
   } else {
     primaryTarget = join11(configRoot, agentsFileName);
   }
-  if (existsSync12(primaryTarget) || isSymlink(primaryTarget)) {
-    unlinkSync4(primaryTarget);
-  }
   try {
-    symlinkSync(realpathSync(sourcePath), primaryTarget);
-  } catch (e) {
-    if (e.code === "EPERM") {
-      copyFileSync2(sourcePath, primaryTarget);
-    } else {
-      throw e;
+    const resolvedSource = realpathSync(sourcePath);
+    if (existsSync12(primaryTarget) || isSymlink(primaryTarget)) {
+      unlinkSync4(primaryTarget);
+    }
+    try {
+      symlinkSync(resolvedSource, primaryTarget);
+    } catch (e) {
+      if (e.code === "EPERM") {
+        copyFileSync2(sourcePath, primaryTarget);
+      } else {
+        throw e;
+      }
     }
+  } catch (e) {
+    logger.warn(`  Failed to install config file: ${e.message}`);
   }
   if (isProjectLevel && primaryTarget !== join11(configRoot, agentsFileName)) {
     if (configRootConfigLink === false) return;
@@ -2778,6 +2790,10 @@ async function installExternalRepos(repos, repoPath, configRoot, installPath, le
         await execa3("git", args, { timeout: 12e4 });
       } catch {
         logger.warn(`  git clone failed: ${repo.url}, clone manually: git clone ${repo.url} ${repo.dir}`);
+        try {
+          rmSync(targetDir, { recursive: true, force: true });
+        } catch {
+        }
         continue;
       }
     }
@@ -2936,6 +2952,18 @@ async function installViaManifest(plugin, repoPath, tool, level, installPath) {
 }
 
 // src/core/installer.ts
+function findShell() {
+  const candidates = process.platform === "win32" ? ["bash", "sh"] : ["bash", "sh"];
+  for (const cmd of candidates) {
+    try {
+      const detectCmd = process.platform === "win32" ? "where" : "which";
+      execaSync(detectCmd, [cmd], { timeout: 3e3 });
+      return cmd;
+    } catch {
+    }
+  }
+  return null;
+}
 async function installPlugin(opts) {
   const plugin = getPluginById(opts.pluginId);
   if (!plugin) {
@@ -3011,7 +3039,8 @@ async function installPlugin(opts) {
           opts.level,
           cwd,
           configRoot,
-          result.manifest
+          result.manifest,
+          plugin.externalRepos?.map((r) => basename2(r.dir))
         );
         if (backupInfo) {
           record.backup = {
@@ -3060,7 +3089,17 @@ async function installPlugin(opts) {
     args.push(opts.installPath);
   }
   try {
-    const shell = process.platform === "win32" ? "sh" : "bash";
+    const shell = findShell();
+    if (!shell) {
+      return {
+        success: false,
+        pluginId: opts.pluginId,
+        skillsCount: 0,
+        agentsCount: 0,
+        errors: [t("error_no_shell")],
+        warnings: []
+      };
+    }
     const execOptions = {
       cwd,
       timeout: 3e5,
@@ -3086,7 +3125,8 @@ async function installPlugin(opts) {
         opts.level,
         cwd,
         configRoot,
-        manifest
+        manifest,
+        plugin.externalRepos?.map((r) => basename2(r.dir))
       );
       if (backupInfo) {
         record.backup = {
@@ -4191,7 +4231,7 @@ async function installPlugins(pluginIds, tool, level, repoPath, installPath, yes
 
 // src/commands/uninstall.ts
 import { existsSync as existsSync17, unlinkSync as unlinkSync7, rmdirSync as rmdirSync2, readdirSync as readdirSync6 } from "fs";
-import { resolve, basename as basename2 } from "path";
+import { resolve, basename as basename3, sep } from "path";
 import chalk11 from "chalk";
 async function uninstallCommand(names, options) {
   const tool = options.tool ? validateTool(options.tool) : "opencode";
@@ -4225,7 +4265,7 @@ async function uninstallCommand(names, options) {
     const allowedBases = [resolve(configRoot), resolve(record.installPath)];
     const isSafePath = (p) => {
       const resolved = resolve(p);
-      return allowedBases.some((base) => resolved === base || resolved.startsWith(base + "/"));
+      return allowedBases.some((base) => resolved === base || resolved.startsWith(base + sep));
     };
     let removedFiles = 0;
     let removedDirs = 0;
@@ -4234,7 +4274,7 @@ async function uninstallCommand(names, options) {
       try {
         if (existsSync17(filePath) || isSymlink(filePath)) {
           unlinkSync7(filePath);
-          const name = basename2(filePath);
+          const name = basename3(filePath);
           logger.step(`  ${t("uninstall_remove_label")}: ${name}`);
           removedFiles++;
         }
@@ -4251,7 +4291,7 @@ async function uninstallCommand(names, options) {
           const entries = readdirSync6(dirPath);
           if (entries.length === 0) {
             rmdirSync2(dirPath);
-            const name = basename2(dirPath);
+            const name = basename3(dirPath);
             logger.step(`  ${t("uninstall_clean_empty_dir")}: ${name}/`);
             removedDirs++;
           }
@@ -4553,7 +4593,7 @@ function handleExit(error) {
 }
 process.on("SIGINT", () => {
   console.log("\n" + t("init_cancelled"));
-  process.exit(0);
+  process.exit(130);
 });
 process.on("uncaughtException", (error) => {
   handleExit(error);