codexmate 0.0.26 → 0.0.28

package/web-ui/modules/app.computed.dashboard.mjs

@@ -1,3 +1,5 @@
+import { getProviderDisplayUrl, checkIsTransformProvider } from './provider-url-display.mjs';
+import { getCodexModelCatalogForProvider, CODEX_PROVIDER_TEMPLATES } from '../logic.codex.mjs';
 export function createDashboardComputed() {
     return {
         agentsDiffHasChanges() {
@@ -29,6 +31,50 @@ export function createDashboardComputed() {
             }
             return list;
         },
+        activeProviderModel() {
+            return (name) => {
+                const target = String(name || '').trim();
+                if (!target) return '';
+                const dict = this.currentModels && typeof this.currentModels === 'object' ? this.currentModels : {};
+                const fromDict = typeof dict[target] === 'string' ? dict[target].trim() : '';
+                if (fromDict) return fromDict;
+                const activeName = String(this.currentProvider || '').trim();
+                if (target === activeName) {
+                    const top = typeof this.currentModel === 'string' ? this.currentModel.trim() : '';
+                    if (top && top !== '未设置') return top;
+                }
+                return '';
+            };
+        },
+        codexModelOptions() {
+            const seen = new Set();
+            const out = [];
+            const push = (val) => {
+                const s = typeof val === 'string' ? val.trim() : '';
+                if (!s || seen.has(s)) return;
+                seen.add(s);
+                out.push(s);
+            };
+            const activeName = String(this.displayCurrentProvider || '').trim();
+            const current = typeof this.currentModel === 'string' ? this.currentModel.trim() : '';
+            if (current && current !== '未设置') push(current);
+            const dict = this.currentModels && typeof this.currentModels === 'object' ? this.currentModels : {};
+            if (activeName && typeof dict[activeName] === 'string') push(dict[activeName]);
+            const remote = Array.isArray(this.models) ? this.models : [];
+            for (const m of remote) push(m);
+            const list = Array.isArray(this.providersList) ? this.providersList : [];
+            const activeProvider = list.find((p) => p && p.name === activeName);
+            if (activeProvider) {
+                for (const m of getCodexModelCatalogForProvider(activeProvider)) push(m);
+            }
+            return out;
+        },
+        codexModelHasList() {
+            return this.codexModelOptions.length > 0;
+        },
+        codexProviderTemplates() {
+            return CODEX_PROVIDER_TEMPLATES;
+        },
         displayCurrentProvider() {
             const switching = String(this.providerSwitchDisplayTarget || '').trim();
             if (switching) return switching;
@@ -39,6 +85,14 @@ export function createDashboardComputed() {
             const list = Array.isArray(this.providersList) ? this.providersList : [];
             return list;
         },
+
+        displayProviderUrl() {
+            return (provider) => getProviderDisplayUrl(provider);
+        },
+
+        isTransformProvider() {
+            return (provider) => checkIsTransformProvider(provider);
+        },
         installTargetCards() {
             const targets = Array.isArray(this.installStatusTargets) && this.installStatusTargets.length
                 ? this.installStatusTargets

package/web-ui/modules/app.computed.session.mjs

@@ -2,6 +2,7 @@ import {
     buildSessionTimelineNodes,
     buildUsageChartGroups,
     buildUsageHeatmap,
+    buildUsageHourlyHeatmap,
     isSessionQueryEnabled
 } from '../logic.mjs';
 import { SESSION_TRASH_PAGE_SIZE } from './app.constants.mjs';
@@ -580,6 +581,53 @@ export function createSessionComputed() {
                 weekdayAxis
             };
         },
+        sessionUsageHourlyHeatmap() {
+            const sessions = this.sessionUsageCharts && Array.isArray(this.sessionUsageCharts.filteredSessions)
+                ? this.sessionUsageCharts.filteredSessions
+                : this.sessionsUsageList;
+            const result = buildUsageHourlyHeatmap(sessions, { range: this.sessionsUsageTimeRange });
+            const t = typeof this.t === 'function' ? this.t : null;
+            const lang = typeof this.lang === 'string' ? this.lang.trim().toLowerCase() : '';
+            const weekdayLabelsZh = ['周一', '周二', '周三', '周四', '周五', '周六', '周日'];
+            const weekdayLabelsEn = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'];
+            const weekdayLabels = lang === 'en' ? weekdayLabelsEn : weekdayLabelsZh;
+            const max = Math.max(1, result.maxSessionCount);
+            const grid = Array.isArray(result.grid) ? result.grid : [];
+            const rows = grid.map((cells, dayIndex) => ({
+                weekday: weekdayLabels[dayIndex] || '',
+                cells: cells.map((cell, hourIndex) => {
+                    const ratio = cell.sessionCount > 0 ? (cell.sessionCount / max) : 0;
+                    const level = cell.sessionCount <= 0
+                        ? 0
+                        : (ratio <= 0.25 ? 1 : (ratio <= 0.5 ? 2 : (ratio <= 0.75 ? 3 : 4)));
+                    const hourLabel = String(hourIndex).padStart(2, '0');
+                    const tooltipText = t
+                        ? t('usage.hourlyHeatmap.tooltip', {
+                            weekday: weekdayLabels[dayIndex],
+                            hour: hourLabel,
+                            sessions: cell.sessionCount,
+                            messages: cell.messageCount,
+                            tokens: (cell.tokenTotal || 0).toLocaleString('en-US')
+                        })
+                        : `${weekdayLabels[dayIndex] || ''} ${hourLabel}:00 · ${cell.sessionCount} sessions · ${cell.messageCount} messages · ${(cell.tokenTotal || 0).toLocaleString('en-US')} tokens`;
+                    return {
+                        hour: hourIndex,
+                        hourLabel,
+                        sessionCount: cell.sessionCount,
+                        messageCount: cell.messageCount,
+                        tokenTotal: cell.tokenTotal,
+                        level,
+                        tooltip: tooltipText
+                    };
+                })
+            }));
+            return {
+                range: result.range,
+                rows,
+                hourLabels: result.hourLabels,
+                maxSessionCount: result.maxSessionCount
+            };
+        },
         sessionUsageSummaryCards() {
             const summary = this.sessionUsageCharts && this.sessionUsageCharts.summary
                 ? this.sessionUsageCharts.summary

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

@@ -4,6 +4,7 @@ export function createClaudeConfigMethods(options = {}) {
     return {
         switchClaudeConfig(name) {
             this.currentClaudeConfig = name;
+            try { localStorage.setItem('currentClaudeConfig', name || ''); } catch (_) {}
             this.refreshClaudeModelContext();
         },
 
@@ -36,7 +37,10 @@ export function createClaudeConfigMethods(options = {}) {
         },
 
         saveClaudeConfigs() {
-            localStorage.setItem('claudeConfigs', JSON.stringify(this.claudeConfigs));
+            try { localStorage.setItem('claudeConfigs', JSON.stringify(this.claudeConfigs)); } catch (_) {}
+            if (this.currentClaudeConfig) {
+                try { localStorage.setItem('currentClaudeConfig', this.currentClaudeConfig); } catch (_) {}
+            }
         },
 
         openEditConfigModal(name) {
@@ -73,7 +77,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();
@@ -81,14 +85,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();
                 }
@@ -143,23 +150,27 @@ export function createClaudeConfigMethods(options = {}) {
 
         async applyClaudeConfig(name) {
             this.currentClaudeConfig = name;
+            try { localStorage.setItem('currentClaudeConfig', name || ''); } catch (_) {}
             this.refreshClaudeModelContext();
             const config = this.claudeConfigs[name];
 
             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');

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.providers.mjs

@@ -149,6 +149,9 @@ 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');
@@ -158,6 +161,11 @@ export function createProvidersMethods(options = {}) {
                 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;
+                }
             } catch (e) {
                 this.showMessage('添加失败', 'error');
             }
@@ -377,7 +385,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) {

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';
@@ -778,6 +773,7 @@ export function createSessionBrowserMethods(options = {}) {
             const normalized = typeof nextRange === 'string' ? nextRange.trim().toLowerCase() : '';
             const range = normalized === 'all' ? 'all' : (normalized === '30d' ? '30d' : '7d');
             this.sessionsUsageTimeRange = range;
+            try { localStorage.setItem('sessionsUsageTimeRange', range); } catch (_) {}
             if (range === 'all') {
                 this.sessionsUsageCompareEnabled = false;
             }
@@ -848,6 +844,9 @@ export function createSessionBrowserMethods(options = {}) {
                 if (loadSucceeded) {
                     this.sessionsUsageLoadedOnce = true;
                     this.sessionsUsageLoadedLimit = limit;
+                    if (!this.sessionsUsageSelectedDayKey && Array.isArray(this.sessionUsageDailyTableRows) && this.sessionUsageDailyTableRows.length > 0) {
+                        this.sessionsUsageSelectedDayKey = this.sessionUsageDailyTableRows[0].key;
+                    }
                 }
             }
         },

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,7 +221,7 @@ export function createSessionTrashMethods(options = {}) {
         async switchSettingsTab(tab, options = {}) {
             const nextTab = this.normalizeSettingsTab(tab);
             this.settingsTab = nextTab;
-            if (nextTab !== 'trash') {
+            if (nextTab !== 'data') {
                 return;
             }
             const forceRefresh = options.forceRefresh === true;
@@ -270,6 +270,20 @@ export function createSessionTrashMethods(options = {}) {
             }
         },
 
+        normalizeSessionTrashRetentionDays(value) {
+            const numeric = Number(value);
+            if (!Number.isFinite(numeric) || numeric < 1) {
+                return 30;
+            }
+            return Math.min(365, Math.max(1, Math.floor(numeric)));
+        },
+
+        setSessionTrashRetentionDays(days) {
+            const normalized = this.normalizeSessionTrashRetentionDays(days);
+            this.sessionTrashRetentionDays = normalized;
+            try { localStorage.setItem('codexmateSessionTrashRetentionDays', String(normalized)); } catch (_) {}
+        },
+
         getSessionTrashActionKey(item) {
             return item && typeof item.trashId === 'string' ? item.trashId : '';
         },
@@ -294,7 +308,8 @@ export function createSessionTrashMethods(options = {}) {
             try {
                 const res = await api('list-session-trash', {
                     limit: sessionTrashListLimit,
-                    forceRefresh: !!options.forceRefresh
+                    forceRefresh: !!options.forceRefresh,
+                    retentionDays: this.sessionTrashRetentionDays
                 });
                 if (!this.isLatestSessionTrashListRequestToken(requestToken)) {
                     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) {
@@ -315,6 +322,7 @@ export function createStartupClaudeMethods(options = {}) {
                     if (matchName) {
                         if (this.currentClaudeConfig !== matchName) {
                             this.currentClaudeConfig = matchName;
+                            try { localStorage.setItem('currentClaudeConfig', matchName); } catch (_) {}
                         }
                         this.refreshClaudeModelContext({ silentError: silentModelError });
                         return;
@@ -323,6 +331,7 @@ export function createStartupClaudeMethods(options = {}) {
                     if (importedName) {
                         if (this.currentClaudeConfig !== importedName) {
                             this.currentClaudeConfig = importedName;
+                            try { localStorage.setItem('currentClaudeConfig', importedName); } catch (_) {}
                         }
                         this.refreshClaudeModelContext({ silentError: silentModelError });
                         if (!silent) {
@@ -338,12 +347,14 @@ export function createStartupClaudeMethods(options = {}) {
                             : (configNames[0] || '');
                         if (!fallback) {
                             this.currentClaudeConfig = '';
+                            try { localStorage.setItem('currentClaudeConfig', ''); } catch (_) {}
                             this.currentClaudeModel = '';
                             this.resetClaudeModelsState();
                             return;
                         }
                         if (this.currentClaudeConfig !== fallback) {
                             this.currentClaudeConfig = fallback;
+                            try { localStorage.setItem('currentClaudeConfig', fallback); } catch (_) {}
                         }
                         this.refreshClaudeModelContext({ silentError: silentModelError });
                     }