@wu529778790/open-im 1.10.4 → 1.10.5-beta.1

package/dist/adapters/claude-sdk-adapter.js

@@ -13,6 +13,7 @@ import { existsSync, readFileSync } from 'fs';
 import { homedir } from 'os';
 import { join } from 'path';
 import { createLogger } from '../logger.js';
+import { refreshClaudeEnvToProcess } from '../config/file-io.js';
 import { toReplyPlainText } from '../shared/utils.js';
 const log = createLogger('ClaudeSDK');
 function loadUserPluginSettings() {
@@ -145,7 +146,9 @@ function isSessionCorruptionError(msg) {
  * @returns SDKSession 对象和实际的 sessionId
  */
 async function getOrCreateSession(sessionId, workDir, model, permissionMode) {
-    const resolvedModel = model?.trim() || 'claude-opus-4-5';
+    // 刷新 Claude 环境变量（支持 cc switch 后无需重启即可生效）
+    refreshClaudeEnvToProcess();
+    const resolvedModel = model?.trim() || process.env.ANTHROPIC_MODEL?.trim() || 'claude-opus-4-5';
     if (activeSessions.size >= MAX_ACTIVE_SESSIONS) {
         throw new Error(`Session pool is full (${MAX_ACTIVE_SESSIONS}). Cannot create new session.`);
     }

package/dist/config/file-io.d.ts

@@ -1,6 +1,8 @@
 import type { AiCommand, FileConfig } from './types.js';
 export declare const CONFIG_PATH: string;
 export declare const CODEX_AUTH_PATHS: string[];
+/** Claude 认证相关的环境变量 key 列表 */
+export declare const CLAUDE_AUTH_ENV_KEYS: readonly ["ANTHROPIC_API_KEY", "ANTHROPIC_AUTH_TOKEN", "CLAUDE_CODE_OAUTH_TOKEN", "ANTHROPIC_BASE_URL", "ANTHROPIC_MODEL"];
 export declare function loadFileConfig(): FileConfig;
 export declare function saveFileConfig(raw: FileConfig): void;
 export declare function getClaudeConfigHome(): string;
@@ -9,3 +11,9 @@ export declare function saveClaudeSettingsEnv(env: Record<string, string>): void
 export declare function normalizeAiCommand(value: unknown, fallback: AiCommand): AiCommand;
 export declare function hasCodexAuth(): boolean;
 export declare function parseCommaSeparated(value: string): string[];
+/**
+ * 将最新的 Claude 认证环境变量按优先级合并到 process.env。
+ * 优先级：shell 环境变量 > tools.claude.env（config.json） > ~/.claude/settings.json
+ * 启动时调用一次；cc switch 后再次调用即可生效。
+ */
+export declare function refreshClaudeEnvToProcess(): void;

package/dist/config/file-io.js

@@ -16,9 +16,24 @@ const OLD_ROOT_KEYS = [
     'claudeModel',
 ];
 const AI_COMMANDS = ['claude', 'codex', 'codebuddy'];
+/** Claude 认证相关的环境变量 key 列表 */
+export const CLAUDE_AUTH_ENV_KEYS = [
+    'ANTHROPIC_API_KEY',
+    'ANTHROPIC_AUTH_TOKEN',
+    'CLAUDE_CODE_OAUTH_TOKEN',
+    'ANTHROPIC_BASE_URL',
+    'ANTHROPIC_MODEL',
+];
 // Config cache with mtime tracking
 let cachedConfig = null;
 let cachedClaudeEnv = null;
+// 保存进程启动时 shell 环境中的 Claude 相关 key 原始值（优先级最高，不可被文件配置覆盖）
+const originalShellEnv = {};
+for (const key of CLAUDE_AUTH_ENV_KEYS) {
+    if (process.env[key] !== undefined) {
+        originalShellEnv[key] = process.env[key];
+    }
+}
 function hasOldConfigFormat(raw) {
     const hasOld = OLD_ROOT_KEYS.some((k) => raw[k] !== undefined && raw[k] !== null);
     const hasNew = raw.tools && typeof raw.tools === 'object' && raw.tools.claude;
@@ -174,3 +189,28 @@ export function hasCodexAuth() {
 export function parseCommaSeparated(value) {
     return value.split(',').map((s) => s.trim()).filter(Boolean);
 }
+/**
+ * 将最新的 Claude 认证环境变量按优先级合并到 process.env。
+ * 优先级：shell 环境变量 > tools.claude.env（config.json） > ~/.claude/settings.json
+ * 启动时调用一次；cc switch 后再次调用即可生效。
+ */
+export function refreshClaudeEnvToProcess() {
+    const file = loadFileConfig();
+    const claudeToolEnv = (file.tools?.claude?.env ?? {});
+    const claudeSettingsEnv = loadClaudeSettingsEnv();
+    for (const key of CLAUDE_AUTH_ENV_KEYS) {
+        if (key in originalShellEnv) {
+            process.env[key] = originalShellEnv[key];
+            continue;
+        }
+        if (key in claudeToolEnv) {
+            process.env[key] = claudeToolEnv[key];
+            continue;
+        }
+        if (key in claudeSettingsEnv) {
+            process.env[key] = claudeSettingsEnv[key];
+            continue;
+        }
+        delete process.env[key];
+    }
+}

package/dist/config.d.ts

@@ -1,6 +1,6 @@
 export type { Platform, AiCommand, Config, FilePlatformTelegram, FilePlatformFeishu, FilePlatformQQ, FilePlatformWechat, FilePlatformWework, FilePlatformDingtalk, FilePlatformWorkBuddy, FileToolClaude, FileToolCodex, FileToolCodeBuddy, FileConfig, } from './config/types.js';
 import type { Platform, AiCommand, Config } from './config/types.js';
-export { CONFIG_PATH, loadFileConfig, saveFileConfig, getClaudeConfigHome, loadClaudeSettingsEnv, saveClaudeSettingsEnv, normalizeAiCommand, hasCodexAuth, parseCommaSeparated, } from './config/file-io.js';
+export { CONFIG_PATH, loadFileConfig, saveFileConfig, getClaudeConfigHome, loadClaudeSettingsEnv, saveClaudeSettingsEnv, normalizeAiCommand, hasCodexAuth, parseCommaSeparated, CLAUDE_AUTH_ENV_KEYS, refreshClaudeEnvToProcess, } from './config/file-io.js';
 /** 检测是否需要交互式配置（无 token 且无环境变量） */
 export declare function needsSetup(): boolean;
 export declare function loadConfig(): Config;

package/dist/config.js

@@ -11,7 +11,7 @@ import { createLogger } from './logger.js';
 import { APP_HOME, DEFAULT_TELEMETRY_INGEST_URL, DEFAULT_TELEMETRY_INGEST_TOKEN, } from './constants.js';
 const log = createLogger('config');
 // Re-export file I/O and credential helpers from sub-modules
-export { CONFIG_PATH, loadFileConfig, saveFileConfig, getClaudeConfigHome, loadClaudeSettingsEnv, saveClaudeSettingsEnv, normalizeAiCommand, hasCodexAuth, parseCommaSeparated, } from './config/file-io.js';
+export { CONFIG_PATH, loadFileConfig, saveFileConfig, getClaudeConfigHome, loadClaudeSettingsEnv, saveClaudeSettingsEnv, normalizeAiCommand, hasCodexAuth, parseCommaSeparated, CLAUDE_AUTH_ENV_KEYS, refreshClaudeEnvToProcess, } from './config/file-io.js';
 import { loadFileConfig, normalizeAiCommand, hasCodexAuth, parseCommaSeparated, loadClaudeSettingsEnv, } from './config/file-io.js';
 /** 检测是否需要交互式配置（无 token 且无环境变量） */
 export function needsSetup() {
@@ -61,13 +61,9 @@ export function loadConfig() {
     // 1. 全局 env（最低优先级之一）
     if (file.env)
         mergeEnv(file.env);
-    // 2. tools.claude.env（优先级高于 Claude settings）
-    const claudeToolEnv = file.tools?.claude?.env;
-    if (claudeToolEnv)
-        mergeEnv(claudeToolEnv);
-    // 3. 从 Claude Code 配置合并（最低优先级）
-    const claudeSettingsEnv = loadClaudeSettingsEnv();
-    mergeEnv(claudeSettingsEnv);
+    // 2. tools.claude.env 和 Claude Code 的 ~/.claude/settings.json 不在此处合并到 process.env，
+    //    改由 Claude adapter 在创建 session 前按需加载（refreshClaudeEnvToProcess），
+    //    避免 Claude 凭证泄漏到 Codex / CodeBuddy 等子进程。
     const fileTelegram = file.platforms?.telegram;
     const fileFeishu = file.platforms?.feishu;
     const fileQQ = file.platforms?.qq;
@@ -235,10 +231,20 @@ export function loadConfig() {
     // 6. 校验 Claude API 凭证（SDK 模式需要）
     // 支持：官方 API Key、Auth Token、或自定义 API（第三方模型等，BASE_URL + token）
     if (aiCommand === 'claude') {
+        // 校验凭证时直接从各来源读取，不修改 process.env
+        const claudeToolEnvForCheck = file.tools?.claude?.env;
+        const claudeSettingsForCheck = loadClaudeSettingsEnv();
         const hasCreds = !!(process.env.ANTHROPIC_API_KEY ||
             process.env.ANTHROPIC_AUTH_TOKEN ||
             process.env.CLAUDE_CODE_OAUTH_TOKEN ||
-            process.env.ANTHROPIC_BASE_URL);
+            process.env.ANTHROPIC_BASE_URL ||
+            claudeToolEnvForCheck?.ANTHROPIC_API_KEY ||
+            claudeToolEnvForCheck?.ANTHROPIC_AUTH_TOKEN ||
+            claudeToolEnvForCheck?.ANTHROPIC_BASE_URL ||
+            claudeSettingsForCheck.ANTHROPIC_API_KEY ||
+            claudeSettingsForCheck.ANTHROPIC_AUTH_TOKEN ||
+            claudeSettingsForCheck.CLAUDE_CODE_OAUTH_TOKEN ||
+            claudeSettingsForCheck.ANTHROPIC_BASE_URL);
         if (!hasCreds) {
             const errorMsg = [
                 '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.10.4",
+  "version": "1.10.5-beta.1",
   "description": "Multi-platform IM bridge for AI CLI tools (Claude, Codex, CodeBuddy)",
   "type": "module",
   "main": "dist/index.js",