@sciagent/cli 1.1.42 → 1.1.44

package/bin/sciagent.js

@@ -7,9 +7,9 @@
  * 二进制查找策略：
  * 1. %LOCALAPPDATA%\sciagent\bin\ (Windows) 或 ~/.sciagent/bin/ (Linux/Mac)
  *    - 带严格版本校验（.version文件必须匹配CURRENT_VERSION）
- *    - 版本不匹配时自动从极狐GitLab下载正确版本
+ *    - 版本不匹配时自动从 Release Server 下载正确版本
  * 2. 本地开发目录（仅开发模式）
- * 3. 未找到时自动从极狐GitLab下载
+ * 3. 未找到时自动从 Release Server 下载
  * 
  * 注意：不再从npm optionalDependencies中查找二进制，因为：
  * - npm缓存中的旧包可能包含旧版二进制
@@ -25,13 +25,10 @@ const https = require('https');
 const http = require('http');
 
 // 当前版本号 - 与 postinstall.js 和 package.json 保持同步
-const CURRENT_VERSION = '1.1.42';
+const CURRENT_VERSION = '1.1.44';
 
-// 极狐GitLab下载配置
-const JIHULAB_URL = 'https://jihulab.com';
-const JIHULAB_PROJECT_ID = 351778;
-const JIHULAB_PACKAGE_NAME = 'sciagent';
-const JIHULAB_DOWNLOAD_TOKEN = '2qxfs606HfwESUYJxtRlgm86MQp1OjVnazAK.01.101vzs2qo';
+// Releases 服务器下载配置
+const RELEASE_SERVER_URL = process.env.RELEASE_SERVER_URL || 'https://sciagent.tech';
 
 // 平台和架构映射
 const PLATFORM_MAP = {
@@ -154,16 +151,13 @@ function applyPendingUpdate(installDir) {
 }
 
 /**
- * 从极狐GitLab查询最新版本号
+ * 从 Release Server 查询最新版本号
  * 返回: 版本字符串 或 null
  */
 function fetchLatestVersion() {
   return new Promise((resolve) => {
-    const url = (
-      `${JIHULAB_URL}/api/v4/projects/${JIHULAB_PROJECT_ID}` +
-      `/packages?package_name=${JIHULAB_PACKAGE_NAME}&per_page=1&order_by=version&sort=desc` +
-      `&access_token=${JIHULAB_DOWNLOAD_TOKEN}`
-    );
+    // 使用 /api/releases/list 获取所有版本，取最新的
+    const url = `${RELEASE_SERVER_URL}/api/releases/list`;
     
     const protocol = url.startsWith('https') ? https : http;
     const request = protocol.get(url, {
@@ -174,12 +168,19 @@ function fetchLatestVersion() {
       response.on('data', (chunk) => { data += chunk; });
       response.on('end', () => {
         try {
-          const packages = JSON.parse(data);
-          if (Array.isArray(packages) && packages.length > 0 && packages[0].version) {
-            resolve(packages[0].version);
-          } else {
-            resolve(null);
+          const result = JSON.parse(data);
+          const releases = result.releases || {};
+          // 找到所有版本中的最新版本
+          let latestVersion = null;
+          for (const key of Object.keys(releases)) {
+            const versions = releases[key];
+            if (Array.isArray(versions) && versions.length > 0 && versions[0].version) {
+              if (!latestVersion || compareVersions(versions[0].version, latestVersion) > 0) {
+                latestVersion = versions[0].version;
+              }
+            }
           }
+          resolve(latestVersion);
         } catch (e) {
           resolve(null);
         }
@@ -202,9 +203,7 @@ function backgroundDownloadUpdate(platform, arch, latestVersion) {
   const filename = `sciagent-${platform}-${arch}${ext}`;
   
   const downloadUrl = (
-    `${JIHULAB_URL}/api/v4/projects/${JIHULAB_PROJECT_ID}` +
-    `/packages/generic/${JIHULAB_PACKAGE_NAME}/${latestVersion}/${filename}` +
-    `?access_token=${JIHULAB_DOWNLOAD_TOKEN}`
+    `${RELEASE_SERVER_URL}/api/releases/download/${platform}/${arch}/${latestVersion}`
   );
   
   const installDir = getInstallDir(platform);
@@ -289,7 +288,7 @@ function backgroundDownloadUpdate(platform, arch, latestVersion) {
 
 /**
  * 检查自动更新（后台异步）
- * 1. 查询极狐GitLab最新版本
+ * 1. 查询 Release Server 最新版本
  * 2. 如果有新版本，后台下载到临时目录
  * 3. 下载完成后写入 .pending-update 标记
  * 4. 下次启动时自动应用
@@ -399,7 +398,7 @@ function getBinaryPath() {
         } else if (cmp < 0) {
           // 版本过低 → 自动下载新版本
           console.log(`[INFO] SciAgent version outdated: v${installedVersion} (${(stats.size / (1024 * 1024)).toFixed(1)} MB) → v${CURRENT_VERSION}`);
-          console.log(`[INFO] Downloading new version from JiHuLab...`);
+          console.log(`[INFO] Downloading new version from server...`);
           // 注意：此时当前进程正在运行旧二进制，无法直接替换
           // 下载到临时目录，写入 .pending-update，下次启动时应用
           const downloaded = downloadBinaryToTemp(platform, arch, CURRENT_VERSION);
@@ -443,8 +442,8 @@ function getBinaryPath() {
     }
   }
 
-  // 未找到二进制文件 - 自动从极狐GitLab下载
-  console.log(`[INFO] SciAgent binary not found, downloading v${CURRENT_VERSION} from JiHuLab...`);
+  // 未找到二进制文件 - 自动从 Release Server 下载
+  console.log(`[INFO] SciAgent binary not found, downloading v${CURRENT_VERSION} from server...`);
   
   const downloaded = downloadBinary(platform, arch, CURRENT_VERSION);
   if (downloaded && fs.existsSync(downloaded)) {
@@ -458,7 +457,7 @@ function getBinaryPath() {
 }
 
 /**
- * 从极狐GitLab下载二进制文件到临时目录（不替换当前运行的二进制）
+ * 从 Release Server 下载二进制文件到临时目录（不替换当前运行的二进制）
  * 下载完成后写入 .pending-update 标记，下次启动时自动应用
  * 返回: tempPath 或 null
  */
@@ -468,9 +467,7 @@ function downloadBinaryToTemp(platform, arch, version) {
   const filename = `sciagent-${platform}-${arch}${ext}`;
   
   const downloadUrl = (
-    `${JIHULAB_URL}/api/v4/projects/${JIHULAB_PROJECT_ID}` +
-    `/packages/generic/${JIHULAB_PACKAGE_NAME}/${version}/${filename}` +
-    `?access_token=${JIHULAB_DOWNLOAD_TOKEN}`
+    `${RELEASE_SERVER_URL}/api/releases/download/${platform}/${arch}/${version}`
   );
   
   const installDir = getInstallDir(platform);
@@ -491,7 +488,7 @@ function downloadBinaryToTemp(platform, arch, version) {
         '$ProgressPreference = "SilentlyContinue"',
         `$uri = "${downloadUrl}"`,
         `$out = "${tempPath}"`,
-        'Write-Host "  Downloading from JiHuLab..."',
+        'Write-Host "  Downloading from server..."',
         'Invoke-WebRequest -Uri $uri -OutFile $out -UseBasicParsing',
         'if (Test-Path $out) { $s = (Get-Item $out).Length; Write-Host "  Downloaded: $s bytes" } else { Write-Error "File not created"; exit 1 }'
       ].join('\r\n');
@@ -541,7 +538,7 @@ function downloadBinaryToTemp(platform, arch, version) {
 }
 
 /**
- * 从极狐GitLab下载二进制文件（直接到目标路径，用于首次安装）
+ * 从 Release Server 下载二进制文件（直接到目标路径，用于首次安装）
  */
 function downloadBinary(platform, arch, version) {
   const binName = platform === 'win32' ? 'sciagent.exe' : 'sciagent';
@@ -549,9 +546,7 @@ function downloadBinary(platform, arch, version) {
   const filename = `sciagent-${platform}-${arch}${ext}`;
   
   const downloadUrl = (
-    `${JIHULAB_URL}/api/v4/projects/${JIHULAB_PROJECT_ID}` +
-    `/packages/generic/${JIHULAB_PACKAGE_NAME}/${version}/${filename}` +
-    `?access_token=${JIHULAB_DOWNLOAD_TOKEN}`
+    `${RELEASE_SERVER_URL}/api/releases/download/${platform}/${arch}/${version}`
   );
   
   const installDir = getInstallDir(platform);
@@ -570,7 +565,7 @@ function downloadBinary(platform, arch, version) {
         '$ProgressPreference = "SilentlyContinue"',
         `$uri = "${downloadUrl}"`,
         `$out = "${targetPath}"`,
-        'Write-Host "  Downloading from JiHuLab..."',
+        'Write-Host "  Downloading from server..."',
         'Invoke-WebRequest -Uri $uri -OutFile $out -UseBasicParsing',
         'if (Test-Path $out) { $s = (Get-Item $out).Length; Write-Host "  Downloaded: $s bytes" } else { Write-Error "File not created"; exit 1 }'
       ].join('\r\n');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sciagent/cli",
-  "version": "1.1.42",
+  "version": "1.1.44",
   "description": "SciAgent CLI - AI Research Assistant",
   "main": "index.js",
   "files": [

package/scripts/postinstall.js

@@ -27,7 +27,7 @@ const ARCH_MAP = {
 };
 
 // 当前版本号 - 每次发布时同步更新
-const CURRENT_VERSION = '1.1.42';
+const CURRENT_VERSION = '1.1.44';
 
 // GitHub Releases 回退版本列表（当当前版本的 release 不存在时尝试）
 const GITHUB_FALLBACK_VERSIONS = ['1.1.3', '1.0.50', '1.0.48', '1.0.46', '1.0.40', '1.0.38', '1.0.36'];
@@ -35,7 +35,7 @@ const GITHUB_FALLBACK_VERSIONS = ['1.1.3', '1.0.50', '1.0.48', '1.0.46', '1.0.40
 // Releases 服务器配置
 // 优先使用环境变量，否则使用默认服务器
 const RELEASE_SERVER_URL = process.env.RELEASE_SERVER_URL || 
-  'https://u250924-a8fa-f3b5e200.westc.seetacloud.com:8443';
+  'https://sciagent.tech';
 
 // PyPI 镜像源列表（国内优先）
 const PYPI_MIRRORS = [
@@ -131,7 +131,7 @@ function checkBinaryInstalled(platform, arch) {
   // 1. npm 缓存中的旧包可能包含旧版二进制（如 1.0.40 的 194MB 旧 exe）
   // 2. npm 可能修改 package.json 版本号来匹配请求，但二进制文件仍是旧的
   // 3. 超过 250MB 的包无法发布到 npm，只有空壳包
-  // 所有二进制统一从极狐GitLab下载，确保版本正确
+  // 所有二进制统一从 Release Server 下载，确保版本正确
   
   return { installed: false };
 }
@@ -521,12 +521,9 @@ sys.exit(1)
   return false;
 }
 
-// 极狐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';
+// Releases 服务器配置
+const RELEASE_SERVER_URL = process.env.RELEASE_SERVER_URL || 
+  'https://sciagent.tech';
 
 /**
  * 检查 sciagent 进程是否正在运行
@@ -681,18 +678,14 @@ function promptUpdateChoice() {
   });
 }
 
-async function downloadFromJiHuLab(platform, arch, version) {
+async function downloadFromServer(platform, arch, version) {
   const binName = platform === 'win32' ? 'sciagent.exe' : 'sciagent';
   const ext = platform === 'win32' ? '.exe' : '';
   const filename = `sciagent-${platform}-${arch}${ext}`;
   
-  const downloadUrl = (
-    `${JIHULAB_URL}/api/v4/projects/${JIHULAB_PROJECT_ID}` +
-    `/packages/generic/${JIHULAB_PACKAGE_NAME}/${version}/${filename}` +
-    `?access_token=${JIHULAB_DOWNLOAD_TOKEN}`
-  );
+  const downloadUrl = `${RELEASE_SERVER_URL}/api/releases/download/${platform}/${arch}/${version}`;
   
-  console.log(`\n  [JiHuLab] Downloading ${filename} v${version}...`);
+  console.log(`\n  [Server] Downloading ${filename} v${version}...`);
   
   // 确定安装目录
   const installDir = getHomeBinDir();
@@ -715,9 +708,9 @@ async function downloadFromJiHuLab(platform, arch, version) {
         '$ProgressPreference = "SilentlyContinue"',
         `$uri = "${downloadUrl}"`,
         `$out = "${tempPath}"`,
-        'Write-Host "  [JiHuLab] Downloading..."',
+        'Write-Host "  [Server] Downloading..."',
         'Invoke-WebRequest -Uri $uri -OutFile $out -UseBasicParsing',
-        'if (Test-Path $out) { $s = (Get-Item $out).Length; Write-Host "  [JiHuLab] Downloaded: $s bytes" } else { Write-Error "File not created"; exit 1 }'
+        'if (Test-Path $out) { $s = (Get-Item $out).Length; Write-Host "  [Server] Downloaded: $s bytes" } else { Write-Error "File not created"; exit 1 }'
       ].join('\r\n');
       fs.writeFileSync(tmpScript, scriptContent, 'utf8');
       
@@ -766,7 +759,7 @@ async function downloadFromJiHuLab(platform, arch, version) {
     console.log(`  [WARN] Downloaded file validation failed`);
     return false;
   } catch (e) {
-    console.log(`  [WARN] JiHuLab download failed: ${e.message}`);
+    console.log(`  [WARN] Server download failed: ${e.message}`);
     return false;
   }
 }
@@ -854,54 +847,9 @@ async function applyDownloadedBinary(tempPath, targetPath, installDir, version,
   return true; // 下载成功，只是替换延迟
 }
 
-async function downloadFromServer(platform, arch, version) {
-  const binName = platform === 'win32' ? 'sciagent.exe' : 'sciagent';
-  const downloadUrl = `${RELEASE_SERVER_URL}/api/releases/download/${platform}/${arch}/${version}`;
-  
-  console.log(`\n  📥 从 Releases 服务器下载 ${binName} v${version}...`);
-  
-  // 确定安装目录
-  const installDir = getHomeBinDir();
-  fs.mkdirSync(installDir, { recursive: true });
-  
-  const targetPath = path.join(installDir, binName);
-  
-  // 下载到临时目录
-  const tempDir = path.join(os.tmpdir(), 'sciagent-update');
-  fs.mkdirSync(tempDir, { recursive: true });
-  const tempPath = path.join(tempDir, binName);
-  try { if (fs.existsSync(tempPath)) fs.unlinkSync(tempPath); } catch (e) {}
-  
-  try {
-    await downloadFile(downloadUrl, tempPath, 600000); // 10 分钟超时
-    
-    // 验证下载
-    if (fs.existsSync(tempPath)) {
-      const stats = fs.statSync(tempPath);
-      if (stats.size > 10 * 1024 * 1024) { // 至少 10MB
-        console.log(`  ✅ 下载到临时文件: ${tempPath} (${(stats.size / (1024 * 1024)).toFixed(1)} MB)`);
-        
-        // Linux/macOS 添加执行权限
-        if (platform !== 'win32') {
-          fs.chmodSync(tempPath, 0o755);
-        }
-        
-        // 尝试替换（处理文件锁定）
-        return await applyDownloadedBinary(tempPath, targetPath, installDir, version, platform);
-      }
-    }
-    
-    console.log(`  ⚠️  下载文件验证失败`);
-    return false;
-  } catch (e) {
-    console.log(`  ⚠️  服务器下载失败: ${e.message}`);
-    return false;
-  }
-}
-
 // installBinaryPackage 已移除
 // 原因：npm optionalDependencies 缓存旧包导致版本错乱
-// 所有二进制统一从极狐GitLab下载
+// 所有二进制统一从 sciagent.tech 服务器下载
 
 async function main() {
   console.log('[postinstall] Starting postinstall script...');
@@ -938,28 +886,22 @@ async function main() {
   } else {
     console.log(`⚠️  Platform binary not found: ${packageName}`);
     
-    // 下载策略: 1) 极狐GitLab（稳定可靠） 2) Releases服务器 3) npm包
+    // 下载策略: 从 sciagent.tech 服务器下载
     console.log('');
-    console.log('  尝试从极狐GitLab下载...');
-    let jihuSuccess = await downloadFromJiHuLab(platform, arch, CURRENT_VERSION);
+    console.log('  尝试从服务器下载...');
+    let success = await downloadFromServer(platform, arch, CURRENT_VERSION);
     
     // 如果当前版本失败，尝试回退版本
-    if (!jihuSuccess) {
+    if (!success) {
       for (const fallbackVersion of GITHUB_FALLBACK_VERSIONS) {
         if (fallbackVersion === CURRENT_VERSION) continue;
         console.log(`  尝试回退版本 v${fallbackVersion}...`);
-        jihuSuccess = await downloadFromJiHuLab(platform, arch, fallbackVersion);
-        if (jihuSuccess) break;
+        success = await downloadFromServer(platform, arch, fallbackVersion);
+        if (success) break;
       }
     }
     
-    if (!jihuSuccess) {
-      // 极狐GitLab 失败，尝试 Releases 服务器
-      console.log('');
-      console.log('  尝试从 Releases 服务器下载...');
-      const serverSuccess = await downloadFromServer(platform, arch, CURRENT_VERSION);
-      
-      if (!serverSuccess) {
+    if (!success) {
         console.error('');
         console.error('╔══════════════════════════════════════════════════════════╗');
         console.error('║          Manual Installation Required                   ║');
@@ -967,7 +909,7 @@ async function main() {
         console.error('');
         console.error('  All download sources failed. Please try again later or:');
         console.error(`    1. Check your network connection`);
-        console.error(`    2. Visit: https://jihulab.com/13996615495-group/research-agent/-/packages`);
+        console.error(`    2. Visit: https://sciagent.tech`);
         console.error('');
         process.exit(1);
       }