@sciagent/cli 1.1.77 → 1.1.79

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.77';
+const CURRENT_VERSION = '1.1.79';
 
 // Releases 下载源配置（优先级从高到低）
 // JihuLab 通用包仓库（国内 CDN，速度快）作为主源
@@ -841,11 +841,63 @@ function downloadBinary(platform, arch, version) {
 }
 
 /**
- * 主函数
+ * 处理更新重启流程
+ * 当子进程以退出码42退出时调用：
+ * 1. 检查 .download-request 文件，如果存在则下载新版本
+ * 2. 应用 .pending-update（如果存在）
+ * 3. 返回 true 表示应该重新启动，false 表示不需要
+ */
+function handleUpdateRestart(platform, arch) {
+  const installDir = getInstallDir(platform);
+
+  // 1. 检查 download-request
+  const requestFile = path.join(installDir, '.download-request');
+  if (fs.existsSync(requestFile)) {
+    try {
+      const requestData = JSON.parse(fs.readFileSync(requestFile, 'utf8'));
+      const targetVersion = requestData.version;
+      console.log(`[UPDATE] Found download request for v${targetVersion}`);
+
+      // 下载新版本二进制到临时目录
+      const tempPath = downloadBinaryToTemp(platform, arch, targetVersion);
+      if (tempPath) {
+        console.log(`[UPDATE] ✅ Downloaded v${targetVersion} to temp.`);
+        // .pending-update 已经在 downloadBinaryToTemp 中写入
+      } else {
+        console.log(`[UPDATE] ⚠️ Download failed, will restart with current version.`);
+      }
+
+      // 删除 download-request
+      try { fs.unlinkSync(requestFile); } catch (e) {}
+    } catch (e) {
+      console.log(`[UPDATE] ⚠️ Error reading download request: ${e.message}`);
+      try { fs.unlinkSync(requestFile); } catch (e2) {}
+    }
+  }
+
+  // 2. 应用 pending update
+  const applied = applyPendingUpdate(installDir);
+  if (applied) {
+    console.log(`[UPDATE] ✅ Update applied successfully.`);
+  }
+
+  return true; // 应该重新启动
+}
+
+/**
+ * 主函数 - 支持更新重启循环
  */
 function main() {
-  const binaryPath = getBinaryPath();
-  
+  const platform = PLATFORM_MAP[process.platform];
+  const arch = ARCH_MAP[process.arch];
+
+  if (!platform || !arch) {
+    console.error(`Error: Unsupported platform/arch: ${process.platform}/${process.arch}`);
+    process.exit(1);
+  }
+
+  let binaryPath = getBinaryPath();
+
   // 检查二进制文件是否存在
   if (!fs.existsSync(binaryPath)) {
     console.error(`Error: Binary not found at: ${binaryPath}`);
@@ -859,7 +911,6 @@ function main() {
     try {
       fs.accessSync(binaryPath, fs.constants.X_OK);
     } catch (e) {
-      // 添加可执行权限
       fs.chmodSync(binaryPath, 0o755);
     }
   }
@@ -868,9 +919,9 @@ function main() {
   const args = process.argv.slice(2);
 
   // 启动子进程
-  const child = spawn(binaryPath, args, {
-    stdio: 'inherit',  // 继承父进程的stdio
-    windowsHide: false  // Windows下不隐藏控制台
+  let child = spawn(binaryPath, args, {
+    stdio: 'inherit',
+    windowsHide: false
   });
 
   // 处理子进程退出
@@ -878,6 +929,74 @@ function main() {
     if (signal) {
       // 被信号终止
       process.kill(process.pid, signal);
+    } else if (code === 42) {
+      // 退出码 42 = 更新重启
+      console.log('[RESTART] Update restart triggered (exit code 42).');
+      console.log('[RESTART] Processing update...');
+
+      // 处理更新流程
+      handleUpdateRestart(platform, arch);
+
+      // 重新获取二进制路径（可能已更新）
+      const newBinaryPath = getBinaryPath();
+      if (fs.existsSync(newBinaryPath)) {
+        binaryPath = newBinaryPath;
+      }
+
+      console.log('[RESTART] Re-launching SciAgent...');
+      
+      // 重新启动子进程
+      child = spawn(binaryPath, args, {
+        stdio: 'inherit',
+        windowsHide: false
+      });
+
+      // 重新绑定事件处理
+      child.on('exit', (code2, signal2) => {
+        if (signal2) {
+          process.kill(process.pid, signal2);
+        } else if (code2 === 42) {
+          // 再次更新重启（递归处理）
+          console.log('[RESTART] Second update restart, re-processing...');
+          handleUpdateRestart(platform, arch);
+          const updatedPath = getBinaryPath();
+          if (fs.existsSync(updatedPath)) {
+            binaryPath = updatedPath;
+          }
+          console.log('[RESTART] Re-launching SciAgent...');
+          child = spawn(binaryPath, args, {
+            stdio: 'inherit',
+            windowsHide: false
+          });
+          child.on('exit', (code3, signal3) => {
+            if (signal3) {
+              process.kill(process.pid, signal3);
+            } else {
+              process.exit(code3 || 0);
+            }
+          });
+          child.on('error', (err) => {
+            console.error(`Error: Failed to restart SciAgent: ${err.message}`);
+            process.exit(1);
+          });
+        } else {
+          process.exit(code2 || 0);
+        }
+      });
+
+      child.on('error', (err) => {
+        console.error(`Error: Failed to restart SciAgent: ${err.message}`);
+        process.exit(1);
+      });
+
+      // 转发信号
+      process.on('SIGINT', () => {
+        try { child.kill('SIGINT'); } catch (e) {}
+      });
+      process.on('SIGTERM', () => {
+        try { child.kill('SIGTERM'); } catch (e) {}
+      });
+
     } else {
       // 正常退出，传递退出码
       process.exit(code || 0);
@@ -900,11 +1019,11 @@ function main() {
 
   // 转发信号到子进程
   process.on('SIGINT', () => {
-    child.kill('SIGINT');
+    try { child.kill('SIGINT'); } catch (e) {}
   });
 
   process.on('SIGTERM', () => {
-    child.kill('SIGTERM');
+    try { child.kill('SIGTERM'); } catch (e) {}
   });
 
   // Windows下处理CTRL+C
@@ -916,7 +1035,7 @@ function main() {
     });
 
     rl.on('SIGINT', () => {
-      child.kill('SIGINT');
+      try { child.kill('SIGINT'); } catch (e) {}
     });
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sciagent/cli",
-  "version": "1.1.77",
+  "version": "1.1.79",
   "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.77';
+const CURRENT_VERSION = '1.1.79';
 
 // 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'];