@wu529778790/open-im 1.2.0 → 1.2.1

package/dist/config.js

@@ -10,7 +10,6 @@ import { join, isAbsolute } from 'node:path';
 import { homedir } from 'node:os';
 import { APP_HOME } from './constants.js';
 const CONFIG_PATH = join(APP_HOME, 'config.json');
-const CLAUDE_SETTINGS_PATH = join(homedir(), '.claude', 'settings.json');
 function loadFileConfig() {
     try {
         return JSON.parse(readFileSync(CONFIG_PATH, 'utf-8'));
@@ -19,17 +18,34 @@ function loadFileConfig() {
         return {};
     }
 }
-/** 从 ~/.claude/settings.json 加载 Claude API 凭证（Claude Code 共用配置） */
+/** 获取用户主目录（兼容不同运行环境，如 launchd、systemd 等） */
+function getClaudeConfigHome() {
+    return process.env.HOME || process.env.USERPROFILE || homedir();
+}
+/** 从 Claude Code 配置文件加载 env，支持多路径（与 Claude Code 共用） */
 function loadClaudeSettingsEnv() {
-    try {
-        const raw = JSON.parse(readFileSync(CLAUDE_SETTINGS_PATH, 'utf-8'));
-        const env = raw?.env;
-        if (env && typeof env === 'object') {
-            return env;
+    const home = getClaudeConfigHome();
+    const paths = [
+        join(home, '.claude', 'settings.json'),
+        join(home, '.claude.json'),
+    ];
+    for (const p of paths) {
+        try {
+            const raw = JSON.parse(readFileSync(p, 'utf-8'));
+            const env = raw?.env;
+            if (env && typeof env === 'object') {
+                const result = {};
+                for (const [k, v] of Object.entries(env)) {
+                    if (v != null && typeof k === 'string') {
+                        result[k] = String(v);
+                    }
+                }
+                return result;
+            }
+        }
+        catch {
+            /* 文件不存在或格式错误，尝试下一路径 */
         }
-    }
-    catch {
-        /* 文件不存在或格式错误，忽略 */
     }
     return {};
 }
@@ -73,20 +89,18 @@ function parseCommaSeparated(value) {
 export function loadConfig() {
     const file = loadFileConfig();
     // 将配置文件中的 env 设置到环境变量（优先级低于现有环境变量）
-    if (file.env) {
-        for (const [key, value] of Object.entries(file.env)) {
-            if (!(key in process.env)) {
-                process.env[key] = value;
+    const mergeEnv = (env) => {
+        for (const [key, value] of Object.entries(env)) {
+            if (!(key in process.env) && value != null && typeof key === 'string') {
+                process.env[key] = String(value);
             }
         }
-    }
-    // 从 ~/.claude/settings.json 合并 Claude API 凭证（Claude Code 共用，最低优先级）
+    };
+    if (file.env)
+        mergeEnv(file.env);
+    // 从 Claude Code 配置合并 API 凭证（~/.claude/settings.json 或 ~/.claude.json，最低优先级）
     const claudeEnv = loadClaudeSettingsEnv();
-    for (const [key, value] of Object.entries(claudeEnv)) {
-        if (!(key in process.env)) {
-            process.env[key] = value;
-        }
-    }
+    mergeEnv(claudeEnv);
     const fileTelegram = file.platforms?.telegram;
     const fileFeishu = file.platforms?.feishu;
     const fileWechat = file.platforms?.wechat;

package/package.json

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