yymaxapi 1.0.96 → 1.0.98

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

@@ -829,82 +829,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') {
@@ -2834,6 +2775,88 @@ function syncMirroredAuthStores(paths) {
   }
 }
 
+function getManagedAgentSessionDirs(paths, agentId) {
+  if (!paths?.configDir || !agentId) return [];
+  const dirs = [path.join(paths.configDir, 'agents', agentId, 'sessions')];
+
+  for (const target of paths.syncTargets || []) {
+    const baseDir = path.dirname(target);
+    dirs.push(path.join(baseDir, 'agents', agentId, 'sessions'));
+  }
+
+  return [...new Set(dirs.filter(Boolean))];
+}
+
+function archiveManagedSessionFile(sessionDir, sessionId) {
+  if (!sessionDir || !sessionId) return false;
+  const sessionFile = path.join(sessionDir, `${sessionId}.jsonl`);
+  if (!fs.existsSync(sessionFile)) return false;
+
+  const archiveDir = path.join(sessionDir, 'archive');
+  if (!fs.existsSync(archiveDir)) {
+    fs.mkdirSync(archiveDir, { recursive: true });
+  }
+
+  const archiveName = `${sessionId}-${Date.now()}.jsonl`;
+  fs.renameSync(sessionFile, path.join(archiveDir, archiveName));
+  return true;
+}
+
+function resetManagedAgentSessionStore(sessionDir, agentId) {
+  if (!sessionDir || !agentId) return { changed: false, archived: 0 };
+  const sessionsPath = path.join(sessionDir, 'sessions.json');
+  if (!fs.existsSync(sessionsPath)) return { changed: false, archived: 0 };
+
+  let store;
+  try {
+    store = JSON.parse(fs.readFileSync(sessionsPath, 'utf8'));
+  } catch {
+    return { changed: false, archived: 0 };
+  }
+
+  if (!store || typeof store !== 'object' || Array.isArray(store)) {
+    return { changed: false, archived: 0 };
+  }
+
+  const keyPrefix = `agent:${agentId}:`;
+  const keysToRemove = Object.keys(store).filter(key => key.startsWith(keyPrefix));
+  if (keysToRemove.length === 0) return { changed: false, archived: 0 };
+
+  const remaining = { ...store };
+  const removedSessionIds = new Set();
+  for (const key of keysToRemove) {
+    const sessionId = String(store[key]?.sessionId || '').trim();
+    if (sessionId) removedSessionIds.add(sessionId);
+    delete remaining[key];
+  }
+
+  let archived = 0;
+  for (const sessionId of removedSessionIds) {
+    const stillReferenced = Object.values(remaining).some(entry => String(entry?.sessionId || '').trim() === sessionId);
+    if (stillReferenced) continue;
+    if (archiveManagedSessionFile(sessionDir, sessionId)) archived += 1;
+  }
+
+  fs.writeFileSync(sessionsPath, JSON.stringify(remaining, null, 2), 'utf8');
+  return { changed: true, archived };
+}
+
+function resetManagedAgentSessionsWithSync(paths, agentId) {
+  const dirs = getManagedAgentSessionDirs(paths, agentId);
+  let changed = false;
+  let archived = 0;
+
+  for (const sessionDir of dirs) {
+    try {
+      const result = resetManagedAgentSessionStore(sessionDir, agentId);
+      if (result.changed) changed = true;
+      archived += result.archived || 0;
+    } catch { /* best-effort */ }
+  }
+
+  return { changed, archived };
+}
+
 function renameProviderInAuthStore(paths, oldProvider, newProvider) {
   if (!paths?.authProfiles || !oldProvider || !newProvider || oldProvider === newProvider) return false;
   const store = readAuthStore(paths.authProfiles);
@@ -4616,6 +4639,12 @@ async function autoActivate(paths, args = {}) {
   if (yunyiLayoutResult.applied) {
     syncManagedYunyiAuthProfiles(paths, config);
   }
+  if (!isClaudePrimary) {
+    const resetResult = resetManagedAgentSessionsWithSync(paths, YYMAXAPI_OPENCLAW_GPT_AGENT_ID);
+    if (resetResult.changed) {
+      console.log(chalk.gray(`   已重置 ${YYMAXAPI_OPENCLAW_GPT_AGENT_ID} 的活动会话映射`));
+    }
+  }
   const opencodeDefaultModelKey = isClaudePrimary ? `yunyi-claude/${claudeModelId}` : `yunyi-codex/${codexModelId}`;
   try { syncExternalTools('claude', claudeBaseUrl, apiKey, { codexBaseUrl, claudeModelId, opencodeDefaultModelKey }); } catch { /* ignore */ }
   try { syncExternalTools('codex', codexBaseUrl, apiKey, { modelId: codexModelId }); } catch { /* ignore */ }
@@ -4729,9 +4758,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'] });
@@ -5112,7 +5140,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')) {
@@ -5589,6 +5617,12 @@ async function switchModel(paths) {
   primary = finalSelected;
   ensureGatewaySettings(config);
   writeConfigWithSync(paths, config);
+  if (selectedAgentId === YYMAXAPI_OPENCLAW_GPT_AGENT_ID) {
+    const resetResult = resetManagedAgentSessionsWithSync(paths, selectedAgentId);
+    if (resetResult.changed) {
+      console.log(chalk.gray(`   已重置 ${selectedAgentId} 的活动会话映射`));
+    }
+  }
 
   const selectedProviderKey = finalSelected.split('/')[0];
   const selectedProviderConfig = providers[selectedProviderKey];

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

@@ -148,21 +148,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.96",
+  "version": "1.0.98",
   "description": "跨平台 OpenClaw/Clawdbot 配置管理工具 - 管理中转地址、模型切换、API Keys、测速优化",
   "main": "bin/yymaxapi.js",
   "bin": {