codexmate 0.0.56 → 0.0.57

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

@@ -4,8 +4,7 @@
         switchMainTabHelper,
         loadMoreSessionMessagesHelper
     } = options;
-    const NAV_STATE_STORAGE_KEY = 'codexmateNavState.v1';
-    const MAIN_TAB_SET = new Set([
+    const MAIN_TAB_ORDER = [
         'dashboard',
         'config',
         'sessions',
@@ -17,7 +16,39 @@
         'settings',
         'trash',
         'prompts'
-    ]);
+    ];
+    const MAIN_TAB_SET = new Set(MAIN_TAB_ORDER);
+    const DISABLED_MAIN_TAB_SET = new Set(['orchestration']);
+    const normalizeMainTab = (tab) => typeof tab === 'string'
+        ? tab.trim().toLowerCase()
+        : '';
+    const isMainTabSelectable = (tab) => {
+        const normalized = normalizeMainTab(tab);
+        return !!(normalized && MAIN_TAB_SET.has(normalized) && !DISABLED_MAIN_TAB_SET.has(normalized));
+    };
+    const getFirstSelectableMainTab = () => MAIN_TAB_ORDER.find((tab) => isMainTabSelectable(tab)) || 'dashboard';
+    const resolveSelectableMainTab = (tab) => {
+        const normalized = normalizeMainTab(tab);
+        if (isMainTabSelectable(normalized)) return normalized;
+        return getFirstSelectableMainTab();
+    };
+    const resolveSwitchMainTabTarget = (tab) => {
+        const normalized = normalizeMainTab(tab);
+        if (!normalized) return '';
+        if (isMainTabSelectable(normalized)) return normalized;
+        if (MAIN_TAB_SET.has(normalized) && DISABLED_MAIN_TAB_SET.has(normalized)) {
+            return getFirstSelectableMainTab();
+        }
+        return '';
+    };
+    const cancelDisabledMainTabEvent = (event) => {
+        if (event && typeof event.preventDefault === 'function') {
+            event.preventDefault();
+        }
+        if (event && typeof event.stopPropagation === 'function') {
+            event.stopPropagation();
+        }
+    };
     const loadDoctorOverview = async (vm, options = {}) => {
         if (!vm || typeof vm !== 'object') return false;
         if (vm.__doctorLoading) return false;
@@ -41,23 +72,6 @@
             }
         }
     };
-    const readNavState = () => {
-        if (typeof localStorage === 'undefined') return null;
-        let raw = '';
-        try {
-            raw = localStorage.getItem(NAV_STATE_STORAGE_KEY) || '';
-        } catch (_) {
-            raw = '';
-        }
-        if (!raw) return null;
-        try {
-            const parsed = JSON.parse(raw);
-            return parsed && typeof parsed === 'object' ? parsed : null;
-        } catch (_) {
-            return null;
-        }
-    };
-
     const canonicalizeWebUiRuntimeUrl = () => {
         if (typeof window === 'undefined' || !window.location) return;
         try {
@@ -85,7 +99,6 @@
 
     const persistNavState = (vm, overrides = null) => {
         if (!vm || vm.__navStateRestoring) return;
-        if (typeof localStorage === 'undefined') return;
         const resolvedOverrides = overrides && typeof overrides === 'object' ? overrides : null;
         const mainTabSource = resolvedOverrides && typeof resolvedOverrides.mainTab === 'string'
             ? resolvedOverrides.mainTab
@@ -93,76 +106,36 @@
         const configModeSource = resolvedOverrides && typeof resolvedOverrides.configMode === 'string'
             ? resolvedOverrides.configMode
             : vm.configMode;
-        const mainTab = typeof mainTabSource === 'string' ? mainTabSource.trim().toLowerCase() : '';
+        const mainTab = normalizeMainTab(mainTabSource);
         const configMode = typeof configModeSource === 'string' ? configModeSource.trim().toLowerCase() : '';
         const settingsTab = typeof vm.settingsTab === 'string' ? vm.settingsTab.trim().toLowerCase() : 'general';
         const skillsTargetApp = typeof vm.skillsTargetApp === 'string' && (vm.skillsTargetApp === 'codex' || vm.skillsTargetApp === 'claude') ? vm.skillsTargetApp : 'codex';
         const promptTemplatesMode = typeof vm.promptTemplatesMode === 'string' && (vm.promptTemplatesMode === 'compose' || vm.promptTemplatesMode === 'manage') ? vm.promptTemplatesMode : 'compose';
         const snapshot = {
             settingsTab: settingsTab === 'data' ? 'data' : 'general',
-            mainTab: MAIN_TAB_SET.has(mainTab) ? mainTab : 'dashboard',
+            mainTab: resolveSelectableMainTab(mainTab),
             configMode: configModeSet && configModeSet.has(configMode) ? configMode : 'codex',
             skillsTargetApp,
             promptTemplatesMode
         };
-        try {
-            localStorage.setItem(NAV_STATE_STORAGE_KEY, JSON.stringify(snapshot));
-        } catch (_) {}
         if (typeof vm.persistWebUiPreferences === 'function') {
             vm.persistWebUiPreferences({ navigation: snapshot });
         }
     };
 
     return {
+        toggleSidebarCollapsed() {
+            this.sidebarCollapsed = !this.sidebarCollapsed;
+            if (typeof this.persistWebUiPreferences === 'function') {
+                this.persistWebUiPreferences({ sidebarCollapsed: this.sidebarCollapsed });
+            }
+        },
+
         saveNavState() {
             persistNavState(this);
         },
         restoreNavStateFromStorage() {
-            if (this.__navStateRestoring) return false;
-            const restored = readNavState();
-            if (!restored) return false;
-            const nextMainTab = restored && typeof restored.mainTab === 'string'
-                ? restored.mainTab.trim().toLowerCase()
-                : '';
-            const nextConfigMode = restored && typeof restored.configMode === 'string'
-                ? restored.configMode.trim().toLowerCase()
-                : '';
-            const shouldUpdateConfigMode = !!(nextConfigMode && configModeSet && configModeSet.has(nextConfigMode));
-            const shouldUpdateMainTab = !!(nextMainTab && MAIN_TAB_SET.has(nextMainTab) && nextMainTab !== this.mainTab);
-            const nextSettingsTab = restored && typeof restored.settingsTab === 'string'
-                ? restored.settingsTab.trim().toLowerCase()
-                : '';
-            const shouldUpdateSettingsTab = !!(nextSettingsTab && (nextSettingsTab === 'general' || nextSettingsTab === 'data') && nextSettingsTab !== this.settingsTab);
-            const nextSkillsTargetApp = restored && typeof restored.skillsTargetApp === 'string' && (restored.skillsTargetApp === 'codex' || restored.skillsTargetApp === 'claude')
-                ? restored.skillsTargetApp : '';
-            const shouldUpdateSkillsTargetApp = !!(nextSkillsTargetApp && nextSkillsTargetApp !== this.skillsTargetApp);
-            const nextPromptTemplatesMode = restored && typeof restored.promptTemplatesMode === 'string' && (restored.promptTemplatesMode === 'compose' || restored.promptTemplatesMode === 'manage')
-                ? restored.promptTemplatesMode : '';
-            const shouldUpdatePromptTemplatesMode = !!(nextPromptTemplatesMode && nextPromptTemplatesMode !== this.promptTemplatesMode);
-            if (!shouldUpdateConfigMode && !shouldUpdateMainTab && !shouldUpdateSettingsTab && !shouldUpdateSkillsTargetApp && !shouldUpdatePromptTemplatesMode) {
-                return false;
-            }
-            this.__navStateRestoring = true;
-            try {
-                if (shouldUpdateConfigMode) {
-                    this.configMode = nextConfigMode;
-                }
-                if (shouldUpdateSettingsTab) {
-                    this.settingsTab = nextSettingsTab;
-                }
-                if (shouldUpdateMainTab) {
-                    this.switchMainTab(nextMainTab);
-                }
-                if (shouldUpdateSkillsTargetApp) {
-                    this.skillsTargetApp = nextSkillsTargetApp;
-                }
-                if (shouldUpdatePromptTemplatesMode) {
-                    this.promptTemplatesMode = nextPromptTemplatesMode;
-                }
-            } finally {
-                this.__navStateRestoring = false;
-            }
-            return true;
+            return false;
         },
         switchConfigMode(mode) {
             const normalizedMode = typeof mode === 'string'
@@ -353,6 +326,10 @@
             }
             const normalizedTab = typeof tab === 'string' ? tab.trim().toLowerCase() : '';
             if (!normalizedTab) return;
+            if (!isMainTabSelectable(normalizedTab)) {
+                cancelDisabledMainTabEvent(event);
+                return;
+            }
             persistNavState(this, { mainTab: normalizedTab });
             this.setMainTabSwitchIntent(normalizedTab);
             this.applyImmediateNavIntent(normalizedTab);
@@ -394,8 +371,13 @@
             this.switchConfigMode(normalizedMode);
         },
         onMainTabClick(tab) {
+            const event = arguments.length > 1 ? arguments[1] : null;
             const normalizedTab = typeof tab === 'string' ? tab.trim().toLowerCase() : '';
             if (!normalizedTab) return;
+            if (!isMainTabSelectable(normalizedTab)) {
+                cancelDisabledMainTabEvent(event);
+                return;
+            }
             if (this.consumePointerNavCommit('main', normalizedTab)) return;
             this.switchMainTab(normalizedTab);
         },
@@ -437,16 +419,20 @@
             }
             return this.configMode === mode;
         },
+        isMainTabDisabled(tab) {
+            const normalizedTab = normalizeMainTab(tab);
+            return !!(normalizedTab && MAIN_TAB_SET.has(normalizedTab) && DISABLED_MAIN_TAB_SET.has(normalizedTab));
+        },
+        getFirstSelectableMainTab() {
+            return getFirstSelectableMainTab();
+        },
         switchMainTab(tab) {
             const normalizedTab = typeof tab === 'string'
                 ? tab.trim().toLowerCase()
                 : '';
-            const targetTab = normalizedTab || tab;
+            const targetTab = resolveSwitchMainTabTarget(normalizedTab || tab);
             if (!targetTab) return;
             canonicalizeWebUiRuntimeUrl();
-            if (targetTab === 'orchestration' && this.taskOrchestrationTabEnabled !== true) {
-                return this.switchMainTab('config');
-            }
             persistNavState(this, {
                 mainTab: targetTab,
                 configMode: targetTab === 'config' ? this.configMode : this.configMode
@@ -473,13 +459,11 @@
                 switchState.ticket += 1;
                 switchState.pendingTarget = '';
                 if (targetTab === 'dashboard' && !this.__doctorLoadedOnce) {
-                if (targetTab === 'trash' && !this.sessionTrashLoadedOnce) {
-                    if (typeof this.loadSessionTrash === 'function') {
-                        void this.loadSessionTrash({ forceRefresh: false });
-                    }
-                }
                     void loadDoctorOverview(this);
                 }
+                if (targetTab === 'trash' && !this.sessionTrashLoadedOnce && typeof this.loadSessionTrash === 'function') {
+                    void this.loadSessionTrash({ forceRefresh: false });
+                }
                 if (
                     targetTab === 'sessions'
                     && typeof this.prepareSessionTabRender === 'function'
@@ -488,7 +472,7 @@
                     this.prepareSessionTabRender();
                 }
                 this.scheduleAfterFrame(() => {
-                    this.clearMainTabSwitchIntent(normalizedTab);
+                    this.clearMainTabSwitchIntent(targetTab);
                 });
                 return;
             }
@@ -510,7 +494,7 @@
                     void loadDoctorOverview(this);
                 }
                 this.scheduleAfterFrame(() => {
-                    this.clearMainTabSwitchIntent(normalizedTab);
+                    this.clearMainTabSwitchIntent(targetTab);
                 });
                 return result;
             }
@@ -527,7 +511,7 @@
                 if (pendingTarget === 'dashboard') {
                     void loadDoctorOverview(this);
                 }
-                this.clearMainTabSwitchIntent(normalizedTab);
+                this.clearMainTabSwitchIntent(pendingTarget);
             });
         },
 

package/web-ui/modules/app.methods.openclaw-editing.mjs

@@ -360,13 +360,10 @@ export function createOpenclawEditingMethods() {
         },
 
         saveOpenclawConfigs() {
-            try {
-                localStorage.setItem('openclawConfigs', JSON.stringify(this.openclawConfigs));
-                return true;
-            } catch (_) {
-                this.showMessage('保存本地 OpenClaw 配置失败', 'error');
-                return false;
+            if (typeof this.persistWebUiPreferences === 'function') {
+                this.persistWebUiPreferences({ openclawConfigs: this.openclawConfigs });
             }
+            return true;
         },
 
         // Accordion stepper methods

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

@@ -1,6 +1,5 @@
 import {
-    normalizeConfigTemplateDiffConfirmEnabled,
-    persistConfigTemplateDiffConfirmEnabledToStorage
+    normalizeConfigTemplateDiffConfirmEnabled
 } from './config-template-confirm-pref.mjs';
 
 export function createSessionActionMethods(options = {}) {
@@ -302,9 +301,6 @@ export function createSessionActionMethods(options = {}) {
         setSessionTrashEnabled(value) {
             const enabled = this.normalizeSessionTrashEnabled(value);
             this.sessionTrashEnabled = enabled;
-            try {
-                localStorage.setItem('codexmateSessionTrashEnabled', enabled ? 'true' : 'false');
-            } catch (_) {}
             if (typeof this.persistWebUiPreferences === 'function') {
                 this.persistWebUiPreferences({ sessionTrashEnabled: enabled });
             }
@@ -313,9 +309,6 @@ export function createSessionActionMethods(options = {}) {
         setSessionTimelineStyle(style) {
             const normalized = style === 'bar' ? 'bar' : 'dots';
             this.sessionTimelineStyle = normalized;
-            try {
-                localStorage.setItem('codexmateSessionTimelineStyle', normalized);
-            } catch (_) {}
             if (typeof this.persistWebUiPreferences === 'function') {
                 this.persistWebUiPreferences({ sessionTimelineStyle: normalized });
             }
@@ -324,7 +317,6 @@ export function createSessionActionMethods(options = {}) {
         setConfigTemplateDiffConfirmEnabled(value) {
             const enabled = this.normalizeConfigTemplateDiffConfirmEnabled(value);
             this.configTemplateDiffConfirmEnabled = enabled;
-            persistConfigTemplateDiffConfirmEnabledToStorage(enabled);
             if (typeof this.persistWebUiPreferences === 'function') {
                 this.persistWebUiPreferences({ configTemplateDiffConfirmEnabled: enabled });
             }
@@ -338,9 +330,6 @@ export function createSessionActionMethods(options = {}) {
         setShareCommandPrefix(value) {
             const normalized = this.normalizeShareCommandPrefix(value);
             this.shareCommandPrefix = normalized;
-            try {
-                localStorage.setItem('codexmateShareCommandPrefix', normalized);
-            } catch (_) {}
             if (typeof this.persistWebUiPreferences === 'function') {
                 this.persistWebUiPreferences({ shareCommandPrefix: normalized });
             }

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

@@ -30,16 +30,7 @@ function isSessionLoadNativeDialogEnabled(vm) {
         // 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
-    }
+    if (vm && vm.sessionLoadNativeDialog === true) return true;
 
     try {
         const search = typeof location !== 'undefined' && location && typeof location.search === 'string'
@@ -271,28 +262,17 @@ export function createSessionBrowserMethods(options = {}) {
                     url.hash = '';
                     window.history.replaceState(null, '', url.toString());
                 } catch (_) {}
-                try {
-                    const sortCache = localStorage.getItem('codexmateSessionSortMode');
-                    this.sessionSortMode = normalizeSortMode(sortCache);
-                } catch (_) {}
                 if (this.mainTab === 'sessions' && typeof this.loadSessions === 'function') {
                     void this.loadSessions();
                 }
                 return;
             }
-            const sourceCache = localStorage.getItem('codexmateSessionFilterSource');
-            const pathCache = localStorage.getItem('codexmateSessionPathFilter');
-            const cached = buildSessionFilterCacheState(sourceCache, pathCache);
+            const cached = buildSessionFilterCacheState(this.sessionFilterSource, this.sessionPathFilter);
             this.sessionFilterSource = cached.source;
             this.sessionPathFilter = cached.pathFilter;
-            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.sessionRoleFilter = normalizeSessionRoleFilter(this.sessionRoleFilter);
+            this.sessionTimePreset = normalizeSessionTimePreset(this.sessionTimePreset);
+            this.sessionSortMode = normalizeSortMode(this.sessionSortMode);
             this.refreshSessionPathOptions(this.sessionFilterSource);
             if (this.mainTab === 'sessions' && typeof this.loadSessions === 'function') {
                 const shouldReload = cached.source !== 'all'
@@ -308,27 +288,26 @@ export function createSessionBrowserMethods(options = {}) {
 
         persistSessionFilterCache() {
             const cached = buildSessionFilterCacheState(this.sessionFilterSource, this.sessionPathFilter);
-            localStorage.setItem('codexmateSessionFilterSource', cached.source);
-            if (cached.pathFilter) {
-                localStorage.setItem('codexmateSessionPathFilter', cached.pathFilter);
-            } else {
-                localStorage.removeItem('codexmateSessionPathFilter');
-            }
-            if (this.sessionQuery && isSessionQueryEnabled(this.sessionFilterSource)) {
-                localStorage.setItem('codexmateSessionQuery', this.sessionQuery);
-            } else {
-                localStorage.removeItem('codexmateSessionQuery');
+            if (typeof this.persistWebUiPreferences === 'function') {
+                this.persistWebUiPreferences({
+                    sessionFilters: {
+                        source: cached.source,
+                        pathFilter: cached.pathFilter,
+                        query: this.sessionQuery && isSessionQueryEnabled(this.sessionFilterSource) ? this.sessionQuery : '',
+                        roleFilter: normalizeSessionRoleFilter(this.sessionRoleFilter),
+                        timePreset: normalizeSessionTimePreset(this.sessionTimePreset),
+                        sortMode: this.normalizeSessionSortMode(this.sessionSortMode)
+                    }
+                });
             }
-            localStorage.setItem('codexmateSessionRoleFilter', normalizeSessionRoleFilter(this.sessionRoleFilter));
-            localStorage.setItem('codexmateSessionTimePreset', normalizeSessionTimePreset(this.sessionTimePreset));
         },
 
         onSessionSortChange() {
             const normalized = this.normalizeSessionSortMode(this.sessionSortMode);
             this.sessionSortMode = normalized;
-            try {
-                localStorage.setItem('codexmateSessionSortMode', normalized);
-            } catch (_) {}
+            if (typeof this.persistWebUiPreferences === 'function') {
+                this.persistWebUiPreferences({ sessionFilters: { sortMode: normalized } });
+            }
         },
 
         getSessionHotLabel(session) {
@@ -361,25 +340,16 @@ export function createSessionBrowserMethods(options = {}) {
         },
 
         restoreSessionPinnedMap() {
-            const cached = localStorage.getItem('codexmateSessionPinnedMap');
-            if (!cached) {
-                this.sessionPinnedMap = {};
-                return;
-            }
-            try {
-                const parsed = JSON.parse(cached);
-                this.sessionPinnedMap = this.normalizeSessionPinnedMap(parsed);
-            } catch (_) {
-                this.sessionPinnedMap = {};
-                localStorage.removeItem('codexmateSessionPinnedMap');
-            }
+            this.sessionPinnedMap = this.normalizeSessionPinnedMap(this.sessionPinnedMap);
         },
 
         persistSessionPinnedMap() {
             const payload = (this.sessionPinnedMap && typeof this.sessionPinnedMap === 'object')
                 ? this.sessionPinnedMap
                 : {};
-            localStorage.setItem('codexmateSessionPinnedMap', JSON.stringify(payload));
+            if (typeof this.persistWebUiPreferences === 'function') {
+                this.persistWebUiPreferences({ sessionPinnedMap: payload });
+            }
         },
 
         shouldPruneSessionPinnedMap(sessions = this.sessionsList) {
@@ -802,7 +772,6 @@ 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 (typeof this.persistWebUiPreferences === 'function') {
                 this.persistWebUiPreferences({ sessionsUsageTimeRange: range });
             }

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

@@ -310,7 +310,6 @@ export function createSessionTrashMethods(options = {}) {
         setSessionTrashRetentionDays(days) {
             const normalized = this.normalizeSessionTrashRetentionDays(days);
             this.sessionTrashRetentionDays = normalized;
-            try { localStorage.setItem('codexmateSessionTrashRetentionDays', String(normalized)); } catch (_) {}
             if (typeof this.persistWebUiPreferences === 'function') {
                 this.persistWebUiPreferences({ sessionTrashRetentionDays: normalized });
             }

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

@@ -10,28 +10,20 @@ import {
 } from '../logic.mjs';
 import { nextClaudeConfigName } from './provider-default-names.mjs';
 
-const DELETED_CLAUDE_SETTINGS_IMPORTS_STORAGE_KEY = 'deletedClaudeSettingsImports';
-
 function normalizeDeletedClaudeImportUrl(value) {
     return typeof value === 'string' ? value.trim().replace(/\/+$/g, '') : '';
 }
 
-function shouldSuppressDeletedClaudeSettingsImport(env = {}) {
+function shouldSuppressDeletedClaudeSettingsImport(env = {}, deletedEntries = []) {
     const normalized = normalizeClaudeSettingsEnv(env);
     const baseUrl = normalizeDeletedClaudeImportUrl(normalized.baseUrl);
     const model = normalizeClaudeValue(normalized.model);
     if (!baseUrl || !model) return false;
-    try {
-        const raw = localStorage.getItem(DELETED_CLAUDE_SETTINGS_IMPORTS_STORAGE_KEY);
-        const parsed = raw ? JSON.parse(raw) : [];
-        const entries = Array.isArray(parsed) ? parsed : [];
-        return entries.some((entry) => entry
-            && typeof entry === 'object'
-            && normalizeDeletedClaudeImportUrl(entry.baseUrl) === baseUrl
-            && normalizeClaudeValue(entry.model) === model);
-    } catch (_) {
-        return false;
-    }
+    const entries = Array.isArray(deletedEntries) ? deletedEntries : [];
+    return entries.some((entry) => entry
+        && typeof entry === 'object'
+        && normalizeDeletedClaudeImportUrl(entry.baseUrl) === baseUrl
+        && normalizeClaudeValue(entry.model) === model);
 }
 
 export function createStartupClaudeMethods(options = {}) {
@@ -153,9 +145,6 @@ export function createStartupClaudeMethods(options = {}) {
                             claude: statusRes.toolConfigPermissions.claude === true,
                             opencode: statusRes.toolConfigPermissions.opencode === true
                         };
-                        try {
-                            localStorage.setItem('toolConfigPermissions', JSON.stringify(this.toolConfigPermissions));
-                        } catch (_) {}
                     }
                     this.providersList = listRes.providers;
                     if (typeof this.loadLocalBridgeExcluded === 'function') { this.loadLocalBridgeExcluded(); }
@@ -275,7 +264,7 @@ export function createStartupClaudeMethods(options = {}) {
         },
 
         shouldSuppressClaudeSettingsImport(env) {
-            return isLikelyBuiltinClaudeProxySettingsEnv(env) || shouldSuppressDeletedClaudeSettingsImport(env);
+            return isLikelyBuiltinClaudeProxySettingsEnv(env) || shouldSuppressDeletedClaudeSettingsImport(env, this.deletedClaudeSettingsImports);
         },
 
         findDuplicateClaudeConfigName(config) {
@@ -381,7 +370,7 @@ export function createStartupClaudeMethods(options = {}) {
                     if (matchName) {
                         if (this.currentClaudeConfig !== matchName) {
                             this.currentClaudeConfig = matchName;
-                            try { localStorage.setItem('currentClaudeConfig', matchName); } catch (_) {}
+                            if (typeof this.persistWebUiPreferences === 'function') this.persistWebUiPreferences({ currentClaudeConfig: matchName });
                         }
                         this.refreshClaudeModelContext({ silentError: silentModelError });
                         return;
@@ -390,7 +379,7 @@ export function createStartupClaudeMethods(options = {}) {
                     if (builtinProxyMatch) {
                         if (this.currentClaudeConfig !== builtinProxyMatch) {
                             this.currentClaudeConfig = builtinProxyMatch;
-                            try { localStorage.setItem('currentClaudeConfig', builtinProxyMatch); } catch (_) {}
+                            if (typeof this.persistWebUiPreferences === 'function') this.persistWebUiPreferences({ currentClaudeConfig: builtinProxyMatch });
                         }
                         this.refreshClaudeModelContext({ silentError: silentModelError });
                         return;
@@ -401,7 +390,7 @@ export function createStartupClaudeMethods(options = {}) {
                     if (importedName) {
                         if (this.currentClaudeConfig !== importedName) {
                             this.currentClaudeConfig = importedName;
-                            try { localStorage.setItem('currentClaudeConfig', importedName); } catch (_) {}
+                            if (typeof this.persistWebUiPreferences === 'function') this.persistWebUiPreferences({ currentClaudeConfig: importedName });
                         }
                         this.refreshClaudeModelContext({ silentError: silentModelError });
                         if (!silent) {
@@ -417,14 +406,14 @@ export function createStartupClaudeMethods(options = {}) {
                             : (configNames[0] || '');
                         if (!fallback) {
                             this.currentClaudeConfig = '';
-                            try { localStorage.setItem('currentClaudeConfig', ''); } catch (_) {}
+                            if (typeof this.persistWebUiPreferences === 'function') this.persistWebUiPreferences({ currentClaudeConfig: '' });
                             this.currentClaudeModel = '';
                             this.resetClaudeModelsState();
                             return;
                         }
                         if (this.currentClaudeConfig !== fallback) {
                             this.currentClaudeConfig = fallback;
-                            try { localStorage.setItem('currentClaudeConfig', fallback); } catch (_) {}
+                            if (typeof this.persistWebUiPreferences === 'function') this.persistWebUiPreferences({ currentClaudeConfig: fallback });
                         }
                         this.refreshClaudeModelContext({ silentError: silentModelError });
                     }
@@ -611,14 +600,10 @@ export function createStartupClaudeMethods(options = {}) {
         },
 
         maybeShowStarPrompt() {
-            const storageKey = 'codexmateStarPrompted';
-            try {
-                if (!localStorage.getItem(storageKey)) {
-                    localStorage.setItem(storageKey, '1');
-                }
-            } catch (_) {
-                // Ignore storage failures silently. The startup UI should not show
-                // promotional prompts or block normal configuration work.
+            if (this.starPrompted === true) return;
+            this.starPrompted = true;
+            if (typeof this.persistWebUiPreferences === 'function') {
+                this.persistWebUiPreferences({ starPrompted: true });
             }
         }
     };