codexmate 0.0.27 → 0.0.29

package/web-ui/modules/app.methods.claude-config.mjs

@@ -43,6 +43,16 @@ export function createClaudeConfigMethods(options = {}) {
             }
         },
 
+        openCloneClaudeConfigModal(name, config) {
+            this.newClaudeConfig = {
+                name: '',
+                apiKey: config.apiKey || '',
+                baseUrl: config.baseUrl || '',
+                model: config.model || ''
+            };
+            this.showClaudeConfigModal = true;
+        },
+
         openEditConfigModal(name) {
             const config = this.claudeConfigs[name];
             this.editingConfig = {
@@ -77,7 +87,7 @@ export function createClaudeConfigMethods(options = {}) {
 
             const config = this.claudeConfigs[name];
             if (!config.apiKey) {
-                this.showMessage('已保存，未应用', 'info');
+                this.showMessage('已保存（未填写 API Key）', 'info');
                 this.closeEditConfigModal();
                 if (name === this.currentClaudeConfig) {
                     this.refreshClaudeModelContext();
@@ -85,14 +95,17 @@ export function createClaudeConfigMethods(options = {}) {
                 return;
             }
 
+            const _claudeKey = `${name}|${config.apiKey || ""}|${config.baseUrl || ""}|${config.model || ""}`;
             try {
                 const res = await api('apply-claude-config', { config });
                 if (res.error || res.success === false) {
                     this.showMessage(res.error || '应用配置失败', 'error');
                 } else {
                     this.currentClaudeConfig = name;
-                    const targetTip = res.targetPath ? `（${res.targetPath}）` : '';
-                    this.showMessage(`已保存并应用到 Claude 配置${targetTip}`, 'success');
+                    if (this._lastAppliedClaudeKey !== _claudeKey) {
+                        this.showMessage('Claude 配置已生效', 'success');
+                        this._lastAppliedClaudeKey = _claudeKey;
+                    }
                     this.closeEditConfigModal();
                     this.refreshClaudeModelContext();
                 }
@@ -153,18 +166,21 @@ export function createClaudeConfigMethods(options = {}) {
 
             if (!config.apiKey) {
                 if (config.externalCredentialType) {
-                    return this.showMessage('检测到外部 Claude 认证状态；当前仅支持展示，若需由 codexmate 接管请补充 API Key', 'info');
+                    return this.showMessage('使用外部认证，无需 API Key', 'info');
                 }
                 return this.showMessage('请先配置 API Key', 'error');
             }
 
+            const _claudeKey2 = `${name}|${config.apiKey || ""}|${config.baseUrl || ""}|${config.model || ""}`;
             try {
                 const res = await api('apply-claude-config', { config });
                 if (res.error || res.success === false) {
                     this.showMessage(res.error || '应用配置失败', 'error');
                 } else {
-                    const targetTip = res.targetPath ? `（${res.targetPath}）` : '';
-                    this.showMessage(`已应用配置到 Claude 设置: ${name}${targetTip}`, 'success');
+                    if (this._lastAppliedClaudeKey !== _claudeKey2) {
+                        this.showMessage('配置已应用', 'success');
+                        this._lastAppliedClaudeKey = _claudeKey2;
+                    }
                 }
             } catch (_) {
                 this.showMessage('应用配置失败', 'error');
@@ -176,8 +192,8 @@ export function createClaudeConfigMethods(options = {}) {
             this.newClaudeConfig = {
                 name: '',
                 apiKey: '',
-                baseUrl: 'https://open.bigmodel.cn/api/anthropic',
-                model: 'glm-4.7'
+                baseUrl: '',
+                model: ''
             };
         }
     };

package/web-ui/modules/app.methods.codex-config.mjs

@@ -180,7 +180,19 @@ export function createCodexConfigMethods(options = {}) {
             const previousModels = Array.isArray(this.models) ? [...this.models] : [];
             const previousModelsSource = this.modelsSource;
             const previousModelsHasCurrent = this.modelsHasCurrent;
+            // 切走前把上一个 provider 的 model 落到内存字典，避免切回时显示抖动。
+            if (previousProvider && typeof previousModel === 'string' && previousModel.trim() && previousModel !== '未设置') {
+                if (!this.currentModels || typeof this.currentModels !== 'object') this.currentModels = {};
+                this.currentModels[previousProvider] = previousModel.trim();
+            }
             this.currentProvider = name;
+            // 立即按字典预填，让 UI 不出现空白；远端 /models 后台异步补齐。
+            const dictModel = typeof this.activeProviderModel === 'function'
+                ? this.activeProviderModel(name)
+                : '';
+            if (dictModel) {
+                this.currentModel = dictModel;
+            }
             const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
             // 不要把“切换提供商”强绑定到 /models 成功与否：
@@ -195,7 +207,11 @@ export function createCodexConfigMethods(options = {}) {
 
             await Promise.race([modelsTask, delay(250)]);
 
-            if (this.modelsSource === 'remote' && this.models.length > 0 && !this.models.includes(this.currentModel)) {
+            // 只在“字典中没有该 provider 记录”时才允许 remote 首项覆盖，否则尊重用户上次选择。
+            if (!dictModel
+                && this.modelsSource === 'remote'
+                && this.models.length > 0
+                && !this.models.includes(this.currentModel)) {
                 this.currentModel = this.models[0];
                 this.modelsHasCurrent = true;
             }
@@ -208,7 +224,10 @@ export function createCodexConfigMethods(options = {}) {
             await modelsTask;
 
             if (this.currentProvider === name) {
-                if (this.modelsSource === 'remote' && this.models.length > 0 && !this.models.includes(this.currentModel)) {
+                if (!dictModel
+                    && this.modelsSource === 'remote'
+                    && this.models.length > 0
+                    && !this.models.includes(this.currentModel)) {
                     this.currentModel = this.models[0];
                     this.modelsHasCurrent = true;
                     if (getProviderConfigModeMeta(this.configMode)) {
@@ -261,6 +280,12 @@ export function createCodexConfigMethods(options = {}) {
         },
 
         async onModelChange() {
+            const name = String(this.currentProvider || '').trim();
+            const model = typeof this.currentModel === 'string' ? this.currentModel.trim() : '';
+            if (name && model) {
+                if (!this.currentModels || typeof this.currentModels !== 'object') this.currentModels = {};
+                this.currentModels[name] = model;
+            }
             await this.applyCodexConfigDirect();
         },
 
@@ -629,6 +654,8 @@ export function createCodexConfigMethods(options = {}) {
             this.modelContextWindowInput = modelContextWindow.text;
             this.modelAutoCompactTokenLimitInput = modelAutoCompactTokenLimit.text;
 
+            const _codexKey = `${provider}|${model}|${this.serviceTier || ""}|${this.modelReasoningEffort || ""}|${modelContextWindow.value}|${modelAutoCompactTokenLimit.value}`;
+
             this.codexApplying = true;
             try {
                 const tplRes = await api('get-config-template', {
@@ -665,7 +692,12 @@ export function createCodexConfigMethods(options = {}) {
                 }
 
                 if (options.silent !== true) {
-                    this.showMessage('配置已应用', 'success');
+                    if (this._lastAppliedCodexKey !== _codexKey) {
+                        this.showMessage('配置已应用', 'success');
+                        this._lastAppliedCodexKey = _codexKey;
+                    }
+                } else {
+                    this._lastAppliedCodexKey = _codexKey;
                 }
 
                 const refreshOptions = options.silent === true

package/web-ui/modules/app.methods.index.mjs

@@ -29,6 +29,7 @@ import { createStartupClaudeMethods } from './app.methods.startup-claude.mjs';
 import { createSkillsMethods } from './skills.methods.mjs';
 import { createPluginsMethods } from './plugins.methods.mjs';
 import { createI18nMethods } from './i18n.mjs';
+import { createWebhookMethods } from './app.methods.webhook.mjs';
 import {
     CONFIG_MODE_SET,
     getProviderConfigModeMeta
@@ -43,6 +44,7 @@ import {
 export function createAppMethods() {
     return {
         ...createI18nMethods(),
+        ...createWebhookMethods(),
         ...createStartupClaudeMethods({
             api,
             defaultModelContextWindow: DEFAULT_MODEL_CONTEXT_WINDOW,

package/web-ui/modules/app.methods.navigation.mjs

@@ -1,4 +1,4 @@
-export function createNavigationMethods(options = {}) {
+export function createNavigationMethods(options = {}) {
     const {
         configModeSet,
         switchMainTabHelper,
@@ -14,7 +14,8 @@ export function createNavigationMethods(options = {}) {
         'market',
         'plugins',
         'docs',
-        'settings'
+        'settings',
+        'trash'
     ]);
     const loadDoctorOverview = async (vm, options = {}) => {
         if (!vm || typeof vm !== 'object') return false;
@@ -67,7 +68,9 @@ export function createNavigationMethods(options = {}) {
             : vm.configMode;
         const mainTab = typeof mainTabSource === 'string' ? mainTabSource.trim().toLowerCase() : '';
         const configMode = typeof configModeSource === 'string' ? configModeSource.trim().toLowerCase() : '';
+        const settingsTab = typeof vm.settingsTab === 'string' ? vm.settingsTab.trim().toLowerCase() : 'general';
         const snapshot = {
+            settingsTab: settingsTab === 'data' ? 'data' : 'general',
             mainTab: MAIN_TAB_SET.has(mainTab) ? mainTab : 'dashboard',
             configMode: configModeSet && configModeSet.has(configMode) ? configMode : 'codex'
         };
@@ -77,6 +80,9 @@ export function createNavigationMethods(options = {}) {
     };
 
     return {
+        saveNavState() {
+            persistNavState(this);
+        },
         restoreNavStateFromStorage() {
             if (this.__navStateRestoring) return false;
             const restored = readNavState();
@@ -89,7 +95,11 @@ export function createNavigationMethods(options = {}) {
                 : '';
             const shouldUpdateConfigMode = !!(nextConfigMode && configModeSet && configModeSet.has(nextConfigMode));
             const shouldUpdateMainTab = !!(nextMainTab && MAIN_TAB_SET.has(nextMainTab) && nextMainTab !== this.mainTab);
-            if (!shouldUpdateConfigMode && !shouldUpdateMainTab) {
+            const nextSettingsTab = restored && typeof restored.settingsTab === 'string'
+                ? restored.settingsTab.trim().toLowerCase()
+                : '';
+            const shouldUpdateSettingsTab = !!(nextSettingsTab && (nextSettingsTab === 'general' || nextSettingsTab === 'data') && nextSettingsTab !== this.settingsTab);
+            if (!shouldUpdateConfigMode && !shouldUpdateMainTab && !shouldUpdateSettingsTab) {
                 return false;
             }
             this.__navStateRestoring = true;
@@ -97,6 +107,9 @@ export function createNavigationMethods(options = {}) {
                 if (shouldUpdateConfigMode) {
                     this.configMode = nextConfigMode;
                 }
+                if (shouldUpdateSettingsTab) {
+                    this.settingsTab = nextSettingsTab;
+                }
                 if (shouldUpdateMainTab) {
                     this.switchMainTab(nextMainTab);
                 }
@@ -411,6 +424,11 @@ export function createNavigationMethods(options = {}) {
                 switchState.ticket += 1;
                 switchState.pendingTarget = '';
                 if (targetTab === 'dashboard' && !this.__doctorLoadedOnce) {
+                if (targetTab === 'trash' && !this.sessionTrashLoadedOnce) {
+                    if (typeof this.loadSessionTrash === 'function') {
+                        void this.loadSessionTrash({ forceRefresh: false });
+                    }
+                }
                     void loadDoctorOverview(this);
                 }
                 if (

package/web-ui/modules/app.methods.providers.mjs

@@ -48,6 +48,12 @@ function normalizeProviderDraftState(target) {
     }
 }
 
+function maskKeyLocal(key) {
+    if (!key) return '';
+    if (key.length <= 8) return '****';
+    return key.substring(0, 4) + '...' + key.substring(key.length - 4);
+}
+
 function getProviderValidationForContext(vm, mode = 'add') {
     const draft = mode === 'edit' ? vm.editingProvider : vm.newProvider;
     const editingName = mode === 'edit' ? normalizeText(draft && draft.name) : '';
@@ -149,15 +155,38 @@ export function createProvidersMethods(options = {}) {
                 if (this.newProvider && this.newProvider.useTransform) {
                     payload.useTransform = true;
                 }
+                const suggestedModel = typeof this.newProvider._suggestedModel === 'string'
+                    ? this.newProvider._suggestedModel.trim()
+                    : '';
                 const res = await api('add-provider', payload);
                 if (res.error) {
                     this.showMessage(res.error, 'error');
                     return;
                 }
 
+                // 本地更新：构造新 provider 对象并追加到列表
+                const newProvider = {
+                    name: validation.name,
+                    url: validation.url,
+                    upstreamUrl: '',
+                    codexmate_bridge: payload.useTransform ? 'openai' : '',
+                    key: maskKeyLocal(payload.key),
+                    hasKey: !!payload.key,
+                    models: [],
+                    current: false,
+                    readOnly: false,
+                    nonDeletable: false,
+                    nonEditable: false
+                };
+                this.providersList = [...this.providersList, newProvider];
+
                 this.showMessage('操作成功', 'success');
                 this.closeAddModal();
-                await this.loadAll();
+
+                if (suggestedModel) {
+                    if (!this.currentModels || typeof this.currentModels !== 'object') this.currentModels = {};
+                    this.currentModels[validation.name] = suggestedModel;
+                }
             } catch (e) {
                 this.showMessage('添加失败', 'error');
             }
@@ -229,17 +258,42 @@ export function createProvidersMethods(options = {}) {
                     this.showMessage(res.error, 'error');
                     return;
                 }
+
+                // 本地更新：从列表中移除
+                this.providersList = this.providersList.filter(p => p.name !== name);
+
+                // 清理 currentModels
+                if (this.currentModels && this.currentModels[name]) {
+                    delete this.currentModels[name];
+                }
+
                 if (res.switched && res.provider) {
+                    this.currentProvider = res.provider;
+                    if (res.model) this.currentModel = res.model;
+                    // 更新 current 标记
+                    this.providersList = this.providersList.map(p => ({
+                        ...p,
+                        current: p.name === res.provider
+                    }));
                     this.showMessage(`已删除提供商，自动切换到 ${res.provider}${res.model ? ` / ${res.model}` : ''}`, 'success');
                 } else {
                     this.showMessage('操作成功', 'success');
                 }
-                await this.loadAll();
             } catch (_) {
                 this.showMessage('删除失败', 'error');
             }
         },
 
+        openCloneProviderModal(provider) {
+            this.newProvider = {
+                name: '',
+                url: normalizeProviderUrl(provider.url || ''),
+                key: '',
+                useTransform: !!(provider.codexmate_bridge || '').trim() || /\/bridge\/openai\//.test(provider.url || '')
+            };
+            this.showAddModal = true;
+        },
+
         async openEditModal(provider) {
             const requestId = Symbol('openEditModal');
             this._openEditModalRequestId = requestId;
@@ -311,9 +365,22 @@ export function createProvidersMethods(options = {}) {
                     this.showMessage(res.error, 'error');
                     return;
                 }
+
+                // 本地更新：更新列表中对应 provider 的 url 和 key
+                this.providersList = this.providersList.map(p => {
+                    if (p.name === validation.name) {
+                        return {
+                            ...p,
+                            url: validation.url,
+                            key: params.key ? maskKeyLocal(params.key) : p.key,
+                            hasKey: params.key ? true : p.hasKey
+                        };
+                    }
+                    return p;
+                });
+
                 this.closeEditModal();
                 this.showMessage('操作成功', 'success');
-                await this.loadAll();
             } catch (e) {
                 this.showMessage('更新失败', 'error');
             }
@@ -348,13 +415,26 @@ export function createProvidersMethods(options = {}) {
                 return this.showMessage('请输入模型', 'error');
             }
             try {
-                const res = await api('add-model', { model: this.newModelName.trim() });
+                const modelName = this.newModelName.trim();
+                const res = await api('add-model', { model: modelName });
                 if (res.error) {
                     this.showMessage(res.error, 'error');
                 } else {
+                    // 本地更新：在当前 provider 的 models 中追加
+                    this.providersList = this.providersList.map(p => {
+                        if (p.name === this.currentProvider) {
+                            const exists = p.models.some(m => m.id === modelName);
+                            if (!exists) {
+                                return {
+                                    ...p,
+                                    models: [...p.models, { id: modelName, name: modelName, cost: null, contextWindow: undefined, maxTokens: undefined }]
+                                };
+                            }
+                        }
+                        return p;
+                    });
                     this.showMessage('操作成功', 'success');
                     this.closeModelModal();
-                    await this.loadAll();
                 }
             } catch (_) {
                 this.showMessage('新增模型失败', 'error');
@@ -367,8 +447,17 @@ export function createProvidersMethods(options = {}) {
                 if (res.error) {
                     this.showMessage(res.error, 'error');
                 } else {
+                    // 本地更新：从当前 provider 的 models 中移除
+                    this.providersList = this.providersList.map(p => {
+                        if (p.name === this.currentProvider) {
+                            return {
+                                ...p,
+                                models: p.models.filter(m => m.id !== model)
+                            };
+                        }
+                        return p;
+                    });
                     this.showMessage('操作成功', 'success');
-                    await this.loadAll();
                 }
             } catch (_) {
                 this.showMessage('删除模型失败', 'error');
@@ -377,7 +466,7 @@ export function createProvidersMethods(options = {}) {
 
         closeAddModal() {
             this.showAddModal = false;
-            this.newProvider = { name: '', url: '', key: '', useTransform: false };
+            this.newProvider = { name: '', url: '', key: '', useTransform: false, _suggestedModel: '' };
         },
 
         closeModelModal() {

package/web-ui/modules/app.methods.session-actions.mjs

@@ -181,12 +181,9 @@ export function createSessionActionMethods(options = {}) {
                 return `gemini -r ${arg}`;
             }
             if (source === 'claude') {
-                return `claude -r ${arg}`;
+                return `claude --dangerously-skip-permissions -r ${arg}`;
             }
-            if (this.sessionResumeWithYolo) {
-                return `codex --yolo resume ${arg}`;
-            }
-            return `codex resume ${arg}`;
+            return `codex --yolo resume ${arg}`;
         },
 
         extractClaudeResumeKeyFromFilePath(filePath) {
@@ -254,7 +251,7 @@ export function createSessionActionMethods(options = {}) {
 
         getShareCommandPrefixInvocation() {
             const prefix = this.normalizeShareCommandPrefix(this.shareCommandPrefix);
-            return prefix === 'codexmate' ? 'codexmate' : 'npm start';
+            return prefix === 'codexmate' ? 'codexmate' : 'npm start --';
         },
 
         setShareCommandPrefix(value) {

package/web-ui/modules/app.methods.session-browser.mjs

@@ -249,11 +249,6 @@ export function createSessionBrowserMethods(options = {}) {
             }
         },
 
-        onSessionResumeYoloChange() {
-            const value = this.sessionResumeWithYolo ? '1' : '0';
-            localStorage.setItem('codexmateSessionResumeYolo', value);
-        },
-
         normalizeSessionSortMode(value) {
             const normalized = typeof value === 'string' ? value.trim().toLowerCase() : '';
             return normalized === 'hot' ? 'hot' : 'time';
@@ -698,7 +693,7 @@ export function createSessionBrowserMethods(options = {}) {
             for (const session of visible) {
                 if (!session || typeof session !== 'object') continue;
                 const messageCountRaw = Number(session.messageCount);
-                const shouldHydrate = !Number.isFinite(messageCountRaw) || messageCountRaw === 0;
+                const shouldHydrate = !Number.isFinite(messageCountRaw) || (messageCountRaw === 0 && !session.__messageCountExact);
                 if (!shouldHydrate) continue;
                 const key = this.getSessionExportKey(session);
                 if (!key) continue;

package/web-ui/modules/app.methods.session-trash.mjs

@@ -208,10 +208,10 @@ export function createSessionTrashMethods(options = {}) {
         },
 
         normalizeSettingsTab(tab) {
-            if (tab === 'trash' || tab === 'device') {
+            if (tab === 'general' || tab === 'data') {
                 return tab;
             }
-            return 'backup';
+            return 'general';
         },
 
         async onSettingsTabClick(tab) {
@@ -221,12 +221,11 @@ export function createSessionTrashMethods(options = {}) {
         async switchSettingsTab(tab, options = {}) {
             const nextTab = this.normalizeSettingsTab(tab);
             this.settingsTab = nextTab;
-            if (nextTab !== 'trash') {
-                return;
+            if (typeof this.saveNavState === 'function') {
+                this.saveNavState();
             }
-            const forceRefresh = options.forceRefresh === true;
-            if (forceRefresh || !this.sessionTrashLoadedOnce) {
-                await this.loadSessionTrash({ forceRefresh });
+            if (nextTab !== 'data') {
+                return;
             }
         },
 

package/web-ui/modules/app.methods.startup-claude.mjs

@@ -60,7 +60,14 @@ export function createStartupClaudeMethods(options = {}) {
                         return false;
                     }
                     this.currentProvider = statusRes.provider;
-                    this.currentModel = statusRes.model;
+                    this.currentModels = statusRes.currentModels && typeof statusRes.currentModels === 'object'
+                        ? { ...statusRes.currentModels }
+                        : {};
+                    const dictModelForCurrent = this.currentProvider
+                        && typeof this.currentModels[this.currentProvider] === 'string'
+                        ? this.currentModels[this.currentProvider].trim()
+                        : '';
+                    this.currentModel = dictModelForCurrent || statusRes.model;
                     try {
                         const installRes = await withTimeout(api('install-status'), Math.max(0, Math.min(1200, timeLeftMs())));
                         if (installRes && !installRes.error) {

package/web-ui/modules/app.methods.webhook.mjs

@@ -0,0 +1,79 @@
+import { api } from './api.mjs';
+
+export function createWebhookMethods() {
+    return {
+        async loadWebhookSettings() {
+            try {
+                const data = await api('get-webhook-config');
+                if (data && typeof data === 'object' && !data.error) {
+                    this.webhookConfig = {
+                        enabled: !!data.enabled,
+                        url: typeof data.url === 'string' ? data.url : '',
+                        events: Array.isArray(data.events) && data.events.length
+                            ? data.events.slice()
+                            : this.webhookEventOptions.slice()
+                    };
+                }
+            } catch (e) {
+                this.webhookTestResult = { ok: false, error: e && e.message ? e.message : String(e) };
+            }
+        },
+
+        async saveWebhookSettings() {
+            this.webhookSaving = true;
+            try {
+                const cfg = {
+                    enabled: !!this.webhookConfig.enabled,
+                    url: typeof this.webhookConfig.url === 'string' ? this.webhookConfig.url.trim() : '',
+                    events: Array.isArray(this.webhookConfig.events) ? this.webhookConfig.events.slice() : []
+                };
+                const saved = await api('set-webhook-config', { config: cfg });
+                if (saved && typeof saved === 'object' && !saved.error) {
+                    this.webhookConfig = {
+                        enabled: !!saved.enabled,
+                        url: typeof saved.url === 'string' ? saved.url : '',
+                        events: Array.isArray(saved.events) ? saved.events.slice() : []
+                    };
+                    this.webhookTestResult = { ok: true, status: 'saved' };
+                } else {
+                    this.webhookTestResult = { ok: false, error: (saved && saved.error) || 'save failed' };
+                }
+            } catch (e) {
+                this.webhookTestResult = { ok: false, error: e && e.message ? e.message : String(e) };
+            } finally {
+                this.webhookSaving = false;
+            }
+        },
+
+        async testWebhook() {
+            this.webhookTesting = true;
+            try {
+                const cfg = {
+                    enabled: true,
+                    url: typeof this.webhookConfig.url === 'string' ? this.webhookConfig.url.trim() : '',
+                    events: Array.isArray(this.webhookConfig.events) && this.webhookConfig.events.length
+                        ? this.webhookConfig.events.slice()
+                        : this.webhookEventOptions.slice()
+                };
+                const r = await api('test-webhook', { config: cfg });
+                this.webhookTestResult = r || { ok: false, error: 'no result' };
+            } catch (e) {
+                this.webhookTestResult = { ok: false, error: e && e.message ? e.message : String(e) };
+            } finally {
+                this.webhookTesting = false;
+            }
+        },
+
+        toggleWebhookEvent(eventName) {
+            if (!Array.isArray(this.webhookConfig.events)) {
+                this.webhookConfig.events = [];
+            }
+            const idx = this.webhookConfig.events.indexOf(eventName);
+            if (idx === -1) {
+                this.webhookConfig.events.push(eventName);
+            } else {
+                this.webhookConfig.events.splice(idx, 1);
+            }
+        }
+    };
+}