codexmate 0.0.22 → 0.0.24

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

@@ -193,8 +193,8 @@ export function createAgentsMethods(options = {}) {
                 const fileName = (options.fileName || this.openclawWorkspaceFileName || 'AGENTS.md').trim();
                 this.agentsContext = 'openclaw-workspace';
                 this.agentsWorkspaceFileName = fileName;
-                this.agentsModalTitle = `OpenClaw 工作区文件: ${fileName}`;
-                this.agentsModalHint = `保存后会写入 OpenClaw Workspace 下的 ${fileName}。`;
+                this.agentsModalTitle = tr('modal.agents.title.openclawWorkspaceFile', `OpenClaw 工作区文件: ${fileName}`, { fileName });
+                this.agentsModalHint = tr('modal.agents.hint.openclawWorkspaceFile', `保存后会写入 OpenClaw Workspace 下的 ${fileName}。`, { fileName });
                 return;
             }
             this.agentsContext = context === 'openclaw' ? 'openclaw' : 'codex';
@@ -224,7 +224,47 @@ export function createAgentsMethods(options = {}) {
             this._agentsDiffPreviewRequestToken = null;
         },
         handleGlobalKeydown(event) {
-            if (!event || event.key !== 'Escape') {
+            if (!event) {
+                return;
+            }
+            const isCmdLike = !!(event.metaKey || event.ctrlKey);
+            const key = typeof event.key === 'string' ? event.key : '';
+            const isSearchHotkey = isCmdLike && !event.altKey && (key === 'k' || key === 'K');
+            if (isSearchHotkey) {
+                const target = event.target;
+                const tag = target && target.tagName ? String(target.tagName).toUpperCase() : '';
+                const isTypingTarget = !!(
+                    tag === 'INPUT'
+                    || tag === 'TEXTAREA'
+                    || tag === 'SELECT'
+                    || (target && target.isContentEditable)
+                );
+                if (!isTypingTarget) {
+                    event.preventDefault();
+                    event.stopPropagation();
+                    try {
+                        const focusSelector = (() => {
+                            if (this.showSkillsModal) return '.skills-filter-row input.form-input';
+                            if (this.mainTab === 'sessions') return '#panel-sessions .session-query-input';
+                            if (this.mainTab === 'plugins' && this.pluginsActiveId === 'prompt-templates' && this.promptTemplatesMode !== 'compose') {
+                                return '#panel-plugins .prompt-templates-toolbar input.form-input';
+                            }
+                            return '';
+                        })();
+                        if (focusSelector) {
+                            const el = document.querySelector(focusSelector);
+                            if (el && typeof el.focus === 'function') {
+                                el.focus();
+                                if (typeof el.select === 'function') {
+                                    el.select();
+                                }
+                            }
+                        }
+                    } catch (_) {}
+                }
+                return;
+            }
+            if (key !== 'Escape') {
                 return;
             }
             if (this.showConfirmDialog) {
@@ -233,6 +273,54 @@ export function createAgentsMethods(options = {}) {
                 this.resolveConfirmDialog(false);
                 return;
             }
+            if (this.showSkillsModal && typeof this.closeSkillsModal === 'function') {
+                event.preventDefault();
+                event.stopPropagation();
+                this.closeSkillsModal();
+                return;
+            }
+            if (this.showOpenclawConfigModal && typeof this.closeOpenclawConfigModal === 'function') {
+                event.preventDefault();
+                event.stopPropagation();
+                this.closeOpenclawConfigModal();
+                return;
+            }
+            if (this.showConfigTemplateModal && typeof this.closeConfigTemplateModal === 'function') {
+                event.preventDefault();
+                event.stopPropagation();
+                this.closeConfigTemplateModal();
+                return;
+            }
+            if (this.showEditConfigModal && typeof this.closeEditConfigModal === 'function') {
+                event.preventDefault();
+                event.stopPropagation();
+                this.closeEditConfigModal();
+                return;
+            }
+            if (this.showClaudeConfigModal && typeof this.closeClaudeConfigModal === 'function') {
+                event.preventDefault();
+                event.stopPropagation();
+                this.closeClaudeConfigModal();
+                return;
+            }
+            if (this.showModelModal && typeof this.closeModelModal === 'function') {
+                event.preventDefault();
+                event.stopPropagation();
+                this.closeModelModal();
+                return;
+            }
+            if (this.showAddModal && typeof this.closeAddModal === 'function') {
+                event.preventDefault();
+                event.stopPropagation();
+                this.closeAddModal();
+                return;
+            }
+            if (this.showEditModal && typeof this.closeEditModal === 'function') {
+                event.preventDefault();
+                event.stopPropagation();
+                this.closeEditModal();
+                return;
+            }
             if (!this.showAgentsModal) {
                 return;
             }

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

@@ -271,53 +271,164 @@ export function createCodexConfigMethods(options = {}) {
             });
         },
 
-        async runHealthCheck() {
+        async runHealthCheck(options = {}) {
             this.healthCheckLoading = true;
             this.healthCheckResult = null;
-            let shouldRunClaudeSpeedTests = false;
+            this.healthCheckBatchTotal = 0;
+            this.healthCheckBatchDone = 0;
+            this.healthCheckBatchFailed = 0;
             try {
-                const res = await api('config-health-check', {
-                    remote: this.configMode === 'codex'
-                });
+                const silent = !!(options && options.silent);
+                const forceRefresh = !!(options && options.forceRefresh);
+                const useDoctor = !!(options && options.doctor);
+                if (useDoctor) {
+                    const res = await api('doctor', {
+                        lang: this.lang,
+                        remote: true,
+                        range: this.sessionsUsageTimeRange,
+                        targetApp: this.skillsTargetApp,
+                        includeUsage: true,
+                        includeTasks: true,
+                        includeSkills: true,
+                        includeInstall: true,
+                        forceRefresh
+                    });
+                    if (hasResponseError(res)) {
+                        this.healthCheckResult = null;
+                        if (!silent) {
+                            this.showMessage(getResponseMessage(res, '检查失败'), 'error');
+                        }
+                        return;
+                    }
+                    if (res && typeof res === 'object') {
+                        this.healthCheckResult = res;
+                        const report = res.report && typeof res.report === 'object' ? res.report : null;
+                        const summary = report && report.summary && typeof report.summary === 'object' ? report.summary : null;
+                        const total = summary && Number.isFinite(Number(summary.total))
+                            ? Math.max(0, Math.floor(Number(summary.total)))
+                            : (Array.isArray(res.issues) ? res.issues.length : 0);
+                        const errors = summary && Number.isFinite(Number(summary.error)) ? Math.max(0, Math.floor(Number(summary.error))) : 0;
+                        const warns = summary && Number.isFinite(Number(summary.warn)) ? Math.max(0, Math.floor(Number(summary.warn))) : 0;
+                        this.healthCheckBatchTotal = total;
+                        this.healthCheckBatchDone = total;
+                        this.healthCheckBatchFailed = errors + warns;
+                        if (!silent && res.ok) {
+                            this.showMessage('检查通过', 'success');
+                        }
+                        return;
+                    }
+                    this.healthCheckResult = null;
+                    if (!silent) {
+                        this.showMessage('检查失败', 'error');
+                    }
+                    return;
+                }
+
+                if (this.configMode === 'claude') {
+                    const entries = Object.entries(this.claudeConfigs || {});
+                    this.healthCheckBatchTotal = entries.length;
+
+                    const speedTasks = entries.map(([name, config]) => this.runClaudeSpeedTest(name, config)
+                        .then((result) => {
+                            if (!result || result.ok !== true) {
+                                this.healthCheckBatchFailed += 1;
+                            }
+                            return { name, result };
+                        })
+                        .catch((err) => {
+                            this.healthCheckBatchFailed += 1;
+                            return {
+                                name,
+                                result: { ok: false, error: err && err.message ? err.message : 'Speed test failed' }
+                            };
+                        })
+                        .finally(() => {
+                            this.healthCheckBatchDone += 1;
+                        })
+                    );
+
+                    const pairs = await Promise.all(speedTasks);
+                    const results = {};
+                    const issues = [];
+                    for (const pair of pairs) {
+                        results[pair.name] = pair.result || null;
+                        if (typeof this.buildSpeedTestIssue === 'function') {
+                            const issue = this.buildSpeedTestIssue(pair.name, pair.result);
+                            if (issue) issues.push(issue);
+                        }
+                    }
+                    const ok = issues.length === 0 && this.healthCheckBatchFailed === 0;
+                    this.healthCheckResult = {
+                        ok,
+                        issues,
+                        remote: {
+                            type: 'speed-test',
+                            speedTests: results
+                        }
+                    };
+                    if (ok && !silent) {
+                        this.showMessage('检查通过', 'success');
+                    }
+                    return;
+                }
+
+                const shouldRunSpeedTests = this.configMode === 'codex';
+                const speedTimeoutMs = shouldRunSpeedTests ? 3500 : 0;
+                const providers = shouldRunSpeedTests
+                    ? (this.providersList || [])
+                        .map((provider) => typeof provider === 'string'
+                            ? provider.trim()
+                            : String((provider && provider.name) || '').trim())
+                        .filter(Boolean)
+                    : [];
+                const currentProvider = String(this.currentProvider || '').trim();
+                const orderedProviders = currentProvider && providers.includes(currentProvider)
+                    ? [currentProvider, ...providers.filter((name) => name !== currentProvider)]
+                    : providers;
+                this.healthCheckBatchTotal = orderedProviders.length;
+
+                const speedTasks = orderedProviders.map((provider) => this.runSpeedTest(provider, { silent: true, timeoutMs: speedTimeoutMs })
+                    .then((result) => {
+                        if (!result || result.ok !== true) {
+                            this.healthCheckBatchFailed += 1;
+                        }
+                        return { name: provider, result };
+                    })
+                    .catch((err) => {
+                        this.healthCheckBatchFailed += 1;
+                        return {
+                            name: provider,
+                            result: { ok: false, error: err && err.message ? err.message : 'Speed test failed' }
+                        };
+                    })
+                    .finally(() => {
+                        this.healthCheckBatchDone += 1;
+                    })
+                );
+
+                const configTask = api('config-health-check', { remote: this.configMode === 'codex' });
+                const [res, pairs] = await Promise.all([
+                    configTask,
+                    Promise.all(speedTasks)
+                ]);
                 if (hasResponseError(res)) {
                     this.healthCheckResult = null;
-                    this.showMessage(getResponseMessage(res, '检查失败'), 'error');
+                    if (!silent) {
+                        this.showMessage(getResponseMessage(res, '检查失败'), 'error');
+                    }
                 } else if (res && typeof res === 'object') {
-                    shouldRunClaudeSpeedTests = true;
                     const issues = Array.isArray(res.issues) ? [...res.issues] : [];
                     let remote = res.remote || null;
-                    {
-                        const providers = (this.providersList || [])
-                            .map((provider) => typeof provider === 'string'
-                                ? provider.trim()
-                                : String((provider && provider.name) || '').trim())
-                            .filter(Boolean);
-                        const tasks = providers.map(provider =>
-                            this.runSpeedTest(provider, { silent: true })
-                                .then(result => ({ name: provider, result }))
-                                .catch(err => ({
-                                    name: provider,
-                                    result: { ok: false, error: err && err.message ? err.message : 'Speed test failed' }
-                                }))
-                        );
-                        const pairs = await Promise.all(tasks);
+                    if (shouldRunSpeedTests) {
                         const results = {};
                         for (const pair of pairs) {
                             results[pair.name] = pair.result || null;
                             const issue = this.buildSpeedTestIssue(pair.name, pair.result);
                             if (issue) issues.push(issue);
                         }
-                        if (remote && typeof remote === 'object') {
-                            remote = {
-                                ...remote,
-                                speedTests: results
-                            };
-                        } else {
-                            remote = {
-                                type: 'speed-test',
-                                speedTests: results
-                            };
-                        }
+                        remote = remote && typeof remote === 'object'
+                            ? { ...remote, speedTests: results }
+                            : { type: 'speed-test', speedTests: results };
                     }
 
                     const ok = issues.length === 0;
@@ -327,146 +438,24 @@ export function createCodexConfigMethods(options = {}) {
                         issues,
                         remote
                     };
-                    if (ok) {
+                    if (ok && !silent) {
                         this.showMessage('检查通过', 'success');
                     }
                 } else {
                     this.healthCheckResult = null;
-                    this.showMessage('检查失败', 'error');
+                    if (!silent) {
+                        this.showMessage('检查失败', 'error');
+                    }
                 }
             } catch (e) {
                 this.healthCheckResult = null;
-                this.showMessage('检查失败', 'error');
-            } finally {
-                if (shouldRunClaudeSpeedTests && this.configMode === 'claude') {
-                    try {
-                        const entries = Object.entries(this.claudeConfigs || {});
-                        await Promise.all(entries.map(([name, config]) => this.runClaudeSpeedTest(name, config)));
-                    } catch (e) {}
-                }
-                this.healthCheckLoading = false;
-            }
-        },
-
-        buildDefaultHealthCheckPrompt() {
-            return '请简短回复：连接正常。';
-        },
-
-        openHealthCheckDialog(options = {}) {
-            const providerName = typeof options.providerName === 'string'
-                ? options.providerName.trim()
-                : '';
-            const locked = !!options.locked && !!providerName;
-            if (locked && providerName && providerName !== String(this.currentProvider || '').trim()) {
-                if (typeof this.showMessage === 'function') {
-                    this.showMessage('请先切换到该提供商再进行健康聊天测试', 'info');
-                }
-                return;
-            }
-            const nextProvider = providerName
-                || String(this.healthCheckDialogSelectedProvider || '').trim()
-                || String(this.currentProvider || '').trim()
-                || String(((this.displayProvidersList || [])[0] || {}).name || '').trim();
-
-            this.showHealthCheckDialog = true;
-            this.healthCheckDialogLockedProvider = locked ? nextProvider : '';
-            this.healthCheckDialogSelectedProvider = nextProvider;
-            this.healthCheckDialogPrompt = this.buildDefaultHealthCheckPrompt();
-            this.healthCheckDialogMessages = [];
-            this.healthCheckDialogLastResult = null;
-        },
-
-        closeHealthCheckDialog(options = {}) {
-            if (this.healthCheckDialogSending && !options.force) {
-                return;
-            }
-            this.showHealthCheckDialog = false;
-            this.healthCheckDialogLockedProvider = '';
-            this.healthCheckDialogSelectedProvider = '';
-            this.healthCheckDialogPrompt = this.buildDefaultHealthCheckPrompt();
-            this.healthCheckDialogMessages = [];
-            this.healthCheckDialogLastResult = null;
-        },
-
-        async sendHealthCheckDialogMessage() {
-            if (this.healthCheckDialogSending) {
-                return;
-            }
-
-            const provider = String(
-                this.healthCheckDialogLockedProvider || this.healthCheckDialogSelectedProvider || ''
-            ).trim();
-            const prompt = String(this.healthCheckDialogPrompt || '').trim();
-            if (!provider) {
-                this.showMessage('请先选择提供商', 'error');
-                return;
-            }
-            if (!prompt) {
-                this.showMessage('请输入消息内容', 'error');
-                return;
-            }
-
-            this.healthCheckDialogMessages.push({
-                id: `user-${Date.now()}`,
-                role: 'user',
-                text: prompt
-            });
-            this.healthCheckDialogSending = true;
-            this.healthCheckDialogLastResult = null;
-
-            try {
-                const res = await api('provider-chat-check', {
-                    name: provider,
-                    prompt
-                });
-                this.healthCheckDialogLastResult = res;
-
-                if (hasResponseError(res) || res.ok === false) {
-                    const message = getResponseMessage(res, '健康聊天测试失败');
-                    this.healthCheckDialogMessages.push({
-                        id: `assistant-${Date.now()}`,
-                        role: 'assistant',
-                        text: message,
-                        ok: false,
-                        status: Number.isFinite(res && res.status) ? res.status : 0,
-                        durationMs: Number.isFinite(res && res.durationMs) ? res.durationMs : 0,
-                        model: typeof (res && res.model) === 'string' ? res.model : '',
-                        rawPreview: typeof (res && res.rawPreview) === 'string' ? res.rawPreview : ''
-                    });
-                    this.showMessage(message, 'error');
-                    return;
+                if (!(options && options.silent)) {
+                    this.showMessage('检查失败', 'error');
                 }
-
-                const reply = typeof res.reply === 'string' && res.reply.trim()
-                    ? res.reply.trim()
-                    : '已收到回复，但未解析到可展示文本。';
-                this.healthCheckDialogMessages.push({
-                    id: `assistant-${Date.now()}`,
-                    role: 'assistant',
-                    text: reply,
-                    ok: true,
-                    status: Number.isFinite(res.status) ? res.status : 0,
-                    durationMs: Number.isFinite(res.durationMs) ? res.durationMs : 0,
-                    model: typeof res.model === 'string' ? res.model : '',
-                    rawPreview: typeof res.rawPreview === 'string' ? res.rawPreview : ''
-                });
-                this.healthCheckDialogPrompt = '';
-            } catch (e) {
-                const message = e && e.message ? e.message : '健康聊天测试失败';
-                this.healthCheckDialogMessages.push({
-                    id: `assistant-${Date.now()}`,
-                    role: 'assistant',
-                    text: message,
-                    ok: false,
-                    status: 0,
-                    durationMs: 0,
-                    model: '',
-                    rawPreview: ''
-                });
-                this.healthCheckDialogLastResult = { ok: false, error: message };
-                this.showMessage(message, 'error');
             } finally {
-                this.healthCheckDialogSending = false;
+                this.healthCheckBatchTotal = this.healthCheckBatchTotal || 0;
+                this.healthCheckBatchDone = Math.min(this.healthCheckBatchDone || 0, this.healthCheckBatchTotal || 0);
+                this.healthCheckLoading = false;
             }
         },
 

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

@@ -156,6 +156,22 @@ export function createInstallMethods() {
 
         setInstallRegistryPreset(presetName) {
             this.installRegistryPreset = this.normalizeInstallRegistryPreset(presetName);
+        },
+
+        getInstallStatusTarget(targetId) {
+            const key = typeof targetId === 'string' ? targetId.trim() : '';
+            if (!key) return null;
+            const list = Array.isArray(this.installStatusTargets) ? this.installStatusTargets : [];
+            return list.find((item) => item && item.id === key) || null;
+        },
+
+        isInstallTargetInstalled(targetId) {
+            const target = this.getInstallStatusTarget(targetId);
+            return !!(target && target.installed === true);
+        },
+
+        shouldShowCliInstallPlaceholder(targetId) {
+            return Array.isArray(this.installStatusTargets) && !this.isInstallTargetInstalled(targetId);
         }
     };
 }

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

@@ -4,6 +4,70 @@ export function createNavigationMethods(options = {}) {
         switchMainTabHelper,
         loadMoreSessionMessagesHelper
     } = options;
+    const NAV_STATE_STORAGE_KEY = 'codexmateNavState.v1';
+    const MAIN_TAB_SET = new Set([
+        'dashboard',
+        'config',
+        'sessions',
+        'usage',
+        'orchestration',
+        'market',
+        'plugins',
+        'docs',
+        'settings'
+    ]);
+    const loadDoctorOverview = async (vm, options = {}) => {
+        if (!vm || typeof vm !== 'object') return false;
+        if (vm.__doctorLoading) return false;
+        const forceRefresh = !!(options && options.forceRefresh);
+        vm.__doctorLoading = true;
+        let ok = true;
+        try {
+            if (typeof vm.runHealthCheck === 'function') {
+                await vm.runHealthCheck({ doctor: true, silent: true, forceRefresh });
+            }
+            vm.__doctorLoadedOnce = true;
+            return true;
+        } catch (_) {
+            ok = false;
+            vm.__doctorLoadedOnce = true;
+            return false;
+        } finally {
+            vm.__doctorLoading = false;
+            if (!ok) {
+                vm.__doctorLoadedOnce = true;
+            }
+        }
+    };
+    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 persistNavState = (vm) => {
+        if (!vm || vm.__navStateRestoring) return;
+        if (typeof localStorage === 'undefined') return;
+        const mainTab = typeof vm.mainTab === 'string' ? vm.mainTab.trim().toLowerCase() : '';
+        const configMode = typeof vm.configMode === 'string' ? vm.configMode.trim().toLowerCase() : '';
+        const snapshot = {
+            mainTab: MAIN_TAB_SET.has(mainTab) ? mainTab : 'dashboard',
+            configMode: configModeSet && configModeSet.has(configMode) ? configMode : 'codex'
+        };
+        try {
+            localStorage.setItem(NAV_STATE_STORAGE_KEY, JSON.stringify(snapshot));
+        } catch (_) {}
+    };
 
     return {
         switchConfigMode(mode) {
@@ -34,6 +98,7 @@ export function createNavigationMethods(options = {}) {
                 this.scheduleAfterFrame(() => {
                     this.clearMainTabSwitchIntent('config');
                 });
+                persistNavState(this);
                 return;
             }
             this.switchMainTab('config');
@@ -300,6 +365,9 @@ export function createNavigationMethods(options = {}) {
             if (targetTab === previousTab) {
                 switchState.ticket += 1;
                 switchState.pendingTarget = '';
+                if (targetTab === 'dashboard' && !this.__doctorLoadedOnce) {
+                    void loadDoctorOverview(this);
+                }
                 if (
                     targetTab === 'sessions'
                     && typeof this.prepareSessionTabRender === 'function'
@@ -324,6 +392,10 @@ export function createNavigationMethods(options = {}) {
                 switchState.ticket += 1;
                 switchState.pendingTarget = '';
                 const result = switchMainTabHelper.call(this, targetTab);
+                persistNavState(this);
+                if (targetTab === 'dashboard') {
+                    void loadDoctorOverview(this);
+                }
                 this.scheduleAfterFrame(() => {
                     this.clearMainTabSwitchIntent(normalizedTab);
                 });
@@ -338,6 +410,10 @@ export function createNavigationMethods(options = {}) {
                 const pendingTarget = liveState.pendingTarget || targetTab;
                 liveState.pendingTarget = '';
                 switchMainTabHelper.call(this, pendingTarget);
+                persistNavState(this);
+                if (pendingTarget === 'dashboard') {
+                    void loadDoctorOverview(this);
+                }
                 this.clearMainTabSwitchIntent(normalizedTab);
             });
         },

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

@@ -37,7 +37,12 @@ export function createRuntimeMethods(options = {}) {
             const silent = !!options.silent;
             this.speedLoading[name] = true;
             try {
-                const res = await api('speed-test', { name });
+                const timeoutMs = Number.isFinite(options.timeoutMs) ? Math.max(1000, Number(options.timeoutMs)) : 0;
+                const payload = { name };
+                if (timeoutMs) {
+                    payload.timeoutMs = timeoutMs;
+                }
+                const res = await api('speed-test', payload);
                 if (res.error) {
                     this.speedResults[name] = { ok: false, error: res.error };
                     if (!silent) {
@@ -66,6 +71,8 @@ export function createRuntimeMethods(options = {}) {
         async runClaudeSpeedTest(name, config) {
             if (!name || this.claudeSpeedLoading[name]) return null;
             const baseUrl = config && typeof config.baseUrl === 'string' ? config.baseUrl.trim() : '';
+            const apiKey = config && typeof config.apiKey === 'string' ? config.apiKey.trim() : '';
+            const model = config && typeof config.model === 'string' ? config.model.trim() : '';
             this.claudeSpeedLoading[name] = true;
             try {
                 if (!baseUrl) {
@@ -73,7 +80,22 @@ export function createRuntimeMethods(options = {}) {
                     this.claudeSpeedResults[name] = res;
                     return res;
                 }
-                const res = await api('speed-test', { url: baseUrl });
+                if (!apiKey) {
+                    const res = { ok: false, error: 'Missing API key' };
+                    this.claudeSpeedResults[name] = res;
+                    return res;
+                }
+                if (!model) {
+                    const res = { ok: false, error: 'Missing model' };
+                    this.claudeSpeedResults[name] = res;
+                    return res;
+                }
+                const res = await api('speed-test', {
+                    kind: 'claude',
+                    url: baseUrl,
+                    apiKey,
+                    model
+                });
                 if (res.error) {
                     this.claudeSpeedResults[name] = { ok: false, error: res.error };
                     return { ok: false, error: res.error };