yymaxapi 1.0.97 → 1.0.99

package/README.md

@@ -23,6 +23,8 @@ $env:OPENCLAW_CLAUDE_KEY="你的Key"; npx yymaxapi@latest preset-claude
 set OPENCLAW_CLAUDE_KEY=你的Key && npx yymaxapi@latest preset-claude
 ```
 
+说明：`preset-claude` 现在只写 Claude Code CLI 自身配置，不会改动 OpenClaw、Codex CLI、Opencode。
+
 **方式三：一键配置 Codex**
 ```bash
 # macOS/Linux
@@ -38,22 +40,22 @@ set OPENCLAW_CODEX_KEY=你的Key && npx yymaxapi@latest preset-codex
 **方式四：完全自动化（无交互）**
 ```bash
 # macOS/Linux
-OPENCLAW_CLAUDE_KEY="你的Key" npx yymaxapi@latest preset-claude --model claude-opus-4-5 --set-primary true --force --test true
+OPENCLAW_CLAUDE_KEY="你的Key" npx yymaxapi@latest preset-claude --model claude-opus-4-6 --set-primary true --force --test true
 
 # Windows PowerShell
-$env:OPENCLAW_CLAUDE_KEY="你的Key"; npx yymaxapi@latest preset-claude --model claude-opus-4-5 --set-primary true --force --test true
+$env:OPENCLAW_CLAUDE_KEY="你的Key"; npx yymaxapi@latest preset-claude --model claude-opus-4-6 --set-primary true --force --test true
 
 # Windows CMD
-set OPENCLAW_CLAUDE_KEY=你的Key && npx yymaxapi@latest preset-claude --model claude-opus-4-5 --set-primary true --force --test true
+set OPENCLAW_CLAUDE_KEY=你的Key && npx yymaxapi@latest preset-claude --model claude-opus-4-6 --set-primary true --force --test true
 
 # macOS/Linux
-OPENCLAW_CODEX_KEY="你的Key" npx yymaxapi@latest preset-codex --model gpt-5.2 --set-primary true --force --test true
+OPENCLAW_CODEX_KEY="你的Key" npx yymaxapi@latest preset-codex --model gpt-5.4 --set-primary true --force --test true
 
 # Windows PowerShell
-$env:OPENCLAW_CODEX_KEY="你的Key"; npx yymaxapi@latest preset-codex --model gpt-5.2 --set-primary true --force --test true
+$env:OPENCLAW_CODEX_KEY="你的Key"; npx yymaxapi@latest preset-codex --model gpt-5.4 --set-primary true --force --test true
 
 # Windows CMD
-set OPENCLAW_CODEX_KEY=你的Key && npx yymaxapi@latest preset-codex --model gpt-5.2 --set-primary true --force --test true
+set OPENCLAW_CODEX_KEY=你的Key && npx yymaxapi@latest preset-codex --model gpt-5.4 --set-primary true --force --test true
 ```
 
 ## 重要说明

package/bin/yymaxapi.js

@@ -108,7 +108,11 @@ const DEFAULT_CLAUDE_MODELS = [
   },
   {
     "id": "claude-opus-4-6",
-    "name": "Claude Opus 4.6 (待稳定)"
+    "name": "Claude Opus 4.6"
+  },
+  {
+    "id": "claude-opus-4-6-thinking",
+    "name": "Claude Opus 4.6 Thinking"
   }
 ];
 
@@ -829,82 +833,23 @@ function writeConfig(configPath, config) {
 // ============ 多工具配置同步 ============
 
 function writeClaudeCodeSettings(baseUrl, apiKey, modelId = getDefaultClaudeModel().id) {
-  const home = os.homedir();
   // ~/.claude/settings.json
-  const claudeDir = path.join(home, '.claude');
-  const settingsPath = path.join(claudeDir, 'settings.json');
+  const settingsPath = getClaudeCodeSettingsPath();
+  const claudeDir = path.dirname(settingsPath);
   try {
     let settings = {};
     if (fs.existsSync(settingsPath)) {
       try { settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8')); } catch { settings = {}; }
     }
     settings.apiBaseUrl = baseUrl.replace(/\/+$/, '');
-    settings.model = modelId;
-    settings.availableModels = CLAUDE_MODELS.map(model => model.id);
     if (!settings.env) settings.env = {};
-    settings.env.ANTHROPIC_BASE_URL = baseUrl.replace(/\/+$/, '');
     settings.env.ANTHROPIC_AUTH_TOKEN = apiKey;
-    settings.env.ANTHROPIC_MODEL = modelId;
+    delete settings.availableModels;
+    delete settings.env.ANTHROPIC_BASE_URL;
+    delete settings.env.ANTHROPIC_MODEL;
     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(home, '.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 { /* 非关键，静默失败 */ }
-
-  // 写入 shell 环境变量
-  if (process.platform === 'win32') {
-    try {
-      const cleanUrl = baseUrl.replace(/\/+$/, '');
-      execSync(
-        `powershell -NoProfile -Command "[Environment]::SetEnvironmentVariable('ANTHROPIC_BASE_URL','${cleanUrl}','User'); [Environment]::SetEnvironmentVariable('ANTHROPIC_AUTH_TOKEN','${apiKey}','User'); [Environment]::SetEnvironmentVariable('ANTHROPIC_MODEL','${modelId}','User')"`,
-        { stdio: 'pipe' }
-      );
-    } catch { /* best-effort */ }
-  } else {
-    const marker = '# >>> yymaxapi claude >>>';
-    const markerEnd = '# <<< yymaxapi claude <<<';
-    const cleanUrl = baseUrl.replace(/\/+$/, '');
-    // 只持久化工具本身需要的 Claude 变量，TLS 放宽只能留在进程内临时使用。
-    const block = [
-      marker,
-      `export ANTHROPIC_BASE_URL="${cleanUrl}"`,
-      `export ANTHROPIC_AUTH_TOKEN="${apiKey}"`,
-      `export ANTHROPIC_MODEL="${modelId}"`,
-      markerEnd
-    ].join('\n');
-
-    const shellEnv = process.env.SHELL || '';
-    const rcFiles = [];
-    if (shellEnv.includes('zsh') || !shellEnv) rcFiles.push(path.join(home, '.zshrc'));
-    if (shellEnv.includes('bash') || !shellEnv) rcFiles.push(path.join(home, '.bashrc'));
-    if (rcFiles.length === 0) rcFiles.push(path.join(home, '.profile'));
-
-    for (const rcFile of rcFiles) {
-      try {
-        let content = '';
-        if (fs.existsSync(rcFile)) {
-          content = fs.readFileSync(rcFile, 'utf8');
-          const re = new RegExp(
-            `${marker.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}[\\s\\S]*?${markerEnd.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\n?`,
-            'g'
-          );
-          content = content.replace(re, '').trimEnd();
-        }
-        fs.writeFileSync(rcFile, content ? `${content}\n\n${block}\n` : `${block}\n`, 'utf8');
-      } catch { /* best-effort */ }
-    }
-  }
 }
 
 function writeCodexConfig(baseUrl, apiKey, modelId = 'gpt-5.4') {
@@ -1995,7 +1940,7 @@ const YYMAXAPI_OPENCLAW_GPT_FALLBACK = `${YYMAXAPI_OPENCLAW_GPT_PROVIDER}/gpt-5.
 const YYMAXAPI_MANAGED_MAIN_NAMES = new Set(['Claude', 'claude', 'yunyi-claude', 'claude-yunyi']);
 const YYMAXAPI_MANAGED_GPT_NAMES = new Set(['GPT', 'Codex', 'gpt', 'yunyi-gpt', 'yunyi-codex']);
 const YYMAXAPI_MANAGED_MULTIMODAL_MODELS = {
-  claude: new Set(['claude-sonnet-4-6', 'claude-opus-4-6']),
+  claude: new Set(['claude-sonnet-4-6', 'claude-opus-4-6', 'claude-opus-4-6-thinking']),
   codex: new Set(['gpt-5.4', 'gpt-5.3-codex'])
 };
 
@@ -2031,15 +1976,9 @@ function stripManagedYunyiSuffix(baseUrl) {
 
 function getManagedYunyiModelCatalog(type) {
   if (type === 'claude') {
-    return [
-      { id: 'claude-sonnet-4-6', name: 'Claude Sonnet 4.6' },
-      { id: 'claude-opus-4-6', name: 'Claude Opus 4.6' }
-    ];
+    return CLAUDE_MODELS;
   }
-  return [
-    { id: 'gpt-5.4', name: 'GPT 5.4' },
-    { id: 'gpt-5.3-codex', name: 'GPT 5.3 Codex' }
-  ];
+  return CODEX_MODELS;
 }
 
 function resolveManagedYunyiModelName(type, modelId, fallbackName) {
@@ -2097,15 +2036,29 @@ function canonicalizeManagedYunyiModelKey(modelKey, preferredType = '') {
   return text;
 }
 
+function getManagedYunyiProviderName(type) {
+  return type === 'claude' ? YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER : YYMAXAPI_OPENCLAW_GPT_PROVIDER;
+}
+
+function getManagedYunyiDefaultPrimaryModelKey(type) {
+  return type === 'claude' ? YYMAXAPI_OPENCLAW_CLAUDE_PRIMARY : YYMAXAPI_OPENCLAW_GPT_PRIMARY;
+}
+
 function getManagedYunyiKnownModelKeys(type) {
-  return type === 'claude'
-    ? [YYMAXAPI_OPENCLAW_CLAUDE_PRIMARY, YYMAXAPI_OPENCLAW_CLAUDE_FALLBACK]
-    : [YYMAXAPI_OPENCLAW_GPT_PRIMARY, YYMAXAPI_OPENCLAW_GPT_FALLBACK];
+  const providerName = getManagedYunyiProviderName(type);
+  return getManagedYunyiModelCatalog(type).map(model => `${providerName}/${model.id}`);
+}
+
+function getManagedYunyiModelAliasEntries() {
+  return {
+    ...Object.fromEntries(getManagedYunyiKnownModelKeys('claude').map(modelKey => [modelKey, YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER])),
+    ...Object.fromEntries(getManagedYunyiKnownModelKeys('codex').map(modelKey => [modelKey, YYMAXAPI_OPENCLAW_GPT_PROVIDER]))
+  };
 }
 
 function normalizeManagedYunyiModelState(type, modelState = {}, options = {}) {
   const knownKeys = getManagedYunyiKnownModelKeys(type);
-  const fallbackPrimary = knownKeys[0];
+  const fallbackPrimary = knownKeys[0] || getManagedYunyiDefaultPrimaryModelKey(type);
   const currentPrimary = canonicalizeManagedYunyiModelKey(modelState.primary || '', type);
   const canPreserve = !options.force && currentPrimary && knownKeys.includes(currentPrimary);
   const primary = canPreserve ? currentPrimary : fallbackPrimary;
@@ -2195,12 +2148,7 @@ function applyManagedYunyiModelSelection(config, selectedModelKey) {
     changed = true;
   }
 
-  const managedModelAliases = {
-    [YYMAXAPI_OPENCLAW_CLAUDE_PRIMARY]: YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER,
-    [YYMAXAPI_OPENCLAW_CLAUDE_FALLBACK]: YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER,
-    [YYMAXAPI_OPENCLAW_GPT_PRIMARY]: YYMAXAPI_OPENCLAW_GPT_PROVIDER,
-    [YYMAXAPI_OPENCLAW_GPT_FALLBACK]: YYMAXAPI_OPENCLAW_GPT_PROVIDER
-  };
+  const managedModelAliases = getManagedYunyiModelAliasEntries();
   for (const [modelKey, alias] of Object.entries(managedModelAliases)) {
     const nextEntry = { alias };
     if (JSON.stringify(config.agents.defaults.models[modelKey] || {}) !== JSON.stringify(nextEntry)) {
@@ -2587,12 +2535,7 @@ function applyManagedYunyiOpenClawLayout(config, options = {}) {
   }
 
   const defaultsModels = config.agents.defaults.models;
-  const managedModelAliases = {
-    [YYMAXAPI_OPENCLAW_CLAUDE_PRIMARY]: YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER,
-    [YYMAXAPI_OPENCLAW_CLAUDE_FALLBACK]: YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER,
-    [YYMAXAPI_OPENCLAW_GPT_PRIMARY]: YYMAXAPI_OPENCLAW_GPT_PROVIDER,
-    [YYMAXAPI_OPENCLAW_GPT_FALLBACK]: YYMAXAPI_OPENCLAW_GPT_PROVIDER
-  };
+  const managedModelAliases = getManagedYunyiModelAliasEntries();
   for (const [modelKey, alias] of Object.entries(managedModelAliases)) {
     const nextEntry = { alias };
     if (JSON.stringify(defaultsModels[modelKey] || {}) !== JSON.stringify(nextEntry)) {
@@ -4817,9 +4760,8 @@ async function activateClaudeCode(paths, args = {}) {
   console.log(chalk.gray('   API Key: 已设置'));
   console.log(chalk.gray('\n   已写入:'));
   console.log(chalk.gray('   • ~/.claude/settings.json'));
-  console.log(chalk.gray('   • ~/.claude.json (跳过 onboarding)'));
-  console.log(chalk.gray('   • shell 环境变量 (ANTHROPIC_BASE_URL, ANTHROPIC_AUTH_TOKEN, ANTHROPIC_MODEL)'));
-  console.log(chalk.yellow('\n   提示: 请重新打开终端或执行 source ~/.zshrc 使环境变量生效'));
+  console.log(chalk.gray('   • 最小字段: apiBaseUrl + env.ANTHROPIC_AUTH_TOKEN'));
+  console.log(chalk.yellow('\n   提示: 如果 Claude Code 已在运行，重新打开一个会话即可读取新配置'));
 
   if (await confirmImmediateTest(args, '是否立即测试 Claude Code CLI 连接？')) {
     await testAdditionalCliConnections(args, { only: ['claude'] });
@@ -5200,7 +5142,7 @@ async function main() {
     return;
   }
   if (args.preset === 'claude' || args._.includes('preset-claude') || args._.includes('claude-preset')) {
-    await autoActivate(paths, { ...args, primary: 'claude' });
+    await activateClaudeCode(paths, args);
     return;
   }
   if (args.preset === 'codex' || args._.includes('preset-codex') || args._.includes('codex-preset')) {

package/config/API/350/212/202/347/202/271/350/256/276/347/275/256.md

@@ -25,7 +25,8 @@
   "models": {
     "claude": [
       { "id": "claude-sonnet-4-6", "name": "Claude Sonnet 4.6" },
-      { "id": "claude-opus-4-6", "name": "Claude Opus 4.6 (待稳定)" }
+      { "id": "claude-opus-4-6", "name": "Claude Opus 4.6" },
+      { "id": "claude-opus-4-6-thinking", "name": "Claude Opus 4.6 Thinking" }
     ],
     "codex": [
       { "id": "gpt-5.4", "name": "GPT 5.4" },
@@ -103,7 +104,7 @@ npx yymaxapi@latest
 
 **注意事项：**
 - `base_url` 不要加 `/v1`，平台会自动拼接路径
-- Claude 可用模型：`claude-sonnet-4-6`、`claude-opus-4-6`
+- Claude 可用模型：`claude-sonnet-4-6`、`claude-opus-4-6`、`claude-opus-4-6-thinking`
 - GPT 可用模型：`gpt-5.4`
 - 已验证环境：腾讯云 OpenCloudOS，OpenClaw `2026.2.3-1`
 - 参考文档：https://cloud.tencent.com/developer/article/2624003
@@ -148,21 +149,20 @@ npx yymaxapi@latest
 
 **2. Claude Code CLI（本机终端）**
 
-在终端执行一次，或写入 `~/.zshrc` / `~/.bashrc` 后 `source`，Claude Code 即走云翼 Claude：
+推荐直接写 `settings.json` 最小配置：
 
-```bash
-export ANTHROPIC_BASE_URL="https://yunyi.rdzhvip.com/claude"
-export ANTHROPIC_AUTH_TOKEN="<你的云翼 API Key>"
-# 若遇证书报错可加：
-export NODE_TLS_REJECT_UNAUTHORIZED=0
+```json
+{
+  "apiBaseUrl": "https://yunyi.rdzhvip.com/claude",
+  "env": {
+    "ANTHROPIC_AUTH_TOKEN": "<你的云翼 API Key>"
+  }
+}
 ```
 
-Windows（PowerShell，用户级环境变量）：
+文件位置：
 
-```powershell
-[Environment]::SetEnvironmentVariable('ANTHROPIC_BASE_URL', 'https://yunyi.rdzhvip.com/claude', 'User')
-[Environment]::SetEnvironmentVariable('ANTHROPIC_AUTH_TOKEN', '<你的云翼 API Key>', 'User')
-[Environment]::SetEnvironmentVariable('NODE_TLS_REJECT_UNAUTHORIZED', '0', 'User')
-```
+- macOS / Linux：`~/.claude/settings.json`
+- Windows：`%USERPROFILE%\\.claude\\settings.json`
 
 完成后：腾讯云 OpenClaw 里可选 Claude 或 GPT；本机 Claude Code CLI 使用同一 Key 走云翼 Claude。

package/package.json

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