codexmate 0.1.27 → 0.1.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codexmate",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "description": "Codex/Claude Code/OpenClaw 配置、会话与任务编排 CLI + Web 工具",
   "main": "cli.js",
   "bin": {

package/web-ui/app.js

@@ -333,6 +333,9 @@ document.addEventListener('DOMContentLoaded', () => {
                     opencode: 0
                 },
                 sessionExporting: {},
+                sessionExportRange: 'default',
+                sessionExportNotice: null,
+                sessionSearchInfo: null,
                 sessionConverting: {},
                 sessionImportingNative: {},
                 sessionCloning: {},
@@ -575,6 +578,7 @@ document.addEventListener('DOMContentLoaded', () => {
                 kilocodeAutoSaveSignature: '',
                 forceCompactLayout: false,
                 sidebarCollapsed: false,
+                theme: 'light',
                 sessionLoadNativeDialog: false,
                 starPrompted: false,
                 webhookConfig: { enabled: false, url: '', events: ['provider-switch', 'claude-md-edit'] },
@@ -604,6 +608,9 @@ document.addEventListener('DOMContentLoaded', () => {
             if (typeof this.initI18n === 'function') {
                 this.initI18n();
             }
+            if (typeof this.applyDocumentTheme === 'function') {
+                this.applyDocumentTheme();
+            }
             if (typeof this.loadWebhookSettings === 'function') {
                 this.loadWebhookSettings();
             }

package/web-ui/index.html

@@ -11,6 +11,18 @@
     <script src="/res/marked.min.js"></script>
     <script src="/res/purify.min.js"></script>
     <link rel="stylesheet" href="/web-ui/styles.css">
+    <script>
+        // Render hint: skip the light flash for dark-theme users before the
+        // server preference store loads. Kept in sync by applyDocumentTheme().
+        (function () {
+            try {
+                var cachedTheme = localStorage.getItem('codexmateThemeCache');
+                if (cachedTheme === 'dark' || cachedTheme === 'ocean') {
+                    document.documentElement.setAttribute('data-theme', cachedTheme);
+                }
+            } catch (_) {}
+        })();
+    </script>
 </head>
 <body>
     <!-- @include ./partials/index/layout-header.html -->

package/web-ui/logic.sessions.mjs

@@ -1,3 +1,4 @@
+export const DEFAULT_SESSION_CONTENT_SCAN_LIMIT = 50;
 export const DEFAULT_SESSION_LIST_LIMIT = 200;
 export const DEFAULT_SESSION_LIST_FAST_LIMIT = 20;
 
@@ -29,14 +30,14 @@ function shouldUseFastSessionBrowseLimit(options = {}) {
 
 export function isSessionQueryEnabled(source) {
     const normalized = normalizeSessionSource(source, '');
-    return normalized === 'codex' || normalized === 'claude' || normalized === 'gemini' || normalized === 'codebuddy' || normalized === 'workbuddy' || normalized === 'pi' || normalized === 'opencode' || normalized === 'all';
+    return normalized === 'codex' || normalized === 'claude' || normalized === 'gemini' || normalized === 'codebuddy' || normalized === 'workbuddy' || normalized === 'pi' || normalized === 'opencode' || normalized === 'zed' || normalized === 'all';
 }
 
 export function normalizeSessionSource(source, fallback = 'all') {
     const normalized = typeof source === 'string'
         ? source.trim().toLowerCase()
         : '';
-    if (normalized === 'codex' || normalized === 'claude' || normalized === 'gemini' || normalized === 'codebuddy' || normalized === 'workbuddy' || normalized === 'pi' || normalized === 'opencode' || normalized === 'all') {
+    if (normalized === 'codex' || normalized === 'claude' || normalized === 'gemini' || normalized === 'codebuddy' || normalized === 'workbuddy' || normalized === 'pi' || normalized === 'opencode' || normalized === 'zed' || normalized === 'all') {
         return normalized;
     }
     return fallback;
@@ -64,10 +65,11 @@ function getSessionSourceLabel(source) {
     if (source === 'workbuddy') return 'WorkBuddy AI';
     if (source === 'pi') return 'Pi';
     if (source === 'opencode') return 'OpenCode';
+    if (source === 'zed') return 'Zed';
     return 'Codex';
 }
 
-const SESSION_USAGE_SOURCE_ORDER = ['codex', 'claude', 'gemini', 'codebuddy', 'workbuddy', 'pi', 'opencode'];
+const SESSION_USAGE_SOURCE_ORDER = ['codex', 'claude', 'gemini', 'codebuddy', 'workbuddy', 'pi', 'opencode', 'zed'];
 
 function collectSessionModelNames(session) {
     if (!session || typeof session !== 'object') {
@@ -154,7 +156,7 @@ export function buildSessionListParams(options = {}) {
         query: queryValue,
         queryMode: 'and',
         queryScope: 'content',
-        contentScanLimit: 50,
+        contentScanLimit: DEFAULT_SESSION_CONTENT_SCAN_LIMIT,
         roleFilter,
         timeRangePreset,
         limit,

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

@@ -250,48 +250,65 @@ export function buildSessionWorkspaceSummary(session, messages, options = {}) {
     return summary;
 }
 
+const DURATION_UNIT_TABLES = {
+    en: {
+        zero: '0m',
+        underOne: '<1m',
+        spaced: true,
+        spaceCompact: false,
+        compact: [['d', 1440], ['h', 60], ['m', 1]],
+        long: [['day', 1440], ['hr', 60], ['min', 1]]
+    },
+    ja: {
+        zero: '0分',
+        underOne: '<1分',
+        spaced: false,
+        spaceCompact: false,
+        compact: [['日', 1440], ['時間', 60], ['分', 1]],
+        long: [['日', 1440], ['時間', 60], ['分', 1]]
+    },
+    vi: {
+        zero: '0 phút',
+        underOne: '<1 phút',
+        spaced: true,
+        spaceCompact: true,
+        compact: [['ngày', 1440], ['giờ', 60], ['phút', 1]],
+        long: [['ngày', 1440], ['giờ', 60], ['phút', 1]]
+    },
+    zh: {
+        zero: '0分',
+        underOne: '<1分',
+        spaced: false,
+        spaceCompact: false,
+        compact: [['天', 1440], ['时', 60], ['分', 1]],
+        long: [['天', 1440], ['小时', 60], ['分', 1]]
+    },
+    'zh-tw': {
+        zero: '0分',
+        underOne: '<1分',
+        spaced: false,
+        spaceCompact: false,
+        compact: [['天', 1440], ['時', 60], ['分', 1]],
+        long: [['天', 1440], ['小時', 60], ['分', 1]]
+    }
+};
+
 function formatUsageDuration(value, options = {}) {
     const normalizedLang = typeof options.lang === 'string' ? options.lang.trim().toLowerCase() : '';
-    const isEn = normalizedLang === 'en';
+    const unitSet = DURATION_UNIT_TABLES[normalizedLang] || DURATION_UNIT_TABLES.zh;
     const numeric = Number(value);
     if (!Number.isFinite(numeric) || numeric <= 0) {
-        return isEn ? '0m' : '0分';
+        return unitSet.zero;
     }
     const totalMinutes = Math.floor(numeric / 60000);
     if (totalMinutes <= 0) {
-        return isEn ? '<1m' : '<1分';
+        return unitSet.underOne;
     }
     const maxParts = Number.isFinite(Number(options.maxParts))
         ? Math.max(1, Math.floor(Number(options.maxParts)))
         : 2;
     const compact = options.compact !== false;
-    const units = compact
-        ? (
-            isEn
-                ? [
-                    { label: 'd', value: 24 * 60 },
-                    { label: 'h', value: 60 },
-                    { label: 'm', value: 1 }
-                ]
-                : [
-                    { label: '天', value: 24 * 60 },
-                    { label: '时', value: 60 },
-                    { label: '分', value: 1 }
-                ]
-        )
-        : (
-            isEn
-                ? [
-                    { label: 'day', value: 24 * 60 },
-                    { label: 'hr', value: 60 },
-                    { label: 'min', value: 1 }
-                ]
-                : [
-                    { label: '天', value: 24 * 60 },
-                    { label: '小时', value: 60 },
-                    { label: '分', value: 1 }
-                ]
-        );
+    const units = (compact ? unitSet.compact : unitSet.long).map(([label, minutes]) => ({ label, value: minutes }));
     let remainingMinutes = totalMinutes;
     const parts = [];
     for (const unit of units) {
@@ -302,13 +319,14 @@ function formatUsageDuration(value, options = {}) {
         if (count <= 0) {
             continue;
         }
-        parts.push(compact ? `${count}${unit.label}` : (isEn ? `${count} ${unit.label}` : `${count}${unit.label}`));
+        parts.push((compact ? unitSet.spaceCompact : unitSet.spaced) ? `${count} ${unit.label}` : `${count}${unit.label}`);
         remainingMinutes -= count * unit.value;
         if (parts.length >= maxParts) {
             break;
         }
     }
-    return parts.length ? parts.join(compact ? '' : ' ') : (isEn ? '0m' : '0分');
+    const separator = compact ? (unitSet.spaceCompact ? ' ' : '') : ' ';
+    return parts.length ? parts.join(separator) : unitSet.zero;
 }
 
 export function createSessionComputed() {
@@ -325,7 +343,8 @@ export function createSessionComputed() {
                 { value: "codebuddy", label: this.t("sessions.source.codebuddy") },
                 { value: "workbuddy", label: this.t("sessions.source.workbuddy") },
                 { value: "pi", label: this.t("sessions.source.pi") },
-                { value: "opencode", label: this.t("sessions.source.opencode") }
+                { value: "opencode", label: this.t("sessions.source.opencode") },
+                { value: "zed", label: this.t("sessions.source.zed") }
             ];
         },
         activeSessionExportKey() {

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

@@ -252,6 +252,38 @@ export function createAgentsMethods(options = {}) {
             this.agentsDiffFingerprint = '';
             this._agentsDiffPreviewRequestToken = null;
         },
+        trapModalFocus(event) {
+            const overlays = typeof document !== 'undefined' && typeof document.querySelectorAll === 'function'
+                ? Array.from(document.querySelectorAll('.modal-overlay'))
+                : [];
+            if (!overlays.length) {
+                return;
+            }
+            const modal = overlays[overlays.length - 1];
+            const focusableSelector = 'button:not(:disabled), [href], input:not(:disabled), select:not(:disabled), textarea:not(:disabled), [tabindex]:not([tabindex="-1"])';
+            const focusables = Array.from(modal.querySelectorAll(focusableSelector))
+                .filter((el) => el.offsetParent !== null || el === document.activeElement);
+            if (!focusables.length) {
+                return;
+            }
+            const first = focusables[0];
+            const last = focusables[focusables.length - 1];
+            const active = document.activeElement;
+            if (!modal.contains(active)) {
+                event.preventDefault();
+                first.focus();
+                return;
+            }
+            if (event.shiftKey && active === first) {
+                event.preventDefault();
+                last.focus();
+                return;
+            }
+            if (!event.shiftKey && active === last) {
+                event.preventDefault();
+                first.focus();
+            }
+        },
         handleGlobalKeydown(event) {
             if (!event) {
                 return;
@@ -293,6 +325,10 @@ export function createAgentsMethods(options = {}) {
                 }
                 return;
             }
+            if (key === 'Tab') {
+                this.trapModalFocus(event);
+                return;
+            }
             if (key !== 'Escape') {
                 return;
             }

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

@@ -75,7 +75,8 @@ export function createCodexConfigMethods(options = {}) {
                 const res = await api('export-session', {
                     source: session.source,
                     sessionId: session.sessionId,
-                    filePath: session.filePath
+                    filePath: session.filePath,
+                    ...(this.sessionExportRange === 'all' ? { maxMessages: 'all' } : {})
                 });
                 if (res.error) {
                     this.showMessage(res.error, 'error');
@@ -84,6 +85,7 @@ export function createCodexConfigMethods(options = {}) {
 
                 const fileName = res.fileName || `${session.source || 'session'}-${session.sessionId || Date.now()}.md`;
                 this.downloadTextFile(fileName, res.content || '');
+                this.sessionExportNotice = res.truncated ? { key } : null;
                 if (res.truncated) {
                     const maxLabel = res.maxMessages === 'all' ? 'all' : res.maxMessages;
                     this.showMessage(`会话导出完成（已截断：最多 ${maxLabel} 条消息）`, 'info');

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

@@ -38,6 +38,7 @@ import { createPluginsMethods } from './plugins.methods.mjs';
 import { createI18nMethods } from './i18n.mjs';
 import { createWebhookMethods } from './app.methods.webhook.mjs';
 import { createWebUiPreferencesMethods } from './app.methods.web-ui-preferences.mjs';
+import { createThemeMethods } from './app.methods.theme.mjs';
 import {
     CONFIG_MODE_SET,
     getProviderConfigModeMeta
@@ -92,6 +93,7 @@ export function createAppMethods() {
         ...createProvidersMethods({ api }),
         ...createProviderCacheMethods({ api }),
         ...createWebUiPreferencesMethods({ api }),
+        ...createThemeMethods(),
         ...createClaudeConfigMethods({ api }),
         ...createToolConfigPermissionMethods({ api }),
         ...createOpenclawCoreMethods(),

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

@@ -479,6 +479,14 @@ export function createProvidersMethods(options = {}) {
 
         async resetConfig() {
             if (this.resetConfigLoading) return;
+            const confirmed = await this.requestConfirmDialog({
+                title: this.t('settings.reset.confirmTitle'),
+                message: this.t('settings.reset.confirmMessage'),
+                confirmText: this.t('settings.reset.button'),
+                cancelText: this.t('confirm.cancel'),
+                danger: true
+            });
+            if (!confirmed) return;
             this.resetConfigLoading = true;
             try {
                 const res = await api('reset-config');
@@ -486,7 +494,7 @@ export function createProvidersMethods(options = {}) {
                     this.showMessage(res.error, 'error');
                     return;
                 }
-                const backup = res.backupFile ? `（已备份: ${res.backupFile}）` : '';
+                const backup = res.backupFile ? this.t('toast.provider.resetBackup', { file: res.backupFile }) : '';
                 this.showMessage(this.t('toast.provider.resetSuccess', { backup }), 'success');
                 await this.loadAll();
             } catch (e) {
@@ -498,7 +506,7 @@ export function createProvidersMethods(options = {}) {
 
         async addModel() {
             if (!this.newModelName || !this.newModelName.trim()) {
-                return this.showMessage('请输入模型', 'error');
+                return this.showMessage(this.t('toast.provider.modelRequired'), 'error');
             }
             try {
                 const modelName = this.newModelName.trim();
@@ -523,7 +531,7 @@ export function createProvidersMethods(options = {}) {
                     this.closeModelModal();
                 }
             } catch (_) {
-                this.showMessage('新增模型失败', 'error');
+                this.showMessage(this.t('toast.provider.addModelFail'), 'error');
             }
         },
 
@@ -546,7 +554,7 @@ export function createProvidersMethods(options = {}) {
                     this.showMessage(this.t('toast.operation.success'), 'success');
                 }
             } catch (_) {
-                this.showMessage('删除模型失败', 'error');
+                this.showMessage(this.t('toast.provider.deleteModelFail'), 'error');
             }
         },
 

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

@@ -28,8 +28,8 @@ export function createSessionActionMethods(options = {}) {
                 let error = '';
                 if (!source) {
                     error = '缺少 source 参数';
-                } else if (source !== 'codex' && source !== 'claude' && source !== 'gemini' && source !== 'codebuddy' && source !== 'workbuddy' && source !== 'pi' && source !== 'opencode') {
-                    error = 'source 仅支持 codex、claude、gemini、codebuddy、workbuddy、pi 或 opencode';
+                } else if (source !== 'codex' && source !== 'claude' && source !== 'gemini' && source !== 'codebuddy' && source !== 'workbuddy' && source !== 'pi' && source !== 'opencode' && source !== 'zed') {
+                    error = 'source 仅支持 codex、claude、gemini、codebuddy、workbuddy、pi、opencode 或 zed';
                 }
                 if (!sessionId && !filePath) {
                     error = error ? `${error}，还缺少 sessionId 或 filePath` : '缺少 sessionId 或 filePath 参数';
@@ -77,11 +77,13 @@ export function createSessionActionMethods(options = {}) {
                             ? 'Pi'
                             : (context.params.source === 'opencode'
                                 ? 'OpenCode'
-                                : (context.params.source === 'codebuddy'
-                                    ? 'CodeBuddy Code'
-                                    : (context.params.source === 'workbuddy'
-                                        ? 'WorkBuddy AI'
-                                        : context.params.source))))));
+                                : (context.params.source === 'zed'
+                                    ? 'Zed'
+                                    : (context.params.source === 'codebuddy'
+                                        ? 'CodeBuddy Code'
+                                        : (context.params.source === 'workbuddy'
+                                            ? 'WorkBuddy AI'
+                                            : context.params.source)))))))
             this.activeSession = {
                 source: context.params.source,
                 sourceLabel,
@@ -110,7 +112,7 @@ export function createSessionActionMethods(options = {}) {
         buildSessionStandaloneUrl(session) {
             if (!session) return '';
             const source = typeof session.source === 'string' ? session.source.trim().toLowerCase() : '';
-            if (!source || (source !== 'codex' && source !== 'claude' && source !== 'gemini' && source !== 'codebuddy' && source !== 'workbuddy' && source !== 'pi' && source !== 'opencode')) return '';
+            if (!source || (source !== 'codex' && source !== 'claude' && source !== 'gemini' && source !== 'codebuddy' && source !== 'workbuddy' && source !== 'pi' && source !== 'opencode' && source !== 'zed')) return '';
             const sessionId = typeof session.sessionId === 'string' ? session.sessionId.trim() : '';
             const filePath = typeof session.filePath === 'string' ? session.filePath.trim() : '';
             if (!sessionId && !filePath) return '';

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

@@ -524,7 +524,9 @@ export function createSessionBrowserMethods(options = {}) {
                                         ? this.t('sessions.source.pi')
                                         : (this.sessionFilterSource === 'opencode'
                                             ? this.t('sessions.source.opencode')
-                                            : this.sessionFilterSource))))));
+                                            : (this.sessionFilterSource === 'zed'
+                                                ? this.t('sessions.source.zed')
+                                                : this.sessionFilterSource)))))));
                 chips.push({ key: 'source', title: this.t('sessions.filters.source'), value: label });
             }
             if (this.sessionPathFilter) {

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

@@ -292,7 +292,7 @@ export function createSessionTrashMethods(options = {}) {
                 this.sessionTrashCountLoadedOnce = true;
             } catch (e) {
                 if (this.isLatestSessionTrashCountRequestToken(requestToken) && options.silent !== true) {
-                    this.showMessage('加载回收站数量失败', 'error');
+                    this.showMessage(this.t('settings.trash.loadCountFail'), 'error');
                 }
             } finally {
                 this.sessionTrashCountLoading = false;
@@ -365,7 +365,7 @@ export function createSessionTrashMethods(options = {}) {
             } catch (e) {
                 if (this.isLatestSessionTrashListRequestToken(requestToken)) {
                     this.sessionTrashLastLoadFailed = true;
-                    this.showMessage('加载回收站失败', 'error');
+                    this.showMessage(this.t('settings.trash.loadFail'), 'error');
                 }
             } finally {
                 this.sessionTrashLoading = false;
@@ -392,7 +392,7 @@ export function createSessionTrashMethods(options = {}) {
                     this.showMessage(res.error, 'error');
                     return;
                 }
-                this.showMessage('会话已恢复', 'success');
+                this.showMessage(this.t('settings.trash.restored'), 'success');
                 if (typeof this.invalidateSessionsUsageData === 'function') {
                     this.invalidateSessionsUsageData({ preserveList: true });
                 }
@@ -402,7 +402,7 @@ export function createSessionTrashMethods(options = {}) {
                     await this.loadSessions();
                 }
             } catch (e) {
-                this.showMessage('恢复失败', 'error');
+                this.showMessage(this.t('settings.trash.restoreFail'), 'error');
             } finally {
                 this.sessionTrashRestoring[key] = false;
             }
@@ -414,10 +414,10 @@ export function createSessionTrashMethods(options = {}) {
                 return;
             }
             const confirmed = await this.requestConfirmDialog({
-                title: '彻底删除回收站记录',
-                message: '该会话将从回收站永久删除，且无法恢复。',
-                confirmText: '彻底删除',
-                cancelText: '取消',
+                title: this.t('settings.trash.purgeConfirmTitle'),
+                message: this.t('settings.trash.purgeConfirmMessage'),
+                confirmText: this.t('settings.trash.purge'),
+                cancelText: this.t('confirm.cancel'),
                 danger: true
             });
             if (!confirmed) {
@@ -430,11 +430,11 @@ export function createSessionTrashMethods(options = {}) {
                     this.showMessage(res.error, 'error');
                     return;
                 }
-                this.showMessage('已彻底删除', 'success');
+                this.showMessage(this.t('settings.trash.purged'), 'success');
                 this.invalidateSessionTrashRequests();
                 await this.loadSessionTrash({ forceRefresh: true });
             } catch (e) {
-                this.showMessage('彻底删除失败', 'error');
+                this.showMessage(this.t('settings.trash.purgeFail'), 'error');
             } finally {
                 this.sessionTrashPurging[key] = false;
             }
@@ -446,10 +446,10 @@ export function createSessionTrashMethods(options = {}) {
                 return;
             }
             const confirmed = await this.requestConfirmDialog({
-                title: '清空回收站',
-                message: '该操作会永久删除回收站中的全部会话，且无法恢复。',
-                confirmText: '全部清空',
-                cancelText: '取消',
+                title: this.t('settings.trash.clearConfirmTitle'),
+                message: this.t('settings.trash.clearConfirmMessage'),
+                confirmText: this.t('settings.trash.clearConfirmButton'),
+                cancelText: this.t('confirm.cancel'),
                 danger: true
             });
             if (!confirmed) {
@@ -462,11 +462,11 @@ export function createSessionTrashMethods(options = {}) {
                     this.showMessage(res.error, 'error');
                     return;
                 }
-                this.showMessage('回收站已清空', 'success');
+                this.showMessage(this.t('settings.trash.cleared'), 'success');
                 this.invalidateSessionTrashRequests();
                 await this.loadSessionTrash({ forceRefresh: true });
             } catch (e) {
-                this.showMessage('清空回收站失败', 'error');
+                this.showMessage(this.t('settings.trash.clearFail'), 'error');
             } finally {
                 this.sessionTrashClearing = false;
             }

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

@@ -0,0 +1,39 @@
+const THEME_STORAGE_CACHE_KEY = 'codexmateThemeCache';
+
+export function createThemeMethods() {
+    return {
+        normalizeTheme(value) {
+            const normalized = typeof value === 'string' ? value.trim().toLowerCase() : '';
+            return normalized === 'dark' || normalized === 'ocean' ? normalized : 'light';
+        },
+        applyDocumentTheme() {
+            try {
+                if (typeof document === 'undefined' || !document.documentElement) return;
+                const next = this.normalizeTheme(this.theme);
+                if (next === 'dark' || next === 'ocean') {
+                    document.documentElement.setAttribute('data-theme', next);
+                } else {
+                    document.documentElement.removeAttribute('data-theme');
+                }
+                // Render hint only: lets the inline head script skip the light
+                // flash before server preferences arrive. Source of truth is
+                // the server-side webUi preference store.
+                const storage = typeof globalThis !== 'undefined' ? globalThis.localStorage : null;
+                if (storage && typeof storage.setItem === 'function' && typeof storage.removeItem === 'function') {
+                    if (next === 'dark' || next === 'ocean') storage.setItem(THEME_STORAGE_CACHE_KEY, next);
+                    else storage.removeItem(THEME_STORAGE_CACHE_KEY);
+                }
+            } catch (_) {}
+        },
+        setTheme(theme) {
+            const next = this.normalizeTheme(theme);
+            if (next !== this.theme) {
+                this.theme = next;
+                this.applyDocumentTheme();
+            }
+            if (typeof this.persistWebUiPreferences === 'function') {
+                this.persistWebUiPreferences({ theme: next });
+            }
+        }
+    };
+}

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

@@ -352,6 +352,9 @@ export function createWebUiPreferencesMethods(options = {}) {
                     ? source.projectClaudeMdPath
                     : (typeof this.projectClaudeMdPath === 'string' ? this.projectClaudeMdPath : ''),
                 sidebarCollapsed: normalizeBoolean(hasOwn(source, 'sidebarCollapsed') ? source.sidebarCollapsed : this.sidebarCollapsed, false),
+                theme: typeof this.normalizeTheme === 'function'
+                    ? this.normalizeTheme(hasOwn(source, 'theme') ? source.theme : this.theme)
+                    : 'light',
                 configModeVisibility: typeof this.normalizeConfigModeVisibility === 'function'
                     ? this.normalizeConfigModeVisibility(hasOwn(source, 'configModeVisibility') ? source.configModeVisibility : this.configModeVisibility)
                     : { codex: true, claude: true, openclaw: true, opencode: true, kilocode: true },
@@ -423,6 +426,12 @@ export function createWebUiPreferencesMethods(options = {}) {
                 if (hasOwn(source, 'sidebarCollapsed')) {
                     this.sidebarCollapsed = normalizeBoolean(source.sidebarCollapsed, false);
                 }
+                if (typeof source.theme === 'string') {
+                    this.theme = typeof this.normalizeTheme === 'function'
+                        ? this.normalizeTheme(source.theme)
+                        : 'light';
+                    if (typeof this.applyDocumentTheme === 'function') this.applyDocumentTheme();
+                }
                 if (hasOwn(source, 'configModeVisibility') && typeof this.normalizeConfigModeVisibility === 'function') {
                     this.configModeVisibility = this.normalizeConfigModeVisibility(source.configModeVisibility);
                 }