@sciagent/cli 1.0.52 → 1.0.54

package/bin/sciagent.js

@@ -8,6 +8,7 @@
 const { spawn } = require('child_process');
 const path = require('path');
 const fs = require('fs');
+const os = require('os');
 
 // 平台和架构映射
 const PLATFORM_MAP = {
@@ -47,6 +48,15 @@ function getBinaryPath() {
   // 尝试从node_modules中查找
   const binName = platform === 'win32' ? 'sciagent.exe' : 'sciagent';
   
+  // 方法0: 从 ~/.sciagent/bin/ 或 %LOCALAPPDATA%\sciagent\bin 查找（postinstall下载位置）
+  const homeBinDir = platform === 'win32'
+    ? path.join(process.env.LOCALAPPDATA || os.homedir(), 'sciagent', 'bin')
+    : path.join(os.homedir(), '.sciagent', 'bin');
+  const homeBinPath = path.join(homeBinDir, binName);
+  if (fs.existsSync(homeBinPath)) {
+    return homeBinPath;
+  }
+
   // 方法1: 从optionalDependencies安装的包中查找
   try {
     const packagePath = require.resolve(`${packageName}/bin/${binName}`);
@@ -69,12 +79,12 @@ function getBinaryPath() {
 
   // 未找到二进制文件
   console.error(`Error: Could not find SciAgent binary for ${platform}-${arch}`);
-  console.error(`Tried to find package: ${packageName}`);
-  console.error('');
-  console.error('Please install the platform-specific package:');
-  console.error(`  npm install ${packageName}`);
+  console.error(`Tried locations:`);
+  console.error(`  ${homeBinPath}`);
+  console.error(`  ${packageName}/bin/${binName} (npm package)`);
+  console.error(`  ${localPath} (dev mode)`);
   console.error('');
-  console.error('Or install all platform packages:');
+  console.error('Please reinstall:');
   console.error('  npm install -g @sciagent/cli');
   process.exit(1);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sciagent/cli",
-  "version": "1.0.52",
+  "version": "1.0.54",
   "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.51",
+    "@sciagent/cli-linux-x64": "1.0.54",
     "@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.52",
+    "@sciagent/cli-win32-x64": "1.0.54",
     "@sciagent/cli-win32-arm64": "1.0.39"
   },
   "keywords": [

package/scripts/postinstall.js

@@ -27,7 +27,7 @@ const ARCH_MAP = {
 };
 
 // 当前版本号 - 每次发布时同步更新
-const CURRENT_VERSION = '1.0.52';
+const CURRENT_VERSION = '1.0.54';
 
 // 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'];
@@ -79,10 +79,38 @@ function getCodebuddyBinDir() {
   }
 }
 
+function getHomeBinDir() {
+  return process.platform === 'win32'
+    ? path.join(process.env.LOCALAPPDATA || os.homedir(), 'sciagent', 'bin')
+    : path.join(os.homedir(), '.sciagent', 'bin');
+}
+
 function checkBinaryInstalled(platform, arch) {
   const packageName = `@sciagent/cli-${platform}-${arch}`;
   const binName = platform === 'win32' ? 'sciagent.exe' : 'sciagent';
+  const homeBinDir = getHomeBinDir();
+  const homeBinPath = path.join(homeBinDir, binName);
+  
+  // 检查 ~/.sciagent/bin/ 或 %LOCALAPPDATA%\sciagent\bin
+  if (fs.existsSync(homeBinPath)) {
+    const stats = fs.statSync(homeBinPath);
+    if (stats.size > 10 * 1024 * 1024) {
+      // 检查版本文件，版本不匹配则视为未安装（需要重新下载）
+      const versionFile = path.join(homeBinDir, '.version');
+      if (fs.existsSync(versionFile)) {
+        const installedVersion = fs.readFileSync(versionFile, 'utf8').trim();
+        if (installedVersion === CURRENT_VERSION) {
+          return { installed: true, path: homeBinPath };
+        } else {
+          console.log(`  ℹ️  已安装版本 ${installedVersion} != 目标版本 ${CURRENT_VERSION}，需要更新`);
+        }
+      } else {
+        console.log(`  ℹ️  二进制版本未知，需要重新下载`);
+      }
+    }
+  }
   
+  // 检查 npm 包路径
   try {
     const packagePath = require.resolve(`${packageName}/bin/${binName}`);
     return { installed: true, path: packagePath };
@@ -272,42 +300,34 @@ async function installCodebuddySdk() {
   const platformKey = `${platform}-${arch}`;
   const platformTag = PYPI_PLATFORM_MAP[platformKey];
   
-  if (!platformTag) {
-    console.log(`⚠️  不支持的平台: ${platformKey}，跳过 CodeBuddy SDK 安装`);
-    return false;
-  }
-  
   console.log('');
   console.log('📦 正在安装 CodeBuddy SDK...');
   
-  try {
-    // 获取版本信息和下载URL
-    console.log('  正在获取版本信息...');
-    const sdkInfo = await getSdkDownloadInfo(platformTag);
-    console.log(`  版本: ${sdkInfo.version}`);
-    console.log(`  平台: ${platformTag}`);
-    console.log(`  文件大小: ${(sdkInfo.size / (1024 * 1024)).toFixed(1)} MB`);
-    
-    // 创建临时目录
-    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'sciagent-sdk-'));
-    const wheelFilename = `codebuddy_agent_sdk-${sdkInfo.version}-py3-none-${platformTag}.whl`;
-    const wheelPath = path.join(tmpDir, wheelFilename);
-    
-    // 使用从JSON API获取的正确URL下载
-    const binaryName = BINARY_NAMES[platform] || 'codebuddy-headless';
-    const binDir = getCodebuddyBinDir();
-    const targetPath = path.join(binDir, binaryName);
-    
-    console.log('  正在下载...');
-    await downloadFile(sdkInfo.url, wheelPath);
-    console.log('  ✅ 下载成功');
-    
-    // 提取二进制文件
-    console.log('  正在提取二进制文件...');
-    fs.mkdirSync(binDir, { recursive: true });
-    
-    // 使用 Python 解压 wheel 文件
-    const extractScript = `
+  // 策略1: 从 PyPI 下载 wheel（Linux/macOS 有wheel，Windows 没有）
+  if (platformTag) {
+    try {
+      console.log('  正在获取版本信息...');
+      const sdkInfo = await getSdkDownloadInfo(platformTag);
+      console.log(`  版本: ${sdkInfo.version}`);
+      console.log(`  平台: ${platformTag}`);
+      console.log(`  文件大小: ${(sdkInfo.size / (1024 * 1024)).toFixed(1)} MB`);
+      
+      const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'sciagent-sdk-'));
+      const wheelFilename = `codebuddy_agent_sdk-${sdkInfo.version}-py3-none-${platformTag}.whl`;
+      const wheelPath = path.join(tmpDir, wheelFilename);
+      
+      const binaryName = BINARY_NAMES[platform] || 'codebuddy-headless';
+      const binDir = getCodebuddyBinDir();
+      const targetPath = path.join(binDir, binaryName);
+      
+      console.log('  正在下载...');
+      await downloadFile(sdkInfo.url, wheelPath);
+      console.log('  ✅ 下载成功');
+      
+      console.log('  正在提取二进制文件...');
+      fs.mkdirSync(binDir, { recursive: true });
+      
+      const extractScript = `
 import zipfile, sys, os
 wheel_path = sys.argv[1]
 target_dir = sys.argv[2]
@@ -327,49 +347,106 @@ with zipfile.ZipFile(wheel_path, 'r') as zf:
 print(f'Error: {binary_name} not found in wheel')
 sys.exit(1)
 `;
-    
-    const scriptPath = path.join(tmpDir, 'extract.py');
-    fs.writeFileSync(scriptPath, extractScript);
-    
-    try {
-      execSync(`python3 "${scriptPath}" "${wheelPath}" "${binDir}" "${binaryName}"`, {
-        stdio: 'inherit',
-        timeout: 120000
-      });
+      
+      const scriptPath = path.join(tmpDir, 'extract.py');
+      fs.writeFileSync(scriptPath, extractScript);
+      
+      try {
+        execSync(`python3 "${scriptPath}" "${wheelPath}" "${binDir}" "${binaryName}"`, {
+          stdio: 'inherit',
+          timeout: 120000
+        });
+      } catch (e) {
+        execSync(`python "${scriptPath}" "${wheelPath}" "${binDir}" "${binaryName}"`, {
+          stdio: 'inherit',
+          timeout: 120000
+        });
+      }
+      
+      if (fs.existsSync(targetPath)) {
+        const stats = fs.statSync(targetPath);
+        console.log(`✅ CodeBuddy SDK 安装成功！(PyPI wheel)`);
+        console.log(`   路径: ${targetPath}`);
+        console.log(`   大小: ${(stats.size / (1024 * 1024)).toFixed(1)} MB`);
+        
+        try { fs.unlinkSync(wheelPath); fs.unlinkSync(scriptPath); fs.rmdirSync(tmpDir); } catch (e) {}
+        return true;
+      }
     } catch (e) {
-      // 如果python3失败，尝试python
-      execSync(`python "${scriptPath}" "${wheelPath}" "${binDir}" "${binaryName}"`, {
-        stdio: 'inherit',
-        timeout: 120000
-      });
+      console.log(`  ⚠️  PyPI 下载失败: ${e.message}`);
     }
+  }
+  
+  // 策略2: 从 npm 安装 @tencent-ai/codebuddy-code（全平台支持，国内可访问）
+  console.log('  尝试从 npm 安装 @tencent-ai/codebuddy-code...');
+  try {
+    execSync('npm install -g @tencent-ai/codebuddy-code', {
+      stdio: 'inherit',
+      timeout: 300000
+    });
     
-    // 验证安装
-    if (fs.existsSync(targetPath)) {
-      const stats = fs.statSync(targetPath);
-      const sizeMb = (stats.size / (1024 * 1024)).toFixed(1);
-      console.log(`✅ CodeBuddy SDK 安装成功！`);
-      console.log(`   路径: ${targetPath}`);
-      console.log(`   大小: ${sizeMb} MB`);
+    // 查找 npm 安装的 codebuddy-headless.js
+    const npmRootResult = execSync('npm root -g', { encoding: 'utf8', timeout: 10000 }).trim();
+    const headlessJsPath = path.join(npmRootResult, '@tencent-ai', 'codebuddy-code', 'dist', 'codebuddy-headless.js');
+    
+    if (fs.existsSync(headlessJsPath)) {
+      // 创建 wrapper 脚本，让 codebuddy-headless 可以被直接调用
+      const binDir = getCodebuddyBinDir();
+      fs.mkdirSync(binDir, { recursive: true });
+      const binaryName = BINARY_NAMES[platform] || 'codebuddy-headless';
+      const wrapperPath = path.join(binDir, binaryName);
       
-      // 清理临时文件
-      try {
-        fs.unlinkSync(wheelPath);
-        fs.unlinkSync(scriptPath);
-        fs.rmdirSync(tmpDir);
-      } catch (e) {}
+      if (platform === 'win32') {
+        // Windows: 创建 .cmd wrapper
+        const cmdPath = wrapperPath.replace(/\.(exe)?$/, '.cmd');
+        fs.writeFileSync(cmdPath, `@echo off\r\nnode "${headlessJsPath}" %*\r\n`);
+        // 也创建 .exe placeholder（实际用 .cmd）
+        fs.writeFileSync(wrapperPath, `#!/usr/bin/env node\r\nrequire("${headlessJsPath}");`);
+      } else {
+        fs.writeFileSync(wrapperPath, `#!/usr/bin/env node\nrequire("${headlessJsPath}");`);
+        fs.chmodSync(wrapperPath, 0o755);
+      }
       
+      console.log(`✅ CodeBuddy SDK 安装成功！(npm @tencent-ai/codebuddy-code)`);
+      console.log(`   路径: ${wrapperPath}`);
+      console.log(`   headless.js: ${headlessJsPath}`);
       return true;
     } else {
-      console.error('❌ 安装验证失败');
-      return false;
+      console.log(`  ⚠️  npm 安装成功但未找到 codebuddy-headless.js`);
     }
+  } catch (e) {
+    console.log(`  ⚠️  npm 安装失败: ${e.message}`);
+  }
+  
+  // 策略3: 从 releases 服务器下载
+  console.log('  尝试从 Releases 服务器下载 CodeBuddy SDK...');
+  try {
+    const binDir = getCodebuddyBinDir();
+    fs.mkdirSync(binDir, { recursive: true });
+    const binaryName = BINARY_NAMES[platform] || 'codebuddy-headless';
+    const targetPath = path.join(binDir, binaryName);
+    const downloadUrl = `${RELEASE_SERVER_URL}/api/releases/download/codebuddy/${platform}/${arch}/latest`;
     
+    await downloadFile(downloadUrl, targetPath, 600000);
+    
+    if (fs.existsSync(targetPath)) {
+      const stats = fs.statSync(targetPath);
+      if (stats.size > 10 * 1024 * 1024) {
+        if (platform !== 'win32') {
+          fs.chmodSync(targetPath, 0o755);
+        }
+        console.log(`✅ CodeBuddy SDK 安装成功！(Releases 服务器)`);
+        console.log(`   路径: ${targetPath}`);
+        return true;
+      }
+    }
   } catch (e) {
-    console.error(`❌ CodeBuddy SDK 安装失败: ${e.message}`);
-    console.error('   你可以稍后运行 "sciagent install-sdk" 手动安装');
-    return false;
+    console.log(`  ⚠️  Releases 服务器下载失败: ${e.message}`);
   }
+  
+  console.log('⚠️  CodeBuddy SDK 安装失败，CLI 仍可启动（AI 对话功能将在 SDK 安装后可用）');
+  console.log('   手动安装: npm install -g @tencent-ai/codebuddy-code');
+  return false;
 }
 
 // GitHub Releases 配置
@@ -383,7 +460,7 @@ async function downloadFromGitHub(platform, arch, version) {
   console.log(`\n  📥 尝试从 GitHub Releases 下载...`);
   
   // 确定安装目录
-  const installDir = path.join(os.homedir(), '.sciagent', 'bin');
+  const installDir = getHomeBinDir();
   fs.mkdirSync(installDir, { recursive: true });
   const targetPath = path.join(installDir, binName);
   
@@ -487,6 +564,8 @@ async function downloadFromGitHub(platform, arch, version) {
         if (platform !== 'win32') {
           fs.chmodSync(targetPath, 0o755);
         }
+        // 写入版本文件
+        fs.writeFileSync(path.join(installDir, '.version'), version);
         return true;
       }
     }
@@ -506,7 +585,7 @@ async function downloadFromServer(platform, arch, version) {
   console.log(`\n  📥 从 Releases 服务器下载: ${downloadUrl}`);
   
   // 确定安装目录
-  const installDir = path.join(os.homedir(), '.sciagent', 'bin');
+  const installDir = getHomeBinDir();
   fs.mkdirSync(installDir, { recursive: true });
   
   const targetPath = path.join(installDir, binName);
@@ -525,6 +604,9 @@ async function downloadFromServer(platform, arch, version) {
           fs.chmodSync(targetPath, 0o755);
         }
         
+        // 写入版本文件
+        fs.writeFileSync(path.join(installDir, '.version'), version);
+        
         return true;
       }
     }