@sciagent/cli 1.0.84 → 1.0.85

package/bin/sciagent.js

@@ -3,17 +3,27 @@
 /**
  * SciAgent CLI 薄壳脚本
  * 自动识别平台并调用对应的预编译二进制文件
+ * 
+ * 二进制查找策略：
+ * 1. %LOCALAPPDATA%\sciagent\bin\ (Windows) 或 ~/.sciagent/bin/ (Linux/Mac)
+ *    - 带严格版本校验（.version文件必须匹配CURRENT_VERSION）
+ *    - 版本不匹配时自动从极狐GitLab下载正确版本
+ * 2. 本地开发目录（仅开发模式）
+ * 3. 未找到时自动从极狐GitLab下载
+ * 
+ * 注意：不再从npm optionalDependencies中查找二进制，因为：
+ * - npm缓存中的旧包可能包含旧版二进制
+ * - npm可能修改package.json版本号来匹配请求，但二进制文件仍是旧的
+ * - 超过250MB的包无法发布到npm
  */
 
 const { spawn, execSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
-const https = require('https');
-const http = require('http');
 
 // 当前版本号 - 与 postinstall.js 和 package.json 保持同步
-const CURRENT_VERSION = '1.0.84';
+const CURRENT_VERSION = '1.0.85';
 
 // 极狐GitLab下载配置
 const JIHULAB_URL = 'https://jihulab.com';
@@ -50,6 +60,15 @@ function compareVersions(a, b) {
   return 0;
 }
 
+/**
+ * 获取二进制安装目录
+ */
+function getInstallDir(platform) {
+  return platform === 'win32'
+    ? path.join(process.env.LOCALAPPDATA || os.homedir(), 'sciagent', 'bin')
+    : path.join(os.homedir(), '.sciagent', 'bin');
+}
+
 /**
  * 获取当前平台的二进制文件路径
  */
@@ -69,102 +88,66 @@ function getBinaryPath() {
     process.exit(1);
   }
 
-  // 构建包名
-  const packageName = `@sciagent/cli-${platform}-${arch}`;
-  
-  // 尝试从node_modules中查找
   const binName = platform === 'win32' ? 'sciagent.exe' : 'sciagent';
-  
-  // 方法0: 从 ~/.sciagent/bin/ 或 %LOCALAPPDATA%\sciagent\bin 查找（postinstall下载位置）
-  const homeBinDir = platform === 'win32'
-    ? path.join(process.env.LOCALAPPDATA || os.homedir(), 'sciagent', 'bin')
-    : path.join(os.homedir(), '.sciagent', 'bin');
-  const homeBinPath = path.join(homeBinDir, binName);
-  if (fs.existsSync(homeBinPath)) {
-    const stats = fs.statSync(homeBinPath);
+  const installDir = getInstallDir(platform);
+  const binPath = path.join(installDir, binName);
+  const versionFile = path.join(installDir, '.version');
+
+  // 检查已安装的二进制
+  if (fs.existsSync(binPath)) {
+    const stats = fs.statSync(binPath);
     if (stats.size > 10 * 1024 * 1024) {
-      // 版本检查：不匹配时自动下载新版本
-      const versionFile = path.join(homeBinDir, '.version');
+      // 读取版本文件
       if (fs.existsSync(versionFile)) {
         const installedVersion = fs.readFileSync(versionFile, 'utf8').trim();
         const cmp = compareVersions(installedVersion, CURRENT_VERSION);
-        if (cmp < 0) {
-          // 安装版本低于预期版本 → 自动下载新版本
-          console.log(`[INFO] Binary version outdated: installed=${installedVersion}, expected=${CURRENT_VERSION}`);
-          console.log(`[INFO] Downloading new version...`);
-          try { fs.unlinkSync(homeBinPath); fs.unlinkSync(versionFile); } catch (e) {}
+        
+        if (cmp === 0) {
+          // 版本精确匹配 → 直接使用
+          console.log(`[INFO] SciAgent v${installedVersion} (installed)`);
+          return binPath;
+        } else if (cmp < 0) {
+          // 版本过低 → 自动下载新版本
+          console.log(`[INFO] SciAgent version outdated: v${installedVersion} → v${CURRENT_VERSION}`);
+          console.log(`[INFO] Downloading new version from JiHuLab...`);
+          try { fs.unlinkSync(binPath); fs.unlinkSync(versionFile); } catch (e) {}
           const downloaded = downloadBinary(platform, arch, CURRENT_VERSION);
           if (downloaded) return downloaded;
           console.error(`[ERROR] Failed to download v${CURRENT_VERSION}. Please run: npm install -g @sciagent/cli`);
           process.exit(1);
-        } else if (cmp > 0) {
-          // 安装版本高于预期 → 用户手动装了新版，允许运行
-          console.log(`[INFO] Binary version ${installedVersion} is newer than npm package version ${CURRENT_VERSION}, using it.`);
+        } else {
+          // 版本更高 → 允许运行（用户可能手动安装了新版）
+          console.log(`[INFO] SciAgent v${installedVersion} (newer than package v${CURRENT_VERSION})`);
+          return binPath;
         }
-        // cmp === 0 → 版本匹配，正常使用
       } else {
-        // 没有 .version 文件 → 自动下载新版本
-        console.log(`[INFO] Binary version unknown (no .version file), downloading v${CURRENT_VERSION}...`);
-        try { fs.unlinkSync(homeBinPath); } catch (e) {}
+        // 没有.version文件 → 可能是旧安装，重新下载
+        console.log(`[INFO] SciAgent binary found but version unknown, downloading v${CURRENT_VERSION}...`);
+        try { fs.unlinkSync(binPath); } catch (e) {}
         const downloaded = downloadBinary(platform, arch, CURRENT_VERSION);
         if (downloaded) return downloaded;
         console.error(`[ERROR] Failed to download v${CURRENT_VERSION}. Please run: npm install -g @sciagent/cli`);
         process.exit(1);
       }
-      return homeBinPath;
-    }
-  }
-
-  // 方法1: 从optionalDependencies安装的包中查找
-  // ⚠️ 重要：npm包中的二进制可能是旧版本（npm缓存/250MB限制导致无法发布新版）
-  // 必须严格校验版本，版本不匹配则跳过并触发下载
-  try {
-    const packagePath = require.resolve(`${packageName}/bin/${binName}`);
-    if (fs.existsSync(packagePath)) {
-      const stats = fs.statSync(packagePath);
-      if (stats.size > 10 * 1024 * 1024) {
-        // 严格版本校验：读取npm包的package.json
-        try {
-          const pkgJsonPath = require.resolve(`${packageName}/package.json`);
-          const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf8'));
-          const pkgVersion = pkgJson.version;
-          const cmp = compareVersions(pkgVersion, CURRENT_VERSION);
-          if (cmp !== 0) {
-            // 版本不匹配（无论高低）→ 跳过，下载正确版本
-            console.log(`[INFO] npm package binary version mismatch: ${packageName}@${pkgVersion} != ${CURRENT_VERSION}, will download correct version`);
-            // 不return，继续到下载逻辑
-          } else {
-            // 版本精确匹配，使用
-            console.log(`[INFO] Using npm package binary: ${packageName}@${pkgVersion}`);
-            return packagePath;
-          }
-        } catch (e) {
-          // 无法读取package.json，跳过
-          console.log(`[INFO] Cannot read package version from ${packageName}, skipping npm binary`);
-        }
-      } else {
-        console.log(`[INFO] npm package binary too small (${(stats.size / 1024).toFixed(0)} KB), likely a stub`);
-      }
+    } else {
+      // 文件太小，损坏
+      console.log(`[INFO] SciAgent binary too small (${(stats.size / 1024).toFixed(0)} KB), removing...`);
+      try { fs.unlinkSync(binPath); } catch (e) {}
     }
-  } catch (e) {
-    // 包未安装，继续尝试其他方法
   }
 
-  // 方法2: 从本地packages目录查找（开发模式）
+  // 开发模式：从本地packages目录查找
   const localPath = path.join(__dirname, '..', 'packages', `sciagent-${platform}-${arch}`, 'bin', binName);
   if (fs.existsSync(localPath)) {
-    return localPath;
-  }
-
-  // 方法3: 从当前目录的bin查找
-  const binPath = path.join(__dirname, '..', 'bin', platform, arch, binName);
-  if (fs.existsSync(binPath)) {
-    return binPath;
+    const stats = fs.statSync(localPath);
+    if (stats.size > 10 * 1024 * 1024) {
+      console.log(`[INFO] SciAgent (dev mode)`);
+      return localPath;
+    }
   }
 
-  // 未找到匹配版本的二进制文件 - 自动从极狐GitLab下载
-  console.log(`⚠️  SciAgent binary not found or version mismatch for ${platform}-${arch}`);
-  console.log(`   Attempting to download v${CURRENT_VERSION} from JiHuLab...`);
+  // 未找到二进制文件 - 自动从极狐GitLab下载
+  console.log(`[INFO] SciAgent binary not found, downloading v${CURRENT_VERSION} from JiHuLab...`);
   
   const downloaded = downloadBinary(platform, arch, CURRENT_VERSION);
   if (downloaded && fs.existsSync(downloaded)) {
@@ -190,9 +173,7 @@ function downloadBinary(platform, arch, version) {
     `?access_token=${JIHULAB_DOWNLOAD_TOKEN}`
   );
   
-  const installDir = platform === 'win32'
-    ? path.join(process.env.LOCALAPPDATA || os.homedir(), 'sciagent', 'bin')
-    : path.join(os.homedir(), '.sciagent', 'bin');
+  const installDir = getInstallDir(platform);
   fs.mkdirSync(installDir, { recursive: true });
   const targetPath = path.join(installDir, binName);
   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sciagent/cli",
-  "version": "1.0.84",
+  "version": "1.0.85",
   "description": "SciAgent CLI - AI Research Assistant",
   "main": "index.js",
   "files": [
@@ -15,12 +15,12 @@
     "postinstall": "node scripts/postinstall.js"
   },
   "optionalDependencies": {
-    "@sciagent/cli-linux-x64": "1.0.84",
-    "@sciagent/cli-linux-arm64": "1.0.84",
-    "@sciagent/cli-darwin-x64": "1.0.84",
-    "@sciagent/cli-darwin-arm64": "1.0.84",
-    "@sciagent/cli-win32-x64": "1.0.84",
-    "@sciagent/cli-win32-arm64": "1.0.84"
+    "@sciagent/cli-linux-x64": "1.0.85",
+    "@sciagent/cli-linux-arm64": "1.0.85",
+    "@sciagent/cli-darwin-x64": "1.0.85",
+    "@sciagent/cli-darwin-arm64": "1.0.85",
+    "@sciagent/cli-win32-x64": "1.0.85",
+    "@sciagent/cli-win32-arm64": "1.0.85"
   },
   "keywords": [
     "ai",

package/scripts/postinstall.js

@@ -27,7 +27,7 @@ const ARCH_MAP = {
 };
 
 // 当前版本号 - 每次发布时同步更新
-const CURRENT_VERSION = '1.0.84';
+const CURRENT_VERSION = '1.0.85';
 
 // GitHub Releases 回退版本列表（当当前版本的 release 不存在时尝试）
 const GITHUB_FALLBACK_VERSIONS = ['1.0.50', '1.0.48', '1.0.46', '1.0.40', '1.0.38', '1.0.36'];