codexmate 0.0.20 → 0.0.22

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

@@ -1,3 +1,8 @@
+import {
+    normalizeConfigTemplateDiffConfirmEnabled,
+    persistConfigTemplateDiffConfirmEnabledToStorage
+} from './config-template-confirm-pref.mjs';
+
 export function createSessionActionMethods(options = {}) {
     const {
         api,
@@ -153,6 +158,54 @@ export function createSessionActionMethods(options = {}) {
             return this.quoteShellArg(value);
         },
 
+        normalizeShareCommandPrefix(value) {
+            const normalized = typeof value === 'string' ? value.trim().toLowerCase() : '';
+            if (normalized === 'codexmate') {
+                return 'codexmate';
+            }
+            return 'npm start';
+        },
+
+        normalizeSessionTrashEnabled(value) {
+            if (value === false) return false;
+            const normalized = typeof value === 'string' ? value.trim().toLowerCase() : '';
+            if (normalized === '0' || normalized === 'false' || normalized === 'off' || normalized === 'no') {
+                return false;
+            }
+            return true;
+        },
+
+        normalizeConfigTemplateDiffConfirmEnabled(value) {
+            return normalizeConfigTemplateDiffConfirmEnabled(value);
+        },
+
+        setSessionTrashEnabled(value) {
+            const enabled = this.normalizeSessionTrashEnabled(value);
+            this.sessionTrashEnabled = enabled;
+            try {
+                localStorage.setItem('codexmateSessionTrashEnabled', enabled ? 'true' : 'false');
+            } catch (_) {}
+        },
+
+        setConfigTemplateDiffConfirmEnabled(value) {
+            const enabled = this.normalizeConfigTemplateDiffConfirmEnabled(value);
+            this.configTemplateDiffConfirmEnabled = enabled;
+            persistConfigTemplateDiffConfirmEnabledToStorage(enabled);
+        },
+
+        getShareCommandPrefixInvocation() {
+            const prefix = this.normalizeShareCommandPrefix(this.shareCommandPrefix);
+            return prefix === 'codexmate' ? 'codexmate' : 'npm start';
+        },
+
+        setShareCommandPrefix(value) {
+            const normalized = this.normalizeShareCommandPrefix(value);
+            this.shareCommandPrefix = normalized;
+            try {
+                localStorage.setItem('codexmateShareCommandPrefix', normalized);
+            } catch (_) {}
+        },
+
         fallbackCopyText(text) {
             let textarea = null;
             try {
@@ -256,16 +309,19 @@ export function createSessionActionMethods(options = {}) {
             const baseUrl = typeof payload.baseUrl === 'string' ? payload.baseUrl.trim() : '';
             const apiKey = typeof payload.apiKey === 'string' ? payload.apiKey : '';
             const model = typeof payload.model === 'string' ? payload.model.trim() : '';
+            const bridge = typeof payload.bridge === 'string' ? payload.bridge.trim() : '';
             if (!name || !baseUrl) return '';
 
+            const cli = this.getShareCommandPrefixInvocation();
             const nameArg = this.quoteShellArg(name);
             const urlArg = this.quoteShellArg(baseUrl);
             const keyArg = apiKey ? this.quoteShellArg(apiKey) : '';
-            const switchCmd = `codexmate switch ${nameArg}`;
+            const switchCmd = `${cli} switch ${nameArg}`;
+            const bridgeArgs = bridge ? ` --bridge ${this.quoteShellArg(bridge)}` : '';
             const addCmd = apiKey
-                ? `codexmate add ${nameArg} ${urlArg} ${keyArg}`
-                : `codexmate add ${nameArg} ${urlArg}`;
-            const modelCmd = model ? ` && codexmate use ${this.quoteShellArg(model)}` : '';
+                ? `${cli} add ${nameArg} ${urlArg} ${keyArg}${bridgeArgs}`
+                : `${cli} add ${nameArg} ${urlArg}${bridgeArgs}`;
+            const modelCmd = model ? ` && ${cli} use ${this.quoteShellArg(model)}` : '';
             return `${addCmd} && ${switchCmd}${modelCmd}`;
         },
 
@@ -280,7 +336,7 @@ export function createSessionActionMethods(options = {}) {
             const urlArg = this.quoteShellArg(baseUrl);
             const keyArg = this.quoteShellArg(apiKey);
             const modelArg = this.quoteShellArg(model);
-            return `codexmate claude ${urlArg} ${keyArg} ${modelArg}`;
+            return `${this.getShareCommandPrefixInvocation()} claude ${urlArg} ${keyArg} ${modelArg}`;
         },
 
         async copyProviderShareCommand(provider) {
@@ -290,7 +346,7 @@ export function createSessionActionMethods(options = {}) {
                 return;
             }
             if (!this.shouldAllowProviderShare(provider)) {
-                this.showMessage('本地入口不可分享', 'info');
+                this.showMessage('不可分享', 'info');
                 return;
             }
             if (this.providerShareLoading[name]) {
@@ -389,6 +445,9 @@ export function createSessionActionMethods(options = {}) {
                 }
 
                 this.showMessage('操作成功', 'success');
+                if (typeof this.invalidateSessionsUsageData === 'function') {
+                    this.invalidateSessionsUsageData({ preserveList: true });
+                }
                 try {
                     await this.loadSessions();
                     if (res.sessionId) {
@@ -412,13 +471,27 @@ export function createSessionActionMethods(options = {}) {
                 this.showMessage('不支持此操作', 'error');
                 return;
             }
+            const useTrash = this.sessionTrashEnabled !== false;
+            if (!useTrash && typeof this.requestConfirmDialog === 'function') {
+                const confirmed = await this.requestConfirmDialog({
+                    title: '直接删除会话',
+                    message: '关闭回收站后，删除会话将直接永久删除，且无法恢复。',
+                    confirmText: '直接删除',
+                    cancelText: '取消',
+                    danger: true
+                });
+                if (!confirmed) {
+                    return;
+                }
+            }
             const key = this.getSessionExportKey(session);
             if (this.sessionDeleting[key]) {
                 return;
             }
             this.sessionDeleting[key] = true;
             try {
-                const res = await api('trash-session', {
+                const action = useTrash ? 'trash-session' : 'delete-session';
+                const res = await api(action, {
                     source: session.source,
                     sessionId: session.sessionId,
                     filePath: session.filePath
@@ -428,19 +501,26 @@ export function createSessionActionMethods(options = {}) {
                     return;
                 }
                 this.removeSessionPin(session);
-                this.invalidateSessionTrashRequests();
-                this.showMessage('已移入回收站', 'success');
-                if (this.sessionTrashLoadedOnce) {
-                    this.prependSessionTrashItem(this.buildSessionTrashItemFromSession(session, res), {
-                        totalCount: res && res.totalCount !== undefined ? res.totalCount : undefined
-                    });
+                if (useTrash) {
+                    this.invalidateSessionTrashRequests();
+                    this.showMessage('已移入回收站', 'success');
+                    if (this.sessionTrashLoadedOnce) {
+                        this.prependSessionTrashItem(this.buildSessionTrashItemFromSession(session, res), {
+                            totalCount: res && res.totalCount !== undefined ? res.totalCount : undefined
+                        });
+                    } else {
+                        this.sessionTrashTotalCount = this.normalizeSessionTrashTotalCount(
+                            res && res.totalCount !== undefined
+                                ? res.totalCount
+                                : (this.normalizeSessionTrashTotalCount(this.sessionTrashTotalCount, this.sessionTrashItems) + 1),
+                            this.sessionTrashItems
+                        );
+                    }
                 } else {
-                    this.sessionTrashTotalCount = this.normalizeSessionTrashTotalCount(
-                        res && res.totalCount !== undefined
-                            ? res.totalCount
-                            : (this.normalizeSessionTrashTotalCount(this.sessionTrashTotalCount, this.sessionTrashItems) + 1),
-                        this.sessionTrashItems
-                    );
+                    this.showMessage('已删除', 'success');
+                }
+                if (typeof this.invalidateSessionsUsageData === 'function') {
+                    this.invalidateSessionsUsageData({ preserveList: true });
                 }
                 try {
                     await this.removeSessionFromCurrentList(session);

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

@@ -5,6 +5,69 @@ import {
     normalizeSessionPathFilter
 } from '../logic.mjs';
 
+function isSessionLoadNativeDialogEnabled(vm) {
+    if (vm && typeof vm.isSessionLoadNativeDialogEnabled === 'function' && vm.isSessionLoadNativeDialogEnabled !== isSessionLoadNativeDialogEnabled) {
+        try {
+            return !!vm.isSessionLoadNativeDialogEnabled();
+        } catch (_) {
+            // fall through to shared detection
+        }
+    }
+
+    try {
+        if (globalThis && globalThis.__CODEXMATE_SESSION_LOAD_NATIVE_DIALOG__ === true) {
+            return true;
+        }
+    } catch (_) {
+        // ignore global flag lookup failures
+    }
+
+    try {
+        if (typeof localStorage !== 'undefined' && typeof localStorage.getItem === 'function') {
+            const stored = String(localStorage.getItem('codexmateSessionLoadNativeDialog') || '').trim().toLowerCase();
+            if (stored === '1' || stored === 'true' || stored === 'yes' || stored === 'on') {
+                return true;
+            }
+        }
+    } catch (_) {
+        // ignore storage lookup failures
+    }
+
+    try {
+        const search = typeof location !== 'undefined' && location && typeof location.search === 'string'
+            ? location.search
+            : (typeof window !== 'undefined' && window.location && typeof window.location.search === 'string'
+                ? window.location.search
+                : '');
+        if (!search) {
+            return false;
+        }
+        const params = new URLSearchParams(search);
+        const value = String(params.get('sessionLoadNativeDialog') || '').trim().toLowerCase();
+        return value === '1' || value === 'true' || value === 'yes' || value === 'on';
+    } catch (_) {
+        return false;
+    }
+}
+
+function emitSessionLoadNativeDialog(vm, step, details = '') {
+    if (!isSessionLoadNativeDialogEnabled(vm)) {
+        return;
+    }
+    const alertFn = typeof globalThis.alert === 'function'
+        ? globalThis.alert.bind(globalThis)
+        : (typeof window !== 'undefined' && typeof window.alert === 'function'
+            ? window.alert.bind(window)
+            : null);
+    if (!alertFn) {
+        return;
+    }
+    const message = details
+        ? `[codexmate][session-load] ${step}\n${details}`
+        : `[codexmate][session-load] ${step}`;
+    alertFn(message);
+}
+
 export function createSessionBrowserMethods(options = {}) {
     const {
         api,
@@ -84,11 +147,20 @@ export function createSessionBrowserMethods(options = {}) {
             }
         },
 
+        isSessionLoadNativeDialogEnabled() {
+            return isSessionLoadNativeDialogEnabled(this);
+        },
+
+        emitSessionLoadNativeDialog(step, details = '') {
+            emitSessionLoadNativeDialog(this, step, details);
+        },
+
         async loadSessionPathOptions(options = {}) {
             const source = options.source === 'claude' ? 'claude' : (options.source === 'all' ? 'all' : 'codex');
             const forceRefresh = !!options.forceRefresh;
             const loaded = !!this.sessionPathOptionsLoadedMap[source];
             if (!forceRefresh && loaded) {
+                emitSessionLoadNativeDialog(this, 'loadSessionPathOptions:cache-hit', `source=${source}`);
                 if (source === this.sessionFilterSource) {
                     this.sessionPathOptionsLoading = false;
                 }
@@ -101,6 +173,11 @@ export function createSessionBrowserMethods(options = {}) {
             const requestSeq = (Number(nextSeqMap[source]) || 0) + 1;
             nextSeqMap[source] = requestSeq;
             this.sessionPathRequestSeqMap = nextSeqMap;
+            emitSessionLoadNativeDialog(
+                this,
+                'loadSessionPathOptions:start',
+                `source=${source}\nforceRefresh=${forceRefresh}\nrequestSeq=${requestSeq}`
+            );
             if (source === this.sessionFilterSource) {
                 this.sessionPathOptionsLoading = true;
             }
@@ -111,6 +188,11 @@ export function createSessionBrowserMethods(options = {}) {
                     forceRefresh
                 });
                 if (requestSeq !== Number(((this.sessionPathRequestSeqMap || {})[source]) || 0)) {
+                    emitSessionLoadNativeDialog(
+                        this,
+                        'loadSessionPathOptions:stale-response',
+                        `source=${source}\nrequestSeq=${requestSeq}`
+                    );
                     return;
                 }
                 if (res && !res.error && Array.isArray(res.paths)) {
@@ -119,8 +201,24 @@ export function createSessionBrowserMethods(options = {}) {
                         ...this.sessionPathOptionsLoadedMap,
                         [source]: true
                     };
+                    emitSessionLoadNativeDialog(
+                        this,
+                        'loadSessionPathOptions:success',
+                        `source=${source}\npaths=${res.paths.length}`
+                    );
+                } else if (res && res.error) {
+                    emitSessionLoadNativeDialog(
+                        this,
+                        'loadSessionPathOptions:error',
+                        `source=${source}\nerror=${res.error}`
+                    );
                 }
-            } catch (_) {
+            } catch (error) {
+                emitSessionLoadNativeDialog(
+                    this,
+                    'loadSessionPathOptions:exception',
+                    `source=${source}\nerror=${error && error.message ? error.message : String(error)}`
+                );
                 // 路径补全失败不影响会话主流程
             } finally {
                 if (
@@ -129,6 +227,11 @@ export function createSessionBrowserMethods(options = {}) {
                 ) {
                     this.sessionPathOptionsLoading = false;
                 }
+                emitSessionLoadNativeDialog(
+                    this,
+                    'loadSessionPathOptions:complete',
+                    `source=${source}\nrequestSeq=${requestSeq}`
+                );
             }
         },
 
@@ -359,16 +462,94 @@ export function createSessionBrowserMethods(options = {}) {
             }
         },
 
-        async loadSessions() {
-            const result = await loadSessionsHelper.call(this, api);
+        invalidateSessionsUsageData(options = {}) {
+            this.sessionsUsageLoadedOnce = false;
+            this.sessionsUsageError = '';
+            if (options.preserveList !== true) {
+                this.sessionsUsageList = [];
+            }
+        },
+
+        async loadSessionsUsage(options = {}) {
+            if (this.sessionsUsageLoading) return;
+            this.sessionsUsageLoading = true;
+            this.sessionsUsageError = '';
+            let loadSucceeded = false;
+            try {
+                const res = await api('list-sessions-usage', {
+                    source: 'all',
+                    limit: 2000,
+                    forceRefresh: !!options.forceRefresh
+                });
+                if (res.error) {
+                    this.sessionsUsageError = res.error;
+                    this.showMessage(res.error, 'error');
+                    return;
+                }
+                this.sessionsUsageList = Array.isArray(res.sessions) ? res.sessions : [];
+                loadSucceeded = true;
+            } catch (e) {
+                this.sessionsUsageError = '加载 usage 统计失败';
+                this.showMessage('加载 usage 统计失败', 'error');
+            } finally {
+                this.sessionsUsageLoading = false;
+                if (loadSucceeded) {
+                    this.sessionsUsageLoadedOnce = true;
+                }
+            }
+        },
+
+        async loadSessions(options = {}) {
+            const result = await loadSessionsHelper.call(this, api, options || {});
             this.pruneSessionPinnedMap(this.sessionsList);
             return result;
         },
 
         async selectSession(session) {
-            if (!session) return;
-            if (this.activeSession && this.getSessionExportKey(this.activeSession) === this.getSessionExportKey(session)) return;
+            if (!session) {
+                emitSessionLoadNativeDialog(this, 'selectSession:skip-empty');
+                return;
+            }
+            emitSessionLoadNativeDialog(
+                this,
+                'selectSession:start',
+                `sessionId=${session.sessionId || ''}\nsource=${session.source || ''}`
+            );
+            const isSameSession = this.activeSession
+                && this.getSessionExportKey(this.activeSession) === this.getSessionExportKey(session);
+            if (isSameSession) {
+                emitSessionLoadNativeDialog(this, 'selectSession:same-session', `sessionId=${session.sessionId || ''}`);
+                if (this.sessionDetailLoading) {
+                    emitSessionLoadNativeDialog(this, 'selectSession:skip-detail-loading', `sessionId=${session.sessionId || ''}`);
+                    return;
+                }
+                const currentMessages = Array.isArray(this.activeSessionMessages) ? this.activeSessionMessages : [];
+                if (currentMessages.length > 0) {
+                    emitSessionLoadNativeDialog(
+                        this,
+                        'selectSession:skip-existing-messages',
+                        `sessionId=${session.sessionId || ''}\nmessages=${currentMessages.length}`
+                    );
+                    return;
+                }
+                if (typeof this.scheduleAfterFrame === 'function') {
+                    const selectedSession = this.activeSession;
+                    emitSessionLoadNativeDialog(this, 'selectSession:schedule-detail', `sessionId=${session.sessionId || ''}`);
+                    this.scheduleAfterFrame(() => {
+                        if (this.activeSession !== selectedSession) return;
+                        void this.loadActiveSessionDetail();
+                    });
+                    return;
+                }
+                emitSessionLoadNativeDialog(this, 'selectSession:load-detail-now', `sessionId=${session.sessionId || ''}`);
+                await this.loadActiveSessionDetail();
+                return;
+            }
             this.activeSession = session;
+            emitSessionLoadNativeDialog(this, 'selectSession:activate', `sessionId=${session.sessionId || ''}`);
+            if (typeof this.expandVisibleSessionList === 'function') {
+                this.expandVisibleSessionList(0, { ensureActive: true });
+            }
             this.activeSessionMessages = [];
             this.resetSessionDetailPagination();
             this.resetSessionPreviewMessageRender();
@@ -377,6 +558,16 @@ export function createSessionBrowserMethods(options = {}) {
             this.cancelSessionTimelineSync();
             this.sessionTimelineActiveKey = '';
             this.clearSessionTimelineRefs();
+            if (typeof this.scheduleAfterFrame === 'function') {
+                const selectedSession = this.activeSession;
+                emitSessionLoadNativeDialog(this, 'selectSession:schedule-detail', `sessionId=${session.sessionId || ''}`);
+                this.scheduleAfterFrame(() => {
+                    if (this.activeSession !== selectedSession) return;
+                    void this.loadActiveSessionDetail();
+                });
+                return;
+            }
+            emitSessionLoadNativeDialog(this, 'selectSession:load-detail-now', `sessionId=${session.sessionId || ''}`);
             await this.loadActiveSessionDetail();
         },
 

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

@@ -22,6 +22,16 @@ export function createSessionTimelineMethods() {
     };
 
     return {
+        hasRenderableSessionTimeline() {
+            return !!(
+                this.sessionTimelineEnabled
+                && this.mainTab === 'sessions'
+                && this.getMainTabForNav() === 'sessions'
+                && this.sessionPreviewRenderEnabled
+                && Array.isArray(this.sessionTimelineNodes)
+                && this.sessionTimelineNodes.length
+            );
+        },
         setSessionPreviewContainerRef(el) {
             this.sessionPreviewContainerEl = el || null;
             this.updateSessionTimelineOffset();
@@ -33,21 +43,6 @@ export function createSessionTimelineMethods() {
         },
         observeSessionPreviewHeaderResize() {
             this.disconnectSessionPreviewHeaderResizeObserver();
-            if (!this.sessionPreviewHeaderEl || typeof ResizeObserver !== 'function') return;
-            this.sessionPreviewHeaderResizeObserver = new ResizeObserver(() => {
-                this.updateSessionTimelineOffset();
-                this.invalidateSessionTimelineMeasurementCache();
-                if (
-                    this.sessionTimelineEnabled
-                    && this.mainTab === 'sessions'
-                    && this.getMainTabForNav() === 'sessions'
-                    && this.sessionPreviewRenderEnabled
-                    && this.sessionTimelineNodes.length
-                ) {
-                    this.scheduleSessionTimelineSync();
-                }
-            });
-            this.sessionPreviewHeaderResizeObserver.observe(this.sessionPreviewHeaderEl);
         },
         setSessionPreviewHeaderRef(el) {
             this.disconnectSessionPreviewHeaderResizeObserver();
@@ -191,7 +186,18 @@ export function createSessionTimelineMethods() {
         updateSessionTimelineOffset() {
             const container = this.sessionPreviewContainerEl || this.$refs.sessionPreviewContainer;
             if (!container || !container.style) return;
+            if (!this.hasRenderableSessionTimeline()) {
+                if (this.__sessionPreviewHeaderOffsetPx != null) {
+                    container.style.removeProperty('--session-preview-header-offset');
+                    this.__sessionPreviewHeaderOffsetPx = null;
+                }
+                return;
+            }
             const offset = getSessionPreviewHeaderOffset(this);
+            if (this.__sessionPreviewHeaderOffsetPx === offset) {
+                return;
+            }
+            this.__sessionPreviewHeaderOffsetPx = offset;
             container.style.setProperty('--session-preview-header-offset', `${offset}px`);
         },
         bindSessionMessageRef(messageKey, el, ticket = this.sessionTabRenderTicket) {
@@ -237,6 +243,7 @@ export function createSessionTimelineMethods() {
             this.sessionTimelineRafId = 0;
         },
         scheduleSessionTimelineSync() {
+            this.updateSessionTimelineOffset();
             if (this.sessionTimelineRafId) return;
             if (typeof requestAnimationFrame === 'function') {
                 this.sessionTimelineRafId = requestAnimationFrame(() => {

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

@@ -340,6 +340,9 @@ export function createSessionTrashMethods(options = {}) {
                     return;
                 }
                 this.showMessage('会话已恢复', 'success');
+                if (typeof this.invalidateSessionsUsageData === 'function') {
+                    this.invalidateSessionsUsageData({ preserveList: true });
+                }
                 this.invalidateSessionTrashRequests();
                 await this.loadSessionTrash({ forceRefresh: true });
                 if (this.sessionsLoadedOnce) {