yymaxapi 1.0.18 → 1.0.20

package/bin/yymaxapi.js

@@ -490,6 +490,34 @@ function getConfigPath() {
     );
   }
 
+  // Windows + WSL: 尝试读取 WSL 内的配置文件
+  if (process.platform === 'win32' && isWslAvailable()) {
+    try {
+      const wslHome = getWslHome() || '/root';
+      const wslPaths = [
+        `${wslHome}/.openclaw/openclaw.json`,
+        `${wslHome}/.openclaw/moltbot.json`,
+        `${wslHome}/.clawdbot/openclaw.json`,
+        '/root/.openclaw/openclaw.json',
+        '/root/.openclaw/moltbot.json',
+      ];
+      for (const wp of wslPaths) {
+        const check = safeExec(`wsl -- bash -c "test -f '${wp}' && echo yes"`, { timeout: 5000 });
+        if (check.ok && check.output.trim() === 'yes') {
+          // 将 WSL 配置复制到 Windows 侧，保持同步
+          const winDest = path.join(openclawStateDir, path.basename(wp));
+          try {
+            const content = execFileSync('wsl', ['bash', '-c', `cat '${wp}'`], { encoding: 'utf8', timeout: 10000 });
+            if (!fs.existsSync(openclawStateDir)) fs.mkdirSync(openclawStateDir, { recursive: true });
+            fs.writeFileSync(winDest, content, 'utf8');
+            if (!candidates.includes(winDest)) candidates.unshift(winDest);
+          } catch {}
+          break;
+        }
+      }
+    } catch {}
+  }
+
   const defaultConfig = preferMoltbot
     ? path.join(moltbotPrimaryDir, 'moltbot.json')
     : path.join(openclawStateDir, 'openclaw.json');
@@ -3040,28 +3068,44 @@ async function autoInstallGitWindows() {
     }
   }
 
-  // 方式2: 下载 Git 安装包（动态获取最新版本号）
+  // 方式2: 下载 Git 安装包（优先国内镜像，fallback GitHub）
   const spinner = ora({ text: '正在获取 Git 最新版本...', spinner: 'dots' }).start();
   const installerPath = path.join(os.tmpdir(), 'git-installer.exe');
-  let downloadUrl;
-  try {
-    const tagJson = execSync('powershell -Command "(Invoke-RestMethod https://api.github.com/repos/git-for-windows/git/releases/latest).tag_name"', { stdio: 'pipe', timeout: 30000 }).toString().trim();
-    // tag 格式: v2.48.1.windows.1 → 需要转成 Git-2.48.1-64-bit.exe
-    const ver = tagJson.replace(/^v/, '').replace(/\.windows\.\d+$/, '');
-    downloadUrl = `https://github.com/git-for-windows/git/releases/latest/download/Git-${ver}-64-bit.exe`;
-    spinner.text = `正在下载 Git ${ver}...`;
-  } catch (e) {
-    // fallback: 用固定版本
-    downloadUrl = 'https://github.com/git-for-windows/git/releases/download/v2.48.1.windows.1/Git-2.48.1-64-bit.exe';
-    spinner.text = '正在下载 Git 安装包...';
+  const GIT_VER = '2.48.1';
+  const fileName = `Git-${GIT_VER}-64-bit.exe`;
+  const mirrors = [
+    `https://registry.npmmirror.com/-/binary/git-for-windows/v${GIT_VER}.windows.1/${fileName}`,
+    `https://github.com/git-for-windows/git/releases/download/v${GIT_VER}.windows.1/${fileName}`,
+  ];
+  let downloadUrl = mirrors[0];
+  spinner.text = `正在下载 Git ${GIT_VER}（国内镜像）...`;
+
+  let downloaded = false;
+  for (let i = 0; i < mirrors.length; i++) {
+    downloadUrl = mirrors[i];
+    if (i > 0) spinner.text = `正在下载 Git ${GIT_VER}（GitHub）...`;
+    try {
+      execSync(`powershell -Command "Invoke-WebRequest -Uri '${downloadUrl}' -OutFile '${installerPath}'"`, {
+        stdio: 'pipe', timeout: 300000
+      });
+      downloaded = true;
+      break;
+    } catch (e) {
+      if (i < mirrors.length - 1) {
+        spinner.text = '国内镜像下载失败，切换 GitHub...';
+      }
+    }
   }
 
-  try {
-    execSync(`powershell -Command "Invoke-WebRequest -Uri '${downloadUrl}' -OutFile '${installerPath}'"`, {
-      stdio: 'pipe', timeout: 300000
-    });
-    spinner.succeed('Git 安装包下载完成');
+  if (!downloaded) {
+    spinner.fail('Git 下载失败（所有镜像均不可达）');
+    console.log(chalk.cyan('   请手动安装: https://git-scm.com/download/win'));
+    return false;
+  }
+
+  spinner.succeed('Git 安装包下载完成');
 
+  try {
     const installSpinner = ora({ text: '正在静默安装 Git...', spinner: 'dots' }).start();
     execSync(`"${installerPath}" /VERYSILENT /NORESTART /NOCANCEL /SP- /CLOSEAPPLICATIONS /RESTARTAPPLICATIONS /COMPONENTS="icons,ext\\reg\\shellhere,assoc,assoc_sh"`, {
       stdio: 'pipe', timeout: 300000
@@ -3070,7 +3114,7 @@ async function autoInstallGitWindows() {
     console.log(chalk.yellow('   请关闭当前终端，重新打开后再运行此工具'));
     return false;
   } catch (e) {
-    spinner.fail('Git 下载/安装失败');
+    spinner.fail('Git 安装失败');
     console.log(chalk.cyan('   请手动安装: https://git-scm.com/download/win'));
     return false;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yymaxapi",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "跨平台 OpenClaw/Clawdbot 配置管理工具 - 管理中转地址、模型切换、API Keys、测速优化",
   "main": "bin/yymaxapi.js",
   "bin": {