codexmate 0.0.56 → 0.0.57

package/web-ui/modules/app.computed.main-tabs.mjs

@@ -12,7 +12,8 @@ function readTaskOrchestrationDraftMetrics(taskOrchestration) {
     const title = String(state.title || '').trim();
     const workflowIds = normalizeTaskDraftLines(state.workflowIdsText);
     const followUps = normalizeTaskDraftLines(state.followUpsText);
-    const engine = String(state.selectedEngine || 'codex').trim().toLowerCase() === 'workflow' ? 'workflow' : 'codex';
+    const requestCount = target ? followUps.length + 1 : 0;
+    const engine = String(state.selectedEngine || 'openai-chat').trim().toLowerCase() === 'workflow' ? 'workflow' : 'openai-chat';
     const runMode = String(state.runMode || 'write').trim().toLowerCase();
     const allowWrite = runMode === 'write';
     const dryRun = runMode === 'dry-run';
@@ -37,12 +38,234 @@ function readTaskOrchestrationDraftMetrics(taskOrchestration) {
         planWarnings,
         workflowCount: workflowIds.length,
         followUpCount: followUps.length,
+        requestCount,
+        hasSequentialFollowUps: followUps.length > 0,
         planNodeCount: planNodes.length,
         allowWrite,
         dryRun
     };
 }
 
+
+function formatTaskConversationMeta(items) {
+    return items.filter(Boolean).join(' · ');
+}
+
+function collectTaskRunWorkspaceFileLines(detail) {
+    const run = detail && detail.run && typeof detail.run === 'object' ? detail.run : null;
+    const nodes = Array.isArray(detail && detail.nodes)
+        ? detail.nodes
+        : (Array.isArray(run && run.nodes) ? run.nodes : []);
+    const files = [];
+    for (const node of nodes) {
+        const output = node && node.output && typeof node.output === 'object' ? node.output : null;
+        const workspaceFiles = Array.isArray(output && output.workspaceFiles) ? output.workspaceFiles : [];
+        const materializedFiles = Array.isArray(output && output.materializedFiles) ? output.materializedFiles : [];
+        for (const file of workspaceFiles) {
+            if (!file || typeof file !== 'object') continue;
+            const op = String(file.operation || '').trim().toUpperCase() || 'FILE';
+            const filePath = String(file.relativePath || file.path || '').trim();
+            if (filePath) files.push(`${op} ${filePath}`);
+        }
+        for (const file of materializedFiles) {
+            if (!file || typeof file !== 'object') continue;
+            const filePath = String(file.relativePath || file.path || '').trim();
+            if (filePath) files.push(`WRITE ${filePath}`);
+        }
+    }
+    return Array.from(new Set(files)).slice(0, 6);
+}
+
+function normalizeTaskWorkspacePath(value) {
+    return String(value || '').trim().replace(/\\+/g, '/').replace(/\/$/, '');
+}
+
+function readTaskWorkspacePathFromItem(item) {
+    if (!item || typeof item !== 'object') return '';
+    return normalizeTaskWorkspacePath(item.cwd || item.workspacePath || item.projectPath || item.path);
+}
+
+function formatTaskWorkspaceLabel(workspacePath, fallback = 'Auto workspace') {
+    const normalized = normalizeTaskWorkspacePath(workspacePath);
+    if (!normalized) return fallback;
+    const parts = normalized.split('/').filter(Boolean);
+    return parts.length ? parts[parts.length - 1] : normalized;
+}
+
+function readTaskItemTimestamp(item) {
+    if (!item || typeof item !== 'object') return '';
+    return String(item.updatedAt || item.completedAt || item.startedAt || item.createdAt || item.enqueuedAt || '').trim();
+}
+
+function addTaskWorkspaceCandidate(workspaces, workspacePath, source, timestamp = '') {
+    const normalized = normalizeTaskWorkspacePath(workspacePath);
+    if (!normalized) return;
+    const key = normalized.toLowerCase();
+    const current = workspaces.get(key) || {
+        key,
+        path: normalized,
+        label: formatTaskWorkspaceLabel(normalized),
+        meta: normalized,
+        queueCount: 0,
+        runCount: 0,
+        lastActivity: ''
+    };
+    if (source === 'queue') current.queueCount += 1;
+    if (source === 'run') current.runCount += 1;
+    if (timestamp && (!current.lastActivity || timestamp > current.lastActivity)) {
+        current.lastActivity = timestamp;
+    }
+    workspaces.set(key, current);
+}
+
+function taskItemMatchesWorkspace(item, workspacePath) {
+    const selectedWorkspacePath = normalizeTaskWorkspacePath(workspacePath);
+    if (!selectedWorkspacePath) return true;
+    return readTaskWorkspacePathFromItem(item) === selectedWorkspacePath;
+}
+
+function createTaskWorkspaceItems(taskOrchestration) {
+    const state = taskOrchestration && typeof taskOrchestration === 'object' ? taskOrchestration : {};
+    const workspaces = new Map();
+    addTaskWorkspaceCandidate(workspaces, state.workspacePath, 'draft');
+    const detail = state.selectedRunDetail && typeof state.selectedRunDetail === 'object' ? state.selectedRunDetail : null;
+    if (detail) addTaskWorkspaceCandidate(workspaces, detail.cwd, 'detail');
+    const queue = Array.isArray(state.queue) ? state.queue : [];
+    const runs = Array.isArray(state.runs) ? state.runs : [];
+    queue.forEach((item) => addTaskWorkspaceCandidate(workspaces, readTaskWorkspacePathFromItem(item), 'queue', readTaskItemTimestamp(item)));
+    runs.forEach((item) => addTaskWorkspaceCandidate(workspaces, readTaskWorkspacePathFromItem(item), 'run', readTaskItemTimestamp(item)));
+    const items = Array.from(workspaces.values()).sort((a, b) => {
+        const byActivity = String(b.lastActivity || '').localeCompare(String(a.lastActivity || ''));
+        if (byActivity !== 0) return byActivity;
+        return a.label.localeCompare(b.label);
+    });
+    if (items.length === 0) {
+        items.push({
+            key: '__auto__',
+            path: '',
+            label: 'Auto workspace',
+            meta: 'Server default cwd',
+            queueCount: queue.length,
+            runCount: runs.length,
+            lastActivity: ''
+        });
+    }
+    return items;
+}
+
+function createTaskWorkspaceSessions(taskOrchestration, workspacePath) {
+    const state = taskOrchestration && typeof taskOrchestration === 'object' ? taskOrchestration : {};
+    const queue = Array.isArray(state.queue) ? state.queue : [];
+    const runs = Array.isArray(state.runs) ? state.runs : [];
+    const queueSessions = queue
+        .filter((item) => taskItemMatchesWorkspace(item, workspacePath))
+        .map((item) => ({
+            id: item.taskId || item.lastRunId || `queue-${readTaskItemTimestamp(item)}`,
+            type: 'queue',
+            status: item.status || item.runStatus || 'queued',
+            title: item.title || item.target || item.taskId || 'Queued task',
+            meta: item.threadId || item.cwd || item.taskId || '',
+            taskId: item.taskId || '',
+            runId: item.lastRunId || '',
+            threadId: item.threadId || '',
+            cwd: readTaskWorkspacePathFromItem(item),
+            timestamp: readTaskItemTimestamp(item),
+            active: true
+        }));
+    const runSessions = runs
+        .filter((item) => taskItemMatchesWorkspace(item, workspacePath))
+        .map((item) => ({
+            id: item.runId || item.taskId || `run-${readTaskItemTimestamp(item)}`,
+            type: 'run',
+            status: item.status || 'completed',
+            title: item.title || item.summary || item.taskId || item.runId || 'Run',
+            meta: item.threadId || item.cwd || `${item.durationMs || 0}ms`,
+            taskId: item.taskId || '',
+            runId: item.runId || '',
+            threadId: item.threadId || '',
+            cwd: readTaskWorkspacePathFromItem(item),
+            timestamp: readTaskItemTimestamp(item),
+            active: false
+        }));
+    return queueSessions.concat(runSessions).sort((a, b) => {
+        if (a.active !== b.active) return a.active ? -1 : 1;
+        return String(b.timestamp || '').localeCompare(String(a.timestamp || ''));
+    });
+}
+
+function createTaskConversationMessages(taskOrchestration, t = null) {
+    const state = taskOrchestration && typeof taskOrchestration === 'object' ? taskOrchestration : {};
+    const messages = [];
+    const target = String(state.target || '').trim();
+    const followUps = normalizeTaskDraftLines(state.followUpsText);
+    const detail = state.selectedRunDetail && typeof state.selectedRunDetail === 'object' ? state.selectedRunDetail : null;
+    const detailRun = detail && detail.run && typeof detail.run === 'object' ? detail.run : null;
+    if (detail) {
+        const fileLines = collectTaskRunWorkspaceFileLines(detail);
+        const resultLines = [];
+        if (detailRun && detailRun.summary) {
+            resultLines.push(detailRun.summary);
+        } else {
+            resultLines.push(translateTaskText(t, 'orchestration.chat.assistant.contextFallback', '已选中一个历史任务，继续时会继承它的线程和工作区。'));
+        }
+        if (fileLines.length > 0) {
+            resultLines.push(translateTaskText(t, 'orchestration.chat.assistant.filesSummary', `文件操作：${fileLines.join('；')}`, { files: fileLines.join('；') }));
+        }
+        messages.push({
+            id: 'context-run',
+            role: 'assistant',
+            label: detailRun && detailRun.status === 'success'
+                ? translateTaskText(t, 'orchestration.chat.assistant.resultLabel', '实现结果')
+                : translateTaskText(t, 'orchestration.chat.assistant.contextLabel', '上一轮上下文'),
+            text: resultLines.join('\n'),
+            meta: formatTaskConversationMeta([
+                detail.threadId ? translateTaskText(t, 'orchestration.chat.meta.thread', `线程 ${detail.threadId}`, { value: detail.threadId }) : '',
+                detail.cwd ? translateTaskText(t, 'orchestration.chat.meta.workspace', `工作区 ${detail.cwd}`, { value: detail.cwd }) : '',
+                detailRun && detailRun.status ? detailRun.status : ''
+            ])
+        });
+    } else if (!target && followUps.length === 0) {
+        messages.push({
+            id: 'assistant-empty',
+            role: 'assistant',
+            label: translateTaskText(t, 'orchestration.chat.assistant.readyLabel', 'Codexmate'),
+            text: translateTaskText(t, 'orchestration.chat.assistant.empty', '先发第一个需求；如果还有第二个需求，继续发送，Codexmate 会按顺序处理并保留上下文。'),
+            meta: translateTaskText(t, 'orchestration.chat.meta.order', '顺序执行 · 保留上下文')
+        });
+    }
+    if (target) {
+        messages.push({
+            id: 'user-target',
+            role: 'user',
+            label: translateTaskText(t, 'orchestration.chat.user.step', '需求 {count}', { count: 1 }),
+            text: target,
+            meta: translateTaskText(t, 'orchestration.chat.meta.first', '先完成这一条')
+        });
+    }
+    followUps.forEach((item, index) => {
+        const step = index + 2;
+        messages.push({
+            id: `user-follow-up-${index}`,
+            role: 'user',
+            label: translateTaskText(t, 'orchestration.chat.user.step', '需求 {count}', { count: step }),
+            text: item,
+            meta: translateTaskText(t, 'orchestration.chat.meta.afterPrevious', '等待前一条完成后继续')
+        });
+    });
+    if (!state.plan && target) {
+        messages.push({
+            id: 'assistant-next',
+            role: 'assistant',
+            label: translateTaskText(t, 'orchestration.chat.assistant.readyLabel', 'Codexmate'),
+            text: followUps.length > 0
+                ? translateTaskText(t, 'orchestration.chat.assistant.sequenceReady', '已收到多条需求；执行时会先完成需求 1，再带着上下文继续后续需求。')
+                : translateTaskText(t, 'orchestration.chat.assistant.singleReady', '已收到第一条需求。可以继续补需求 2，或直接预览并执行。'),
+            meta: translateTaskText(t, 'orchestration.chat.meta.previewNext', '下一步：预览计划')
+        });
+    }
+    return messages;
+}
+
 function translateTaskText(t, key, fallback, params = null) {
     if (typeof t !== 'function') return fallback;
     const translated = t(key, params);
@@ -60,13 +283,23 @@ function createTaskDraftChecklist(metrics, t = null) {
             done: metrics.hasTarget,
             detail: metrics.hasTarget ? translateTaskText(t, 'orchestration.readiness.target.done', '已写目标') : translateTaskText(t, 'orchestration.readiness.target.missing', '还没写目标')
         },
+        {
+            key: 'sequence',
+            label: translateTaskText(t, 'orchestration.readiness.sequence.label', '顺序'),
+            done: metrics.hasTarget,
+            detail: !metrics.hasTarget
+                ? translateTaskText(t, 'orchestration.readiness.sequence.missing', '先发送需求 1')
+                : (metrics.hasSequentialFollowUps
+                    ? translateTaskText(t, 'orchestration.readiness.sequence.multiple', '{count} 条需求会按顺序执行：先完成需求 1，再继续需求 2。', { count: metrics.requestCount })
+                    : translateTaskText(t, 'orchestration.readiness.sequence.single', '当前只有需求 1；继续发送会变成需求 2。'))
+        },
         {
             key: 'engine',
             label: metrics.engine === 'workflow' ? 'Workflow' : translateTaskText(t, 'orchestration.readiness.engine.label', '执行策略'),
             done: workflowReady,
             detail: metrics.engine === 'workflow'
                 ? (metrics.workflowCount > 0 ? translateTaskText(t, 'orchestration.readiness.workflow.done', `已选 ${metrics.workflowCount} 个 Workflow`, { count: metrics.workflowCount }) : translateTaskText(t, 'orchestration.readiness.workflow.missing', '还没选 Workflow ID'))
-                : translateTaskText(t, 'orchestration.readiness.engine.codex', '使用 Codex 规划节点')
+                : translateTaskText(t, 'orchestration.readiness.engine.openaiChat', '使用 OpenAI Chat-compatible 节点')
         },
         {
             key: 'scope',
@@ -81,7 +314,7 @@ function createTaskDraftChecklist(metrics, t = null) {
             label: translateTaskText(t, 'orchestration.readiness.preview.label', '预览'),
             done: previewReady,
             detail: !metrics.hasPlan
-                ? translateTaskText(t, 'orchestration.readiness.preview.missing', '还没生成计划')
+                ? translateTaskText(t, 'orchestration.readiness.preview.missing', '还没发送 /plan')
                 : (metrics.planIssues.length > 0 ? translateTaskText(t, 'orchestration.readiness.preview.blocked', `有 ${metrics.planIssues.length} 个阻塞项`, { count: metrics.planIssues.length }) : translateTaskText(t, 'orchestration.readiness.preview.ready', `计划可用，${metrics.planNodeCount} 个节点`, { count: metrics.planNodeCount }))
         }
     ];
@@ -106,7 +339,9 @@ function createTaskDraftReadiness(metrics, t = null) {
         return {
             tone: 'warn',
             title: translateTaskText(t, 'orchestration.readiness.preview.title', '建议先预览'),
-            summary: translateTaskText(t, 'orchestration.readiness.preview.summary', '草稿已成形，先生成一次计划，确认节点和依赖再执行。')
+            summary: metrics.hasSequentialFollowUps
+                ? translateTaskText(t, 'orchestration.readiness.preview.sequenceSummary', '草稿已成形，已锁定 {count} 条顺序需求：先完成需求 1，再继续需求 2。', { count: metrics.requestCount })
+                : translateTaskText(t, 'orchestration.readiness.preview.summary', '草稿已成形，发送 /plan 预览方案，确认节点和依赖再执行。')
         };
     }
     if (metrics.planIssues.length > 0) {
@@ -120,7 +355,7 @@ function createTaskDraftReadiness(metrics, t = null) {
         return {
             tone: 'warn',
             title: translateTaskText(t, 'orchestration.readiness.warn.title', '可以执行，但有提醒'),
-            summary: translateTaskText(t, 'orchestration.readiness.warn.summary', `计划已生成，但还有 ${metrics.planWarnings.length} 条提醒值得先看一眼。`, { count: metrics.planWarnings.length })
+            summary: translateTaskText(t, 'orchestration.readiness.warn.summary', `/plan 方案已生成，但还有 ${metrics.planWarnings.length} 条提醒值得先看一眼。`, { count: metrics.planWarnings.length })
         };
     }
     if (metrics.dryRun) {
@@ -134,7 +369,7 @@ function createTaskDraftReadiness(metrics, t = null) {
         tone: 'success',
         title: translateTaskText(t, 'orchestration.readiness.ready.title', '可以执行'),
         summary: metrics.followUpCount > 0
-            ? translateTaskText(t, 'orchestration.readiness.ready.withFollowUps', `主目标和收尾动作都已具备，可以直接执行或入队。`)
+            ? translateTaskText(t, 'orchestration.readiness.ready.withFollowUps', `已锁定 ${metrics.requestCount} 条顺序需求：先完成需求 1，再带上下文继续需求 2。`, { count: metrics.requestCount })
             : translateTaskText(t, 'orchestration.readiness.ready.summary', '主目标已经够清楚了，可以直接执行或入队。')
     };
 }
@@ -191,13 +426,72 @@ export function createMainTabsComputed() {
             if (detail && Array.isArray(detail.nodes)) return detail.nodes;
             return Array.isArray(run.nodes) ? run.nodes : [];
         },
+        taskOrchestrationActiveQueue() {
+            const queue = this.taskOrchestration && Array.isArray(this.taskOrchestration.queue)
+                ? this.taskOrchestration.queue
+                : [];
+            return queue.filter((item) => {
+                const status = String((item && (item.status || item.runStatus)) || '').trim().toLowerCase();
+                return status === 'queued' || status === 'running';
+            });
+        },
+        taskOrchestrationEngineLabel() {
+            const state = this.taskOrchestration && typeof this.taskOrchestration === 'object'
+                ? this.taskOrchestration
+                : {};
+            return state.selectedEngine === 'workflow' ? 'Workflow' : 'Codex';
+        },
+        taskOrchestrationWorkbenchVisible() {
+            const state = this.taskOrchestration && typeof this.taskOrchestration === 'object'
+                ? this.taskOrchestration
+                : {};
+            const activeQueue = Array.isArray(this.taskOrchestrationActiveQueue)
+                ? this.taskOrchestrationActiveQueue
+                : [];
+            return activeQueue.length > 0
+                || !!String(state.selectedRunId || '').trim()
+                || !!String(state.selectedRunError || '').trim()
+                || (state.workspaceTab === 'runs' && Array.isArray(state.runs) && state.runs.length > 0);
+        },
+        taskOrchestrationWorkspacePath() {
+            const state = this.taskOrchestration && typeof this.taskOrchestration === 'object'
+                ? this.taskOrchestration
+                : {};
+            const detail = state.selectedRunDetail && typeof state.selectedRunDetail === 'object'
+                ? state.selectedRunDetail
+                : null;
+            return normalizeTaskWorkspacePath(state.workspacePath || (detail && detail.cwd) || '');
+        },
+        taskOrchestrationWorkspaceItems() {
+            const items = createTaskWorkspaceItems(this.taskOrchestration);
+            const selectedPath = this.taskOrchestrationWorkspacePath;
+            return items.map((item) => ({
+                ...item,
+                active: normalizeTaskWorkspacePath(item.path) === selectedPath || (!selectedPath && !item.path)
+            }));
+        },
+        taskOrchestrationWorkspaceQueue() {
+            const queue = this.taskOrchestration && Array.isArray(this.taskOrchestration.queue)
+                ? this.taskOrchestration.queue
+                : [];
+            return queue.filter((item) => taskItemMatchesWorkspace(item, this.taskOrchestrationWorkspacePath));
+        },
+        taskOrchestrationWorkspaceRuns() {
+            const runs = this.taskOrchestration && Array.isArray(this.taskOrchestration.runs)
+                ? this.taskOrchestration.runs
+                : [];
+            return runs.filter((item) => taskItemMatchesWorkspace(item, this.taskOrchestrationWorkspacePath));
+        },
+        taskOrchestrationWorkspaceSessions() {
+            return createTaskWorkspaceSessions(this.taskOrchestration, this.taskOrchestrationWorkspacePath);
+        },
         taskOrchestrationQueueStats() {
             const queue = this.taskOrchestration && Array.isArray(this.taskOrchestration.queue)
                 ? this.taskOrchestration.queue
                 : [];
             const stats = { queued: 0, running: 0, failed: 0 };
             for (const item of queue) {
-                const status = String(item && item.status || '').trim().toLowerCase();
+                const status = String((item && (item.status || item.runStatus)) || '').trim().toLowerCase();
                 if (status === 'queued') stats.queued += 1;
                 else if (status === 'running') stats.running += 1;
                 else if (status === 'failed') stats.failed += 1;
@@ -212,6 +506,9 @@ export function createMainTabsComputed() {
         },
         taskOrchestrationDraftReadiness() {
             return createTaskDraftReadiness(this.taskOrchestrationDraftMetrics, this.t && this.t.bind(this));
+        },
+        taskOrchestrationConversationMessages() {
+            return createTaskConversationMessages(this.taskOrchestration, this.t && this.t.bind(this));
         }
     };
 }

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

@@ -354,6 +354,9 @@ export function createAgentsMethods(options = {}) {
             return !!this.agentsSaving || this.hasAgentsContentChanged() || this.agentsDiffVisible;
         },
         handleBeforeUnload(event) {
+            if (typeof this.flushWebUiPreferences === 'function') {
+                this.flushWebUiPreferences();
+            }
             if (!this.hasPendingAgentsDraft()) {
                 return;
             }

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

@@ -8,8 +8,6 @@ function normalizeClaudeBaseUrl(value) {
     return normalizeClaudeText(value).replace(/\/+$/g, '');
 }
 
-const DELETED_CLAUDE_SETTINGS_IMPORTS_KEY = 'deletedClaudeSettingsImports';
-
 function buildDeletedClaudeSettingsFingerprint(config = {}) {
     const safe = config && typeof config === 'object' ? config : {};
     const baseUrl = normalizeClaudeBaseUrl(safe.baseUrl);
@@ -92,10 +90,41 @@ export function createClaudeConfigMethods(options = {}) {
     return {
         switchClaudeConfig(name) {
             this.currentClaudeConfig = name;
-            try { localStorage.setItem('currentClaudeConfig', name || ''); } catch (_) {}
+            if (typeof this.persistWebUiPreferences === 'function') {
+                this.persistWebUiPreferences({ currentClaudeConfig: name || '' });
+            }
             this.refreshClaudeModelContext();
         },
 
+        normalizeStoredClaudeConfigs() {
+            const configs = this.claudeConfigs && typeof this.claudeConfigs === 'object' && !Array.isArray(this.claudeConfigs)
+                ? this.claudeConfigs
+                : {};
+            let changed = configs !== this.claudeConfigs;
+            for (const config of Object.values(configs)) {
+                if (!config || typeof config !== 'object') continue;
+                if (config.apiKey && config.apiKey.includes('****')) {
+                    config.apiKey = '';
+                    config.hasKey = false;
+                    changed = true;
+                }
+                const targetApiRaw = typeof config.targetApi === 'string' ? config.targetApi.trim().toLowerCase() : '';
+                const previousTargetApi = config.targetApi;
+                if (targetApiRaw === 'chat_completions' || targetApiRaw === 'chat-completions' || targetApiRaw === 'chat/completions') {
+                    config.targetApi = 'chat_completions';
+                } else if (targetApiRaw === 'ollama') {
+                    config.targetApi = 'ollama';
+                } else {
+                    config.targetApi = 'responses';
+                }
+                if (config.targetApi !== previousTargetApi) {
+                    changed = true;
+                }
+            }
+            this.claudeConfigs = configs;
+            return changed;
+        },
+
         onClaudeModelChange() {
             const name = this.currentClaudeConfig;
             if (!name || name === 'claude-local') {
@@ -124,9 +153,14 @@ export function createClaudeConfigMethods(options = {}) {
         },
 
         saveClaudeConfigs() {
-            try { localStorage.setItem('claudeConfigs', JSON.stringify(this.claudeConfigs)); } catch (_) {}
-            if (this.currentClaudeConfig) {
-                try { localStorage.setItem('currentClaudeConfig', this.currentClaudeConfig); } catch (_) {}
+            if (typeof this.normalizeStoredClaudeConfigs === 'function') {
+                this.normalizeStoredClaudeConfigs();
+            }
+            if (typeof this.persistWebUiPreferences === 'function') {
+                this.persistWebUiPreferences({
+                    claudeConfigs: this.claudeConfigs,
+                    currentClaudeConfig: this.currentClaudeConfig || ''
+                });
             }
             this.syncClaudeBridgeProviders();
         },
@@ -134,18 +168,17 @@ export function createClaudeConfigMethods(options = {}) {
         rememberDeletedClaudeSettingsImport(config) {
             const fingerprint = buildDeletedClaudeSettingsFingerprint(config);
             if (!fingerprint) return;
-            try {
-                const raw = localStorage.getItem(DELETED_CLAUDE_SETTINGS_IMPORTS_KEY);
-                const parsed = raw ? JSON.parse(raw) : [];
-                const entries = Array.isArray(parsed) ? parsed : [];
-                const deduped = entries.filter((entry) => {
-                    if (!entry || typeof entry !== 'object') return false;
-                    return normalizeClaudeBaseUrl(entry.baseUrl) !== fingerprint.baseUrl
-                        || normalizeClaudeText(entry.model) !== fingerprint.model;
-                });
-                deduped.push(fingerprint);
-                localStorage.setItem(DELETED_CLAUDE_SETTINGS_IMPORTS_KEY, JSON.stringify(deduped.slice(-50)));
-            } catch (_) {}
+            const entries = Array.isArray(this.deletedClaudeSettingsImports) ? this.deletedClaudeSettingsImports : [];
+            const deduped = entries.filter((entry) => {
+                if (!entry || typeof entry !== 'object') return false;
+                return normalizeClaudeBaseUrl(entry.baseUrl) !== fingerprint.baseUrl
+                    || normalizeClaudeText(entry.model) !== fingerprint.model;
+            });
+            deduped.push(fingerprint);
+            this.deletedClaudeSettingsImports = deduped.slice(-50);
+            if (typeof this.persistWebUiPreferences === 'function') {
+                this.persistWebUiPreferences({ deletedClaudeSettingsImports: this.deletedClaudeSettingsImports });
+            }
         },
 
         async applyCurrentClaudeConfigSilently() {
@@ -227,15 +260,18 @@ export function createClaudeConfigMethods(options = {}) {
                 const current = normalizeClaudeText(this.currentClaudeConfig);
                 if (current && !configs[current]) {
                     this.currentClaudeConfig = firstCachedName || Object.keys(configs)[0] || '';
-                    try { localStorage.setItem('currentClaudeConfig', this.currentClaudeConfig); } catch (_) {}
                     changed = true;
                 } else if (firstCachedName) {
-                    let savedCurrent = '';
-                    try { savedCurrent = localStorage.getItem('currentClaudeConfig') || ''; } catch (_) {}
                     const currentConfig = current && configs[current] ? configs[current] : null;
-                    if (!savedCurrent && (!current || (currentConfig && currentConfig.hasKey === false && !currentConfig.providerCacheRef))) {
+                    const currentApplyable = currentConfig && (
+                        currentConfig.hasKey === true
+                        || !!normalizeClaudeText(currentConfig.apiKey)
+                        || !!normalizeClaudeText(currentConfig.providerCacheRef)
+                        || !!normalizeClaudeText(currentConfig.externalCredentialType)
+                        || normalizeClaudeText(currentConfig.targetApi) === 'ollama'
+                    );
+                    if (!currentApplyable) {
                         this.currentClaudeConfig = firstCachedName;
-                        try { localStorage.setItem('currentClaudeConfig', firstCachedName); } catch (_) {}
                         changed = true;
                     }
                 }
@@ -458,7 +494,9 @@ export function createClaudeConfigMethods(options = {}) {
             const silentSuccess = silent || !!(options && options.silentSuccess);
             const silentError = silent || !!(options && options.silentError);
             this.currentClaudeConfig = name;
-            try { localStorage.setItem('currentClaudeConfig', name || ''); } catch (_) {}
+            if (typeof this.persistWebUiPreferences === 'function') {
+                this.persistWebUiPreferences({ currentClaudeConfig: name || '' });
+            }
             this.refreshClaudeModelContext();
             const config = this.claudeConfigs[name];
 
@@ -572,7 +610,9 @@ export function createClaudeConfigMethods(options = {}) {
 
         async applyClaudeLocalBridge() {
             this.currentClaudeConfig = 'claude-local';
-            try { localStorage.setItem('currentClaudeConfig', 'claude-local'); } catch (_) {}
+            if (typeof this.persistWebUiPreferences === 'function') {
+                this.persistWebUiPreferences({ currentClaudeConfig: 'claude-local' });
+            }
             this.refreshClaudeModelContext();
 
             const candidates = this.claudeLocalBridgeCandidateProviders();