@42ailab/42plugin 0.3.2 → 0.3.5

package/bin/42plugin-repair

@@ -5,11 +5,15 @@
  * 用于修复常见的安装问题，特别是 Windows 平台
  */
 
-const { platform, arch, env } = process;
+const { platform, arch, env, argv } = process;
 const { execSync } = require("child_process");
 const { existsSync, rmSync, writeFileSync } = require("fs");
 const { join, isAbsolute } = require("path");
 
+// 解析命令行参数
+const uninstallOnly = argv.includes("--uninstall-only") || argv.includes("--remove");
+const packages = ["@42ailab/42plugin", `@42ailab/42plugin-${platform}-${arch}`];
+
 // 颜色输出
 const colors = {
   reset: "\x1b[0m",
@@ -65,7 +69,11 @@ function detectPackageManager() {
 }
 
 async function repair() {
-  log("\n🔧 42plugin 自动修复工具", "cyan");
+  if (uninstallOnly) {
+    log("\n🗑️  42plugin 卸载工具", "cyan");
+  } else {
+    log("\n🔧 42plugin 自动修复工具", "cyan");
+  }
   log("=" .repeat(40), "cyan");
 
   const packageManager = detectPackageManager();
@@ -99,26 +107,31 @@ async function repair() {
     log(`   ⚠️  缓存清理失败: ${error.message}`, "yellow");
   }
 
-  // Step 2: 卸载旧版本
-  log("\n步骤 2: 卸载旧版本...", "yellow");
-  try {
-    switch (packageManager) {
-      case "npm":
-        execSync("npm uninstall -g @42ailab/42plugin", { stdio: "inherit" });
-        break;
-      case "bun":
-        execSync("bun remove -g @42ailab/42plugin", { stdio: "inherit" });
-        break;
-      case "yarn":
-        execSync("yarn global remove @42ailab/42plugin", { stdio: "inherit" });
-        break;
-      case "pnpm":
-        execSync("pnpm remove -g @42ailab/42plugin", { stdio: "inherit" });
-        break;
+  // Step 2: 从所有包管理器卸载旧版本（确保彻底清理）
+  log("\n步骤 2: 从所有包管理器卸载旧版本...", "yellow");
+
+  const uninstallCommands = {
+    npm: (pkg) => `npm uninstall -g ${pkg}`,
+    bun: (pkg) => `bun remove -g ${pkg}`,
+    yarn: (pkg) => `yarn global remove ${pkg}`,
+    pnpm: (pkg) => `pnpm remove -g ${pkg}`,
+  };
+
+  let anyUninstalled = false;
+  for (const [pm, getCmd] of Object.entries(uninstallCommands)) {
+    for (const pkg of packages) {
+      try {
+        execSync(getCmd(pkg), { stdio: "pipe" });
+        log(`   ✅ [${pm}] ${pkg} 卸载完成`, "green");
+        anyUninstalled = true;
+      } catch {
+        // 未安装或 PM 不可用，静默跳过
+      }
     }
-    log("   ✅ 旧版本卸载完成", "green");
-  } catch (error) {
-    log("   ⚠️  未找到已安装的版本", "yellow");
+  }
+
+  if (!anyUninstalled) {
+    log("   ℹ️  未找到通过包管理器安装的版本", "yellow");
   }
 
   // Step 3: Windows 特殊处理
@@ -128,8 +141,17 @@ async function repair() {
     // 清理可能损坏的全局 node_modules（仅清理 42plugin 相关目录）
     const globalPaths = [];
 
+    // 获取 npm 实际全局 prefix（用户可能修改了默认路径）
+    let npmPrefix = null;
+    try {
+      npmPrefix = execSync("npm config get prefix", { encoding: "utf-8", stdio: "pipe" }).trim();
+    } catch {}
+
     // 安全地构建路径，确保环境变量存在且路径为绝对路径
-    if (env.APPDATA && isAbsolute(env.APPDATA)) {
+    if (npmPrefix && isAbsolute(npmPrefix)) {
+      globalPaths.push(join(npmPrefix, "node_modules", "@42ailab", "42plugin"));
+      globalPaths.push(join(npmPrefix, "node_modules", "@42ailab", "42plugin-win32-x64"));
+    } else if (env.APPDATA && isAbsolute(env.APPDATA)) {
       globalPaths.push(join(env.APPDATA, "npm", "node_modules", "@42ailab", "42plugin"));
       globalPaths.push(join(env.APPDATA, "npm", "node_modules", "@42ailab", "42plugin-win32-x64"));
     }
@@ -156,11 +178,45 @@ async function repair() {
       }
     }
 
-    // 检查并关闭可能占用文件的防病毒软件提示
-    log("\n   💡 提示: 如果安装仍然失败，请尝试:", "yellow");
-    log("      1. 暂时禁用 Windows Defender 或其他防病毒软件", "yellow");
-    log("      2. 以管理员身份运行命令提示符", "yellow");
-    log("      3. 检查代理设置: npm config get proxy", "yellow");
+    // 清理 bun bin 目录中的 42plugin 相关文件
+    // bun remove 不会自动删除 ~/.bun/bin/ 下的 .exe 和 .bunx 文件
+    if (env.USERPROFILE && isAbsolute(env.USERPROFILE)) {
+      const bunBinDir = join(env.USERPROFILE, ".bun", "bin");
+      const bunBinFiles = [
+        join(bunBinDir, "42plugin.exe"),
+        join(bunBinDir, "42plugin.bunx"),
+        join(bunBinDir, "42plugin-repair.exe"),
+        join(bunBinDir, "42plugin-repair.bunx"),
+      ];
+      for (const filePath of bunBinFiles) {
+        if (existsSync(filePath)) {
+          log(`   清理 ${filePath}...`, "blue");
+          try {
+            rmSync(filePath, { force: true });
+            log(`   ✅ 清理完成`, "green");
+          } catch (error) {
+            log(`   ⚠️  清理失败: ${error.message}`, "yellow");
+          }
+        }
+      }
+    }
+
+    if (!uninstallOnly) {
+      // 检查并关闭可能占用文件的防病毒软件提示
+      log("\n   💡 提示: 如果安装仍然失败，请尝试:", "yellow");
+      log("      1. 暂时禁用 Windows Defender 或其他防病毒软件", "yellow");
+      log("      2. 以管理员身份运行命令提示符", "yellow");
+      log("      3. 检查代理设置: npm config get proxy", "yellow");
+    }
+  }
+
+  // 仅卸载模式：跳过重新安装和验证
+  if (uninstallOnly) {
+    log("\n✅ 42plugin 已彻底卸载。", "green");
+    log("   如需重新安装，请运行:", "blue");
+    log("   npm install -g @42ailab/42plugin", "blue");
+    log("   或: bun add -g @42ailab/42plugin", "blue");
+    return;
   }
 
   // Step 4: 重新安装

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@42ailab/42plugin",
-  "version": "0.3.2",
+  "version": "0.3.5",
   "description": "42plugin CLI - AI 插件管理工具",
   "bin": {
     "42plugin": "bin/42plugin",
@@ -36,10 +36,10 @@
     "node": ">=18.0.0"
   },
   "optionalDependencies": {
-    "@42ailab/42plugin-darwin-arm64": "0.3.2",
-    "@42ailab/42plugin-darwin-x64": "0.3.2",
-    "@42ailab/42plugin-linux-arm64": "0.3.2",
-    "@42ailab/42plugin-linux-x64": "0.3.2",
-    "@42ailab/42plugin-win32-x64": "0.3.2"
+    "@42ailab/42plugin-darwin-arm64": "0.3.5",
+    "@42ailab/42plugin-darwin-x64": "0.3.5",
+    "@42ailab/42plugin-linux-arm64": "0.3.5",
+    "@42ailab/42plugin-linux-x64": "0.3.5",
+    "@42ailab/42plugin-win32-x64": "0.3.5"
   }
 }