@42ailab/42plugin 0.2.17 → 0.2.19

package/bin/42plugin

@@ -8,7 +8,7 @@
  */
 
 import { spawnSync } from 'node:child_process';
-import { existsSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -23,6 +23,17 @@ const PLATFORMS = {
   'win32-x64': '@42ailab/42plugin-win32-x64',
 };
 
+// 获取主包版本号
+function getMainPackageVersion() {
+  try {
+    const pkgPath = join(__dirname, '..', 'package.json');
+    const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+    return pkg.version;
+  } catch {
+    return null;
+  }
+}
+
 // 获取当前平台标识
 function getPlatformKey() {
   const platform = process.platform;
@@ -49,18 +60,20 @@ function detectPackageManager() {
 }
 
 // 尝试自动安装平台包
-function tryAutoInstall(packageName) {
+function tryAutoInstall(packageName, version) {
   const pm = detectPackageManager();
-  console.error(`正在自动安装平台包: ${packageName}...`);
+  // 使用具体版本号，避免 latest tag 同步问题
+  const packageSpec = version ? `${packageName}@${version}` : packageName;
+  console.error(`正在自动安装平台包: ${packageSpec}...`);
 
   let result;
   if (pm === 'bun') {
-    result = spawnSync('bun', ['add', '-g', packageName], {
+    result = spawnSync('bun', ['add', '-g', packageSpec], {
       stdio: 'inherit',
       shell: process.platform === 'win32',
     });
   } else {
-    result = spawnSync('npm', ['install', '-g', packageName], {
+    result = spawnSync('npm', ['install', '-g', packageSpec], {
       stdio: 'inherit',
       shell: process.platform === 'win32',
     });
@@ -73,6 +86,7 @@ function tryAutoInstall(packageName) {
 function findBinary(autoInstall = false) {
   const platformKey = getPlatformKey();
   const packageName = PLATFORMS[platformKey];
+  const version = getMainPackageVersion();
 
   if (!packageName) {
     console.error(`错误: 不支持的平台 ${platformKey}`);
@@ -84,13 +98,15 @@ function findBinary(autoInstall = false) {
   const binaryName = process.platform === 'win32' ? '42plugin.exe' : '42plugin';
 
   // 尝试多个可能的路径
+  // __dirname = .../node_modules/@42ailab/42plugin/bin
+  // packageName = @42ailab/42plugin-darwin-arm64 (包含 scope，需要从 node_modules 开始)
   const possiblePaths = [
-    // 1. 作为依赖安装时的路径 (node_modules/@42ailab/42plugin-xxx/bin/42plugin)
-    join(__dirname, '..', '..', packageName, 'bin', binaryName),
-    // 2. 全局安装时的路径
+    // 1. bun/npm 全局安装路径: 回退到 node_modules 再拼接 packageName
+    join(__dirname, '..', '..', '..', packageName, 'bin', binaryName),
+    // 2. npm 嵌套 node_modules 路径
     join(__dirname, '..', 'node_modules', packageName, 'bin', binaryName),
-    // 3. pnpm 的路径
-    join(__dirname, '..', '..', '.pnpm', 'node_modules', packageName, 'bin', binaryName),
+    // 3. pnpm 路径
+    join(__dirname, '..', '..', '..', '.pnpm', 'node_modules', packageName, 'bin', binaryName),
   ];
 
   for (const binPath of possiblePaths) {
@@ -101,27 +117,32 @@ function findBinary(autoInstall = false) {
 
   // 找不到二进制文件，尝试自动安装
   if (!autoInstall) {
-    if (tryAutoInstall(packageName)) {
+    if (tryAutoInstall(packageName, version)) {
       // 安装成功，重新查找
       return findBinary(true);
     }
   }
 
   // 自动安装失败，显示手动安装提示
+  const versionSpec = version ? `@${version}` : '';
   console.error('');
   console.error(`错误: 找不到 ${platformKey} 平台的二进制文件`);
-  console.error(`请手动安装: ${packageName}`);
+  console.error(`请手动安装: ${packageName}${versionSpec}`);
   console.error('');
   console.error('尝试以下方法:');
   console.error('');
-  console.error('  # Bun 用户');
-  console.error(`  bun add -g ${packageName}`);
+  console.error('  # 推荐: Homebrew (macOS/Linux)');
+  console.error('  brew install 42ailab/42plugin/42plugin');
   console.error('');
-  console.error('  # npm 用户');
-  console.error('  npm install -g @42ailab/42plugin');
+  console.error('  # npm 用户 (指定版本)');
+  console.error(`  npm install -g ${packageName}${versionSpec}`);
   console.error('');
-  console.error('  # Homebrew (macOS/Linux)');
-  console.error('  brew install 42ailab/42plugin/42plugin');
+  console.error('  # Bun 用户 (指定版本)');
+  console.error(`  bun add -g ${packageName}${versionSpec}`);
+  console.error('');
+  console.error('如果问题持续，请尝试清除缓存后重新安装:');
+  console.error('  npm cache clean --force');
+  console.error('  bun pm cache rm');
   process.exit(1);
 }
 

package/package.json

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