@wu529778790/open-im 1.7.1-beta.8 → 1.8.0

package/dist/config-web.js

@@ -241,7 +241,7 @@ function buildInitialPayload(file) {
                 : getClaudeConfigHome() + "/.claude/settings.json",
             claudeAuthToken: claudeEnv.ANTHROPIC_AUTH_TOKEN ?? "",
             claudeBaseUrl: claudeEnv.ANTHROPIC_BASE_URL ?? "",
-            claudeModel: file.tools?.claude?.model ?? claudeEnv.ANTHROPIC_MODEL ?? "",
+            claudeModel: claudeEnv.ANTHROPIC_MODEL ?? "",
             claudeProxy: file.tools?.claude?.proxy ?? "",
             codexTimeoutMs: file.tools?.codex?.timeoutMs ?? 600000,
             codebuddyTimeoutMs: file.tools?.codebuddy?.timeoutMs ?? 600000,
@@ -498,7 +498,7 @@ function toFileConfig(payload, existing) {
                 workDir: clean(payload.ai.claudeWorkDir) ?? process.cwd(),
                 timeoutMs: payload.ai.claudeTimeoutMs,
                 proxy: clean(payload.ai.claudeProxy),
-                // model is now saved to ~/.claude/settings.json as ANTHROPIC_MODEL
+                // model is now saved to ~/.claude/settings.json as env var
             },
             codex: {
                 ...existing.tools?.codex,

package/dist/config.d.ts

@@ -32,6 +32,8 @@ export interface Config {
     aiCommand: AiCommand;
     codexCliPath: string;
     codebuddyCliPath: string;
+    /** Claude 访问 API 的代理（如 http://127.0.0.1:7890） */
+    claudeProxy?: string;
     /** Codex 访问 chatgpt.com 的代理（如 http://127.0.0.1:7890） */
     codexProxy?: string;
     claudeTimeoutMs: number;
@@ -133,10 +135,14 @@ export interface FilePlatformDingtalk {
     cardTemplateId?: string;
 }
 export interface FileToolClaude {
+    cliPath?: string;
     workDir?: string;
     timeoutMs?: number;
-    model?: string;
+    skipPermissions?: boolean;
+    /** HTTP/HTTPS 代理，用于访问 Claude API（如 http://127.0.0.1:7890） */
     proxy?: string;
+    /** Claude API 配置（优先级：环境变量 > tools.claude.env > ~/.claude/settings.json） */
+    env?: Record<string, string>;
 }
 export interface FileToolCodex {
     cliPath?: string;

package/dist/config.js

@@ -55,7 +55,8 @@ function migrateToNewConfigFormat(raw) {
             ...tc,
             workDir: tc.workDir ?? raw.claudeWorkDir ?? process.cwd(),
             timeoutMs: tc.timeoutMs ?? raw.claudeTimeoutMs ?? 600000,
-            model: tc.model ?? raw.claudeModel,
+            proxy: tc.proxy,
+            // model 现在通过 env 配置，不再在这里处理
         },
         codex: {
             ...tcod,
@@ -216,11 +217,16 @@ export function loadConfig() {
             }
         }
     };
+    // 1. 全局 env（最低优先级之一）
     if (file.env)
         mergeEnv(file.env);
-    // 从 Claude Code 配置合并 API 凭证（~/.claude/settings.json 或 ~/.claude.json，最低优先级）
-    const claudeEnv = loadClaudeSettingsEnv();
-    mergeEnv(claudeEnv);
+    // 2. tools.claude.env（优先级高于 Claude settings）
+    const claudeToolEnv = file.tools?.claude?.env;
+    if (claudeToolEnv)
+        mergeEnv(claudeToolEnv);
+    // 3. 从 Claude Code 配置合并（最低优先级）
+    const claudeSettingsEnv = loadClaudeSettingsEnv();
+    mergeEnv(claudeSettingsEnv);
     const fileTelegram = file.platforms?.telegram;
     const fileFeishu = file.platforms?.feishu;
     const fileQQ = file.platforms?.qq;
@@ -331,6 +337,7 @@ export function loadConfig() {
     const tc = file.tools?.claude ?? {};
     const tcod = file.tools?.codex ?? {};
     const tcb = file.tools?.codebuddy ?? {};
+    const claudeProxy = process.env.CLAUDE_PROXY ?? tc.proxy;
     const codexProxy = process.env.CODEX_PROXY ?? tcod.proxy;
     let codexCliPath = process.env.CODEX_CLI_PATH ?? tcod.cliPath ?? 'codex';
     if (process.platform === 'win32' && codexCliPath === 'codex') {
@@ -400,8 +407,9 @@ export function loadConfig() {
                 '方式 2：运行配置向导',
                 '  open-im init',
                 '',
-                '方式 3：编辑 ~/.open-im/config.json 的 env 字段',
-                '  或 ~/.claude/settings.json（与 Claude Code 共用）',
+                '方式 3：编辑配置文件',
+                '  ~/.open-im/config.json: tools.claude.env.ANTHROPIC_MODEL = "..."',
+                '  ~/.claude/settings.json: env.ANTHROPIC_MODEL = "..."（与 Claude Code 共用）',
                 '',
             ].join('\n');
             throw new Error(errorMsg);
@@ -603,12 +611,13 @@ export function loadConfig() {
         aiCommand,
         codexCliPath,
         codebuddyCliPath,
+        claudeProxy,
         codexProxy,
         claudeWorkDir,
         claudeTimeoutMs,
         codexTimeoutMs,
         codebuddyTimeoutMs,
-        claudeModel: process.env.CLAUDE_MODEL ?? process.env.ANTHROPIC_MODEL ?? tc.model,
+        claudeModel: process.env.ANTHROPIC_MODEL,
         logDir,
         logLevel,
         platforms,

package/dist/shared/ai-task.js

@@ -228,8 +228,8 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
                 timeoutMs,
                 model: sessionManager.getModel(ctx.userId, ctx.threadId) ?? config.claudeModel,
                 chatId: ctx.chatId,
-                // Claude 默认跳过权限确认，保持与之前 CLI 行为一致（全自动执行）
-                ...(aiCommand === 'claude' ? { skipPermissions: true } : {}),
+                // 默认跳过权限确认，保持全自动执行
+                skipPermissions: true,
                 ...(aiCommand === 'codex' && config.codexProxy ? { proxy: config.codexProxy } : {}),
             });
             return activeHandle;

package/package.json

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