codexmate 0.0.25 → 0.0.27

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

@@ -10,6 +10,24 @@ export function createSessionActionMethods(options = {}) {
     } = options;
 
     return {
+        isDerivedSessionId(value) {
+            const sessionId = typeof value === 'string' ? value.trim() : String(value || '');
+            if (!sessionId) return false;
+            return /-\d{8}-\d{6}-[0-9a-f]{6}$/i.test(sessionId);
+        },
+
+        isDerivedSession(session) {
+            if (!session || typeof session !== 'object') return false;
+            if (session.derived === true) return true;
+            if (this.isDerivedSessionId(session.sessionId)) return true;
+            const rawFilePath = typeof session.filePath === 'string' ? session.filePath.trim() : '';
+            if (!rawFilePath) return false;
+            const normalized = rawFilePath.replace(/\\/g, '/');
+            if (normalized.includes('/.codexmate/sessions/derived/')) return true;
+            if (normalized.includes('/codexmate-derived/')) return true;
+            return false;
+        },
+
         getSessionStandaloneContext() {
             try {
                 const url = new URL(window.location.href);
@@ -20,6 +38,8 @@ export function createSessionActionMethods(options = {}) {
                 const source = (url.searchParams.get('source') || '').trim().toLowerCase();
                 const sessionId = (url.searchParams.get('sessionId') || url.searchParams.get('id') || '').trim();
                 const filePath = (url.searchParams.get('filePath') || url.searchParams.get('path') || '').trim();
+                const maxMessagesRaw = (url.searchParams.get('maxMessages') || '').trim();
+                const maxMessages = Number(maxMessagesRaw);
                 let error = '';
                 if (!source) {
                     error = '缺少 source 参数';
@@ -39,7 +59,8 @@ export function createSessionActionMethods(options = {}) {
                     params: {
                         source,
                         sessionId,
-                        filePath
+                        filePath,
+                        maxMessages: Number.isFinite(maxMessages) && maxMessages > 0 ? Math.floor(maxMessages) : 0
                     },
                     error: ''
                 };
@@ -67,7 +88,8 @@ export function createSessionActionMethods(options = {}) {
                 sourceLabel,
                 sessionId: context.params.sessionId,
                 filePath: context.params.filePath,
-                title: context.params.sessionId || context.params.filePath || '会话'
+                title: context.params.sessionId || context.params.filePath || '会话',
+                maxMessages: context.params.maxMessages || 50
             };
             this.activeSessionMessages = [];
             this.activeSessionDetailError = '';
@@ -117,6 +139,13 @@ export function createSessionActionMethods(options = {}) {
             if (!session) return false;
             const source = String(session.source || '').trim().toLowerCase();
             const sessionId = typeof session.sessionId === 'string' ? session.sessionId.trim() : '';
+            const filePath = typeof session.filePath === 'string' ? session.filePath.trim() : '';
+            if (source === 'claude') {
+                return !!sessionId || !!this.extractClaudeResumeKeyFromFilePath(filePath);
+            }
+            if (source === 'gemini') {
+                return !!sessionId || !!this.extractClaudeResumeKeyFromFilePath(filePath);
+            }
             return (source === 'codex' || source === 'codebuddy' || source === 'gemini') && !!sessionId;
         },
 
@@ -140,19 +169,42 @@ export function createSessionActionMethods(options = {}) {
         buildResumeCommand(session) {
             const source = session && session.source ? String(session.source).trim().toLowerCase() : '';
             const sessionId = session && session.sessionId ? String(session.sessionId).trim() : '';
-            const arg = this.quoteResumeArg(sessionId);
+            const filePath = session && session.filePath ? String(session.filePath).trim() : '';
+            const resumeKey = (source === 'claude' || source === 'gemini')
+                ? (sessionId || this.extractClaudeResumeKeyFromFilePath(filePath))
+                : sessionId;
+            const arg = this.quoteResumeArg(resumeKey);
             if (source === 'codebuddy') {
                 return `codebuddy -r ${arg}`;
             }
             if (source === 'gemini') {
                 return `gemini -r ${arg}`;
             }
+            if (source === 'claude') {
+                return `claude -r ${arg}`;
+            }
             if (this.sessionResumeWithYolo) {
                 return `codex --yolo resume ${arg}`;
             }
             return `codex resume ${arg}`;
         },
 
+        extractClaudeResumeKeyFromFilePath(filePath) {
+            const value = typeof filePath === 'string' ? filePath.trim() : '';
+            if (!value) return '';
+            const normalized = value.replace(/\\/g, '/');
+            const base = normalized.split('/').pop() || '';
+            if (!base) return '';
+            const lower = base.toLowerCase();
+            if (lower.endsWith('.jsonl')) {
+                return base.slice(0, -6);
+            }
+            if (lower.endsWith('.json')) {
+                return base.slice(0, -5);
+            }
+            return base;
+        },
+
         quoteShellArg(value) {
             const text = typeof value === 'string' ? value : String(value || '');
             if (!text) return "''";

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

@@ -254,10 +254,25 @@ export function createSessionBrowserMethods(options = {}) {
             localStorage.setItem('codexmateSessionResumeYolo', value);
         },
 
+        normalizeSessionSortMode(value) {
+            const normalized = typeof value === 'string' ? value.trim().toLowerCase() : '';
+            return normalized === 'hot' ? 'hot' : 'time';
+        },
+
         restoreSessionFilterCache() {
             const urlState = readSessionsFilterUrlState();
+            const normalizeSortMode = typeof this.normalizeSessionSortMode === 'function'
+                ? this.normalizeSessionSortMode.bind(this)
+                : ((value) => {
+                    const normalized = typeof value === 'string' ? value.trim().toLowerCase() : '';
+                    return normalized === 'hot' ? 'hot' : 'time';
+                });
             if (urlState) {
                 applySessionsFilterUrlState(this, urlState);
+                try {
+                    const sortCache = localStorage.getItem('codexmateSessionSortMode');
+                    this.sessionSortMode = normalizeSortMode(sortCache);
+                } catch (_) {}
                 if (this.mainTab === 'sessions' && typeof this.loadSessions === 'function') {
                     void this.loadSessions();
                 }
@@ -271,9 +286,11 @@ export function createSessionBrowserMethods(options = {}) {
             const queryCache = localStorage.getItem('codexmateSessionQuery');
             const roleCache = localStorage.getItem('codexmateSessionRoleFilter');
             const timeCache = localStorage.getItem('codexmateSessionTimePreset');
+            const sortCache = localStorage.getItem('codexmateSessionSortMode');
             this.sessionQuery = typeof queryCache === 'string' ? queryCache : '';
             this.sessionRoleFilter = normalizeSessionRoleFilter(roleCache);
             this.sessionTimePreset = normalizeSessionTimePreset(timeCache);
+            this.sessionSortMode = normalizeSortMode(sortCache);
             this.refreshSessionPathOptions(this.sessionFilterSource);
             if (this.mainTab === 'sessions' && typeof this.loadSessions === 'function') {
                 const shouldReload = cached.source !== 'all'
@@ -304,6 +321,29 @@ export function createSessionBrowserMethods(options = {}) {
             localStorage.setItem('codexmateSessionTimePreset', normalizeSessionTimePreset(this.sessionTimePreset));
         },
 
+        onSessionSortChange() {
+            const normalized = this.normalizeSessionSortMode(this.sessionSortMode);
+            this.sessionSortMode = normalized;
+            try {
+                localStorage.setItem('codexmateSessionSortMode', normalized);
+            } catch (_) {}
+        },
+
+        getSessionHotLabel(session) {
+            if (!session || typeof session !== 'object') return '';
+            const updatedAtMs = Date.parse(session.updatedAt || '');
+            if (!Number.isFinite(updatedAtMs)) return '';
+            const ageMs = Date.now() - updatedAtMs;
+            if (!Number.isFinite(ageMs) || ageMs < 0) return '';
+            const messageCount = Number.isFinite(Number(session.messageCount))
+                ? Math.max(0, Math.floor(Number(session.messageCount)))
+                : 0;
+            if (ageMs <= (24 * 60 * 60 * 1000) && messageCount >= 20) {
+                return typeof this.t === 'function' ? this.t('sessions.sort.hotBadge') : '热';
+            }
+            return '';
+        },
+
         normalizeSessionPinnedMap(raw) {
             if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
                 return {};
@@ -455,6 +495,64 @@ export function createSessionBrowserMethods(options = {}) {
             await this.loadSessions();
         },
 
+        hasActiveSessionFilters() {
+            if (this.sessionFilterSource && this.sessionFilterSource !== 'all') return true;
+            if (this.sessionPathFilter) return true;
+            if (this.sessionQuery && isSessionQueryEnabled(this.sessionFilterSource)) return true;
+            if (this.sessionRoleFilter && this.sessionRoleFilter !== 'all') return true;
+            if (this.sessionTimePreset && this.sessionTimePreset !== 'all') return true;
+            return false;
+        },
+
+        getSessionFilterChips() {
+            const chips = [];
+            if (this.sessionFilterSource && this.sessionFilterSource !== 'all') {
+                const label = this.sessionFilterSource === 'codex'
+                    ? this.t('sessions.source.codex')
+                    : (this.sessionFilterSource === 'claude'
+                        ? this.t('sessions.source.claudeCode')
+                        : (this.sessionFilterSource === 'gemini'
+                            ? this.t('sessions.source.gemini')
+                            : (this.sessionFilterSource === 'codebuddy' ? this.t('sessions.source.codebuddy') : this.sessionFilterSource)));
+                chips.push({ key: 'source', title: this.t('sessions.filters.source'), value: label });
+            }
+            if (this.sessionPathFilter) {
+                chips.push({ key: 'path', title: this.t('sessions.filters.path'), value: this.sessionPathFilter });
+            }
+            if (this.sessionQuery && isSessionQueryEnabled(this.sessionFilterSource)) {
+                chips.push({ key: 'query', title: this.t('sessions.filters.keyword'), value: this.sessionQuery });
+            }
+            if (this.sessionRoleFilter && this.sessionRoleFilter !== 'all') {
+                const label = this.sessionRoleFilter === 'user'
+                    ? this.t('sessions.role.user')
+                    : (this.sessionRoleFilter === 'assistant'
+                        ? this.t('sessions.role.assistant')
+                        : (this.sessionRoleFilter === 'system' ? this.t('sessions.role.system') : this.sessionRoleFilter));
+                chips.push({ key: 'role', title: this.t('sessions.filters.role'), value: label });
+            }
+            if (this.sessionTimePreset && this.sessionTimePreset !== 'all') {
+                const label = this.sessionTimePreset === '7d'
+                    ? this.t('sessions.time.7d')
+                    : (this.sessionTimePreset === '30d'
+                        ? this.t('sessions.time.30d')
+                        : (this.sessionTimePreset === '90d' ? this.t('sessions.time.90d') : this.sessionTimePreset));
+                chips.push({ key: 'time', title: this.t('sessions.filters.time'), value: label });
+            }
+            return chips;
+        },
+
+        async clearSessionFilterChip(key) {
+            const normalized = typeof key === 'string' ? key.trim().toLowerCase() : '';
+            if (normalized === 'source') this.sessionFilterSource = 'all';
+            if (normalized === 'path') this.sessionPathFilter = '';
+            if (normalized === 'query') this.sessionQuery = '';
+            if (normalized === 'role') this.sessionRoleFilter = 'all';
+            if (normalized === 'time') this.sessionTimePreset = 'all';
+            this.persistSessionFilterCache();
+            syncSessionsFilterUrl(this);
+            await this.loadSessions();
+        },
+
         async clearSessionFilters() {
             this.sessionFilterSource = 'all';
             this.sessionPathFilter = '';
@@ -538,6 +636,135 @@ export function createSessionBrowserMethods(options = {}) {
             }
         },
 
+        cancelScheduledSessionListMessageCountHydrate() {
+            const handle = this.__sessionListMessageCountHydrateHandle || null;
+            if (!handle) return;
+            if (typeof this.cancelIdleTask === 'function') {
+                this.cancelIdleTask(handle);
+            }
+            this.__sessionListMessageCountHydrateHandle = null;
+        },
+
+        resetSessionListMessageCountHydrate() {
+            this.cancelScheduledSessionListMessageCountHydrate();
+            this.__sessionListMessageCountHydrateInFlight = false;
+            this.__sessionListMessageCountHydrateLastScheduleAt = 0;
+            this.__sessionListMessageCountHydrateLastAttemptAtMap = {};
+            this.sessionListMessageCountHydrateRequestSeq = (Number(this.sessionListMessageCountHydrateRequestSeq) || 0) + 1;
+        },
+
+        scheduleSessionListMessageCountHydrate() {
+            if (this.mainTab !== 'sessions' || !this.sessionListRenderEnabled) {
+                return;
+            }
+            const now = Date.now();
+            const lastAt = Number(this.__sessionListMessageCountHydrateLastScheduleAt || 0);
+            if ((now - lastAt) < 120) {
+                return;
+            }
+            this.__sessionListMessageCountHydrateLastScheduleAt = now;
+            this.cancelScheduledSessionListMessageCountHydrate();
+            const run = () => {
+                this.__sessionListMessageCountHydrateHandle = null;
+                void this.hydrateVisibleSessionListMessageCounts();
+            };
+            if (typeof this.scheduleIdleTask === 'function') {
+                this.__sessionListMessageCountHydrateHandle = this.scheduleIdleTask(run, 160);
+                return;
+            }
+            if (typeof this.scheduleAfterFrame === 'function') {
+                this.scheduleAfterFrame(run);
+                return;
+            }
+            run();
+        },
+
+        async hydrateVisibleSessionListMessageCounts() {
+            if (this.__sessionListMessageCountHydrateInFlight) {
+                return;
+            }
+            if (this.mainTab !== 'sessions' || !this.sessionListRenderEnabled) {
+                return;
+            }
+
+            const visible = Array.isArray(this.visibleSessionsList) ? this.visibleSessionsList : [];
+            if (!visible.length) return;
+
+            const now = Date.now();
+            const lastAttemptAtMap = (this.__sessionListMessageCountHydrateLastAttemptAtMap && typeof this.__sessionListMessageCountHydrateLastAttemptAtMap === 'object')
+                ? this.__sessionListMessageCountHydrateLastAttemptAtMap
+                : {};
+            const targets = [];
+            for (const session of visible) {
+                if (!session || typeof session !== 'object') continue;
+                const messageCountRaw = Number(session.messageCount);
+                const shouldHydrate = !Number.isFinite(messageCountRaw) || messageCountRaw === 0;
+                if (!shouldHydrate) continue;
+                const key = this.getSessionExportKey(session);
+                if (!key) continue;
+                const lastAttempt = Number(lastAttemptAtMap[key] || 0);
+                if ((now - lastAttempt) < 5000) {
+                    continue;
+                }
+                lastAttemptAtMap[key] = now;
+                targets.push({
+                    source: session.source,
+                    sessionId: session.sessionId,
+                    filePath: session.filePath
+                });
+                if (targets.length >= 32) {
+                    break;
+                }
+            }
+            this.__sessionListMessageCountHydrateLastAttemptAtMap = lastAttemptAtMap;
+            if (!targets.length) return;
+
+            const requestSeq = (Number(this.sessionListMessageCountHydrateRequestSeq) || 0) + 1;
+            this.sessionListMessageCountHydrateRequestSeq = requestSeq;
+            this.__sessionListMessageCountHydrateInFlight = true;
+            try {
+                const res = await api('session-message-counts', {
+                    items: targets,
+                    limit: targets.length
+                });
+                if (requestSeq !== Number(this.sessionListMessageCountHydrateRequestSeq || 0)) {
+                    return;
+                }
+                if (!res || res.error || !Array.isArray(res.items)) {
+                    return;
+                }
+                const byKey = new Map();
+                for (const item of res.items) {
+                    if (!item || typeof item !== 'object') continue;
+                    const key = typeof item.key === 'string' ? item.key : '';
+                    if (!key) continue;
+                    const messageCount = Number(item.messageCount);
+                    if (!Number.isFinite(messageCount) || messageCount < 0) continue;
+                    byKey.set(key, Math.floor(messageCount));
+                }
+                if (!byKey.size) {
+                    return;
+                }
+                const sessions = Array.isArray(this.sessionsList) ? this.sessionsList : [];
+                const sessionMap = new Map(sessions.map((session) => [this.getSessionExportKey(session), session]));
+                for (const [key, count] of byKey.entries()) {
+                    const matched = sessionMap.get(key);
+                    if (matched) {
+                        matched.messageCount = count;
+                    }
+                    if (this.activeSession && this.getSessionExportKey(this.activeSession) === key) {
+                        this.activeSession.messageCount = count;
+                    }
+                }
+            } catch (_) {
+                return;
+            } finally {
+                if (requestSeq === Number(this.sessionListMessageCountHydrateRequestSeq || 0)) {
+                    this.__sessionListMessageCountHydrateInFlight = false;
+                }
+            }
+        },
+
         invalidateSessionsUsageData(options = {}) {
             this.sessionsUsageLoadedOnce = false;
             this.sessionsUsageLoadedLimit = 0;
@@ -551,9 +778,35 @@ 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;
+            }
             void this.loadSessionsUsage({ range });
         },
 
+        toggleSessionsUsageCompare() {
+            if (this.sessionsUsageTimeRange === 'all') {
+                this.sessionsUsageCompareEnabled = false;
+                return;
+            }
+            this.sessionsUsageCompareEnabled = !this.sessionsUsageCompareEnabled;
+            const range = typeof this.sessionsUsageTimeRange === 'string' ? this.sessionsUsageTimeRange.trim().toLowerCase() : '7d';
+            void this.loadSessionsUsage({
+                range,
+                limit: this.sessionsUsageCompareEnabled ? 2000 : undefined
+            });
+        },
+
+        selectSessionsUsageDay(dayKey) {
+            const normalized = typeof dayKey === 'string' ? dayKey.trim() : '';
+            this.sessionsUsageSelectedDayKey = normalized;
+        },
+
+        clearSessionsUsageDay() {
+            this.sessionsUsageSelectedDayKey = '';
+        },
+
         async loadSessionsUsage(options = {}) {
             if (this.sessionsUsageLoading) return;
             const normalizedRange = typeof options.range === 'string'
@@ -562,7 +815,12 @@ export function createSessionBrowserMethods(options = {}) {
             const range = normalizedRange === 'all' ? 'all' : (normalizedRange === '30d' ? '30d' : '7d');
             const defaultLimit = range === 'all' ? 2000 : (range === '30d' ? 1200 : 600);
             const rawLimit = Number(options.limit);
-            const limit = Number.isFinite(rawLimit) ? Math.max(1, Math.min(rawLimit, 2000)) : defaultLimit;
+            const compareBoost = this.sessionsUsageCompareEnabled && range !== 'all'
+                ? 2000
+                : defaultLimit;
+            const limit = Number.isFinite(rawLimit)
+                ? Math.max(1, Math.min(rawLimit, 2000))
+                : compareBoost;
             const loadedLimit = Number(this.sessionsUsageLoadedLimit || 0);
             if (this.sessionsUsageLoadedOnce && !options.forceRefresh && loadedLimit >= limit) {
                 return;
@@ -591,11 +849,15 @@ 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;
+                    }
                 }
             }
         },
 
         async loadSessions(options = {}) {
+            this.resetSessionListMessageCountHydrate();
             const result = await loadSessionsHelper.call(this, api, options || {});
             this.pruneSessionPinnedMap(this.sessionsList);
             return result;
@@ -686,7 +948,8 @@ export function createSessionBrowserMethods(options = {}) {
                 const res = await api('session-plain', {
                     source: sessionSnapshot.source,
                     sessionId: sessionSnapshot.sessionId,
-                    filePath: sessionSnapshot.filePath
+                    filePath: sessionSnapshot.filePath,
+                    maxMessages: sessionSnapshot.maxMessages || 50
                 });
 
                 if (requestSeq !== this.sessionStandaloneRequestSeq) {
@@ -716,7 +979,11 @@ export function createSessionBrowserMethods(options = {}) {
         },
 
         async loadActiveSessionDetail(options = {}) {
-            return loadActiveSessionDetailHelper.call(this, api, options);
+            const result = await loadActiveSessionDetailHelper.call(this, api, options);
+            if (this.mainTab === 'sessions' && typeof this.scheduleSessionListMessageCountHydrate === 'function') {
+                this.scheduleSessionListMessageCountHydrate();
+            }
+            return result;
         }
     };
 }

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

@@ -256,14 +256,45 @@ export function createSessionTimelineMethods() {
         },
         onSessionPreviewScroll() {
             if (
-                !this.sessionTimelineEnabled
-                || this.mainTab !== 'sessions'
+                this.mainTab !== 'sessions'
                 || this.getMainTabForNav() !== 'sessions'
                 || !this.sessionPreviewRenderEnabled
             ) return;
-            if (!this.sessionTimelineNodes.length) return;
             const scrollEl = this.sessionPreviewScrollEl || this.$refs.sessionPreviewScroll;
             if (!scrollEl) return;
+
+            if (
+                this.canLoadMoreSessionMessages
+                && !this.sessionPreviewLoadingMore
+                && !this.sessionDetailLoading
+                && typeof this.loadMoreSessionMessages === 'function'
+            ) {
+                const now = Date.now();
+                const lastAt = Number(this.sessionPreviewAutoLoadLastAt || 0);
+                if (!this.sessionPreviewAutoLoadPending && (now - lastAt) >= 200) {
+                    const scrollTop = Number(scrollEl.scrollTop || 0);
+                    const clientHeight = Number(scrollEl.clientHeight || 0);
+                    const scrollHeight = Number(scrollEl.scrollHeight || 0);
+                    const threshold = 240;
+                    if (
+                        Number.isFinite(scrollTop)
+                        && Number.isFinite(clientHeight)
+                        && Number.isFinite(scrollHeight)
+                        && (scrollTop + clientHeight) >= (scrollHeight - threshold)
+                    ) {
+                        this.sessionPreviewAutoLoadLastAt = now;
+                        this.sessionPreviewAutoLoadPending = true;
+                        Promise.resolve(this.loadMoreSessionMessages()).finally(() => {
+                            this.sessionPreviewAutoLoadPending = false;
+                        });
+                    }
+                }
+            }
+
+            if (!this.sessionTimelineEnabled) {
+                return;
+            }
+            if (!this.sessionTimelineNodes.length) return;
             const now = Date.now();
             const currentTop = Number(scrollEl.scrollTop || 0);
             const delta = Math.abs(currentTop - Number(this.sessionTimelineLastScrollTop || 0));

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

@@ -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;