@sciagent/cli 1.3.60 → 1.3.63

package/bin/sciagent.js

@@ -25,7 +25,7 @@ const https = require('https');
 const http = require('http');
 
 // 当前版本号 - 与 postinstall.js 和 package.json 保持同步
-const CURRENT_VERSION = '1.3.60';
+const CURRENT_VERSION = '1.3.63';
 
 // Releases 下载源配置（优先级从高到低）
 // JihuLab 通用包仓库（国内 CDN，速度快）作为主源
@@ -120,16 +120,42 @@ function applyPendingUpdate(installDir) {
     try {
       if (process.platform === 'win32') {
         // Windows: 使用 PowerShell
-        const tmpScript = path.join(os.tmpdir(), 'sciagent-apply-update.ps1');
+        // 注意：脚本必须以 UTF-8 BOM 写入——PowerShell 5.1 对无 BOM 的
+        // UTF-8 脚本按系统 ANSI/GBK 解码，中文安装路径会乱码导致复制失败。
+        const tmpScript = path.join(os.tmpdir(), `sciagent-apply-update-${process.pid}.ps1`);
+        const logFile = path.join(installDir, 'update-apply.log');
+        const esc = (s) => String(s).replace(/'/g, "''");
         const scriptContent = [
-          `$target = "${targetPath}"`,
-          `Copy-Item -Path "${tempPath}" -Destination "$target" -Force`,
-          'if (Test-Path $target) { Write-Host "OK" } else { Write-Error "Copy failed"; exit 1 }'
+          `$ErrorActionPreference = 'Stop'`,
+          `$log = '${esc(logFile)}'`,
+          `function Write-Log([string]$msg) { try { $line = '[{0}] {1}' -f (Get-Date -Format 'yyyy-MM-dd HH:mm:ss'), $msg; Add-Content -Path $log -Value $line -Encoding UTF8 } catch {} }`,
+          `Write-Log 'npm applyPendingUpdate: helper started'`,
+          `try {`,
+          `  $target = '${esc(targetPath)}'`,
+          // 轮询等待旧 exe 解锁（最多 60s），避免直接覆盖运行中 exe 报
+          // "与运行的进程共享" / EPERM
+          `  if (Test-Path $target) {`,
+          `    $deadline = (Get-Date).AddSeconds(60)`,
+          `    $unlocked = $false`,
+          `    while ((Get-Date) -lt $deadline) {`,
+          `      try { $fs = [System.IO.File]::Open($target, 'Open', 'ReadWrite', 'None'); $fs.Close(); $unlocked = $true; break } catch { Start-Sleep -Milliseconds 500 }`,
+          `    }`,
+          `    if (-not $unlocked) { throw ('Timed out waiting for target to unlock: ' + $target) }`,
+          `  }`,
+          `  Copy-Item -Path '${esc(tempPath)}' -Destination $target -Force`,
+          `  if (-not (Test-Path $target)) { throw 'Copy failed' }`,
+          `  Write-Log 'npm applyPendingUpdate: replace OK'`,
+          `  Write-Host 'OK'`,
+          `} catch {`,
+          `  Write-Log ('npm applyPendingUpdate FAILED: ' + $_.Exception.ToString())`,
+          `  Write-Host ('FAILED: ' + $_.Exception.Message)`,
+          `  exit 1`,
+          `}`,
         ].join('\r\n');
-        fs.writeFileSync(tmpScript, scriptContent, 'utf8');
+        fs.writeFileSync(tmpScript, '\ufeff' + scriptContent, 'utf8');
         try {
           execSync(`powershell -NoProfile -ExecutionPolicy Bypass -File "${tmpScript}"`, {
-            stdio: 'pipe', timeout: 30000
+            stdio: 'pipe', timeout: 90000
           });
         } finally {
           try { fs.unlinkSync(tmpScript); } catch (e) {}
@@ -778,16 +804,40 @@ function downloadBinary(platform, arch, version) {
             // 尝试替换目标文件
             try {
               if (platform === 'win32') {
-                const tmpScript = path.join(os.tmpdir(), 'sciagent-replace.ps1');
+                const tmpScript = path.join(os.tmpdir(), `sciagent-replace-${process.pid}.ps1`);
+                const logFile = path.join(installDir, 'update-apply.log');
+                const esc = (s) => String(s).replace(/'/g, "''");
+                // 脚本必须以 UTF-8 BOM 写入（PowerShell 5.1 无 BOM 按 ANSI/GBK
+                // 解码，中文路径乱码）；并轮询等待运行中 exe 解锁后再覆盖。
                 const scriptContent = [
-                  `$target = "${targetPath}"`,
-                  `Copy-Item -Path "${tempPath}" -Destination "$target" -Force`,
-                  'if (Test-Path $target) { Write-Host "OK" } else { Write-Error "Copy failed"; exit 1 }'
+                  `$ErrorActionPreference = 'Stop'`,
+                  `$log = '${esc(logFile)}'`,
+                  `function Write-Log([string]$msg) { try { $line = '[{0}] {1}' -f (Get-Date -Format 'yyyy-MM-dd HH:mm:ss'), $msg; Add-Content -Path $log -Value $line -Encoding UTF8 } catch {} }`,
+                  `Write-Log 'downloadBinary replace: helper started'`,
+                  `try {`,
+                  `  $target = '${esc(targetPath)}'`,
+                  `  if (Test-Path $target) {`,
+                  `    $deadline = (Get-Date).AddSeconds(60)`,
+                  `    $unlocked = $false`,
+                  `    while ((Get-Date) -lt $deadline) {`,
+                  `      try { $fs = [System.IO.File]::Open($target, 'Open', 'ReadWrite', 'None'); $fs.Close(); $unlocked = $true; break } catch { Start-Sleep -Milliseconds 500 }`,
+                  `    }`,
+                  `    if (-not $unlocked) { throw ('Timed out waiting for target to unlock: ' + $target) }`,
+                  `  }`,
+                  `  Copy-Item -Path '${esc(tempPath)}' -Destination $target -Force`,
+                  `  if (-not (Test-Path $target)) { throw 'Copy failed' }`,
+                  `  Write-Log 'downloadBinary replace: OK'`,
+                  `  Write-Host 'OK'`,
+                  `} catch {`,
+                  `  Write-Log ('downloadBinary replace FAILED: ' + $_.Exception.ToString())`,
+                  `  Write-Host ('FAILED: ' + $_.Exception.Message)`,
+                  `  exit 1`,
+                  `}`,
                 ].join('\r\n');
-                fs.writeFileSync(tmpScript, scriptContent, 'utf8');
+                fs.writeFileSync(tmpScript, '\ufeff' + scriptContent, 'utf8');
                 try {
                   execSync(`powershell -NoProfile -ExecutionPolicy Bypass -File "${tmpScript}"`, {
-                    stdio: 'pipe', timeout: 30000
+                    stdio: 'pipe', timeout: 90000
                   });
                 } finally {
                   try { fs.unlinkSync(tmpScript); } catch (e) {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sciagent/cli",
-  "version": "1.3.60",
+  "version": "1.3.63",
   "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.3.60';
+const CURRENT_VERSION = '1.3.63';
 
 // 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'];
@@ -684,16 +684,41 @@ function tryReplaceBinary(tempPath, targetPath, installDir, version, platform) {
     // 先尝试直接复制
     if (process.platform === 'win32') {
       // Windows: 使用 PowerShell Copy-Item
-      const tmpScript = path.join(os.tmpdir(), 'sciagent-replace.ps1');
+      // 脚本必须以 UTF-8 BOM 写入（PowerShell 5.1 无 BOM 按 ANSI/GBK 解码，
+      // 中文安装路径会乱码导致复制失败）；并轮询等待 exe 解锁再覆盖。
+      const tmpScript = path.join(os.tmpdir(), `sciagent-replace-${process.pid}.ps1`);
+      const logFile = path.join(installDir, 'update-apply.log');
+      const esc = (s) => String(s).replace(/'/g, "''");
       const scriptContent = [
-        `Copy-Item -Path "${tempPath}" -Destination "${targetPath}" -Force`,
-        'if (Test-Path $out) { Write-Host "OK" } else { Write-Error "Copy failed"; exit 1 }'
+        `$ErrorActionPreference = 'Stop'`,
+        `$log = '${esc(logFile)}'`,
+        `function Write-Log([string]$msg) { try { $line = '[{0}] {1}' -f (Get-Date -Format 'yyyy-MM-dd HH:mm:ss'), $msg; Add-Content -Path $log -Value $line -Encoding UTF8 } catch {} }`,
+        `Write-Log 'tryReplaceBinary: helper started'`,
+        `try {`,
+        `  $target = '${esc(targetPath)}'`,
+        `  if (Test-Path $target) {`,
+        `    $deadline = (Get-Date).AddSeconds(60)`,
+        `    $unlocked = $false`,
+        `    while ((Get-Date) -lt $deadline) {`,
+        `      try { $fs = [System.IO.File]::Open($target, 'Open', 'ReadWrite', 'None'); $fs.Close(); $unlocked = $true; break } catch { Start-Sleep -Milliseconds 500 }`,
+        `    }`,
+        `    if (-not $unlocked) { throw ('Timed out waiting for target to unlock: ' + $target) }`,
+        `  }`,
+        `  Copy-Item -Path '${esc(tempPath)}' -Destination $target -Force`,
+        `  if (-not (Test-Path $target)) { throw 'Copy failed' }`,
+        `  Write-Log 'tryReplaceBinary: replace OK'`,
+        `  Write-Host 'OK'`,
+        `} catch {`,
+        `  Write-Log ('tryReplaceBinary FAILED: ' + $_.Exception.ToString())`,
+        `  Write-Host ('FAILED: ' + $_.Exception.Message)`,
+        `  exit 1`,
+        `}`,
       ].join('\r\n');
-      fs.writeFileSync(tmpScript, scriptContent, 'utf8');
+      fs.writeFileSync(tmpScript, '\ufeff' + scriptContent, 'utf8');
       try {
         execSync(`powershell -NoProfile -ExecutionPolicy Bypass -File "${tmpScript}"`, {
           stdio: 'pipe',
-          timeout: 30000
+          timeout: 90000
         });
       } finally {
         try { fs.unlinkSync(tmpScript); } catch (e) {}