yymaxapi 1.0.23 → 1.0.25

package/bin/yymaxapi.js

@@ -235,8 +235,10 @@ const CLAUDE_MODELS = PRESETS.models.claude;
 const CODEX_MODELS = PRESETS.models.codex;
 const API_CONFIG = PRESETS.apiConfig;
 
-// 备份文件名
+// 备份文件名（兼容旧版单文件备份）
 const BACKUP_FILENAME = 'openclaw-default.json.bak';
+const BACKUP_DIR_NAME = 'backups';
+const MAX_BACKUPS = 10;
 const EXTRA_BIN_DIRS = [
   path.join(os.homedir(), '.npm-global', 'bin'),
   path.join(os.homedir(), '.local', 'bin'),
@@ -286,18 +288,31 @@ async function multiSampleTest(url, samples = SPEED_SAMPLES) {
   const latencyScore = Math.max(0, 100 - avg / 10);
   const stabilityScore = Math.max(0, 100 - stddev * 2);
   const reachScore = (okPings.length / samples) * 100;
-  const score = Math.round(
+  let score = Math.round(
     latencyScore * SCORE_WEIGHTS.latency +
     stabilityScore * SCORE_WEIGHTS.stability +
     reachScore * SCORE_WEIGHTS.reachability
   );
-  return { success: true, latency: Math.round(avg), min: Math.round(min), stddev: Math.round(stddev), samples: okPings.length, total: samples, score };
+
+  // HTTP 健康检查：TCP 通了再确认服务真的在响应
+  let healthy = false;
+  try {
+    const healthUrl = `${url.replace(/\/+$/, '')}/health`;
+    const res = await httpGetJson(healthUrl, {}, 5000);
+    healthy = res.status >= 200 && res.status < 500;
+  } catch { /* 健康检查失败不影响评分，但会降分 */ }
+  if (!healthy) {
+    score = Math.max(0, score - 15);
+  }
+
+  return { success: true, latency: Math.round(avg), min: Math.round(min), stddev: Math.round(stddev), samples: okPings.length, total: samples, score, healthy };
 }
 
 function formatSpeedResult(r) {
   if (r.success) {
     const bar = r.score >= 70 ? chalk.green('■') : r.score >= 40 ? chalk.yellow('■') : chalk.red('■');
-    return `  ${bar} ${chalk.gray(r.name)} ${chalk.green(r.latency + 'ms')} ${chalk.gray(`(±${r.stddev}ms)`)} ${chalk.cyan(`评分:${r.score}`)}`;
+    const healthTag = r.healthy === false ? chalk.red(' [服务异常]') : '';
+    return `  ${bar} ${chalk.gray(r.name)} ${chalk.green(r.latency + 'ms')} ${chalk.gray(`(±${r.stddev}ms)`)} ${chalk.cyan(`评分:${r.score}`)}${healthTag}`;
   }
   return `  ${chalk.red('□')} ${chalk.gray(r.name)} ${chalk.red(r.error)}`;
 }
@@ -354,54 +369,68 @@ function httpGetJson(url, headers = {}, timeout = 10000) {
 
 async function validateApiKey(nodeUrl, apiKey) {
   const verifyUrl = `${nodeUrl.replace(/\/+$/, '')}/user/api/v1/me`;
+  const maxRetries = 3;
   const spinner = ora({ text: '正在验证 API Key...', spinner: 'dots' }).start();
-  try {
-    const res = await httpGetJson(verifyUrl, { Authorization: `Bearer ${apiKey}` });
-    if (res.status === 200 && res.data) {
-      spinner.succeed('API Key 验证成功');
-      const d = res.data;
-      // 基本信息
-      if (d.service_type) console.log(chalk.gray(`  服务类型: ${d.service_type}`));
-      if (d.billing_mode) console.log(chalk.gray(`  计费模式: ${d.billing_mode}`));
-      if (d.status && d.status !== 'active') console.log(chalk.yellow(`  ⚠ 状态: ${d.status}`));
-      // 配额信息
-      if (d.total_quota !== undefined || d.remaining_quota !== undefined) {
-        const total = d.total_quota || 0;
-        const remaining = d.remaining_quota !== undefined ? d.remaining_quota : total;
-        const used = total - remaining;
-        const pct = total > 0 ? Math.round((used / total) * 100) : 0;
-        const barLen = 20;
-        const filled = Math.round(barLen * pct / 100);
-        const bar = chalk.green('█'.repeat(filled)) + chalk.gray('░'.repeat(barLen - filled));
-        console.log(chalk.gray(`  总配额: ${total}`) + (d.max_requests ? chalk.gray(` | 最大请求: ${d.max_requests}`) : ''));
-        console.log(chalk.gray(`  已用/剩余: ${used} / ${remaining}`));
-        console.log(`  [${bar}] ${pct}%`);
-      }
-      // 每日配额
-      if (d.daily_quota !== undefined || d.daily_remaining !== undefined) {
-        const dTotal = d.daily_quota || 0;
-        const dRemain = d.daily_remaining !== undefined ? d.daily_remaining : dTotal;
-        const dUsed = d.daily_used !== undefined ? d.daily_used : (dTotal - dRemain);
-        console.log(chalk.gray(`  今日配额: ${dTotal} | 已用: ${dUsed} | 剩余: ${dRemain}`));
-      }
-      // 有效期
-      if (d.activated_at) console.log(chalk.gray(`  激活时间: ${new Date(d.activated_at).toLocaleDateString()}`));
-      if (d.expires_at) {
-        const exp = new Date(d.expires_at);
-        const daysLeft = Math.ceil((exp - Date.now()) / 86400000);
-        const expColor = daysLeft <= 7 ? chalk.red : daysLeft <= 30 ? chalk.yellow : chalk.gray;
-        console.log(expColor(`  有效期至: ${exp.toLocaleDateString()} (${daysLeft > 0 ? `剩余 ${daysLeft} 天` : '已过期'})`));
-      }
-      return { valid: true, data: d };
-    } else {
+
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    try {
+      const res = await httpGetJson(verifyUrl, { Authorization: `Bearer ${apiKey}` });
+      if (res.status === 200 && res.data) {
+        spinner.succeed('API Key 验证成功');
+        const d = res.data;
+        // 基本信息
+        if (d.service_type) console.log(chalk.gray(`  服务类型: ${d.service_type}`));
+        if (d.billing_mode) console.log(chalk.gray(`  计费模式: ${d.billing_mode}`));
+        if (d.status && d.status !== 'active') console.log(chalk.yellow(`  ⚠ 状态: ${d.status}`));
+        // 配额信息
+        if (d.total_quota !== undefined || d.remaining_quota !== undefined) {
+          const total = d.total_quota || 0;
+          const remaining = d.remaining_quota !== undefined ? d.remaining_quota : total;
+          const used = total - remaining;
+          const pct = total > 0 ? Math.round((used / total) * 100) : 0;
+          const barLen = 20;
+          const filled = Math.round(barLen * pct / 100);
+          const bar = chalk.green('█'.repeat(filled)) + chalk.gray('░'.repeat(barLen - filled));
+          console.log(chalk.gray(`  总配额: ${total}`) + (d.max_requests ? chalk.gray(` | 最大请求: ${d.max_requests}`) : ''));
+          console.log(chalk.gray(`  已用/剩余: ${used} / ${remaining}`));
+          console.log(`  [${bar}] ${pct}%`);
+        }
+        // 每日配额
+        if (d.daily_quota !== undefined || d.daily_remaining !== undefined) {
+          const dTotal = d.daily_quota || 0;
+          const dRemain = d.daily_remaining !== undefined ? d.daily_remaining : dTotal;
+          const dUsed = d.daily_used !== undefined ? d.daily_used : (dTotal - dRemain);
+          console.log(chalk.gray(`  今日配额: ${dTotal} | 已用: ${dUsed} | 剩余: ${dRemain}`));
+        }
+        // 有效期
+        if (d.activated_at) console.log(chalk.gray(`  激活时间: ${new Date(d.activated_at).toLocaleDateString()}`));
+        if (d.expires_at) {
+          const exp = new Date(d.expires_at);
+          const daysLeft = Math.ceil((exp - Date.now()) / 86400000);
+          const expColor = daysLeft <= 7 ? chalk.red : daysLeft <= 30 ? chalk.yellow : chalk.gray;
+          console.log(expColor(`  有效期至: ${exp.toLocaleDateString()} (${daysLeft > 0 ? `剩余 ${daysLeft} 天` : '已过期'})`));
+        }
+        return { valid: true, data: d };
+      } else {
+        spinner.fail('API Key 验证失败');
+        console.log(chalk.red(`  HTTP ${res.status}`));
+        return { valid: false, status: res.status };
+      }
+    } catch (err) {
+      const isNetworkError = ['ECONNREFUSED', 'ECONNRESET', 'ETIMEDOUT', 'ENOTFOUND', 'EAI_AGAIN', '请求超时'].some(
+        k => (err.message || '').includes(k) || (err.code || '') === k
+      );
+      if (isNetworkError && attempt < maxRetries) {
+        const delay = attempt * 2;
+        spinner.text = `网络错误，${delay}s 后重试 (${attempt}/${maxRetries})...`;
+        await new Promise(r => setTimeout(r, delay * 1000));
+        spinner.text = '正在验证 API Key...';
+        continue;
+      }
       spinner.fail('API Key 验证失败');
-      console.log(chalk.red(`  HTTP ${res.status}`));
-      return { valid: false, status: res.status };
+      console.log(chalk.gray(`  ${err.message}`));
+      return { valid: false, error: err.message };
     }
-  } catch (err) {
-    spinner.fail('API Key 验证失败');
-    console.log(chalk.gray(`  ${err.message}`));
-    return { valid: false, error: err.message };
   }
 }
 
@@ -573,6 +602,92 @@ function writeConfig(configPath, config) {
   fs.writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf8');
 }
 
+// ============ 多工具配置同步 ============
+
+function writeClaudeCodeSettings(baseUrl, apiKey) {
+  // ~/.claude/settings.json
+  const claudeDir = path.join(os.homedir(), '.claude');
+  const settingsPath = path.join(claudeDir, 'settings.json');
+  try {
+    let settings = {};
+    if (fs.existsSync(settingsPath)) {
+      try { settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8')); } catch { settings = {}; }
+    }
+    settings.apiBaseUrl = baseUrl.replace(/\/+$/, '');
+    if (!fs.existsSync(claudeDir)) fs.mkdirSync(claudeDir, { recursive: true });
+    fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf8');
+  } catch { /* 非关键，静默失败 */ }
+
+  // ~/.claude.json — 跳过 onboarding
+  const claudeJsonPath = path.join(os.homedir(), '.claude.json');
+  try {
+    let claudeJson = {};
+    if (fs.existsSync(claudeJsonPath)) {
+      try { claudeJson = JSON.parse(fs.readFileSync(claudeJsonPath, 'utf8')); } catch { claudeJson = {}; }
+    }
+    if (!claudeJson.hasCompletedOnboarding) {
+      claudeJson.hasCompletedOnboarding = true;
+      fs.writeFileSync(claudeJsonPath, JSON.stringify(claudeJson, null, 2), 'utf8');
+    }
+  } catch { /* 非关键，静默失败 */ }
+}
+
+function writeCodexConfig(baseUrl, apiKey) {
+  const codexDir = path.join(os.homedir(), '.codex');
+  if (!fs.existsSync(codexDir)) fs.mkdirSync(codexDir, { recursive: true });
+
+  // ~/.codex/config.toml — 用 section marker 管理
+  const configPath = path.join(codexDir, 'config.toml');
+  const marker = '# >>> maxapi codex >>>';
+  const markerEnd = '# <<< maxapi codex <<<';
+  try {
+    let existing = '';
+    if (fs.existsSync(configPath)) {
+      existing = fs.readFileSync(configPath, 'utf8');
+      // 移除旧的 maxapi section
+      const re = new RegExp(`${marker.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}[\\s\\S]*?${markerEnd.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\n?`, 'g');
+      existing = existing.replace(re, '').trim();
+    }
+    const section = [
+      marker,
+      `model = "o4-mini"`,
+      `provider = "openai"`,
+      ``,
+      `[providers.openai]`,
+      `api_key = "${apiKey}"`,
+      `base_url = "${baseUrl.replace(/\/+$/, '')}"`,
+      markerEnd
+    ].join('\n');
+    const content = existing ? `${existing}\n\n${section}\n` : `${section}\n`;
+    fs.writeFileSync(configPath, content, 'utf8');
+  } catch { /* 非关键，静默失败 */ }
+
+  // ~/.codex/auth.json
+  const authPath = path.join(codexDir, 'auth.json');
+  try {
+    let auth = {};
+    if (fs.existsSync(authPath)) {
+      try { auth = JSON.parse(fs.readFileSync(authPath, 'utf8')); } catch { auth = {}; }
+    }
+    auth.OPENAI_API_KEY = apiKey;
+    fs.writeFileSync(authPath, JSON.stringify(auth, null, 2), 'utf8');
+  } catch { /* 非关键，静默失败 */ }
+}
+
+function syncExternalTools(type, baseUrl, apiKey) {
+  const synced = [];
+  try {
+    if (type === 'claude') {
+      writeClaudeCodeSettings(baseUrl, apiKey);
+      synced.push('Claude Code settings');
+    } else if (type === 'codex') {
+      writeCodexConfig(baseUrl, apiKey);
+      synced.push('Codex CLI config');
+    }
+  } catch { /* ignore */ }
+  return synced;
+}
+
 function syncClawdbotConfigs(paths, config) {
   if (!paths.syncTargets || paths.syncTargets.length === 0) return;
   for (const target of paths.syncTargets) {
@@ -1443,12 +1558,59 @@ async function tryAutoStartGateway(port, allowAutoDaemon) {
 
 // ============ 备份/恢复 ============
 function backupOriginalConfig(configPath, configDir) {
-  const backupPath = path.join(configDir, BACKUP_FILENAME);
-  if (!fs.existsSync(backupPath) && fs.existsSync(configPath)) {
-    fs.copyFileSync(configPath, backupPath);
-    return true;
+  // 兼容旧版：首次运行仍创建 .bak
+  const legacyBackup = path.join(configDir, BACKUP_FILENAME);
+  if (!fs.existsSync(legacyBackup) && fs.existsSync(configPath)) {
+    fs.copyFileSync(configPath, legacyBackup);
   }
-  return false;
+  return false; // 不再在首次运行时显示提示，由 createTimestampedBackup 管理
+}
+
+function createTimestampedBackup(configPath, configDir, label = '') {
+  if (!fs.existsSync(configPath)) return null;
+  const backupDir = path.join(configDir, BACKUP_DIR_NAME);
+  const indexPath = path.join(backupDir, 'index.json');
+  if (!fs.existsSync(backupDir)) fs.mkdirSync(backupDir, { recursive: true });
+
+  let index = [];
+  if (fs.existsSync(indexPath)) {
+    try { index = JSON.parse(fs.readFileSync(indexPath, 'utf8')); } catch { index = []; }
+  }
+
+  const id = Date.now().toString(36);
+  const timestamp = new Date().toISOString();
+  const backupFile = `${id}.json`;
+  fs.copyFileSync(configPath, path.join(backupDir, backupFile));
+
+  const stat = fs.statSync(configPath);
+  index.push({ id, timestamp, file: backupFile, label: label || '', size: stat.size });
+
+  // 保留最近 MAX_BACKUPS 个
+  while (index.length > MAX_BACKUPS) {
+    const old = index.shift();
+    const oldPath = path.join(backupDir, old.file);
+    try { if (fs.existsSync(oldPath)) fs.unlinkSync(oldPath); } catch { }
+  }
+
+  fs.writeFileSync(indexPath, JSON.stringify(index, null, 2), 'utf8');
+  return id;
+}
+
+function listBackups(configDir) {
+  const indexPath = path.join(configDir, BACKUP_DIR_NAME, 'index.json');
+  if (!fs.existsSync(indexPath)) return [];
+  try { return JSON.parse(fs.readFileSync(indexPath, 'utf8')); } catch { return []; }
+}
+
+function restoreFromBackup(configPath, configDir, backupId) {
+  const backupDir = path.join(configDir, BACKUP_DIR_NAME);
+  const index = listBackups(configDir);
+  const entry = index.find(e => e.id === backupId);
+  if (!entry) return false;
+  const backupFile = path.join(backupDir, entry.file);
+  if (!fs.existsSync(backupFile)) return false;
+  fs.copyFileSync(backupFile, configPath);
+  return true;
 }
 
 function restoreDefaultConfig(configPath, configDir) {
@@ -1680,6 +1842,7 @@ async function quickSetup(paths, args = {}) {
   }
 
   const ws = ora({ text: '正在写入配置...', spinner: 'dots' }).start();
+  createTimestampedBackup(paths.openclawConfig, paths.configDir, 'quick-setup');
   ensureGatewaySettings(config);
   writeConfigWithSync(paths, config);
   updateAuthProfiles(paths.authProfiles, providerName, apiKey);
@@ -1863,9 +2026,11 @@ async function presetClaude(paths, args = {}) {
   }
 
   const writeSpinner = ora({ text: '正在写入配置...', spinner: 'dots' }).start();
+  createTimestampedBackup(paths.openclawConfig, paths.configDir, 'claude');
   ensureGatewaySettings(config);
   writeConfigWithSync(paths, config);
   updateAuthProfiles(paths.authProfiles, providerName, apiKey);
+  const extSynced = syncExternalTools('claude', baseUrl, apiKey);
   writeSpinner.succeed('配置写入完成');
 
   console.log(chalk.green('\n✅ Claude 节点配置完成！'));
@@ -1873,6 +2038,7 @@ async function presetClaude(paths, args = {}) {
   console.log(chalk.cyan(`   ${providerName}${tag}: ${buildFullUrl(selectedEndpoint.url, 'claude')}`));
   console.log(chalk.gray(`   模型: ${modelName}`));
   console.log(chalk.gray('   API Key: 已设置'));
+  if (extSynced.length > 0) console.log(chalk.gray(`   同步: ${extSynced.join(', ')}`));
 
   const shouldTestGateway = args.test !== undefined
     ? !['false', '0', 'no'].includes(String(args.test).toLowerCase())
@@ -2053,9 +2219,11 @@ async function presetCodex(paths, args = {}) {
   }
 
   const writeSpinner2 = ora({ text: '正在写入配置...', spinner: 'dots' }).start();
+  createTimestampedBackup(paths.openclawConfig, paths.configDir, 'codex');
   ensureGatewaySettings(config);
   writeConfigWithSync(paths, config);
   updateAuthProfiles(paths.authProfiles, providerName, apiKey);
+  const extSynced2 = syncExternalTools('codex', baseUrl, apiKey);
   writeSpinner2.succeed('配置写入完成');
 
   console.log(chalk.green('\n✅ Codex 节点配置完成！'));
@@ -2063,6 +2231,7 @@ async function presetCodex(paths, args = {}) {
   console.log(chalk.cyan(`   ${providerName}${tag}: ${baseUrl}`));
   console.log(chalk.gray(`   模型: ${modelName}`));
   console.log(chalk.gray('   API Key: 已设置'));
+  if (extSynced2.length > 0) console.log(chalk.gray(`   同步: ${extSynced2.join(', ')}`));
 
   const shouldTestGateway = args.test !== undefined
     ? !['false', '0', 'no'].includes(String(args.test).toLowerCase())
@@ -2078,6 +2247,63 @@ async function presetCodex(paths, args = {}) {
   }
 }
 
+// ============ 一键激活（自动识别服务类型） ============
+async function autoActivate(paths) {
+  console.log(chalk.cyan.bold('\n🚀 一键激活（自动识别服务类型）\n'));
+
+  const apiKey = await promptApiKey('请输入 API Key:', '');
+  if (!apiKey) { console.log(chalk.gray('已取消')); return; }
+
+  // 用第一个节点验证，获取 service_type
+  const nodeUrl = ENDPOINTS[0] ? ENDPOINTS[0].url : '';
+  if (!nodeUrl) { console.log(chalk.red('没有可用节点')); return; }
+
+  console.log('');
+  const validation = await validateApiKey(nodeUrl, apiKey);
+
+  if (!validation.valid) {
+    const { continueAnyway } = await inquirer.prompt([{
+      type: 'confirm', name: 'continueAnyway',
+      message: 'API Key 验证失败，是否手动选择服务类型继续？', default: false
+    }]);
+    if (!continueAnyway) { console.log(chalk.gray('已取消')); return; }
+  }
+
+  const serviceType = (validation.data && validation.data.service_type || '').toLowerCase();
+  let targetType = '';
+
+  if (serviceType.includes('claude') || serviceType.includes('anthropic')) {
+    targetType = 'claude';
+    console.log(chalk.cyan(`\n识别为 Claude 服务，进入 Claude 配置流程...\n`));
+  } else if (serviceType.includes('codex') || serviceType.includes('gpt') || serviceType.includes('openai')) {
+    targetType = 'codex';
+    console.log(chalk.cyan(`\n识别为 Codex 服务，进入 Codex 配置流程...\n`));
+  }
+
+  if (!targetType) {
+    // 无法自动识别，让用户选
+    const hasClaude = CLAUDE_MODELS && CLAUDE_MODELS.length > 0;
+    const hasCodex = CODEX_MODELS && CODEX_MODELS.length > 0;
+    const typeChoices = [];
+    if (hasClaude) typeChoices.push({ name: 'Claude', value: 'claude' });
+    if (hasCodex) typeChoices.push({ name: 'Codex (GPT)', value: 'codex' });
+    if (typeChoices.length === 0) { targetType = 'claude'; }
+    else if (typeChoices.length === 1) { targetType = typeChoices[0].value; }
+    else {
+      const { picked } = await inquirer.prompt([{
+        type: 'list', name: 'picked', message: '无法自动识别服务类型，请选择:', choices: typeChoices
+      }]);
+      targetType = picked;
+    }
+  }
+
+  if (targetType === 'claude') {
+    await presetClaude(paths, { 'api-key': apiKey });
+  } else {
+    await presetCodex(paths, { 'api-key': apiKey });
+  }
+}
+
 // ============ 主程序 ============
 async function main() {
   console.clear();
@@ -2126,6 +2352,7 @@ async function main() {
       loop: false,
       choices: [
         new inquirer.Separator('  -- 配置模型 --'),
+        { name: '  一键激活（自动识别）', value: 'auto_activate' },
         { name: '  激活 Claude', value: 'activate_claude' },
         { name: '  激活 Codex (GPT)', value: 'activate_codex' },
         new inquirer.Separator('  -- 工具 --'),
@@ -2148,6 +2375,9 @@ async function main() {
 
     try {
       switch (action) {
+        case 'auto_activate':
+          await autoActivate(paths);
+          break;
         case 'activate_claude':
           await presetClaude(paths, {});
           break;
@@ -2561,7 +2791,7 @@ async function restartGateway() {
     const wslCli = getWslCliBinary();
     return new Promise((resolve) => {
       const wslCmds = wslCli
-        ? [`wsl -- bash -c "${wslCli} gateway restart"`]
+        ? [`wsl -- bash -lc "${wslCli} gateway restart"`]
         : [
           'wsl -- bash -lc "openclaw gateway restart"',
           'wsl -- bash -lc "clawdbot gateway restart"',
@@ -2612,6 +2842,13 @@ async function forceRestartGateway(resolved, nodeInfo, useNode, env, gatewayPort
           }
         }
       }
+      // Windows + WSL: 也清理 WSL 内的 gateway 进程
+      if (isWslAvailable()) {
+        for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+          safeExec(`wsl -- bash -c "pkill -f '${name}.*gateway' 2>/dev/null || true"`, { timeout: 5000 });
+        }
+        safeExec(`wsl -- bash -c "lsof -ti :${gatewayPort} 2>/dev/null | xargs -r kill -9 2>/dev/null || true"`, { timeout: 5000 });
+      }
     } else {
       // Linux/macOS: pkill gateway 相关进程
       for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
@@ -2651,7 +2888,18 @@ async function forceRestartGateway(resolved, nodeInfo, useNode, env, gatewayPort
       startCmds.push(`bash -lc '${name} gateway'`);
     }
   } else {
+    // Windows: 先尝试原生命令
     startCmds.push('openclaw gateway', 'clawdbot gateway', 'moltbot gateway');
+    // Windows + WSL: 也尝试通过 WSL 启动 gateway
+    if (isWslAvailable()) {
+      const wslCli = getWslCliBinary();
+      if (wslCli) {
+        startCmds.push(`wsl -- bash -lc "${wslCli} gateway"`);
+      }
+      for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+        startCmds.push(`wsl -- bash -lc "${name} gateway"`);
+      }
+    }
   }
 
   for (const cmd of [...new Set(startCmds)].filter(Boolean)) {
@@ -2693,6 +2941,17 @@ async function restartGatewayNative() {
       'npx moltbot gateway restart'
     ];
 
+  // Windows + WSL: 追加 WSL 命令作为额外回退
+  if (process.platform === 'win32' && isWslAvailable()) {
+    const wslCli = getWslCliBinary();
+    if (wslCli) {
+      commands.push(`wsl -- bash -lc "${wslCli} gateway restart"`);
+    }
+    for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+      commands.push(`wsl -- bash -lc "${name} gateway restart"`);
+    }
+  }
+
   return new Promise((resolve) => {
     let tried = 0;
 
@@ -3383,17 +3642,45 @@ async function installOrUpdateOpenClaw() {
 
 // ============ 恢复默认配置 ============
 async function restore(paths) {
-  const backupPath = path.join(paths.configDir, BACKUP_FILENAME);
+  const backups = listBackups(paths.configDir);
+  const legacyBackup = path.join(paths.configDir, BACKUP_FILENAME);
+  const hasLegacy = fs.existsSync(legacyBackup);
 
-  if (!fs.existsSync(backupPath)) {
+  if (backups.length === 0 && !hasLegacy) {
     console.log(chalk.yellow('⚠️ 没有找到备份文件'));
     return;
   }
 
+  const choices = [];
+  for (const b of [...backups].reverse()) {
+    const date = new Date(b.timestamp);
+    const dateStr = date.toLocaleString();
+    const sizeKB = b.size ? `${Math.round(b.size / 1024)}KB` : '';
+    const label = b.label ? ` [${b.label}]` : '';
+    choices.push({ name: `${dateStr}${label} ${chalk.gray(sizeKB)}`, value: b.id });
+  }
+  if (hasLegacy) {
+    choices.push({ name: `初始备份 (首次运行时创建)`, value: '__legacy__' });
+  }
+  choices.push(new inquirer.Separator(''));
+  choices.push({ name: '取消', value: '__cancel__' });
+
+  const { selected } = await inquirer.prompt([{
+    type: 'list',
+    name: 'selected',
+    message: '选择要恢复的备份:',
+    choices
+  }]);
+
+  if (selected === '__cancel__') {
+    console.log(chalk.gray('已取消'));
+    return;
+  }
+
   const { confirm } = await inquirer.prompt([{
     type: 'confirm',
     name: 'confirm',
-    message: '确定要恢复默认配置吗？当前配置将被覆盖。',
+    message: '确定要恢复此备份吗？当前配置将被覆盖。',
     default: false
   }]);
 
@@ -3402,8 +3689,15 @@ async function restore(paths) {
     return;
   }
 
-  if (restoreDefaultConfig(paths.openclawConfig, paths.configDir)) {
-    console.log(chalk.green('\n✅ 已恢复默认配置'));
+  let ok = false;
+  if (selected === '__legacy__') {
+    ok = restoreDefaultConfig(paths.openclawConfig, paths.configDir);
+  } else {
+    ok = restoreFromBackup(paths.openclawConfig, paths.configDir, selected);
+  }
+
+  if (ok) {
+    console.log(chalk.green('\n✅ 已恢复配置'));
   } else {
     console.log(chalk.red('\n❌ 恢复失败'));
   }

package/package.json

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