codexmate 0.0.28 → 0.0.30

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

@@ -1,5 +1,6 @@
 const PROVIDER_NAME_PATTERN = /^[a-zA-Z0-9._-]+$/;
 const RESERVED_PROXY_PROVIDER_NAME = 'codexmate-proxy';
+const RESERVED_LOCAL_PROVIDER_NAME = 'local';
 
 function normalizeText(value) {
     return typeof value === 'string' ? value.trim() : '';
@@ -21,7 +22,7 @@ function isValidHttpUrl(value) {
 
 function isReservedProviderCreationNameInput(name) {
     const normalized = normalizeText(name).toLowerCase();
-    return normalized === RESERVED_PROXY_PROVIDER_NAME;
+    return normalized === RESERVED_PROXY_PROVIDER_NAME || normalized === RESERVED_LOCAL_PROVIDER_NAME;
 }
 
 function isValidProviderNameInputValue(name) {
@@ -48,6 +49,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) : '';
@@ -158,10 +165,25 @@ export function createProvidersMethods(options = {}) {
                     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();
-                // loadAll 会重拉 status 覆盖字典，所以暗示模型在 loadAll 之后再写。
+
                 if (suggestedModel) {
                     if (!this.currentModels || typeof this.currentModels !== 'object') this.currentModels = {};
                     this.currentModels[validation.name] = suggestedModel;
@@ -237,17 +259,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;
@@ -319,9 +366,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');
             }
@@ -356,13 +416,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');
@@ -375,8 +448,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');
@@ -407,6 +489,41 @@ export function createProvidersMethods(options = {}) {
                 : null;
             const key = config ? config.apiKey : '';
             return this.formatKey(key);
+        },
+
+        async loadLocalBridgeExcluded() {
+            try {
+                const res = await api('local-bridge-get-excluded');
+                if (res && Array.isArray(res.excludedProviders)) {
+                    this.localBridgeExcluded = res.excludedProviders;
+                }
+            } catch (e) { /* ignore */ }
+        },
+
+        async toggleLocalBridgeExcluded(providerName) {
+            const name = String(providerName || '').trim();
+            if (!name) return;
+            const idx = this.localBridgeExcluded.indexOf(name);
+            const next = [...this.localBridgeExcluded];
+            if (idx >= 0) {
+                next.splice(idx, 1);
+            } else {
+                next.push(name);
+            }
+            try {
+                const res = await api('local-bridge-set-excluded', { names: next });
+                if (res && !res.error) {
+                    this.localBridgeExcluded = next;
+                }
+            } catch (e) { /* ignore */ }
+        },
+
+        isLocalBridgeExcluded(providerName) {
+            return this.localBridgeExcluded.indexOf(String(providerName || '').trim()) >= 0;
+        },
+
+        localBridgeCandidateProviders() {
+            return (this.providersList || []).filter(p => p && p.name !== 'local' && p.name !== 'codexmate-proxy' && p.codexmate_bridge !== 'local');
         }
     };
 }

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

@@ -251,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

@@ -693,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

@@ -221,13 +221,12 @@ export function createSessionTrashMethods(options = {}) {
         async switchSettingsTab(tab, options = {}) {
             const nextTab = this.normalizeSettingsTab(tab);
             this.settingsTab = nextTab;
+            if (typeof this.saveNavState === 'function') {
+                this.saveNavState();
+            }
             if (nextTab !== 'data') {
                 return;
             }
-            const forceRefresh = options.forceRefresh === true;
-            if (forceRefresh || !this.sessionTrashLoadedOnce) {
-                await this.loadSessionTrash({ forceRefresh });
-            }
         },
 
         async loadSessionTrashCount(options = {}) {

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

@@ -118,6 +118,7 @@ export function createStartupClaudeMethods(options = {}) {
                         }
                     }
                     this.providersList = listRes.providers;
+                    if (typeof this.loadLocalBridgeExcluded === 'function') { this.loadLocalBridgeExcluded(); }
                     if (statusRes.configReady === false) {
                         this.showMessage('配置已加载', 'info');
                     }

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);
+            }
+        }
+    };
+}