openclawapi 1.2.1 → 1.3.0

package/cli.js

@@ -20,13 +20,37 @@ const ENDPOINTS = [
   { name: '备用节点2', url: 'http://47.97.100.10' }
 ];
 
-// 模型预设
-const MODELS = [
+// Claude 模型预设
+const CLAUDE_MODELS = [
   { 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' }
 ];
 
+// Codex 模型预设
+const CODEX_MODELS = [
+  { id: 'gpt-5.2', name: 'GPT 5.2' },
+  { id: 'gpt-5.2-codex', name: 'GPT 5.2 Codex' }
+];
+
+// API 类型配置
+const API_CONFIG = {
+  claude: {
+    urlSuffix: '/claude/v1/messages',
+    api: 'anthropic-messages',
+    contextWindow: 200000,
+    maxTokens: 8192,
+    providerName: 'yunyi-claude'
+  },
+  codex: {
+    urlSuffix: '/codex/response',
+    api: 'openai-responses',
+    contextWindow: 128000,
+    maxTokens: 32768,
+    providerName: 'yunyi-codex'
+  }
+};
+
 // 备份文件名
 const BACKUP_FILENAME = 'openclaw-default.json.bak';
 
@@ -88,7 +112,6 @@ function getConfigPath() {
 
   const configDir = path.dirname(openclawConfig);
 
-  // 查找 auth-profiles 路径
   const authCandidates = [
     path.join(openclawStateDir, 'agents', 'main', 'agent', 'auth-profiles.json'),
     path.join(clawdbotStateDir, 'agents', 'main', 'agent', 'auth-profiles.json'),
@@ -136,17 +159,17 @@ function restoreDefaultConfig(configPath, configDir) {
 }
 
 // ============ URL 构建 ============
-function buildFullUrl(baseUrl) {
+function buildFullUrl(baseUrl, type) {
   const trimmed = baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl;
-  if (trimmed.includes('/claude/v1/messages')) return trimmed;
-  if (trimmed.includes('/claude')) return trimmed + '/v1/messages';
-  return trimmed + '/claude/v1/messages';
+  const suffix = API_CONFIG[type].urlSuffix;
+  if (trimmed.includes(suffix)) return trimmed;
+  return trimmed + suffix;
 }
 
 // ============ 主程序 ============
 async function main() {
   console.clear();
-  console.log(chalk.cyan.bold('\n🔧 OpenClaw 配置工具 (简化版)\n'));
+  console.log(chalk.cyan.bold('\n🔧 OpenClaw 配置工具\n'));
 
   const paths = getConfigPath();
   console.log(chalk.gray(`配置文件: ${paths.openclawConfig}\n`));
@@ -162,8 +185,12 @@ async function main() {
       name: 'action',
       message: '请选择操作:',
       choices: [
-        { name: '🌐 选择节点', value: 'select_node' },
-        { name: '🤖 选择默认模型', value: 'select_model' },
+        { name: '🔵 选择 Claude 节点', value: 'select_claude' },
+        { name: '🟢 选择 Codex 节点', value: 'select_codex' },
+        new inquirer.Separator(),
+        { name: '⚡ 激活 Claude', value: 'activate_claude' },
+        { name: '⚡ 激活 Codex', value: 'activate_codex' },
+        new inquirer.Separator(),
         { name: '🔑 设置 API Key', value: 'set_apikey' },
         { name: '📋 查看当前配置', value: 'view_config' },
         { name: '🔄 恢复默认配置', value: 'restore' },
@@ -176,11 +203,17 @@ async function main() {
 
     try {
       switch (action) {
-        case 'select_node':
-          await selectNode(paths);
+        case 'select_claude':
+          await selectNode(paths, 'claude');
+          break;
+        case 'select_codex':
+          await selectNode(paths, 'codex');
+          break;
+        case 'activate_claude':
+          await activate(paths, 'claude');
           break;
-        case 'select_model':
-          await selectModel(paths);
+        case 'activate_codex':
+          await activate(paths, 'codex');
           break;
         case 'set_apikey':
           await setApiKey(paths);
@@ -203,13 +236,16 @@ async function main() {
   }
 }
 
-// ============ 选择节点 ============
-async function selectNode(paths) {
-  console.log(chalk.cyan('📡 节点测速中...\n'));
+// ============ 选择节点 (Claude/Codex) ============
+async function selectNode(paths, type) {
+  const typeLabel = type === 'claude' ? 'Claude' : 'Codex';
+  const models = type === 'claude' ? CLAUDE_MODELS : CODEX_MODELS;
+  const apiConfig = API_CONFIG[type];
+
+  console.log(chalk.cyan(`📡 ${typeLabel} 节点测速中...\n`));
 
   const results = await testAllEndpoints();
 
-  // 按延迟排序
   const sorted = results
     .filter(r => r.success)
     .sort((a, b) => a.latency - b.latency);
@@ -239,19 +275,18 @@ async function selectNode(paths) {
   const primaryIndex = selectedIndex === -1 ? 0 : selectedIndex;
   const selectedEndpoint = sorted[primaryIndex];
 
-  // 读取或创建配置
-  let config = readConfig(paths.openclawConfig) || {};
+  // 选择模型
+  const { selectedModel } = await inquirer.prompt([{
+    type: 'list',
+    name: 'selectedModel',
+    message: `选择 ${typeLabel} 模型:`,
+    choices: models.map(m => ({ name: m.name, value: m.id }))
+  }]);
 
-  // 获取当前模型（保持不变）
-  const currentModelId = config.agents?.defaults?.model?.primary?.split('/')[1] || MODELS[0].id;
-  const modelConfig = MODELS.find(m => m.id === currentModelId) || MODELS[0];
+  const modelConfig = models.find(m => m.id === selectedModel);
 
-  // 清除旧的 yunyi 配置
-  if (config.models?.providers) {
-    Object.keys(config.models.providers).forEach(key => {
-      if (key.startsWith('yunyi-')) delete config.models.providers[key];
-    });
-  }
+  // 读取或创建配置
+  let config = readConfig(paths.openclawConfig) || {};
 
   // 初始化结构
   if (!config.models) config.models = {};
@@ -261,78 +296,93 @@ async function selectNode(paths) {
   if (!config.agents.defaults.model) config.agents.defaults.model = {};
   if (!config.agents.defaults.models) config.agents.defaults.models = {};
 
-  // 添加选中的节点
-  const providerName = 'yunyi-001';
-  config.models.providers[providerName] = {
-    baseUrl: buildFullUrl(selectedEndpoint.url),
-    api: 'anthropic-messages',
+  // 保留旧的 API Key
+  const oldProvider = config.models.providers[apiConfig.providerName];
+  const oldApiKey = oldProvider?.apiKey;
+
+  // 添加/更新节点
+  config.models.providers[apiConfig.providerName] = {
+    baseUrl: buildFullUrl(selectedEndpoint.url, type),
+    api: apiConfig.api,
+    apiKey: oldApiKey,
     models: [{
       id: modelConfig.id,
       name: modelConfig.name,
-      contextWindow: 200000,
-      maxTokens: 8192
+      contextWindow: apiConfig.contextWindow,
+      maxTokens: apiConfig.maxTokens
     }]
   };
 
-  // 设置主模型（无备用）
-  config.agents.defaults.model.primary = `${providerName}/${modelConfig.id}`;
-  config.agents.defaults.model.fallbacks = [];
-  config.agents.defaults.models = {
-    [`${providerName}/${modelConfig.id}`]: { alias: providerName }
-  };
+  // 注册模型
+  const modelKey = `${apiConfig.providerName}/${modelConfig.id}`;
+  config.agents.defaults.models[modelKey] = { alias: apiConfig.providerName };
 
   writeConfig(paths.openclawConfig, config);
 
-  console.log(chalk.green(`\n✅ 配置完成！`));
+  console.log(chalk.green(`\n✅ ${typeLabel} 节点配置完成！`));
   console.log(chalk.cyan(`   节点: ${selectedEndpoint.name} (${selectedEndpoint.url})`));
   console.log(chalk.gray(`   模型: ${modelConfig.name}`));
+  console.log(chalk.gray(`   API Key: ${oldApiKey ? '已设置' : '未设置'}`));
 }
 
-// ============ 选择模型 ============
-async function selectModel(paths) {
-  console.log(chalk.cyan('🤖 选择默认模型\n'));
+// ============ 激活 (Claude/Codex) ============
+async function activate(paths, type) {
+  const typeLabel = type === 'claude' ? 'Claude' : 'Codex';
+  const apiConfig = API_CONFIG[type];
+  const models = type === 'claude' ? CLAUDE_MODELS : CODEX_MODELS;
 
-  const { selectedModel } = await inquirer.prompt([{
-    type: 'list',
-    name: 'selectedModel',
-    message: '选择模型:',
-    choices: MODELS.map(m => ({ name: m.name, value: m.id }))
-  }]);
-
-  const modelConfig = MODELS.find(m => m.id === selectedModel);
   let config = readConfig(paths.openclawConfig);
 
-  if (!config?.models?.providers) {
-    console.log(chalk.yellow('⚠️ 请先选择节点'));
+  if (!config?.models?.providers?.[apiConfig.providerName]) {
+    console.log(chalk.yellow(`⚠️ 请先选择 ${typeLabel} 节点`));
     return;
   }
 
-  // 更新 yunyi 节点的模型
-  const providerName = Object.keys(config.models.providers).find(k => k.startsWith('yunyi-'));
-  if (providerName) {
-    config.models.providers[providerName].models = [{
-      id: modelConfig.id,
-      name: modelConfig.name,
-      contextWindow: 200000,
-      maxTokens: 8192
-    }];
-
-    // 更新主模型（无备用）
-    config.agents.defaults.model.primary = `${providerName}/${modelConfig.id}`;
-    config.agents.defaults.model.fallbacks = [];
-    config.agents.defaults.models = {
-      [`${providerName}/${modelConfig.id}`]: { alias: providerName }
-    };
-  }
+  const provider = config.models.providers[apiConfig.providerName];
+  const currentModelId = provider.models?.[0]?.id || models[0].id;
+  const modelConfig = models.find(m => m.id === currentModelId) || models[0];
+
+  // 设置为主模型
+  const modelKey = `${apiConfig.providerName}/${modelConfig.id}`;
+  config.agents.defaults.model.primary = modelKey;
+  config.agents.defaults.model.fallbacks = [];
 
   writeConfig(paths.openclawConfig, config);
-  console.log(chalk.green(`\n✅ 模型已切换为: ${modelConfig.name}`));
+
+  console.log(chalk.green(`✅ 已激活 ${typeLabel}`));
+  console.log(chalk.cyan(`   节点: ${provider.baseUrl}`));
+  console.log(chalk.gray(`   模型: ${modelConfig.name}`));
 }
 
 // ============ 设置 API Key ============
 async function setApiKey(paths) {
   console.log(chalk.cyan('🔑 设置 API Key\n'));
 
+  let config = readConfig(paths.openclawConfig);
+
+  // 检查已配置的节点
+  const claudeConfigured = config?.models?.providers?.['yunyi-claude'];
+  const codexConfigured = config?.models?.providers?.['yunyi-codex'];
+
+  if (!claudeConfigured && !codexConfigured) {
+    console.log(chalk.yellow('⚠️ 请先选择节点'));
+    return;
+  }
+
+  const choices = [];
+  if (claudeConfigured) choices.push({ name: '🔵 Claude', value: 'claude' });
+  if (codexConfigured) choices.push({ name: '🟢 Codex', value: 'codex' });
+  if (claudeConfigured && codexConfigured) {
+    choices.push({ name: '🔷 两者都设置 (相同 Key)', value: 'both' });
+  }
+
+  const { target } = await inquirer.prompt([{
+    type: 'list',
+    name: 'target',
+    message: '为哪个设置 API Key?',
+    choices
+  }]);
+
   const { apiKey } = await inquirer.prompt([{
     type: 'password',
     name: 'apiKey',
@@ -341,18 +391,15 @@ async function setApiKey(paths) {
     validate: input => input.trim() !== '' || 'API Key 不能为空'
   }]);
 
-  let config = readConfig(paths.openclawConfig);
+  const providers = [];
+  if (target === 'claude' || target === 'both') providers.push('yunyi-claude');
+  if (target === 'codex' || target === 'both') providers.push('yunyi-codex');
 
-  if (!config?.models?.providers) {
-    console.log(chalk.yellow('⚠️ 请先选择节点'));
-    return;
-  }
-
-  // 为 yunyi 节点设置 API Key
-  const providerName = Object.keys(config.models.providers).find(k => k.startsWith('yunyi-'));
-  if (providerName) {
-    config.models.providers[providerName].apiKey = apiKey.trim();
-  }
+  providers.forEach(providerName => {
+    if (config.models.providers[providerName]) {
+      config.models.providers[providerName].apiKey = apiKey.trim();
+    }
+  });
 
   writeConfig(paths.openclawConfig, config);
 
@@ -367,9 +414,9 @@ async function setApiKey(paths) {
     try { authProfiles = JSON.parse(fs.readFileSync(paths.authProfiles, 'utf8')); } catch {}
   }
 
-  if (providerName) {
+  providers.forEach(providerName => {
     authProfiles[`${providerName}:default`] = { apiKey: apiKey.trim() };
-  }
+  });
 
   fs.writeFileSync(paths.authProfiles, JSON.stringify(authProfiles, null, 2), 'utf8');
 
@@ -387,23 +434,46 @@ async function viewConfig(paths) {
     return;
   }
 
-  // 主模型
+  // 当前激活
   const primary = config.agents?.defaults?.model?.primary || '未设置';
-  console.log(chalk.yellow('当前模型:'));
-  console.log(`  ${primary}\n`);
-
-  // 节点信息
-  console.log(chalk.yellow('当前节点:'));
-  if (config.models?.providers) {
-    const provider = Object.entries(config.models.providers).find(([name]) => name.startsWith('yunyi-'));
-    if (provider) {
-      const [name, data] = provider;
-      const hasKey = data.apiKey ? chalk.green('✓ 已设置') : chalk.red('✗ 未设置');
-      console.log(`  ${name}: ${data.baseUrl}`);
-      console.log(`  API Key: ${hasKey}`);
-    } else {
-      console.log('  未配置');
-    }
+  const isClaudeActive = primary.startsWith('yunyi-claude');
+  const isCodexActive = primary.startsWith('yunyi-codex');
+
+  console.log(chalk.yellow('当前激活:'));
+  if (isClaudeActive) {
+    console.log(chalk.blue(`  🔵 Claude: ${primary}`));
+  } else if (isCodexActive) {
+    console.log(chalk.green(`  🟢 Codex: ${primary}`));
+  } else {
+    console.log(`  ${primary}`);
+  }
+  console.log('');
+
+  // Claude 节点
+  console.log(chalk.yellow('Claude 节点:'));
+  const claudeProvider = config.models?.providers?.['yunyi-claude'];
+  if (claudeProvider) {
+    const hasKey = claudeProvider.apiKey ? chalk.green('✓') : chalk.red('✗');
+    const model = claudeProvider.models?.[0]?.name || 'N/A';
+    console.log(`  URL: ${claudeProvider.baseUrl}`);
+    console.log(`  模型: ${model}`);
+    console.log(`  API Key: ${hasKey}`);
+  } else {
+    console.log(chalk.gray('  未配置'));
+  }
+  console.log('');
+
+  // Codex 节点
+  console.log(chalk.yellow('Codex 节点:'));
+  const codexProvider = config.models?.providers?.['yunyi-codex'];
+  if (codexProvider) {
+    const hasKey = codexProvider.apiKey ? chalk.green('✓') : chalk.red('✗');
+    const model = codexProvider.models?.[0]?.name || 'N/A';
+    console.log(`  URL: ${codexProvider.baseUrl}`);
+    console.log(`  模型: ${model}`);
+    console.log(`  API Key: ${hasKey}`);
+  } else {
+    console.log(chalk.gray('  未配置'));
   }
   console.log('');
 

package/package.json

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