openclawapi 1.0.0 → 1.1.1

package/cli.js

@@ -2,35 +2,249 @@
 
 const inquirer = require('inquirer');
 const chalk = require('chalk');
+const fs = require('fs');
+const JSON5 = require('json5');
 const path = require('path');
 const os = require('os');
-const { ConfigManager } = require('./lib/config-manager');
-const { displayMenu, displaySuccess, displayError, displayInfo } = require('./lib/ui');
+const { ConfigManager, getDefaultWorkspace } = require('./lib/config-manager');
+const { displayMenu, displaySuccess, displayError, displayInfo, displayWarning } = require('./lib/ui');
 const { testMultipleRelays, sortBySpeed, formatLatency } = require('./lib/speed-test');
 
+const RELAY_ENDPOINT_PRESETS = {
+  'yunyi-claude': [
+    { name: '国内节点1', url: 'https://yunyi.rdzhvip.com' },
+    { name: '国内节点2', url: 'https://yunyi.skem.cn' },
+    { name: 'CF国外节点1', url: 'https://yunyi.cfd' },
+    { name: 'CF国外节点2', url: 'https://cdn1.yunyi.cfd' },
+    { name: 'CF国外节点3', url: 'https://cdn2.yunyi.cfd' },
+    { name: '备用节点1', url: 'http://47.99.42.193' },
+    { name: '备用节点2', url: 'http://47.97.100.10' }
+  ],
+  'yunyi-codex': [
+    { name: '国内节点1', url: 'https://yunyi.rdzhvip.com' },
+    { name: '国内节点2', url: 'https://yunyi.skem.cn' },
+    { name: 'CF国外节点1', url: 'https://yunyi.cfd' },
+    { name: 'CF国外节点2', url: 'https://cdn1.yunyi.cfd' },
+    { name: 'CF国外节点3', url: 'https://cdn2.yunyi.cfd' },
+    { name: '备用节点1', url: 'http://47.99.42.193' },
+    { name: '备用节点2', url: 'http://47.97.100.10' }
+  ]
+};
+
+const MODEL_PRESETS = {
+  'yunyi-claude': [
+    { id: 'claude-opus-4-5', name: 'Claude Opus 4.5' },
+    { id: 'claude-sonnet-4-5', name: 'Claude Sonnet 4.5' },
+    { id: 'claude-haiku-4-5', name: 'Claude Haiku 4.5' }
+  ],
+  'yunyi-codex': [
+    { id: 'gpt-5.2', name: 'GPT 5.2' },
+    { id: 'gpt-5.2-codex', name: 'GPT 5.2 Codex' }
+  ]
+};
+
+function normalizeRelayKey(relayName) {
+  if (!relayName) return '';
+  if (relayName.startsWith('yunyi-claude')) return 'yunyi-claude';
+  if (relayName.startsWith('yunyi-codex')) return 'yunyi-codex';
+  return relayName;
+}
+
+function getRelaySuffix(relayName) {
+  const key = normalizeRelayKey(relayName);
+  if (key === 'yunyi-claude') return '/claude/v1/messages';
+  if (key === 'yunyi-codex') return '/codex/response';
+  return '';
+}
+
+function buildRelayBaseUrl(baseUrl, relayName) {
+  const suffix = getRelaySuffix(relayName);
+  if (!suffix) return baseUrl;
+  if (!baseUrl) return baseUrl;
+  const trimmed = baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl;
+
+  if (suffix === '/claude/v1/messages') {
+    if (/\/claude\/v1\/messages$/.test(trimmed) || /\/claude\/v1\/message$/.test(trimmed)) {
+      return trimmed;
+    }
+    if (/\/claude\/v1$/.test(trimmed)) {
+      return `${trimmed}/messages`;
+    }
+    if (/\/claude$/.test(trimmed)) {
+      return `${trimmed}/v1/messages`;
+    }
+  }
+
+  if (suffix === '/codex/response') {
+    if (/\/codex\/response$/.test(trimmed)) {
+      return trimmed;
+    }
+    if (/\/codex$/.test(trimmed)) {
+      return `${trimmed}/response`;
+    }
+  }
+
+  if (/\/claude(\/|$)/.test(trimmed) || /\/codex(\/|$)/.test(trimmed)) {
+    return trimmed;
+  }
+
+  return `${trimmed}${suffix}`;
+}
+
+function getRelayEndpoints(relayName) {
+  return RELAY_ENDPOINT_PRESETS[normalizeRelayKey(relayName)] || [];
+}
+
+function getRelayModelPresets(relayName) {
+  return MODEL_PRESETS[normalizeRelayKey(relayName)] || [];
+}
+
+function buildModelEntry(model, apiType) {
+  const defaults = apiType === 'openai-responses'
+    ? { contextWindow: 128000, maxTokens: 32768, reasoning: true, input: ['text', 'image'] }
+    : { contextWindow: 200000, maxTokens: 8192, reasoning: false, input: ['text'] };
+
+  return {
+    id: model.id,
+    name: model.name || model.id,
+    reasoning: defaults.reasoning,
+    input: defaults.input,
+    cost: {
+      input: 0,
+      output: 0,
+      cacheRead: 0,
+      cacheWrite: 0
+    },
+    contextWindow: defaults.contextWindow,
+    maxTokens: defaults.maxTokens
+  };
+}
+
 // 获取配置文件路径（跨平台）
 function getConfigPath() {
   const homeDir = os.homedir();
-  const configDir = path.join(homeDir, '.clawdbot');
+  const openclawStateDir = process.env.OPENCLAW_STATE_DIR || path.join(homeDir, '.openclaw');
+  const clawdbotStateDir = process.env.CLAWDBOT_STATE_DIR || path.join(homeDir, '.clawdbot');
+
+  const envConfig =
+    process.env.OPENCLAW_CONFIG_PATH ||
+    process.env.CLAWDBOT_CONFIG_PATH ||
+    process.env.OPENCLAW_CONFIG;
+
+  const openclawConfig = envConfig || ([
+    path.join(openclawStateDir, 'openclaw.json'),
+    path.join(clawdbotStateDir, 'openclaw.json'),
+    path.join(clawdbotStateDir, 'clawdbot.json'),
+    path.join(clawdbotStateDir, 'moltbot.json')
+  ].find(p => fs.existsSync(p)) || path.join(openclawStateDir, 'openclaw.json'));
+
+  const configDir = path.dirname(openclawConfig);
+  const authProfiles = resolveAuthProfilesPath({
+    configDir,
+    openclawStateDir,
+    clawdbotStateDir
+  });
+
   return {
-    openclawConfig: path.join(configDir, 'openclaw.json'),
-    authProfiles: path.join(configDir, 'agents', 'main', 'agent', 'auth-profiles.json')
+    openclawConfig,
+    authProfiles
   };
 }
 
+function resolveAuthProfilesPath({ configDir, openclawStateDir, clawdbotStateDir }) {
+  const envAgentDir =
+    process.env.OPENCLAW_AGENT_DIR ||
+    process.env.CLAWDBOT_AGENT_DIR ||
+    process.env.PI_CODING_AGENT_DIR;
+  const envAgentName =
+    process.env.OPENCLAW_AGENT ||
+    process.env.CLAWDBOT_AGENT ||
+    process.env.PI_CODING_AGENT;
+
+  const candidates = [];
+
+  if (envAgentDir) {
+    candidates.push(path.join(envAgentDir, 'auth-profiles.json'));
+  }
+
+  if (envAgentName) {
+    candidates.push(path.join(openclawStateDir, 'agents', envAgentName, 'agent', 'auth-profiles.json'));
+    candidates.push(path.join(clawdbotStateDir, 'agents', envAgentName, 'agent', 'auth-profiles.json'));
+  }
+
+  // OpenClaw default + legacy paths
+  candidates.push(path.join(openclawStateDir, 'agents', 'main', 'agent', 'auth-profiles.json'));
+  candidates.push(path.join(openclawStateDir, 'agent', 'auth-profiles.json'));
+
+  // Clawdbot default + legacy paths
+  candidates.push(path.join(clawdbotStateDir, 'agent', 'auth-profiles.json'));
+  candidates.push(path.join(clawdbotStateDir, 'agents', 'main', 'agent', 'auth-profiles.json'));
+
+  // Fallback to config directory if user stores alongside config
+  candidates.push(path.join(configDir, 'agent', 'auth-profiles.json'));
+  candidates.push(path.join(configDir, 'agents', 'main', 'agent', 'auth-profiles.json'));
+
+  const inferred = inferSingleAgentAuthPath(openclawStateDir, clawdbotStateDir);
+  if (inferred) {
+    candidates.unshift(inferred);
+  }
+
+  return candidates.find(p => fs.existsSync(p)) || candidates[0];
+}
+
+function inferSingleAgentAuthPath(openclawStateDir, clawdbotStateDir) {
+  const openclawAgentsDir = path.join(openclawStateDir, 'agents');
+  if (fs.existsSync(openclawAgentsDir)) {
+    const dirs = fs.readdirSync(openclawAgentsDir, { withFileTypes: true })
+      .filter(entry => entry.isDirectory())
+      .map(entry => entry.name);
+    if (dirs.length === 1) {
+      return path.join(openclawAgentsDir, dirs[0], 'agent', 'auth-profiles.json');
+    }
+  }
+
+  const clawdbotAgentsDir = path.join(clawdbotStateDir, 'agents');
+  if (fs.existsSync(clawdbotAgentsDir)) {
+    const dirs = fs.readdirSync(clawdbotAgentsDir, { withFileTypes: true })
+      .filter(entry => entry.isDirectory())
+      .map(entry => entry.name);
+    if (dirs.length === 1) {
+      return path.join(clawdbotAgentsDir, dirs[0], 'agent', 'auth-profiles.json');
+    }
+  }
+
+  return '';
+}
+
 async function main() {
   console.clear();
   console.log(chalk.cyan.bold('\n🔧 OpenClaw 配置管理工具\n'));
 
+  // 显示平台信息
+  const platformInfo = {
+    win32: 'Windows',
+    darwin: 'macOS',
+    linux: 'Linux'
+  };
+  console.log(chalk.gray(`平台: ${platformInfo[process.platform] || process.platform}`));
   const configPaths = getConfigPath();
+  console.log(chalk.gray(`配置目录: ${path.dirname(configPaths.openclawConfig)}`));
+  console.log(chalk.gray(`配置文件: ${configPaths.openclawConfig}\n`));
+  console.log(chalk.gray(`认证文件: ${configPaths.authProfiles}\n`));
   const configManager = new ConfigManager(configPaths);
 
-  // 检查配置文件是否存在
+  // 检查配置文件是否存在，如果不存在则自动初始化
   const exists = await configManager.checkConfigExists();
   if (!exists.openclaw) {
-    displayError(`配置文件不存在: ${configPaths.openclawConfig}`);
-    displayInfo('请先运行 clawdbot onboard 初始化配置');
-    process.exit(1);
+    displayInfo('配置文件不存在，正在初始化...');
+    try {
+      await configManager.initializeConfig();
+      displaySuccess('配置文件初始化成功！');
+    } catch (error) {
+      displayError(`初始化失败: ${error.message}`);
+      displayInfo('请检查目录权限或手动创建配置文件');
+      process.exit(1);
+    }
   }
 
   while (true) {
@@ -40,9 +254,13 @@ async function main() {
         name: 'action',
         message: '请选择操作:',
         choices: [
+          { name: '🚀 快速配置向导 (URL/Key/Token/Workspace)', value: 'quicksetup' },
+          new inquirer.Separator(),
           { name: '📡 管理中转站配置', value: 'relay' },
+          { name: '🧭 快速切换中转端点', value: 'endpoint' },
           { name: '🤖 管理模型配置', value: 'model' },
-          { name: '🔑 管理 API Keys', value: 'apikey' },
+          { name: '🧩 快速切换模型', value: 'modelSwitch' },
+          { name: '🔑 管理 API Keys / Tokens', value: 'apikey' },
           { name: '⚡ 测速并切换中转站', value: 'speedtest' },
           { name: '⚙️  高级设置', value: 'advanced' },
           { name: '📄 查看当前配置', value: 'view' },
@@ -59,12 +277,21 @@ async function main() {
 
     try {
       switch (action) {
+        case 'quicksetup':
+          await quickSetup(configManager);
+          break;
         case 'relay':
           await manageRelay(configManager);
           break;
+        case 'endpoint':
+          await quickSwitchEndpoint(configManager);
+          break;
         case 'model':
           await manageModel(configManager);
           break;
+        case 'modelSwitch':
+          await quickSwitchModel(configManager);
+          break;
         case 'apikey':
           await manageApiKey(configManager);
           break;
@@ -86,6 +313,604 @@ async function main() {
   }
 }
 
+// 快速配置向导 - 一次性配置 URL、Key、Token、Workspace
+async function quickSetup(configManager) {
+  console.log(chalk.cyan.bold('\n🚀 快速配置向导\n'));
+  console.log(chalk.gray('此向导将帮助您快速配置中转站的 URL、API Key、Token 和工作区\n'));
+
+  const defaultWorkspace = getDefaultWorkspace();
+
+const presetChoices = [
+  { name: 'Claude (云逸 国内) https://yunyi.skem.cn/claude', value: 'yunyi-claude-cn' },
+  { name: 'Claude (云逸 海外) https://yunyi.cfd/claude', value: 'yunyi-claude-global' },
+  { name: 'Codex (云逸 国内) https://yunyi.skem.cn/codex', value: 'yunyi-codex-cn' },
+  { name: 'Codex (云逸 海外) https://yunyi.cfd/codex', value: 'yunyi-codex-global' },
+  { name: '自定义 (其他模型)', value: 'custom' }
+];
+
+  const presetMap = {
+    'yunyi-claude-cn': {
+      name: 'yunyi-claude',
+      baseUrl: 'https://yunyi.skem.cn/claude/v1/messages',
+      modelType: 'claude',
+      api: 'anthropic-messages',
+      defaultModelId: 'claude-opus-4-5',
+      compactionMode: 'safeguard'
+    },
+    'yunyi-claude-global': {
+      name: 'yunyi-claude',
+      baseUrl: 'https://yunyi.cfd/claude/v1/messages',
+      modelType: 'claude',
+      api: 'anthropic-messages',
+      defaultModelId: 'claude-opus-4-5',
+      compactionMode: 'safeguard'
+    },
+    'yunyi-codex-cn': {
+      name: 'yunyi-codex',
+      baseUrl: 'https://yunyi.skem.cn/codex/response',
+      modelType: 'codex',
+      api: 'openai-responses',
+      defaultModelId: 'gpt-5.2',
+      defaultModelName: 'GPT 5.2',
+      compactionMode: 'safeguard'
+    },
+    'yunyi-codex-global': {
+      name: 'yunyi-codex',
+      baseUrl: 'https://yunyi.cfd/codex/response',
+      modelType: 'codex',
+      api: 'openai-responses',
+      defaultModelId: 'gpt-5.2',
+      defaultModelName: 'GPT 5.2',
+      compactionMode: 'safeguard'
+    },
+    custom: {}
+  };
+
+  const { preset } = await inquirer.prompt([
+    { type: 'list', name: 'preset', message: '选择模板:', choices: presetChoices }
+  ]);
+  const presetConfig = presetMap[preset] || {};
+
+  // 步骤 1: 中转站名称和 URL
+  const step1 = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'name',
+      message: '中转站名称 (例如: my-relay):',
+      default: presetConfig.name || 'default-relay',
+      validate: (input) => input.trim() !== '' || '名称不能为空'
+    },
+    {
+      type: 'input',
+      name: 'baseUrl',
+      message: '中转站 URL (例如: https://api.example.com/v1):',
+      default: presetConfig.baseUrl || '',
+      validate: (input) => {
+        try {
+          const url = new URL(input);
+          if (url.protocol !== 'http:' && url.protocol !== 'https:') {
+            return '请输入有效的 HTTP/HTTPS URL';
+          }
+          return true;
+        } catch {
+          return '请输入有效的 URL';
+        }
+      }
+    }
+  ]);
+
+  step1.baseUrl = buildRelayBaseUrl(step1.baseUrl, step1.name);
+
+  let backupConfig = null;
+  const { enableBackup } = await inquirer.prompt([
+    {
+      type: 'confirm',
+      name: 'enableBackup',
+      message: '是否添加备用中转端点（用于主备切换）？',
+      default: false
+    }
+  ]);
+
+  if (enableBackup) {
+    const endpoints = getRelayEndpoints(step1.name);
+    const fallbackEndpoint = endpoints.find(item => item.url !== step1.baseUrl);
+    const backupAnswers = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'name',
+        message: '备用中转站名称:',
+        default: `${step1.name}-backup`,
+        validate: (input) => input.trim() !== '' || '名称不能为空'
+      },
+      {
+        type: 'input',
+        name: 'baseUrl',
+        message: '备用端点 Base URL:',
+        default: fallbackEndpoint ? fallbackEndpoint.url : '',
+        validate: (input) => {
+          try {
+            const url = new URL(input);
+            if (url.protocol !== 'http:' && url.protocol !== 'https:') {
+              return '请输入有效的 HTTP/HTTPS URL';
+            }
+            return true;
+          } catch {
+            return '请输入有效的 URL';
+          }
+        }
+      }
+    ]);
+    backupConfig = {
+      name: backupAnswers.name.trim(),
+      baseUrl: buildRelayBaseUrl(backupAnswers.baseUrl.trim(), step1.name)
+    };
+  }
+
+  // 步骤 2: 模型类型（仅支持 Claude / Codex）
+  let modelType = presetConfig.modelType;
+  if (!modelType) {
+    const result = await inquirer.prompt([
+      {
+        type: 'list',
+        name: 'modelType',
+        message: '选择模型类型:',
+        choices: [
+          { name: 'Claude (Anthropic)', value: 'claude' },
+          { name: 'Codex / GPT (OpenAI Responses)', value: 'codex' },
+          { name: '其他/自定义', value: 'other' }
+        ]
+      }
+    ]);
+    modelType = result.modelType;
+  }
+
+  if (modelType === 'other') {
+    displayWarning('非 GPT/Claude 模型仅做配置写入，不保证可用，请优先用 OpenClaw 配置页面。');
+  }
+
+  // 步骤 3: API 类型
+  let apiType = presetConfig.api;
+  if (!apiType) {
+    if (modelType === 'codex') {
+      apiType = 'openai-responses';
+    } else if (modelType === 'claude') {
+      apiType = 'anthropic-messages';
+    } else {
+      const result = await inquirer.prompt([
+        {
+          type: 'list',
+          name: 'apiType',
+          message: 'API 接口类型:',
+          choices: [
+            { name: 'Anthropic Messages (Claude)', value: 'anthropic-messages' },
+            { name: 'OpenAI Responses (Codex / GPT-5+)', value: 'openai-responses' },
+            { name: 'OpenAI Completions', value: 'openai-completions' },
+            { name: 'Google Generative AI (Gemini)', value: 'google-generative-ai' },
+            { name: '自定义', value: 'custom' }
+          ]
+        }
+      ]);
+      apiType = result.apiType;
+      if (apiType === 'custom') {
+        const custom = await inquirer.prompt([
+          { type: 'input', name: 'customApi', message: '输入 API 类型:', validate: (i) => i.trim() !== '' || '不能为空' }
+        ]);
+        apiType = custom.customApi;
+      }
+    }
+  }
+
+  // 步骤 4: 模型选择
+  let modelConfig;
+  if (modelType === 'claude') {
+    const { modelChoice } = await inquirer.prompt([
+      {
+        type: 'list',
+        name: 'modelChoice',
+        message: '选择 Claude 模型:',
+        choices: [
+          { name: 'Claude Opus 4.5', value: { id: 'claude-opus-4-5', name: 'Claude Opus 4.5' } },
+          { name: 'Claude Sonnet 4.5', value: { id: 'claude-sonnet-4-5', name: 'Claude Sonnet 4.5' } },
+          { name: 'Claude Haiku 4.5', value: { id: 'claude-haiku-4-5', name: 'Claude Haiku 4.5' } }
+        ],
+        default: presetConfig.defaultModelId
+      }
+    ]);
+    modelConfig = modelChoice;
+  } else if (modelType === 'codex') {
+    const { modelChoice } = await inquirer.prompt([
+      {
+        type: 'list',
+        name: 'modelChoice',
+        message: '选择 Codex / GPT 模型:',
+        choices: [
+          { name: 'GPT 5.2', value: { id: 'gpt-5.2', name: 'GPT 5.2' } },
+          { name: 'GPT 5.2 Codex', value: { id: 'gpt-5.2-codex', name: 'GPT 5.2 Codex' } }
+        ]
+      }
+    ]);
+    modelConfig = modelChoice;
+  } else {
+    const custom = await inquirer.prompt([
+      { type: 'input', name: 'id', message: '模型 ID:', validate: (i) => i.trim() !== '' || '不能为空' },
+      { type: 'input', name: 'name', message: '模型名称:', validate: (i) => i.trim() !== '' || '不能为空' }
+    ]);
+    modelConfig = { id: custom.id.trim(), name: custom.name.trim() };
+  }
+
+  const includeModelsList = apiType !== 'anthropic-messages';
+  let modelEntry = null;
+
+  if (includeModelsList) {
+    const defaults = modelType === 'codex'
+      ? { contextWindow: 128000, maxTokens: 32768 }
+      : { contextWindow: 200000, maxTokens: 8192 };
+    const { contextWindow, maxTokens } = await inquirer.prompt([
+      {
+        type: 'number',
+        name: 'contextWindow',
+        message: '上下文窗口大小:',
+        default: defaults.contextWindow
+      },
+      {
+        type: 'number',
+        name: 'maxTokens',
+        message: '最大输出 tokens:',
+        default: defaults.maxTokens
+      }
+    ]);
+    modelEntry = {
+      id: modelConfig.id,
+      name: modelConfig.name,
+      reasoning: apiType === 'openai-responses',
+      input: apiType === 'openai-responses' ? ['text', 'image'] : ['text'],
+      cost: {
+        input: 0,
+        output: 0,
+        cacheRead: 0,
+        cacheWrite: 0
+      },
+      contextWindow,
+      maxTokens
+    };
+  }
+
+  // 步骤 5: API Key / Token
+  const step3 = await inquirer.prompt([
+    {
+      type: 'password',
+      name: 'apiKey',
+      message: 'API Key (留空跳过):',
+      mask: '*'
+    },
+    {
+      type: 'password',
+      name: 'providerToken',
+      message: '中转站 Token (留空跳过):',
+      mask: '*'
+    },
+    {
+      type: 'password',
+      name: 'gatewayToken',
+      message: '网关 Token (留空跳过):',
+      mask: '*'
+    }
+  ]);
+
+  // 步骤 6: 工作区
+  const step4 = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'workspace',
+      message: `工作区路径 (留空使用默认):`,
+      default: defaultWorkspace
+    }
+  ]);
+
+  // 执行配置
+  console.log(chalk.cyan('\n正在保存配置...\n'));
+
+  try {
+    // 添加中转站
+    await configManager.addRelay({
+      name: step1.name,
+      baseUrl: step1.baseUrl,
+      auth: 'api-key',
+      api: apiType,
+      headers: {},
+      authHeader: false,
+      modelsMode: 'merge',
+      model: {
+        id: modelConfig.id,
+        name: modelConfig.name,
+        contextWindow: includeModelsList ? modelEntry.contextWindow : undefined,
+        maxTokens: includeModelsList ? modelEntry.maxTokens : undefined,
+        reasoning: includeModelsList ? modelEntry.reasoning : undefined,
+        input: includeModelsList ? modelEntry.input : undefined,
+        cost: includeModelsList ? modelEntry.cost : undefined
+      },
+      models: includeModelsList ? [modelEntry] : []
+    });
+    console.log(chalk.green('  ✓ 中转站已添加'));
+
+    // 设置为主模型
+    await configManager.setPrimaryModel(step1.name, modelConfig.id);
+    console.log(chalk.green('  ✓ 已设为主模型'));
+
+    if (backupConfig) {
+      try {
+        await configManager.addRelay({
+          name: backupConfig.name,
+          baseUrl: backupConfig.baseUrl,
+          auth: 'api-key',
+          api: apiType,
+          headers: {},
+          authHeader: false,
+          modelsMode: 'merge',
+          model: {
+            id: modelConfig.id,
+            name: modelConfig.name,
+            contextWindow: includeModelsList ? modelEntry.contextWindow : undefined,
+            maxTokens: includeModelsList ? modelEntry.maxTokens : undefined,
+            reasoning: includeModelsList ? modelEntry.reasoning : undefined,
+            input: includeModelsList ? modelEntry.input : undefined,
+            cost: includeModelsList ? modelEntry.cost : undefined
+          },
+          models: includeModelsList ? [modelEntry] : []
+        });
+        console.log(chalk.green('  ✓ 备用中转站已添加'));
+
+        const existingFallbacks = await configManager.getFallbackModels();
+        const fallbackKey = `${backupConfig.name}/${modelConfig.id}`;
+        const mergedFallbacks = Array.from(new Set([...existingFallbacks, fallbackKey]));
+        await configManager.setFallbackModels(mergedFallbacks);
+        console.log(chalk.green('  ✓ 已设置备用模型'));
+
+        if (step3.apiKey && step3.apiKey.trim() !== '') {
+          const { useSameKey } = await inquirer.prompt([
+            {
+              type: 'confirm',
+              name: 'useSameKey',
+              message: '是否给备用中转站使用相同 API Key？',
+              default: true
+            }
+          ]);
+          if (useSameKey) {
+            await configManager.setApiKey(backupConfig.name, step3.apiKey);
+            console.log(chalk.green('  ✓ 备用中转站 API Key 已保存'));
+          } else {
+            const { backupApiKey } = await inquirer.prompt([
+              {
+                type: 'password',
+                name: 'backupApiKey',
+                message: '输入备用中转站 API Key:',
+                mask: '*',
+                validate: (input) => input.trim() !== '' || 'API Key 不能为空'
+              }
+            ]);
+            await configManager.setApiKey(backupConfig.name, backupApiKey);
+            console.log(chalk.green('  ✓ 备用中转站 API Key 已保存'));
+          }
+        }
+      } catch (error) {
+        displayWarning(`备用中转站添加失败: ${error.message}`);
+      }
+    }
+
+    // 保存 API Key
+    if (step3.apiKey && step3.apiKey.trim() !== '') {
+      await configManager.setApiKey(step1.name, step3.apiKey);
+      console.log(chalk.green('  ✓ API Key 已保存'));
+    }
+
+    // 保存中转站 Token
+    if (step3.providerToken && step3.providerToken.trim() !== '') {
+      await configManager.setToken(step1.name, step3.providerToken);
+      console.log(chalk.green('  ✓ 中转站 Token 已保存'));
+    }
+
+    // 设置工作区 / 网关 Token / 压缩模式
+    await configManager.setAdvancedSettings({
+      workspace: step4.workspace || defaultWorkspace,
+      compactionMode: presetConfig.compactionMode,
+      gatewayToken: step3.gatewayToken
+    });
+    console.log(chalk.green('  ✓ 高级设置已更新'));
+
+    displaySuccess('\n🎉 配置完成！您现在可以开始使用了。');
+
+    // 显示配置摘要
+    console.log(chalk.cyan('\n配置摘要:'));
+    console.log(`  中转站: ${step1.name}`);
+    console.log(`  URL: ${step1.baseUrl}`);
+    console.log(`  模型: ${modelConfig.name}`);
+    console.log(`  API: ${apiType}`);
+    console.log(`  API Key: ${step3.apiKey ? chalk.green('已设置') : chalk.gray('未设置')}`);
+    console.log(`  网关 Token: ${step3.gatewayToken ? chalk.green('已设置') : chalk.gray('未设置')}`);
+    console.log(`  工作区: ${step4.workspace || defaultWorkspace}`);
+
+  } catch (error) {
+    displayError(`配置失败: ${error.message}`);
+  }
+}
+
+// 快速切换中转端点
+async function quickSwitchEndpoint(configManager) {
+  const relays = await configManager.listRelays();
+  if (relays.length === 0) {
+    displayInfo('请先添加中转站');
+    return;
+  }
+
+  const { relayName } = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'relayName',
+      message: '选择要切换端点的中转站:',
+      choices: relays.map(r => ({ name: `${r.name} (${r.baseUrl})`, value: r.name }))
+    }
+  ]);
+
+  const relay = relays.find(r => r.name === relayName);
+  const endpoints = getRelayEndpoints(relayName);
+  let selectedUrl = '';
+
+  if (endpoints.length > 0) {
+    const { endpoint } = await inquirer.prompt([
+      {
+        type: 'list',
+        name: 'endpoint',
+        message: '选择接入端点:',
+        choices: [
+          ...endpoints.map(item => ({ name: item.name, value: item.url })),
+          { name: '自定义', value: '__custom__' }
+        ]
+      }
+    ]);
+
+    if (endpoint === '__custom__') {
+      const custom = await inquirer.prompt([
+        {
+          type: 'input',
+          name: 'url',
+          message: '输入 Base URL:',
+          validate: (input) => {
+            try {
+              const url = new URL(input);
+              if (url.protocol !== 'http:' && url.protocol !== 'https:') {
+                return '请输入有效的 HTTP/HTTPS URL';
+              }
+              return true;
+            } catch {
+              return '请输入有效的 URL';
+            }
+          }
+        }
+      ]);
+      selectedUrl = custom.url;
+    } else {
+      selectedUrl = endpoint;
+    }
+  } else {
+    const custom = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'url',
+        message: '输入 Base URL:',
+        default: relay.baseUrl,
+        validate: (input) => {
+          try {
+            const url = new URL(input);
+            if (url.protocol !== 'http:' && url.protocol !== 'https:') {
+              return '请输入有效的 HTTP/HTTPS URL';
+            }
+            return true;
+          } catch {
+            return '请输入有效的 URL';
+          }
+        }
+      }
+    ]);
+    selectedUrl = custom.url;
+  }
+
+  const finalUrl = buildRelayBaseUrl(selectedUrl, relayName);
+  if (finalUrl && finalUrl !== relay.baseUrl) {
+    await configManager.updateRelay(relayName, { baseUrl: finalUrl });
+    displaySuccess(`✅ 已切换 "${relayName}" 的端点`);
+  } else {
+    displayInfo('端点未变化');
+  }
+}
+
+// 快速切换模型
+async function quickSwitchModel(configManager) {
+  const relays = await configManager.listRelays();
+  if (relays.length === 0) {
+    displayInfo('请先添加中转站');
+    return;
+  }
+
+  const { relayName } = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'relayName',
+      message: '选择要切换模型的中转站:',
+      choices: relays.map(r => ({ name: `${r.name} (${r.modelName})`, value: r.name }))
+    }
+  ]);
+
+  const config = await configManager.readOpenclawConfig();
+  const provider = config.models?.providers?.[relayName] || {};
+  const apiType = provider.api || (normalizeRelayKey(relayName) === 'yunyi-codex'
+    ? 'openai-responses'
+    : 'anthropic-messages');
+  const providerModels = Array.isArray(provider.models) ? provider.models : [];
+  const presetModels = getRelayModelPresets(relayName);
+
+  const choiceMap = new Map();
+  const choices = [];
+
+  const allowedIds = new Set(presetModels.map(m => m.id));
+
+  providerModels.forEach(m => {
+    const key = m.id;
+    if (allowedIds.has(key) && !choiceMap.has(key)) {
+      choiceMap.set(key, m);
+      choices.push({ name: `${m.name || m.id} (${m.id})`, value: m.id });
+    }
+  });
+
+  presetModels.forEach(m => {
+    if (!choiceMap.has(m.id)) {
+      choiceMap.set(m.id, m);
+      choices.push({ name: `${m.name} (${m.id})`, value: m.id });
+    }
+  });
+
+  if (choices.length === 0) {
+    displayInfo('没有可用的模型选项');
+    return;
+  }
+
+  const { selected } = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'selected',
+      message: '选择模型:',
+      choices
+    }
+  ]);
+
+  const selectedModel = choiceMap.get(selected);
+  const model = {
+    id: selected,
+    name: selectedModel?.name || selected
+  };
+
+  await configManager.setPrimaryModel(relayName, model.id);
+  displaySuccess(`✅ 已切换主模型为 "${relayName}/${model.id}"`);
+
+  if (apiType !== 'anthropic-messages' && Array.isArray(provider.models)) {
+    const exists = providerModels.some(m => m.id === model.id);
+    if (!exists) {
+      const { shouldAdd } = await inquirer.prompt([
+        {
+          type: 'confirm',
+          name: 'shouldAdd',
+          message: '是否将模型写入 providers.models 列表？',
+          default: false
+        }
+      ]);
+      if (shouldAdd) {
+        provider.models.push(buildModelEntry(model, apiType));
+        await configManager.writeOpenclawConfig(config);
+        displaySuccess('✅ 已更新模型列表');
+      }
+    }
+  }
+}
+
 // 管理中转站配置
 async function manageRelay(configManager) {
   const { relayAction } = await inquirer.prompt([
@@ -151,88 +976,133 @@ async function addRelay(configManager) {
       message: '模型类型:',
       choices: [
         { name: 'Claude (Anthropic)', value: 'claude' },
-        { name: 'GPT (OpenAI)', value: 'gpt' },
-        { name: 'Gemini (Google)', value: 'gemini' },
-        { name: '其他', value: 'other' }
+        { name: 'Codex / GPT (OpenAI Responses)', value: 'codex' },
+        { name: '其他/自定义', value: 'other' }
       ]
     }
   ]);
 
+  answers.baseUrl = buildRelayBaseUrl(answers.baseUrl, answers.name);
+
+  let apiType = answers.modelType === 'codex'
+    ? 'openai-responses'
+    : 'anthropic-messages';
+  if (answers.modelType === 'other') {
+    displayWarning('非 GPT/Claude 模型仅做配置写入，不保证可用，请优先用 OpenClaw 配置页面。');
+    const result = await inquirer.prompt([
+      {
+        type: 'list',
+        name: 'apiType',
+        message: 'API 接口类型:',
+        choices: [
+          { name: 'Anthropic Messages (Claude)', value: 'anthropic-messages' },
+          { name: 'OpenAI Responses (Codex / GPT-5+)', value: 'openai-responses' },
+          { name: 'OpenAI Completions', value: 'openai-completions' },
+          { name: 'Google Generative AI (Gemini)', value: 'google-generative-ai' },
+          { name: '自定义', value: 'custom' }
+        ]
+      }
+    ]);
+    apiType = result.apiType;
+    if (apiType === 'custom') {
+      const custom = await inquirer.prompt([
+        { type: 'input', name: 'customApi', message: '输入 API 类型:', validate: (i) => i.trim() !== '' || '不能为空' }
+      ]);
+      apiType = custom.customApi;
+    }
+  }
+
   let modelConfig;
   if (answers.modelType === 'claude') {
-    const { modelId } = await inquirer.prompt([
+    const { modelChoice } = await inquirer.prompt([
       {
         type: 'list',
-        name: 'modelId',
+        name: 'modelChoice',
         message: '选择 Claude 模型:',
         choices: [
-          { name: 'Claude Sonnet 4.5', value: 'claude-sonnet-4-5-20250929' },
-          { name: 'Claude Sonnet 3.7', value: 'claude-3-7-sonnet-latest' },
-          { name: 'Claude Opus 4.5', value: 'claude-opus-4-5-20251101' },
-          { name: '自定义', value: 'custom' }
+          { name: 'Claude Opus 4.5', value: { id: 'claude-opus-4-5', name: 'Claude Opus 4.5' } },
+          { name: 'Claude Sonnet 4.5', value: { id: 'claude-sonnet-4-5', name: 'Claude Sonnet 4.5' } },
+          { name: 'Claude Haiku 4.5', value: { id: 'claude-haiku-4-5', name: 'Claude Haiku 4.5' } }
         ]
       }
     ]);
 
-    if (modelId === 'custom') {
-      const { customId } = await inquirer.prompt([
-        {
-          type: 'input',
-          name: 'customId',
-          message: '输入自定义模型 ID:',
-          validate: (input) => input.trim() !== '' || '模型 ID 不能为空'
-        }
-      ]);
-      modelConfig = { id: customId, name: customId };
-    } else {
-      modelConfig = { id: modelId, name: 'Claude Sonnet 4.5' };
-    }
-  } else if (answers.modelType === 'gpt') {
-    modelConfig = { id: 'gpt-4o', name: 'GPT-4o' };
-  } else if (answers.modelType === 'gemini') {
-    modelConfig = { id: 'gemini-3-pro', name: 'Gemini 3 Pro' };
+    modelConfig = modelChoice;
+  } else if (answers.modelType === 'codex') {
+    const { modelChoice } = await inquirer.prompt([
+      {
+        type: 'list',
+        name: 'modelChoice',
+        message: '选择 Codex / GPT 模型:',
+        choices: [
+          { name: 'GPT 5.2', value: { id: 'gpt-5.2', name: 'GPT 5.2' } },
+          { name: 'GPT 5.2 Codex', value: { id: 'gpt-5.2-codex', name: 'GPT 5.2 Codex' } }
+        ]
+      }
+    ]);
+    modelConfig = modelChoice;
   } else {
-    const { customId, customName } = await inquirer.prompt([
+    const custom = await inquirer.prompt([
+      { type: 'input', name: 'id', message: '模型 ID:', validate: (i) => i.trim() !== '' || '不能为空' },
+      { type: 'input', name: 'name', message: '模型名称:', validate: (i) => i.trim() !== '' || '不能为空' }
+    ]);
+    modelConfig = { id: custom.id.trim(), name: custom.name.trim() };
+  }
+
+  const includeModelsList = apiType !== 'anthropic-messages';
+  let modelEntry = null;
+  if (includeModelsList) {
+    const defaults = answers.modelType === 'codex'
+      ? { contextWindow: 128000, maxTokens: 32768 }
+      : { contextWindow: 200000, maxTokens: 8192 };
+    const { contextWindow, maxTokens } = await inquirer.prompt([
       {
-        type: 'input',
-        name: 'customId',
-        message: '模型 ID:',
-        validate: (input) => input.trim() !== '' || '模型 ID 不能为空'
+        type: 'number',
+        name: 'contextWindow',
+        message: '上下文窗口大小:',
+        default: defaults.contextWindow
       },
       {
-        type: 'input',
-        name: 'customName',
-        message: '模型显示名称:',
-        validate: (input) => input.trim() !== '' || '名称不能为空'
+        type: 'number',
+        name: 'maxTokens',
+        message: '最大输出 tokens:',
+        default: defaults.maxTokens
       }
     ]);
-    modelConfig = { id: customId, name: customName };
+    modelEntry = {
+      id: modelConfig.id,
+      name: modelConfig.name,
+      reasoning: apiType === 'openai-responses',
+      input: apiType === 'openai-responses' ? ['text', 'image'] : ['text'],
+      cost: {
+        input: 0,
+        output: 0,
+        cacheRead: 0,
+        cacheWrite: 0
+      },
+      contextWindow,
+      maxTokens
+    };
   }
 
-  const { contextWindow, maxTokens } = await inquirer.prompt([
-    {
-      type: 'number',
-      name: 'contextWindow',
-      message: '上下文窗口大小:',
-      default: 200000
-    },
-    {
-      type: 'number',
-      name: 'maxTokens',
-      message: '最大输出 tokens:',
-      default: 8192
-    }
-  ]);
-
   await configManager.addRelay({
     name: answers.name,
     baseUrl: answers.baseUrl,
+    auth: 'api-key',
+    api: apiType,
+    headers: {},
+    authHeader: false,
+    modelsMode: 'merge',
     model: {
       id: modelConfig.id,
       name: modelConfig.name,
-      contextWindow,
-      maxTokens
-    }
+      contextWindow: includeModelsList ? modelEntry.contextWindow : undefined,
+      maxTokens: includeModelsList ? modelEntry.maxTokens : undefined,
+      reasoning: includeModelsList ? modelEntry.reasoning : undefined,
+      input: includeModelsList ? modelEntry.input : undefined,
+      cost: includeModelsList ? modelEntry.cost : undefined
+    },
+    models: includeModelsList ? [modelEntry] : []
   });
 
   displaySuccess(`✅ 中转站 "${answers.name}" 添加成功！`);
@@ -256,8 +1126,29 @@ async function editRelay(configManager) {
   ]);
 
   const relay = relays.find(r => r.name === relayName);
+  const config = await configManager.readOpenclawConfig();
+  const provider = config.models?.providers?.[relayName] || {};
+  const apiTypeDefault = provider.api || (normalizeRelayKey(relayName) === 'yunyi-codex'
+    ? 'openai-responses'
+    : 'anthropic-messages');
+  const hasModelList = Array.isArray(provider.models) && provider.models.length > 0;
+  if (!['yunyi-claude', 'yunyi-codex'].includes(normalizeRelayKey(relayName))) {
+    displayWarning('该中转站不在本工具保障范围，仅做配置写入。');
+  }
 
-  const answers = await inquirer.prompt([
+  const apiChoices = [
+    { name: 'Anthropic Messages (Claude)', value: 'anthropic-messages' },
+    { name: 'OpenAI Responses (Codex / GPT-5+)', value: 'openai-responses' },
+    { name: 'OpenAI Completions', value: 'openai-completions' },
+    { name: 'Google Generative AI (Gemini)', value: 'google-generative-ai' },
+    { name: '自定义', value: 'custom' }
+  ];
+
+  if (apiTypeDefault && !apiChoices.some(choice => choice.value === apiTypeDefault)) {
+    apiChoices.unshift({ name: `当前 (${apiTypeDefault})`, value: apiTypeDefault });
+  }
+
+  const questions = [
     {
       type: 'input',
       name: 'baseUrl',
@@ -265,18 +1156,76 @@ async function editRelay(configManager) {
       default: relay.baseUrl
     },
     {
-      type: 'number',
-      name: 'contextWindow',
-      message: '上下文窗口:',
-      default: relay.contextWindow
+      type: 'list',
+      name: 'api',
+      message: 'API 接口类型:',
+      default: apiTypeDefault,
+      choices: apiChoices
     },
     {
-      type: 'number',
-      name: 'maxTokens',
-      message: '最大输出 tokens:',
-      default: relay.maxTokens
+      type: 'confirm',
+      name: 'authHeader',
+      message: '是否启用 authHeader?',
+      default: !!provider.authHeader
+    },
+    {
+      type: 'input',
+      name: 'headers',
+      message: 'Headers (JSON/JSON5，留空保持不变):',
+      default: provider.headers ? JSON.stringify(provider.headers) : ''
+    },
+    {
+      type: 'password',
+      name: 'apiKey',
+      message: 'API Key (留空保持不变):',
+      mask: '*'
     }
-  ]);
+  ];
+
+  if (hasModelList) {
+    questions.push(
+      {
+        type: 'number',
+        name: 'contextWindow',
+        message: '上下文窗口:',
+        default: relay.contextWindow
+      },
+      {
+        type: 'number',
+        name: 'maxTokens',
+        message: '最大输出 tokens:',
+        default: relay.maxTokens
+      }
+    );
+  }
+
+  const answers = await inquirer.prompt(questions);
+
+  if (answers.api === 'custom') {
+    const custom = await inquirer.prompt([
+      { type: 'input', name: 'customApi', message: '输入 API 类型:', validate: (i) => i.trim() !== '' || '不能为空' }
+    ]);
+    answers.api = custom.customApi;
+  }
+
+  if (answers.headers && answers.headers.trim() !== '') {
+    try {
+      answers.headers = JSON5.parse(answers.headers);
+    } catch (error) {
+      displayError(`Headers 解析失败: ${error.message}`);
+      return;
+    }
+  } else {
+    delete answers.headers;
+  }
+
+  if (answers.baseUrl) {
+    answers.baseUrl = buildRelayBaseUrl(answers.baseUrl, relayName);
+  }
+
+  if (!answers.apiKey || answers.apiKey.trim() === '') {
+    delete answers.apiKey;
+  }
 
   await configManager.updateRelay(relayName, answers);
   displaySuccess(`✅ 中转站 "${relayName}" 更新成功！`);
@@ -336,7 +1285,21 @@ async function switchRelay(configManager) {
     }
   ]);
 
-  await configManager.setPrimaryModel(relayName);
+  const selected = relays.find(r => r.name === relayName);
+  let modelId = selected?.modelId;
+  if (!modelId) {
+    const result = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'modelId',
+        message: '该中转站未配置模型 ID，请输入模型 ID:',
+        validate: (input) => input.trim() !== '' || '模型 ID 不能为空'
+      }
+    ]);
+    modelId = result.modelId;
+  }
+
+  await configManager.setPrimaryModel(relayName, modelId);
   displaySuccess(`✅ 已切换到 "${relayName}"`);
 }
 
@@ -371,13 +1334,18 @@ async function manageModel(configManager) {
 async function manageFallback(configManager) {
   const relays = await configManager.listRelays();
   const currentFallbacks = await configManager.getFallbackModels();
+  const availableRelays = relays.filter(r => r.modelId);
+
+  if (availableRelays.length !== relays.length) {
+    displayWarning('部分中转站未配置模型 ID，已跳过');
+  }
 
   const { selected } = await inquirer.prompt([
     {
       type: 'checkbox',
       name: 'selected',
       message: '选择备用模型（按优先级排序）:',
-      choices: relays.map(r => ({
+      choices: availableRelays.map(r => ({
         name: `${r.name} - ${r.modelName}`,
         value: `${r.name}/${r.modelId}`,
         checked: currentFallbacks.includes(`${r.name}/${r.modelId}`)
@@ -389,17 +1357,19 @@ async function manageFallback(configManager) {
   displaySuccess('✅ 备用模型配置已更新');
 }
 
-// 管理 API Keys
+// 管理 API Keys 和 Tokens
 async function manageApiKey(configManager) {
   const { keyAction } = await inquirer.prompt([
     {
       type: 'list',
       name: 'keyAction',
-      message: 'API Key 管理:',
+      message: 'API Key / Token 管理:',
       choices: [
         { name: '➕ 添加/更新 API Key', value: 'add' },
-        { name: '👁️  查看已配置的 Keys', value: 'view' },
+        { name: '🔐 添加/更新 Token', value: 'addToken' },
+        { name: '👁️  查看已配置的 Keys/Tokens', value: 'view' },
         { name: '🗑️  删除 API Key', value: 'delete' },
+        { name: '🗑️  删除 Token', value: 'deleteToken' },
         { name: '⬅️  返回', value: 'back' }
       ]
     }
@@ -411,12 +1381,18 @@ async function manageApiKey(configManager) {
     case 'add':
       await addApiKey(configManager);
       break;
+    case 'addToken':
+      await addToken(configManager);
+      break;
     case 'view':
       await viewApiKeys(configManager);
       break;
     case 'delete':
       await deleteApiKey(configManager);
       break;
+    case 'deleteToken':
+      await deleteToken(configManager);
+      break;
   }
 }
 
@@ -424,6 +1400,11 @@ async function manageApiKey(configManager) {
 async function addApiKey(configManager) {
   const relays = await configManager.listRelays();
 
+  if (relays.length === 0) {
+    displayInfo('请先添加中转站');
+    return;
+  }
+
   const { relayName } = await inquirer.prompt([
     {
       type: 'list',
@@ -447,27 +1428,97 @@ async function addApiKey(configManager) {
   displaySuccess(`✅ API Key 已保存到 "${relayName}"`);
 }
 
-// 查看 API Keys
+// 添加 Token
+async function addToken(configManager) {
+  const relays = await configManager.listRelays();
+
+  if (relays.length === 0) {
+    displayInfo('请先添加中转站');
+    return;
+  }
+
+  const { relayName } = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'relayName',
+      message: '选择中转站:',
+      choices: relays.map(r => ({ name: r.name, value: r.name }))
+    }
+  ]);
+
+  const { token } = await inquirer.prompt([
+    {
+      type: 'password',
+      name: 'token',
+      message: '输入 Token:',
+      mask: '*',
+      validate: (input) => input.trim() !== '' || 'Token 不能为空'
+    }
+  ]);
+
+  await configManager.setToken(relayName, token);
+  displaySuccess(`✅ Token 已保存到 "${relayName}"`);
+}
+
+// 查看 API Keys 和 Tokens
 async function viewApiKeys(configManager) {
   const keys = await configManager.listApiKeys();
 
   if (keys.length === 0) {
-    displayInfo('没有配置任何 API Key');
+    displayInfo('没有配置任何 API Key 或 Token');
     return;
   }
 
-  console.log(chalk.cyan('\n已配置的 API Keys:\n'));
+  console.log(chalk.cyan('\n已配置的 API Keys / Tokens:\n'));
   keys.forEach(k => {
-    const masked = k.key ? `${k.key.substring(0, 8)}...${k.key.substring(k.key.length - 4)}` : '未设置';
-    console.log(`  ${chalk.green('●')} ${k.provider}: ${masked}`);
+    const maskedKey = k.key ? `${k.key.substring(0, 8)}...${k.key.substring(k.key.length - 4)}` : '未设置';
+    const maskedToken = k.token ? `${k.token.substring(0, 8)}...${k.token.substring(k.token.length - 4)}` : '未设置';
+    console.log(`  ${chalk.green('●')} ${k.provider}`);
+    console.log(`    API Key: ${k.key ? chalk.green(maskedKey) : chalk.gray(maskedKey)}`);
+    console.log(`    Token:   ${k.token ? chalk.green(maskedToken) : chalk.gray(maskedToken)}`);
   });
 }
 
+// 删除 Token
+async function deleteToken(configManager) {
+  const keys = await configManager.listApiKeys();
+  const keysWithToken = keys.filter(k => k.token);
+
+  if (keysWithToken.length === 0) {
+    displayInfo('没有可删除的 Token');
+    return;
+  }
+
+  const { provider } = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'provider',
+      message: '选择要删除的 Token:',
+      choices: keysWithToken.map(k => ({ name: k.provider, value: k.provider }))
+    }
+  ]);
+
+  const { confirm } = await inquirer.prompt([
+    {
+      type: 'confirm',
+      name: 'confirm',
+      message: `确定要删除 "${provider}" 的 Token 吗？`,
+      default: false
+    }
+  ]);
+
+  if (confirm) {
+    await configManager.deleteToken(provider);
+    displaySuccess(`✅ Token 已删除`);
+  }
+}
+
 // 删除 API Key
 async function deleteApiKey(configManager) {
   const keys = await configManager.listApiKeys();
+  const keysWithApiKey = keys.filter(k => k.key);
 
-  if (keys.length === 0) {
+  if (keysWithApiKey.length === 0) {
     displayInfo('没有可删除的 API Key');
     return;
   }
@@ -477,7 +1528,7 @@ async function deleteApiKey(configManager) {
       type: 'list',
       name: 'provider',
       message: '选择要删除的 API Key:',
-      choices: keys.map(k => ({ name: k.provider, value: k.provider }))
+      choices: keysWithApiKey.map(k => ({ name: k.provider, value: k.provider }))
     }
   ]);
 
@@ -553,13 +1604,26 @@ async function speedTestAndSwitch(configManager) {
 
   if (action === 'fastest') {
     // 切换到最快的
-    await configManager.setPrimaryModel(fastest.name);
+    const fastestRelay = relays.find(rel => rel.name === fastest.name);
+    let fastestModelId = fastestRelay?.modelId;
+    if (!fastestModelId) {
+      const result = await inquirer.prompt([
+        {
+          type: 'input',
+          name: 'modelId',
+          message: `未找到 "${fastest.name}" 的模型 ID，请输入:`,
+          validate: (input) => input.trim() !== '' || '模型 ID 不能为空'
+        }
+      ]);
+      fastestModelId = result.modelId;
+    }
+    await configManager.setPrimaryModel(fastest.name, fastestModelId);
 
     // 设置其他可用的为备用
-    const fallbacks = sorted.slice(1).map(r => {
-      const relay = relays.find(rel => rel.name === r.name);
-      return `${relay.name}/${relay.modelId}`;
-    });
+    const fallbacks = sorted.slice(1)
+      .map(r => relays.find(rel => rel.name === r.name))
+      .filter(relay => relay && relay.modelId)
+      .map(relay => `${relay.name}/${relay.modelId}`);
     await configManager.setFallbackModels(fallbacks);
 
     displaySuccess(`✅ 已切换到 "${fastest.name}" (${fastest.latency}ms)`);
@@ -580,15 +1644,27 @@ async function speedTestAndSwitch(configManager) {
       }
     ]);
 
-    await configManager.setPrimaryModel(selected);
+    const selectedRelay = relays.find(rel => rel.name === selected);
+    let selectedModelId = selectedRelay?.modelId;
+    if (!selectedModelId) {
+      const result = await inquirer.prompt([
+        {
+          type: 'input',
+          name: 'modelId',
+          message: `未找到 "${selected}" 的模型 ID，请输入:`,
+          validate: (input) => input.trim() !== '' || '模型 ID 不能为空'
+        }
+      ]);
+      selectedModelId = result.modelId;
+    }
+    await configManager.setPrimaryModel(selected, selectedModelId);
 
     // 设置其他为备用
     const fallbacks = sorted
       .filter(r => r.name !== selected)
-      .map(r => {
-        const relay = relays.find(rel => rel.name === r.name);
-        return `${relay.name}/${relay.modelId}`;
-      });
+      .map(r => relays.find(rel => rel.name === r.name))
+      .filter(relay => relay && relay.modelId)
+      .map(relay => `${relay.name}/${relay.modelId}`);
     await configManager.setFallbackModels(fallbacks);
 
     const selectedResult = results.find(r => r.name === selected);
@@ -602,29 +1678,91 @@ async function speedTestAndSwitch(configManager) {
 // 高级设置
 async function manageAdvanced(configManager) {
   const currentConfig = await configManager.getAdvancedSettings();
+  const defaultWorkspace = getDefaultWorkspace();
+
+  console.log(chalk.cyan('\n当前高级设置:'));
+  console.log(`  最大并发: ${currentConfig.maxConcurrent}`);
+  console.log(`  子代理并发: ${currentConfig.subagentMaxConcurrent}`);
+  console.log(`  工作区: ${currentConfig.workspace || chalk.gray('(使用默认)')}`);
+  console.log(`  压缩模式: ${currentConfig.compactionMode || chalk.gray('(未设置)')}`);
+  if (currentConfig.gatewayToken) {
+    const token = currentConfig.gatewayToken;
+    const masked = `${token.substring(0, 6)}...${token.substring(token.length - 4)}`;
+    console.log(`  网关 Token: ${chalk.gray(masked)}`);
+  } else {
+    console.log(`  网关 Token: ${chalk.gray('(未设置)')}`);
+  }
+  console.log(`  默认工作区: ${chalk.gray(defaultWorkspace)}\n`);
 
   const answers = await inquirer.prompt([
     {
       type: 'number',
       name: 'maxConcurrent',
-      message: '最大并发任务数:',
-      default: currentConfig.maxConcurrent || 4
+      message: '最大并发任务数 (1-100):',
+      default: currentConfig.maxConcurrent || 4,
+      validate: (input) => {
+        const num = Number(input);
+        if (isNaN(num) || num < 1 || num > 100) {
+          return '请输入 1 到 100 之间的数字';
+        }
+        return true;
+      }
     },
     {
       type: 'number',
       name: 'subagentMaxConcurrent',
-      message: '子代理最大并发数:',
-      default: currentConfig.subagentMaxConcurrent || 8
+      message: '子代理最大并发数 (1-100):',
+      default: currentConfig.subagentMaxConcurrent || 8,
+      validate: (input) => {
+        const num = Number(input);
+        if (isNaN(num) || num < 1 || num > 100) {
+          return '请输入 1 到 100 之间的数字';
+        }
+        return true;
+      }
     },
     {
       type: 'input',
       name: 'workspace',
-      message: '工作区路径:',
-      default: currentConfig.workspace || path.join(os.homedir(), '.openclaw', 'workspace')
+      message: `工作区路径 (留空使用默认: ${defaultWorkspace}):`,
+      default: currentConfig.workspace || ''
+    },
+    {
+      type: 'list',
+      name: 'compactionMode',
+      message: '压缩模式:',
+      choices: [
+        { name: '保持不变', value: '__keep__' },
+        { name: 'safeguard', value: 'safeguard' },
+        { name: 'auto', value: 'auto' },
+        { name: 'off', value: 'off' }
+      ],
+      default: currentConfig.compactionMode ? currentConfig.compactionMode : '__keep__'
+    },
+    {
+      type: 'password',
+      name: 'gatewayToken',
+      message: '网关 Token (留空保持不变):',
+      mask: '*'
     }
   ]);
 
-  await configManager.setAdvancedSettings(answers);
+  // 如果用户没有输入工作区路径，使用默认值
+  if (!answers.workspace || answers.workspace.trim() === '') {
+    answers.workspace = defaultWorkspace;
+  }
+
+  const advancedUpdate = {
+    maxConcurrent: answers.maxConcurrent,
+    subagentMaxConcurrent: answers.subagentMaxConcurrent,
+    workspace: answers.workspace,
+    gatewayToken: answers.gatewayToken
+  };
+  if (answers.compactionMode !== '__keep__') {
+    advancedUpdate.compactionMode = answers.compactionMode;
+  }
+
+  await configManager.setAdvancedSettings(advancedUpdate);
   displaySuccess('✅ 高级设置已更新');
 }
 
@@ -646,7 +1784,8 @@ async function viewConfig(configManager) {
     console.log(`  ${chalk.green('●')} ${r.name}`);
     console.log(`    URL: ${r.baseUrl}`);
     console.log(`    模型: ${r.modelName} (${r.modelId})`);
-    console.log(`    上下文: ${r.contextWindow} tokens`);
+    const contextInfo = r.contextWindow ? `${r.contextWindow} tokens` : '-';
+    console.log(`    上下文: ${contextInfo}`);
   });
 
   console.log(chalk.yellow('\n高级设置:'));