@wu529778790/open-im 1.7.1-beta.9 → 1.8.1-beta.0

package/dist/config-web-page-i18n.d.ts

@@ -118,6 +118,14 @@ export declare const PAGE_TEXTS: {
         readonly saveOk: "Configuration saved.";
         readonly startOk: "Bridge started.";
         readonly stopOk: "Bridge stopped.";
+        readonly configEditorTitle: "Config Editor";
+        readonly configEditorHint: "Edit ~/.open-im/config.json directly";
+        readonly configJson: "Configuration (JSON)";
+        readonly configJsonHint: "Edit the configuration JSON. Changes will be saved when you click \"Save Config\" in the Service section.";
+        readonly formatJson: "Format";
+        readonly resetJson: "Reset";
+        readonly jsonValid: "Valid JSON";
+        readonly jsonInvalid: "Invalid JSON: {error}";
     };
     readonly zh: {
         readonly pageTitle: "open-im 本地控制台";
@@ -232,5 +240,13 @@ export declare const PAGE_TEXTS: {
         readonly saveOk: "配置已保存。";
         readonly startOk: "桥接已启动。";
         readonly stopOk: "桥接已停止。";
+        readonly configEditorTitle: "JSON 配置编辑器";
+        readonly configEditorHint: "直接编辑 ~/.open-im/config.json";
+        readonly configJson: "配置文件 (JSON)";
+        readonly configJsonHint: "编辑配置 JSON。点击服务区的“保存配置”按钮后保存更改。";
+        readonly formatJson: "格式化";
+        readonly resetJson: "重置";
+        readonly jsonValid: "JSON 有效";
+        readonly jsonInvalid: "JSON 无效：{error}";
     };
 };

package/dist/config-web-page-i18n.js

@@ -118,6 +118,14 @@ export const PAGE_TEXTS = {
         saveOk: "Configuration saved.",
         startOk: "Bridge started.",
         stopOk: "Bridge stopped.",
+        configEditorTitle: "Config Editor",
+        configEditorHint: "Edit ~/.open-im/config.json directly",
+        configJson: "Configuration (JSON)",
+        configJsonHint: "Edit the configuration JSON. Changes will be saved when you click \"Save Config\" in the Service section.",
+        formatJson: "Format",
+        resetJson: "Reset",
+        jsonValid: "Valid JSON",
+        jsonInvalid: "Invalid JSON: {error}",
     },
     zh: {
         pageTitle: "open-im \u672c\u5730\u63a7\u5236\u53f0",
@@ -232,5 +240,13 @@ export const PAGE_TEXTS = {
         saveOk: "\u914d\u7f6e\u5df2\u4fdd\u5b58\u3002",
         startOk: "\u6865\u63a5\u5df2\u542f\u52a8\u3002",
         stopOk: "\u6865\u63a5\u5df2\u505c\u6b62\u3002",
+        configEditorTitle: "JSON \u914d\u7f6e\u7f16\u8f91\u5668",
+        configEditorHint: "\u76f4\u63a5\u7f16\u8f91 ~/.open-im/config.json",
+        configJson: "\u914d\u7f6e\u6587\u4ef6 (JSON)",
+        configJsonHint: "\u7f16\u8f91\u914d\u7f6e JSON\u3002\u70b9\u51fb\u670d\u52a1\u533a\u7684\u201c\u4fdd\u5b58\u914d\u7f6e\u201d\u6309\u94ae\u540e\u4fdd\u5b58\u66f4\u6539\u3002",
+        formatJson: "\u683c\u5f0f\u5316",
+        resetJson: "\u91cd\u7f6e",
+        jsonValid: "JSON \u6709\u6548",
+        jsonInvalid: "JSON \u65e0\u6548\uff1a{error}",
     }
 };

package/dist/config-web-page-script.js

@@ -380,7 +380,7 @@ export const PAGE_SCRIPT = String.raw `      const platformDefinitions = [
 
       // Navigation
       function setActiveNav(targetId) {
-        ["navOverviewBtn","navPlatformsBtn","navAiBtn","navServiceBtn"].forEach((id) => {
+        ["navOverviewBtn","navPlatformsBtn","navAiBtn","navServiceBtn","navConfigEditorBtn"].forEach((id) => {
           const btn = el(id);
           if (btn) btn.classList.toggle("active", id === targetId);
         });
@@ -445,6 +445,70 @@ export const PAGE_SCRIPT = String.raw `      const platformDefinitions = [
         }
       }
 
+      // Open-im Config Editor functions
+      let originalConfigJson = "";
+
+      async function loadOpenImConfig() {
+        const textarea = document.getElementById("configJson");
+        if (!(textarea instanceof HTMLTextAreaElement)) return;
+        try {
+          const data = await request("/api/config/file");
+          const raw = (data.contents || "").trim();
+          originalConfigJson = raw;
+          try {
+            const parsed = JSON.parse(raw);
+            textarea.value = JSON.stringify(parsed, null, 2) + "\n";
+          } catch {
+            textarea.value = raw;
+          }
+          validateJson();
+        } catch (error) {
+          showJsonValidationMessage(error.message || String(error), "error");
+        }
+      }
+
+      function validateJson() {
+        const textarea = document.getElementById("configJson");
+        const message = document.getElementById("jsonValidationMessage");
+        if (!(textarea instanceof HTMLTextAreaElement) || !message) return;
+
+        const json = textarea.value;
+        try {
+          JSON.parse(json);
+          showJsonValidationMessage("Valid JSON", "success");
+        } catch (err) {
+          showJsonValidationMessage("Invalid JSON: " + (err.message || String(err)), "error");
+        }
+      }
+
+      function showJsonValidationMessage(text, type) {
+        const message = document.getElementById("jsonValidationMessage");
+        if (!message) return;
+        message.textContent = text;
+        message.className = "message";
+        if (type) message.classList.add("message-" + type);
+        message.classList.remove("hidden");
+      }
+
+      function formatJson() {
+        const textarea = document.getElementById("configJson");
+        if (!(textarea instanceof HTMLTextAreaElement)) return;
+        try {
+          const parsed = JSON.parse(textarea.value);
+          textarea.value = JSON.stringify(parsed, null, 2) + "\n";
+          validateJson();
+        } catch (err) {
+          showJsonValidationMessage("Cannot format: Invalid JSON", "error");
+        }
+      }
+
+      function resetJson() {
+        const textarea = document.getElementById("configJson");
+        if (!(textarea instanceof HTMLTextAreaElement)) return;
+        textarea.value = originalConfigJson;
+        validateJson();
+      }
+
       // Fill form with data
       const AI_FIELD_MAPPINGS = [
         { id: "ai-aiCommand", key: "aiCommand" },
@@ -475,6 +539,9 @@ export const PAGE_SCRIPT = String.raw `      const platformDefinitions = [
           }
         });
 
+        // Load JSON editor content
+        void loadOpenImConfig();
+
         updateVisualState();
       }
 
@@ -558,11 +625,30 @@ export const PAGE_SCRIPT = String.raw `      const platformDefinitions = [
           });
         });
 
+        // Config editor JSON textarea
+        const configJsonTextarea = document.getElementById("configJson");
+        if (configJsonTextarea) {
+          configJsonTextarea.addEventListener("input", validateJson);
+        }
+
+        // Config editor buttons
+        const formatJsonButton = document.getElementById("formatJsonButton");
+        if (formatJsonButton) {
+          formatJsonButton.addEventListener("click", formatJson);
+        }
+
+        const resetJsonButton = document.getElementById("resetJsonButton");
+        if (resetJsonButton) {
+          resetJsonButton.addEventListener("click", resetJson);
+        }
+
+
         // Navigation
         el("navOverviewBtn").onclick = () => scrollToSection("dashboardSection", "navOverviewBtn");
         el("navPlatformsBtn").onclick = () => scrollToSection("configSection", "navPlatformsBtn");
         el("navAiBtn").onclick = () => scrollToSection("aiSection", "navAiBtn");
         el("navServiceBtn").onclick = () => scrollToSection("serviceSection", "navServiceBtn");
+        el("navConfigEditorBtn").onclick = () => scrollToSection("configEditorSection", "navConfigEditorBtn");
 
         // Language toggle
         el("langButton").onclick = () => {
@@ -617,6 +703,9 @@ export const PAGE_SCRIPT = String.raw `      const platformDefinitions = [
       async function save() {
         setBusy(true);
         try {
+          // First save JSON editor content if changed
+          await saveOpenImConfig();
+          // Then save form data
           await request("/api/config/save?final=1", { method: "POST", body: JSON.stringify(payload()) });
           setMessage(t("saveOk"), "success");
         } catch (error) {
@@ -626,6 +715,31 @@ export const PAGE_SCRIPT = String.raw `      const platformDefinitions = [
         }
       }
 
+      async function saveOpenImConfig() {
+        const textarea = document.getElementById("configJson");
+        if (!(textarea instanceof HTMLTextAreaElement)) return;
+        const json = textarea.value;
+
+        // Validate JSON
+        try {
+          JSON.parse(json);
+        } catch (err) {
+          showJsonValidationMessage("Invalid JSON: " + (err.message || String(err)), "error");
+          throw new Error("Invalid JSON: " + (err.message || String(err)));
+        }
+
+        try {
+          await request("/api/config/file", {
+            method: "POST",
+            body: JSON.stringify({ contents: json }),
+          });
+          originalConfigJson = json;
+        } catch (error) {
+          showJsonValidationMessage(error.message || String(error), "error");
+          throw error;
+        }
+      }
+
       async function startService() {
         setBusy(true);
         try {

package/dist/config-web-page-template.js

@@ -781,6 +781,16 @@ export const PAGE_HTML_PREFIX = String.raw `<!doctype html>
             </svg>
             <span id="navServiceText">Service</span>
           </button>
+          <button class="nav-item" id="navConfigEditorBtn">
+            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+              <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/>
+              <polyline points="14 2 14 8 20 8"/>
+              <line x1="16" y1="13" x2="8" y2="13"/>
+              <line x1="16" y1="17" x2="8" y2="17"/>
+              <polyline points="10 9 9 9 8 9"/>
+            </svg>
+            <span id="navConfigEditorText">Config Editor</span>
+          </button>
         </nav>
       </aside>
 
@@ -1196,6 +1206,33 @@ export const PAGE_HTML_PREFIX = String.raw `<!doctype html>
               </div>
             </div>
           </section>
+
+          <!-- Config Editor Section -->
+          <section class="section" id="configEditorSection" style="display:none">
+            <div class="section-header">
+              <h2 class="section-title" id="configEditorTitle">Config Editor</h2>
+              <p class="section-description" id="configEditorHint">Edit ~/.open-im/config.json directly</p>
+            </div>
+
+            <div class="card">
+              <div class="card-body">
+                <div class="form-group">
+                  <div style="display:flex; justify-content:space-between; align-items:center; margin-bottom:12px;">
+                    <label class="form-label" id="configJson-label">Configuration (JSON)</label>
+                    <div style="display:flex; gap:8px;">
+                      <button id="formatJsonButton" class="btn btn-sm btn-ghost">Format</button>
+                      <button id="resetJsonButton" class="btn btn-sm btn-ghost">Reset</button>
+                    </div>
+                  </div>
+                  <textarea id="configJson" class="form-input mono" rows="20" style="font-family:monospace; font-size:13px; line-height:1.5; min-height:400px; resize:vertical;" spellcheck="false"></textarea>
+                  <p class="form-hint" id="configJson-hint">Edit the configuration JSON. Changes will be saved when you click "Save Config" in the Service section.</p>
+                </div>
+                <div class="form-group">
+                  <div id="jsonValidationMessage" class="message hidden" aria-live="polite"></div>
+                </div>
+              </div>
+            </div>
+          </section>
         </div>
       </main>
     </div>

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') {
@@ -401,7 +408,7 @@ export function loadConfig() {
                 '  open-im init',
                 '',
                 '方式 3：编辑配置文件',
-                '  ~/.open-im/config.json: tools.claude.model = "..."',
+                '  ~/.open-im/config.json: tools.claude.env.ANTHROPIC_MODEL = "..."',
                 '  ~/.claude/settings.json: env.ANTHROPIC_MODEL = "..."（与 Claude Code 共用）',
                 '',
             ].join('\n');
@@ -604,12 +611,13 @@ export function loadConfig() {
         aiCommand,
         codexCliPath,
         codebuddyCliPath,
+        claudeProxy,
         codexProxy,
         claudeWorkDir,
         claudeTimeoutMs,
         codexTimeoutMs,
         codebuddyTimeoutMs,
-        claudeModel: 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.9",
+  "version": "1.8.1-beta.0",
   "description": "Multi-platform IM bridge for AI CLI tools (Claude, Codex, CodeBuddy)",
   "type": "module",
   "main": "dist/index.js",