@42ailab/42plugin 0.2.20 → 0.2.22

package/bin/42plugin

@@ -2,166 +2,60 @@
 
 /**
  * 42plugin CLI 启动脚本
- *
- * 查找并执行对应平台的二进制文件
- * 参考 esbuild、biome 的实现方式
+ * 参考 @biomejs/biome 实现
  */
 
-import { spawnSync } from 'node:child_process';
-import { existsSync, readFileSync } from 'node:fs';
-import { join, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+const { platform, arch, env, version } = process;
+const { spawnSync } = require("child_process");
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
-
-// 平台映射
 const PLATFORMS = {
-  'darwin-arm64': '@42ailab/42plugin-darwin-arm64',
-  'darwin-x64': '@42ailab/42plugin-darwin-x64',
-  'linux-arm64': '@42ailab/42plugin-linux-arm64',
-  'linux-x64': '@42ailab/42plugin-linux-x64',
-  'win32-x64': '@42ailab/42plugin-win32-x64',
+  win32: {
+    x64: "@42ailab/42plugin-win32-x64/bin/42plugin.exe",
+  },
+  darwin: {
+    x64: "@42ailab/42plugin-darwin-x64/bin/42plugin",
+    arm64: "@42ailab/42plugin-darwin-arm64/bin/42plugin",
+  },
+  linux: {
+    x64: "@42ailab/42plugin-linux-x64/bin/42plugin",
+    arm64: "@42ailab/42plugin-linux-arm64/bin/42plugin",
+  },
 };
 
-// 获取主包版本号
-function getMainPackageVersion() {
+const binPath = env.PLUGIN_BINARY || PLATFORMS?.[platform]?.[arch];
+
+if (binPath) {
+  let resolvedPath;
   try {
-    const pkgPath = join(__dirname, '..', 'package.json');
-    const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
-    return pkg.version;
+    resolvedPath = require.resolve(binPath);
   } catch {
-    return null;
-  }
-}
-
-// 获取当前平台标识
-function getPlatformKey() {
-  const platform = process.platform;
-  const arch = process.arch;
-
-  // x86_64 在 Node.js 中是 x64
-  const normalizedArch = arch === 'x64' ? 'x64' : arch;
-
-  return `${platform}-${normalizedArch}`;
-}
-
-// 检测包管理器
-function detectPackageManager() {
-  // 检查是否通过 bun 运行
-  if (process.versions.bun) {
-    return 'bun';
-  }
-  // 检查全局安装路径中是否包含 bun
-  if (__dirname.includes('.bun')) {
-    return 'bun';
-  }
-  // 默认使用 npm
-  return 'npm';
-}
-
-// 尝试自动安装平台包
-function tryAutoInstall(packageName, version) {
-  const pm = detectPackageManager();
-  // 使用具体版本号，避免 latest tag 同步问题
-  const packageSpec = version ? `${packageName}@${version}` : packageName;
-  console.error(`正在自动安装平台包: ${packageSpec}...`);
-
-  let result;
-  if (pm === 'bun') {
-    result = spawnSync('bun', ['add', '-g', packageSpec], {
-      stdio: 'inherit',
-      shell: process.platform === 'win32',
-    });
-  } else {
-    result = spawnSync('npm', ['install', '-g', packageSpec], {
-      stdio: 'inherit',
-      shell: process.platform === 'win32',
-    });
-  }
-
-  return result.status === 0;
-}
-
-// 查找二进制文件路径
-function findBinary(autoInstall = false) {
-  const platformKey = getPlatformKey();
-  const packageName = PLATFORMS[platformKey];
-  const version = getMainPackageVersion();
-
-  if (!packageName) {
-    console.error(`错误: 不支持的平台 ${platformKey}`);
-    console.error(`支持的平台: ${Object.keys(PLATFORMS).join(', ')}`);
+    console.error(`错误: 找不到平台二进制包 ${binPath.split("/")[0]}`);
+    console.error("");
+    console.error("可能原因:");
+    console.error("  - 包管理器未正确安装 optionalDependencies");
+    console.error("  - 版本不匹配 (主包和二进制包版本不一致)");
+    console.error("");
+    console.error("解决方案:");
+    console.error("  # 完全重新安装");
+    console.error("  bun remove -g @42ailab/42plugin && bun add -g @42ailab/42plugin");
+    console.error("");
+    console.error("  # 或使用 Homebrew (推荐)");
+    console.error("  brew install 42ailab/42plugin/42plugin");
     process.exit(1);
   }
 
-  // 可能的二进制文件名
-  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. 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),
-  ];
-
-  for (const binPath of possiblePaths) {
-    if (existsSync(binPath)) {
-      return binPath;
-    }
-  }
-
-  // 找不到二进制文件，尝试自动安装
-  if (!autoInstall) {
-    if (tryAutoInstall(packageName, version)) {
-      // 安装成功，重新查找
-      return findBinary(true);
-    }
-  }
-
-  // 自动安装失败，显示手动安装提示
-  const versionSpec = version ? `@${version}` : '';
-  console.error('');
-  console.error(`错误: 找不到 ${platformKey} 平台的二进制文件`);
-  console.error(`请手动安装: ${packageName}${versionSpec}`);
-  console.error('');
-  console.error('尝试以下方法:');
-  console.error('');
-  console.error('  # 推荐: Homebrew (macOS/Linux)');
-  console.error('  brew install 42ailab/42plugin/42plugin');
-  console.error('');
-  console.error('  # npm 用户 (指定版本)');
-  console.error(`  npm install -g ${packageName}${versionSpec}`);
-  console.error('');
-  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);
-}
-
-// 执行二进制文件
-function run() {
-  const binPath = findBinary();
-  const args = process.argv.slice(2);
-
-  const result = spawnSync(binPath, args, {
-    stdio: 'inherit',
-    shell: false,
+  const result = spawnSync(resolvedPath, process.argv.slice(2), {
+    stdio: "inherit",
+    env: { ...env, JS_RUNTIME_VERSION: version },
   });
 
   if (result.error) {
-    console.error(`执行失败: ${result.error.message}`);
-    process.exit(1);
+    throw result.error;
   }
 
-  process.exit(result.status ?? 0);
+  process.exitCode = result.status;
+} else {
+  console.error(`错误: 不支持的平台 ${platform}-${arch}`);
+  console.error(`支持的平台: darwin-arm64, darwin-x64, linux-arm64, linux-x64, win32-x64`);
+  process.exit(1);
 }
-
-run();

package/package.json

@@ -1,22 +1,19 @@
 {
   "name": "@42ailab/42plugin",
-  "version": "0.2.20",
+  "version": "0.2.22",
   "description": "42plugin CLI - AI 插件管理工具",
-  "type": "module",
   "bin": {
     "42plugin": "bin/42plugin"
   },
   "files": [
     "bin"
   ],
-  "scripts": {},
   "keywords": [
     "claude",
     "claude-code",
     "plugin",
     "cli",
-    "ai",
-    "anthropic"
+    "ai"
   ],
   "author": "42ailab <y@42ailab.com>",
   "license": "MIT",
@@ -24,18 +21,15 @@
     "type": "git",
     "url": "git+https://github.com/42ailab/42plugin.git"
   },
-  "bugs": {
-    "url": "https://github.com/42ailab/42plugin/issues"
-  },
   "homepage": "https://42plugin.com",
   "engines": {
     "node": ">=18.0.0"
   },
   "optionalDependencies": {
-    "@42ailab/42plugin-darwin-arm64": "0.2.20",
-    "@42ailab/42plugin-darwin-x64": "0.2.20",
-    "@42ailab/42plugin-linux-arm64": "0.2.20",
-    "@42ailab/42plugin-linux-x64": "0.2.20",
-    "@42ailab/42plugin-win32-x64": "0.2.20"
+    "@42ailab/42plugin-darwin-arm64": "0.2.22",
+    "@42ailab/42plugin-darwin-x64": "0.2.22",
+    "@42ailab/42plugin-linux-arm64": "0.2.22",
+    "@42ailab/42plugin-linux-x64": "0.2.22",
+    "@42ailab/42plugin-win32-x64": "0.2.22"
   }
 }