@sciagent/cli 1.1.49 → 1.1.50

package/bin/sciagent.js

@@ -25,7 +25,7 @@ const https = require('https');
 const http = require('http');
 
 // 当前版本号 - 与 postinstall.js 和 package.json 保持同步
-const CURRENT_VERSION = '1.1.48';
+const CURRENT_VERSION = '1.1.50';
 
 // Releases 服务器下载配置
 const RELEASE_SERVER_URL = process.env.RELEASE_SERVER_URL || 'https://sciagent.tech';
@@ -396,19 +396,23 @@ function getBinaryPath() {
           checkAutoUpdate(platform, arch);
           return binPath;
         } 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 server...`);
-          // 注意：此时当前进程正在运行旧二进制，无法直接替换
-          // 下载到临时目录，写入 .pending-update，下次启动时应用
-          const downloaded = downloadBinaryToTemp(platform, arch, CURRENT_VERSION);
-          if (downloaded) {
-            console.log(`[INFO] ✅ New version downloaded. Please restart sciagent to apply update.`);
-            // 继续使用当前版本
-            return binPath;
+          const downloaded = downloadBinary(platform, arch, CURRENT_VERSION);
+          if (downloaded && fs.existsSync(downloaded)) {
+            console.log(`[INFO] ✅ Updated to v${CURRENT_VERSION}. Starting...`);
+            checkAutoUpdate(platform, arch);
+            return downloaded;
+          }
+          // 下载失败，尝试临时目录下载
+          const tempDownloaded = downloadBinaryToTemp(platform, arch, CURRENT_VERSION);
+          if (tempDownloaded) {
+            console.log(`[INFO] ✅ New version downloaded to temp. Will apply on next restart.`);
+            console.log(`[INFO] ⚠️ Continuing with current version v${installedVersion} this time.`);
+          } else {
+            console.log(`[INFO] ⚠️ Download failed. Continuing with current version v${installedVersion}.`);
           }
-          // 下载失败，继续使用当前版本
-          console.log(`[INFO] ⚠️ Download failed. Continuing with current version.`);
           return binPath;
         } else {
           // 版本更高 → 允许运行（用户可能手动安装了新版）
@@ -417,11 +421,21 @@ function getBinaryPath() {
           return binPath;
         }
       } else {
-        // 没有.version文件 → 可能是旧安装，下载到临时目录
+        // 没有.version文件 → 版本未知，同步下载正确版本
         console.log(`[INFO] SciAgent binary found but version unknown, downloading v${CURRENT_VERSION}...`);
-        const downloaded = downloadBinaryToTemp(platform, arch, CURRENT_VERSION);
-        if (downloaded) {
-          console.log(`[INFO] ✅ New version downloaded. Please restart sciagent to apply update.`);
+        const downloaded = downloadBinary(platform, arch, CURRENT_VERSION);
+        if (downloaded && fs.existsSync(downloaded)) {
+          console.log(`[INFO] ✅ Installed v${CURRENT_VERSION}. Starting...`);
+          checkAutoUpdate(platform, arch);
+          return downloaded;
+        }
+        // 下载失败，尝试临时目录
+        const tempDownloaded = downloadBinaryToTemp(platform, arch, CURRENT_VERSION);
+        if (tempDownloaded) {
+          console.log(`[INFO] ✅ New version downloaded to temp. Will apply on next restart.`);
+          console.log(`[INFO] ⚠️ Continuing with unknown version this time.`);
+        } else {
+          console.log(`[INFO] ⚠️ Download failed. Continuing with unknown version.`);
         }
         return binPath;
       }
@@ -538,7 +552,8 @@ function downloadBinaryToTemp(platform, arch, version) {
 }
 
 /**
- * 从 Release Server 下载二进制文件（直接到目标路径，用于首次安装）
+ * 从 Release Server 下载二进制文件（直接到目标路径，用于首次安装或版本更新）
+ * 如果目标文件已存在，先下载到临时目录再替换
  */
 function downloadBinary(platform, arch, version) {
   const binName = platform === 'win32' ? 'sciagent.exe' : 'sciagent';
@@ -552,7 +567,107 @@ function downloadBinary(platform, arch, version) {
   const installDir = getInstallDir(platform);
   fs.mkdirSync(installDir, { recursive: true });
   const targetPath = path.join(installDir, binName);
+  const targetExists = fs.existsSync(targetPath);
+  
+  // 如果目标文件已存在，先下载到临时目录再替换
+  if (targetExists) {
+    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) {}
+    
+    console.log(`   Downloading ${filename} v${version} to temp...`);
+    
+    try {
+      if (platform === 'win32') {
+        const tmpScript = path.join(os.tmpdir(), 'sciagent-download.ps1');
+        const scriptContent = [
+          '$ProgressPreference = "SilentlyContinue"',
+          `$uri = "${downloadUrl}"`,
+          `$out = "${tempPath}"`,
+          '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');
+        fs.writeFileSync(tmpScript, scriptContent, 'utf8');
+        
+        try {
+          execSync(`powershell -NoProfile -ExecutionPolicy Bypass -File "${tmpScript}"`, {
+            stdio: 'inherit',
+            timeout: 600000
+          });
+        } finally {
+          try { fs.unlinkSync(tmpScript); } catch (e) {}
+        }
+      } else {
+        execSync(`curl -fsSL -o '${tempPath}' '${downloadUrl}'`, {
+          stdio: 'pipe',
+          timeout: 600000
+        });
+        fs.chmodSync(tempPath, 0o755);
+      }
+      
+      // 验证临时文件
+      if (fs.existsSync(tempPath)) {
+        const tempStats = fs.statSync(tempPath);
+        if (tempStats.size > 10 * 1024 * 1024) {
+          console.log(`   ✅ Downloaded: ${(tempStats.size / (1024 * 1024)).toFixed(1)} MB`);
+          
+          // 尝试替换目标文件
+          try {
+            if (platform === 'win32') {
+              const tmpScript = path.join(os.tmpdir(), 'sciagent-replace.ps1');
+              const scriptContent = [
+                `Copy-Item -Path "${tempPath}" -Destination "${targetPath}" -Force`,
+                'if (Test-Path $out) { Write-Host "OK" } else { Write-Error "Copy failed"; exit 1 }'
+              ].join('\r\n');
+              fs.writeFileSync(tmpScript, scriptContent, 'utf8');
+              try {
+                execSync(`powershell -NoProfile -ExecutionPolicy Bypass -File "${tmpScript}"`, {
+                  stdio: 'pipe', timeout: 30000
+                });
+              } finally {
+                try { fs.unlinkSync(tmpScript); } catch (e) {}
+              }
+            } else {
+              fs.copyFileSync(tempPath, targetPath);
+              fs.chmodSync(targetPath, 0o755);
+            }
+            
+            // 验证替换成功
+            if (fs.existsSync(targetPath)) {
+              const targetStats = fs.statSync(targetPath);
+              if (targetStats.size > 10 * 1024 * 1024) {
+                fs.writeFileSync(path.join(installDir, '.version'), version);
+                try { fs.unlinkSync(tempPath); } catch (e) {}
+                return targetPath;
+              }
+            }
+          } catch (replaceErr) {
+            // 替换失败（可能被锁定），写入 pending update
+            console.log(`   ⚠️ Cannot replace running binary. Writing pending update...`);
+            const pendingData = {
+              version: version,
+              tempPath: tempPath,
+              timestamp: new Date().toISOString(),
+              platform: process.platform
+            };
+            fs.writeFileSync(path.join(installDir, '.pending-update'), JSON.stringify(pendingData, null, 2), 'utf8');
+            console.log(`   📋 Update will be applied on next restart.`);
+            return null;
+          }
+        }
+      }
+    } catch (e) {
+      console.error(`   ❌ Download failed: ${e.message}`);
+      try { if (fs.existsSync(tempPath)) fs.unlinkSync(tempPath); } catch (e2) {}
+    }
+    
+    return null;
+  }
   
+  // 目标文件不存在（首次安装），直接下载到目标路径
   console.log(`   Downloading ${filename} v${version}...`);
   console.log(`   Target: ${targetPath}`);
   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sciagent/cli",
-  "version": "1.1.49",
+  "version": "1.1.50",
   "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.48';
+const CURRENT_VERSION = '1.1.50';
 
 // 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'];
@@ -110,13 +110,21 @@ function checkBinaryInstalled(platform, arch) {
         } else {
           console.log(`  ℹ️  已安装版本 ${installedVersion} != 目标版本 ${CURRENT_VERSION}，需要更新`);
           // 版本不匹配，删除旧文件强制重新下载
-          _removeBinaryFiles(homeBinDir, homeBinPath);
+          const allRemoved = _removeBinaryFiles(homeBinDir, homeBinPath);
+          if (!allRemoved) {
+            // 删除失败（可能被锁定），标记需要更新但不阻塞
+            // downloadFromServer 会下载到临时目录并处理锁定情况
+            console.log(`  ℹ️  旧文件删除失败（可能被占用），将下载新版本到临时目录`);
+          }
           return { installed: false };
         }
       } else {
         console.log(`  ℹ️  二进制版本未知（无.version文件），需要重新下载`);
         // 版本未知，删除文件强制重新下载
-        _removeBinaryFiles(homeBinDir, homeBinPath);
+        const allRemoved = _removeBinaryFiles(homeBinDir, homeBinPath);
+        if (!allRemoved) {
+          console.log(`  ℹ️  旧文件删除失败（可能被占用），将下载新版本到临时目录`);
+        }
         return { installed: false };
       }
     } else {
@@ -144,14 +152,22 @@ function _removeBinaryFiles(binDir, binPath) {
   if (fs.existsSync(versionFile)) {
     filesToRemove.push(versionFile);
   }
+  // 也删除 .pending-update 文件
+  const pendingFile = path.join(binDir, '.pending-update');
+  if (fs.existsSync(pendingFile)) {
+    filesToRemove.push(pendingFile);
+  }
+  let allRemoved = true;
   for (const f of filesToRemove) {
     try {
       fs.unlinkSync(f);
       console.log(`  ℹ️  已删除: ${f}`);
     } catch (e) {
       console.log(`  ⚠️  无法删除 ${f}: ${e.message}`);
+      allRemoved = false;
     }
   }
+  return allRemoved;
 }
 
 function checkCodebuddyBinaryInstalled() {