@sciagent/cli 1.0.71 → 1.0.73

package/bin/sciagent.js

@@ -11,7 +11,7 @@ const fs = require('fs');
 const os = require('os');
 
 // 当前版本号 - 与 postinstall.js 和 package.json 保持同步
-const CURRENT_VERSION = '1.0.71';
+const CURRENT_VERSION = '1.0.73';
 
 // 平台和架构映射
 const PLATFORM_MAP = {
@@ -26,6 +26,22 @@ const ARCH_MAP = {
   amd64: 'x64'
 };
 
+/**
+ * 比较语义化版本号
+ * 返回: -1 (a<b), 0 (a==b), 1 (a>b)
+ */
+function compareVersions(a, b) {
+  const pa = a.split('.').map(Number);
+  const pb = b.split('.').map(Number);
+  for (let i = 0; i < 3; i++) {
+    const na = pa[i] || 0;
+    const nb = pb[i] || 0;
+    if (na < nb) return -1;
+    if (na > nb) return 1;
+  }
+  return 0;
+}
+
 /**
  * 获取当前平台的二进制文件路径
  */
@@ -63,31 +79,36 @@ function getBinaryPath() {
       const versionFile = path.join(homeBinDir, '.version');
       if (fs.existsSync(versionFile)) {
         const installedVersion = fs.readFileSync(versionFile, 'utf8').trim();
-        if (installedVersion !== CURRENT_VERSION) {
-          console.error(`❌ Binary version mismatch: installed=${installedVersion}, expected=${CURRENT_VERSION}`);
+        const cmp = compareVersions(installedVersion, CURRENT_VERSION);
+        if (cmp < 0) {
+          // 安装版本低于预期版本 → 旧版有bug，删除
+          console.error(`[ERROR] Binary version outdated: installed=${installedVersion}, expected=${CURRENT_VERSION}`);
           console.error(`   The cached binary is outdated and may have critical bugs (e.g., 405 error on login).`);
           console.error(`   Deleting cached binary and exiting. Please run 'npm install -g @sciagent/cli' again.`);
-          // 自动删除旧版二进制，下次安装时 postinstall 会重新下载
           try {
             fs.unlinkSync(homeBinPath);
             fs.unlinkSync(versionFile);
-            console.error(`   ✅ Deleted: ${homeBinPath}`);
-            console.error(`   ✅ Deleted: ${versionFile}`);
+            console.error(`   [OK] Deleted: ${homeBinPath}`);
+            console.error(`   [OK] Deleted: ${versionFile}`);
           } catch (e) {
-            console.error(`   ⚠️  Failed to delete: ${e.message}`);
+            console.error(`   [WARN] Failed to delete: ${e.message}`);
             console.error(`   Please manually delete: ${homeBinDir}`);
           }
           process.exit(1);
+        } else if (cmp > 0) {
+          // 安装版本高于预期 → 用户手动装了新版，允许运行
+          console.log(`[INFO] Binary version ${installedVersion} is newer than npm package version ${CURRENT_VERSION}, using it.`);
         }
+        // cmp === 0 → 版本匹配，正常使用
       } else {
         // 没有 .version 文件，说明是极旧版本（v1.0.64之前），可能有405 bug
-        console.error(`❌ Binary version unknown (no .version file). This binary may be outdated.`);
+        console.error(`[ERROR] Binary version unknown (no .version file). This binary may be outdated.`);
         console.error(`   Deleting cached binary and exiting. Please run 'npm install -g @sciagent/cli' again.`);
         try {
           fs.unlinkSync(homeBinPath);
-          console.error(`   ✅ Deleted: ${homeBinPath}`);
+          console.error(`   [OK] Deleted: ${homeBinPath}`);
         } catch (e) {
-          console.error(`   ⚠️  Failed to delete: ${e.message}`);
+          console.error(`   [WARN] Failed to delete: ${e.message}`);
         }
         process.exit(1);
       }

package/package.json

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

package/scripts/postinstall.js

@@ -27,7 +27,7 @@ const ARCH_MAP = {
 };
 
 // 当前版本号 - 每次发布时同步更新
-const CURRENT_VERSION = '1.0.71';
+const CURRENT_VERSION = '1.0.73';
 
 // 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'];
@@ -494,15 +494,25 @@ sys.exit(1)
   return false;
 }
 
-// GitHub Releases 配置
-const GITHUB_REPO = 'poisondrinker/research-agent';
-const GITHUB_API = `https://api.github.com/repos/${GITHUB_REPO}/releases`;
+// 极狐GitLab Package Registry 配置
+const JIHULAB_URL = 'https://jihulab.com';
+const JIHULAB_PROJECT_ID = 351778;
+const JIHULAB_PACKAGE_NAME = 'sciagent';
+// Deploy token with read_package_registry permission (for downloading)
+const JIHULAB_DOWNLOAD_TOKEN = '2qxfs606HfwESUYJxtRlgm86MQp1OjVnazAK.01.101vzs2qo';
 
-async function downloadFromGitHub(platform, arch, version) {
+async function downloadFromJiHuLab(platform, arch, version) {
   const binName = platform === 'win32' ? 'sciagent.exe' : 'sciagent';
-  const assetName = `sciagent-${platform}-${arch}${platform === 'win32' ? '.exe' : ''}`;
+  const ext = platform === 'win32' ? '.exe' : '';
+  const filename = `sciagent-${platform}-${arch}${ext}`;
   
-  console.log(`\n  📥 尝试从 GitHub Releases 下载...`);
+  const downloadUrl = (
+    `${JIHULAB_URL}/api/v4/projects/${JIHULAB_PROJECT_ID}` +
+    `/packages/generic/${JIHULAB_PACKAGE_NAME}/${version}/${filename}` +
+    `?access_token=${JIHULAB_DOWNLOAD_TOKEN}`
+  );
+  
+  console.log(`\n  [JiHuLab] Downloading ${filename} v${version}...`);
   
   // 确定安装目录
   const installDir = getHomeBinDir();
@@ -510,102 +520,13 @@ async function downloadFromGitHub(platform, arch, version) {
   const targetPath = path.join(installDir, binName);
   
   try {
-    // 获取 release 信息
-    const releaseUrl = `${GITHUB_API}/tags/v${version}`;
-    console.log(`  查找 release: v${version}`);
-    
-    const releaseInfo = await new Promise((resolve, reject) => {
-      https.get(releaseUrl, {
-        headers: { 
-          'User-Agent': 'sciagent-cli/1.0',
-          'Accept': 'application/vnd.github.v3+json'
-        },
-        timeout: 15000
-      }, (response) => {
-        let data = '';
-        if (response.statusCode === 301 || response.statusCode === 302) {
-          // Follow redirect
-          https.get(response.headers.location, {
-            headers: { 'User-Agent': 'sciagent-cli/1.0' },
-            timeout: 15000
-          }, (res2) => {
-            let data2 = '';
-            res2.on('data', (chunk) => { data2 += chunk; });
-            res2.on('end', () => {
-              try { resolve(JSON.parse(data2)); } catch (e) { reject(e); }
-            });
-          }).on('error', reject);
-          return;
-        }
-        response.on('data', (chunk) => { data += chunk; });
-        response.on('end', () => {
-          if (response.statusCode === 404) {
-            reject(new Error(`Release v${version} not found`));
-            return;
-          }
-          try { resolve(JSON.parse(data)); } catch (e) { reject(e); }
-        });
-      }).on('error', reject);
-    });
-    
-    // 查找匹配的 asset
-    const assets = releaseInfo.assets || [];
-    const asset = assets.find(a => a.name === assetName || a.name.includes(`${platform}-${arch}`));
-    
-    if (!asset) {
-      console.log(`  ⚠️  未找到匹配的 asset: ${assetName}`);
-      console.log(`  可用 assets: ${assets.map(a => a.name).join(', ') || 'none'}`);
-      return false;
-    }
-    
-    console.log(`  找到: ${asset.name} (${(asset.size / (1024 * 1024)).toFixed(1)} MB)`);
-    console.log(`  下载中...`);
-    
-    // 下载 asset（带 redirect 支持）
-    await new Promise((resolve, reject) => {
-      const downloadUrl = asset.browser_download_url;
-      const protocol = downloadUrl.startsWith('https') ? https : http;
-      
-      const doDownload = (url) => {
-        protocol.get(url, {
-          headers: { 'User-Agent': 'sciagent-cli/1.0' },
-          timeout: 30000
-        }, (response) => {
-          if (response.statusCode >= 300 && response.statusCode < 400 && response.headers.location) {
-            doDownload(response.headers.location);
-            return;
-          }
-          if (response.statusCode !== 200) {
-            reject(new Error(`HTTP ${response.statusCode}`));
-            return;
-          }
-          
-          const totalSize = parseInt(response.headers['content-length'], 10);
-          let downloadedSize = 0;
-          const file = fs.createWriteStream(targetPath);
-          
-          response.on('data', (chunk) => {
-            downloadedSize += chunk.length;
-            if (totalSize) {
-              const percent = Math.floor((downloadedSize / totalSize) * 100);
-              process.stdout.write(`\r  下载进度: ${percent}% (${(downloadedSize / (1024*1024)).toFixed(1)}/${(totalSize / (1024*1024)).toFixed(1)} MB)`);
-            }
-          });
-          
-          response.pipe(file);
-          file.on('finish', () => { file.close(); console.log(); resolve(); });
-          file.on('error', (err) => { file.close(); try { fs.unlinkSync(targetPath); } catch(e){} reject(err); });
-        }).on('error', reject);
-      };
-      
-      doDownload(downloadUrl);
-    });
+    await downloadFile(downloadUrl, targetPath, 600000); // 10 分钟超时
     
     // 验证下载
     if (fs.existsSync(targetPath)) {
       const stats = fs.statSync(targetPath);
       if (stats.size > 10 * 1024 * 1024) {
-        console.log(`  ✅ GitHub 下载成功: ${targetPath} (${(stats.size / (1024 * 1024)).toFixed(1)} MB)`);
+        console.log(`  [OK] JiHuLab download success: ${targetPath} (${(stats.size / (1024 * 1024)).toFixed(1)} MB)`);
         if (platform !== 'win32') {
           fs.chmodSync(targetPath, 0o755);
         }
@@ -615,10 +536,10 @@ async function downloadFromGitHub(platform, arch, version) {
       }
     }
     
-    console.log(`  ⚠️  下载文件验证失败`);
+    console.log(`  [WARN] Downloaded file validation failed`);
     return false;
   } catch (e) {
-    console.log(`  ⚠️  GitHub 下载失败: ${e.message}`);
+    console.log(`  [WARN] JiHuLab download failed: ${e.message}`);
     return false;
   }
 }
@@ -754,31 +675,30 @@ async function main() {
   } else {
     console.log(`⚠️  Platform binary not found: ${packageName}`);
     
-    // 下载策略: 1) Releases服务器 2) GitHub Releases 3) npm包
+    // 下载策略: 1) Releases服务器 2) 极狐GitLab 3) npm包
     console.log('');
     console.log('  尝试从 Releases 服务器下载...');
     const serverSuccess = await downloadFromServer(platform, arch, CURRENT_VERSION);
     
     if (!serverSuccess) {
-      // Releases 服务器失败，尝试 GitHub Releases
+      // Releases 服务器失败，尝试极狐GitLab
       console.log('');
-      console.log('  尝试从 GitHub Releases 下载...');
+      console.log('  尝试从极狐GitLab下载...');
       
-      // 尝试当前版本
-      let githubSuccess = await downloadFromGitHub(platform, arch, CURRENT_VERSION);
+      let jihuSuccess = await downloadFromJiHuLab(platform, arch, CURRENT_VERSION);
       
       // 如果当前版本失败，尝试回退版本
-      if (!githubSuccess) {
+      if (!jihuSuccess) {
         for (const fallbackVersion of GITHUB_FALLBACK_VERSIONS) {
           if (fallbackVersion === CURRENT_VERSION) continue;
           console.log(`  尝试回退版本 v${fallbackVersion}...`);
-          githubSuccess = await downloadFromGitHub(platform, arch, fallbackVersion);
-          if (githubSuccess) break;
+          jihuSuccess = await downloadFromJiHuLab(platform, arch, fallbackVersion);
+          if (jihuSuccess) break;
         }
       }
       
-      if (!githubSuccess) {
-        // GitHub 也失败，回退到 npm 包安装
+      if (!jihuSuccess) {
+        // 极狐GitLab 也失败，回退到 npm 包安装
         console.log('');
         console.log('  回退到 npm 包安装...');
         const npmSuccess = installBinaryPackage(platform, arch);