codexmate 0.0.23 → 0.0.25

package/plugins/prompt-templates/overview.mjs

@@ -0,0 +1,90 @@
+import {
+    persistPromptTemplatesToStorage,
+    readPromptTemplatesFromStorage,
+    readPromptTemplateSelectedIdFromStorage,
+    persistPromptTemplateSelectedIdToStorage
+} from './storage.mjs';
+import { buildBuiltinCommentPolishTemplate } from './comment-polish/index.mjs';
+import { buildBuiltinRuleAckTemplate } from './rule-ack/index.mjs';
+
+function ensureBuiltinTemplates(rawList, builtins) {
+    const list = Array.isArray(rawList) ? rawList.filter(Boolean) : [];
+    const builtinList = Array.isArray(builtins) ? builtins.filter(Boolean) : [];
+    const rest = list.filter((item) => !(item && item.isBuiltin === true));
+    const overridden = new Set(
+        rest
+            .map((item) => (item && typeof item.id === 'string' ? item.id.trim() : ''))
+            .filter(Boolean)
+    );
+    const resolvedBuiltins = builtinList.filter((item) => !(item && overridden.has(item.id)));
+    return [...resolvedBuiltins, ...rest];
+}
+
+export async function loadPromptTemplatesOverview(ctx, options = {}) {
+    const app = ctx && typeof ctx === 'object' ? ctx : {};
+    const silent = !!(options && options.silent);
+    const forceRefresh = !!(options && options.forceRefresh);
+
+    const shouldReload = forceRefresh || app.promptTemplatesLoadedOnce !== true;
+    if (!shouldReload) return true;
+
+    const t = typeof app.t === 'function' ? app.t : null;
+    const rawList = readPromptTemplatesFromStorage(localStorage);
+    const normalized = ensureBuiltinTemplates(rawList, [
+        buildBuiltinCommentPolishTemplate(t),
+        buildBuiltinRuleAckTemplate(t)
+    ]);
+    app.promptTemplatesListRaw = normalized;
+    persistPromptTemplatesToStorage(normalized, localStorage);
+
+    app.promptTemplatesLoadedOnce = true;
+
+    if (!app.promptTemplatesMode) {
+        app.promptTemplatesMode = 'compose';
+    }
+    if (app.promptTemplatesMode !== 'compose' && app.promptTemplatesMode !== 'manage') {
+        app.promptTemplatesMode = 'compose';
+    }
+    if (app.mainTab === 'plugins') {
+        app.promptTemplatesMode = 'compose';
+    }
+
+    if (app.mainTab === 'plugins' && app.promptTemplatesMode === 'compose') {
+        const list = Array.isArray(app.promptTemplatesList) ? app.promptTemplatesList : [];
+        const storedSelected = readPromptTemplateSelectedIdFromStorage(localStorage);
+        const exists = list.some((item) => item && item.id === app.promptComposerSelectedTemplateId);
+        const storedExists = storedSelected ? list.some((item) => item && item.id === storedSelected) : false;
+        if (storedExists && storedSelected !== app.promptComposerSelectedTemplateId) {
+            app.promptComposerSelectedTemplateId = storedSelected;
+        } else if (!app.promptComposerSelectedTemplateId || !exists) {
+            app.promptComposerSelectedTemplateId = 'builtin_comment_polish';
+        }
+        persistPromptTemplateSelectedIdToStorage(app.promptComposerSelectedTemplateId, localStorage);
+        if (!app.promptComposerVarValuesRaw || typeof app.promptComposerVarValuesRaw !== 'object') {
+            app.promptComposerVarValuesRaw = {};
+        }
+    }
+
+    if (app.promptTemplatesMode === 'manage') {
+        const currentSelected = typeof app.promptTemplateSelectedId === 'string'
+            ? app.promptTemplateSelectedId
+            : '';
+        const first = Array.isArray(app.promptTemplatesList) && app.promptTemplatesList.length
+            ? app.promptTemplatesList[0]
+            : null;
+        if (!currentSelected && first && typeof app.selectPromptTemplate === 'function') {
+            app.selectPromptTemplate(first.id);
+        }
+    }
+
+    if (app.mainTab === 'plugins' && app.promptTemplatesMode === 'compose' && typeof app.$nextTick === 'function') {
+        app.$nextTick(() => {
+            const input = app.$refs && app.$refs.promptComposerCodeInput
+                ? app.$refs.promptComposerCodeInput
+                : null;
+            if (input && typeof input.focus === 'function') input.focus();
+        });
+    }
+
+    return true;
+}

package/plugins/prompt-templates/ownership.mjs

@@ -0,0 +1,19 @@
+export const pluginOwnership = {
+    pluginId: 'prompt-templates',
+    createdBy: 'ymkiux',
+    maintainers: ['ymkiux']
+};
+
+export const templateOwnershipById = {
+    builtin_comment_polish: {
+        templateId: 'builtin_comment_polish',
+        createdBy: 'ymkiux',
+        maintainers: ['ymkiux']
+    },
+    builtin_rule_ack: {
+        templateId: 'builtin_rule_ack',
+        createdBy: 'ymkiux',
+        maintainers: ['ymkiux']
+    }
+};
+

package/plugins/prompt-templates/rule-ack/index.mjs

@@ -0,0 +1,21 @@
+import { pluginOwnership, templateOwnershipById } from '../ownership.mjs';
+
+export function buildBuiltinRuleAckTemplate(t) {
+    const tr = (key, fallback, params = null) => (typeof t === 'function' ? t(key, params) : fallback);
+    const line1 = tr('plugins.builtin.ruleAck.line1', '请根据【{{rule}}】，收到请回复');
+    const timestamp = new Date().toISOString();
+    const ownership = templateOwnershipById && templateOwnershipById.builtin_rule_ack
+        ? templateOwnershipById.builtin_rule_ack
+        : pluginOwnership;
+    return {
+        id: 'builtin_rule_ack',
+        name: tr('plugins.builtin.ruleAck.name', '规则确认回复'),
+        description: tr('plugins.builtin.ruleAck.desc', '请根据【{{rule}}】，收到请回复'),
+        template: line1,
+        createdAt: timestamp,
+        updatedAt: timestamp,
+        isBuiltin: true,
+        createdBy: ownership && typeof ownership.createdBy === 'string' ? ownership.createdBy : '',
+        maintainers: ownership && Array.isArray(ownership.maintainers) ? ownership.maintainers : []
+    };
+}

package/plugins/prompt-templates/storage.mjs

@@ -0,0 +1,64 @@
+const STORAGE_KEY = 'codexmate.plugins.promptTemplates.v1';
+const SELECTED_TEMPLATE_STORAGE_KEY = 'codexmate.plugins.promptTemplates.selectedTemplateId.v1';
+
+export function readPromptTemplatesFromStorage(storage = localStorage) {
+    if (!storage) return [];
+    let raw = '';
+    try {
+        raw = storage.getItem(STORAGE_KEY) || '';
+    } catch (_) {
+        raw = '';
+    }
+    if (!raw) return [];
+    try {
+        const parsed = JSON.parse(raw);
+        if (!Array.isArray(parsed)) return [];
+        return parsed;
+    } catch (_) {
+        return [];
+    }
+}
+
+export function persistPromptTemplatesToStorage(list, storage = localStorage) {
+    if (!storage) return false;
+    try {
+        storage.setItem(STORAGE_KEY, JSON.stringify(Array.isArray(list) ? list : []));
+        return true;
+    } catch (_) {
+        return false;
+    }
+}
+
+export function clearPromptTemplatesStorage(storage = localStorage) {
+    if (!storage) return;
+    try {
+        storage.removeItem(STORAGE_KEY);
+    } catch (_) {}
+}
+
+export function readPromptTemplateSelectedIdFromStorage(storage = localStorage) {
+    if (!storage) return '';
+    let raw = '';
+    try {
+        raw = storage.getItem(SELECTED_TEMPLATE_STORAGE_KEY) || '';
+    } catch (_) {
+        raw = '';
+    }
+    const id = typeof raw === 'string' ? raw.trim() : '';
+    return id;
+}
+
+export function persistPromptTemplateSelectedIdToStorage(templateId, storage = localStorage) {
+    if (!storage) return false;
+    const id = typeof templateId === 'string' ? templateId.trim() : '';
+    try {
+        if (!id) {
+            storage.removeItem(SELECTED_TEMPLATE_STORAGE_KEY);
+            return true;
+        }
+        storage.setItem(SELECTED_TEMPLATE_STORAGE_KEY, id);
+        return true;
+    } catch (_) {
+        return false;
+    }
+}

package/plugins/registry.mjs

@@ -0,0 +1,16 @@
+import { pluginMeta as promptTemplatesMeta } from './prompt-templates/manifest.mjs';
+import { loadPromptTemplatesOverview } from './prompt-templates/overview.mjs';
+
+export const pluginsRegistry = [
+    { id: promptTemplatesMeta.id, meta: promptTemplatesMeta, loadOverview: loadPromptTemplatesOverview }
+];
+
+export function getFirstPluginId() {
+    return pluginsRegistry.length ? pluginsRegistry[0].id : '';
+}
+
+export function getPluginEntry(id) {
+    const key = typeof id === 'string' ? id.trim() : '';
+    if (!key) return null;
+    return pluginsRegistry.find((item) => item && item.id === key) || null;
+}

package/web-ui/app.js

@@ -30,8 +30,7 @@ document.addEventListener('DOMContentLoaded', () => {
         data() {
             return {
                 lang: 'zh',
-                // 默认选中首个主标签：Docs
-                mainTab: 'docs',
+                mainTab: 'dashboard',
                 configMode: 'codex',
                 currentProvider: '',
                 currentModel: '',
@@ -63,9 +62,9 @@ document.addEventListener('DOMContentLoaded', () => {
                 showEditConfigModal: false,
                 showOpenclawConfigModal: false,
                 showConfigTemplateModal: false,
-                showHealthCheckDialog: false,
                 showAgentsModal: false,
                 showSkillsModal: false,
+                showHealthCheckModal: false,
                 // Plugins
                 pluginsActiveId: 'prompt-templates',
                 pluginsLoading: false,
@@ -179,17 +178,20 @@ document.addEventListener('DOMContentLoaded', () => {
                 sessionPathOptionsMap: {
                     all: [],
                     codex: [],
-                    claude: []
+                    claude: [],
+                    gemini: []
                 },
                 sessionPathOptionsLoadedMap: {
                     all: false,
                     codex: false,
-                    claude: false
+                    claude: false,
+                    gemini: false
                 },
                 sessionPathRequestSeqMap: {
                     all: 0,
                     codex: 0,
-                    claude: 0
+                    claude: 0,
+                    gemini: 0
                 },
                 sessionExporting: {},
                 sessionCloning: {},
@@ -245,38 +247,14 @@ document.addEventListener('DOMContentLoaded', () => {
                 providerSwitchInProgress: false,
                 pendingProviderSwitch: '',
                 providerSwitchDisplayTarget: '',
-                healthCheckDialogLockedProvider: '',
-                healthCheckDialogSelectedProvider: '',
-                healthCheckDialogPrompt: '请简短回复：连接正常。',
-                healthCheckDialogMessages: [],
-                healthCheckDialogSending: false,
-                healthCheckDialogLastResult: null,
+                healthCheckBatchTotal: 0,
+                healthCheckBatchDone: 0,
+                healthCheckBatchFailed: 0,
                 installPackageManager: 'npm',
                 installCommandAction: 'install',
                 installRegistryPreset: 'default',
                 installRegistryCustom: '',
-                installStatusTargets: [
-                    {
-                        id: 'claude',
-                        name: 'Claude Code CLI',
-                        packageName: '@anthropic-ai/claude-code',
-                        installed: false,
-                        bin: 'claude',
-                        version: '',
-                        commandPath: '',
-                        error: ''
-                    },
-                    {
-                        id: 'codex',
-                        name: 'Codex CLI',
-                        packageName: '@openai/codex',
-                        installed: false,
-                        bin: 'codex',
-                        version: '',
-                        commandPath: '',
-                        error: ''
-                    }
-                ],
+                installStatusTargets: null,
                 newProvider: { name: '', url: '', key: '', useTransform: false },
                 resetConfigLoading: false,
                 editingProvider: { name: '', url: '', key: '', readOnly: false, nonEditable: false },
@@ -434,7 +412,7 @@ document.addEventListener('DOMContentLoaded', () => {
             }
             {
                 const NAV_STATE_STORAGE_KEY = 'codexmateNavState.v1';
-                const mainTabSet = new Set(['config', 'sessions', 'usage', 'orchestration', 'market', 'plugins', 'docs', 'settings']);
+                const mainTabSet = new Set(['dashboard', 'config', 'sessions', 'usage', 'orchestration', 'market', 'plugins', 'docs', 'settings']);
                 let restored = null;
                 try {
                     const raw = localStorage.getItem(NAV_STATE_STORAGE_KEY) || '';
@@ -557,6 +535,14 @@ document.addEventListener('DOMContentLoaded', () => {
                     if (!startupOk) {
                         return;
                     }
+                    if (this.mainTab === 'dashboard') {
+                        if (!this.__doctorLoadedOnce) {
+                            this.__doctorLoadedOnce = true;
+                            if (typeof this.runHealthCheck === 'function') {
+                                void this.runHealthCheck({ doctor: true, silent: true });
+                            }
+                        }
+                    }
                     void this.refreshClaudeSelectionFromSettings({ silent: true });
                     void this.syncDefaultOpenclawConfigEntry({ silent: true });
                 };

package/web-ui/index.html

@@ -4,14 +4,15 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Codex Mate</title>
-    <link rel="icon" type="image/png" href="/res/logo.png">
-    <link rel="apple-touch-icon" href="/res/logo.png">
+    <link rel="icon" type="image/webp" href="/res/logo-pack.webp">
+    <link rel="apple-touch-icon" href="/res/logo-pack.webp">
     <script src="/res/vue.global.prod.js"></script>
     <script src="/res/json5.min.js"></script>
     <link rel="stylesheet" href="/web-ui/styles.css">
 </head>
 <body>
     <!-- @include ./partials/index/layout-header.html -->
+    <!-- @include ./partials/index/panel-dashboard.html -->
     <!-- @include ./partials/index/panel-config-codex.html -->
     <!-- @include ./partials/index/panel-config-claude.html -->
     <!-- @include ./partials/index/panel-config-openclaw.html -->
@@ -24,10 +25,10 @@
     <!-- @include ./partials/index/panel-plugins.html -->
     <!-- @include ./partials/index/layout-footer.html -->
     <!-- @include ./partials/index/modals-basic.html -->
-    <!-- @include ./partials/index/modal-health-check.html -->
     <!-- @include ./partials/index/modal-openclaw-config.html -->
     <!-- @include ./partials/index/modal-config-template-agents.html -->
     <!-- @include ./partials/index/modal-skills.html -->
+    <!-- @include ./partials/index/modal-health-check.html -->
     <!-- @include ./partials/index/modal-confirm-toast.html -->
     <script type="module" src="/web-ui/app.js"></script>
 </body>

package/web-ui/logic.sessions.mjs

@@ -29,14 +29,14 @@ function shouldUseFastSessionBrowseLimit(options = {}) {
 
 export function isSessionQueryEnabled(source) {
     const normalized = normalizeSessionSource(source, '');
-    return normalized === 'codex' || normalized === 'claude' || normalized === 'all';
+    return normalized === 'codex' || normalized === 'claude' || normalized === 'gemini' || normalized === 'codebuddy' || normalized === 'all';
 }
 
 export function normalizeSessionSource(source, fallback = 'all') {
     const normalized = typeof source === 'string'
         ? source.trim().toLowerCase()
         : '';
-    if (normalized === 'codex' || normalized === 'claude' || normalized === 'all') {
+    if (normalized === 'codex' || normalized === 'claude' || normalized === 'gemini' || normalized === 'codebuddy' || normalized === 'all') {
         return normalized;
     }
     return fallback;

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

@@ -37,7 +37,7 @@ export function createDashboardComputed() {
         },
         displayProvidersList() {
             const list = Array.isArray(this.providersList) ? this.providersList : [];
-            return list.filter((item) => String(item && item.name ? item.name : '').trim().toLowerCase() !== 'codexmate-proxy');
+            return list;
         },
         installTargetCards() {
             const targets = Array.isArray(this.installStatusTargets) ? this.installStatusTargets : [];
@@ -59,39 +59,41 @@ export function createDashboardComputed() {
         },
         inspectorBusyStatus() {
             const tasks = [];
-            if (this.loading) tasks.push('初始化');
-            if (this.sessionsLoading) tasks.push('会话加载');
-            if (this.codexModelsLoading || this.claudeModelsLoading) tasks.push('模型加载');
-            if (this.codexApplying || this.configTemplateApplying || this.openclawApplying) tasks.push('配置应用');
-            if (this.agentsSaving) tasks.push('AGENTS 保存');
-            if (this.skillsLoading || this.skillsDeleting || this.skillsScanningImports || this.skillsImporting || this.skillsZipImporting || this.skillsExporting) tasks.push('Skills 管理');
+            if (this.loading) tasks.push(this.t('dashboard.busy.init'));
+            if (this.sessionsLoading) tasks.push(this.t('dashboard.busy.sessions'));
+            if (this.codexModelsLoading || this.claudeModelsLoading) tasks.push(this.t('dashboard.busy.models'));
+            if (this.codexApplying || this.configTemplateApplying || this.openclawApplying) tasks.push(this.t('dashboard.busy.configApply'));
+            if (this.agentsSaving) tasks.push(this.t('dashboard.busy.agents'));
+            if (this.skillsLoading || this.skillsDeleting || this.skillsScanningImports || this.skillsImporting || this.skillsZipImporting || this.skillsExporting) tasks.push(this.t('dashboard.busy.skills'));
             if (this.taskOrchestration && (this.taskOrchestration.loading || this.taskOrchestration.planning || this.taskOrchestration.running || this.taskOrchestration.queueAdding || this.taskOrchestration.queueStarting || this.taskOrchestration.retrying || this.taskOrchestration.selectedRunLoading)) {
-                tasks.push('任务编排');
+                tasks.push(this.t('dashboard.busy.tasks'));
             }
-            return tasks.length ? tasks.join(' / ') : '空闲';
+            return tasks.length ? tasks.join(' / ') : this.t('dashboard.busy.idle');
         },
         inspectorMessageSummary() {
             const value = typeof this.message === 'string' ? this.message.trim() : '';
-            return value || '暂无提示';
+            return value || this.t('dashboard.message.none');
         },
         inspectorSessionSourceLabel() {
-            if (this.sessionFilterSource === 'codex') return 'Codex';
-            if (this.sessionFilterSource === 'claude') return 'Claude Code';
-            return '全部';
+            if (this.sessionFilterSource === 'codex') return this.t('dashboard.sessionSource.codex');
+            if (this.sessionFilterSource === 'claude') return this.t('dashboard.sessionSource.claude');
+            if (this.sessionFilterSource === 'gemini') return this.t('dashboard.sessionSource.gemini');
+            if (this.sessionFilterSource === 'codebuddy') return this.t('dashboard.sessionSource.codebuddy');
+            return this.t('dashboard.sessionSource.all');
         },
         inspectorSessionPathLabel() {
             const value = typeof this.sessionPathFilter === 'string' ? this.sessionPathFilter.trim() : '';
-            return value || '全部路径';
+            return value || this.t('dashboard.sessionPath.all');
         },
         inspectorSessionQueryLabel() {
-            if (!this.isSessionQueryEnabled) return '当前来源不支持';
+            if (!this.isSessionQueryEnabled) return this.t('dashboard.sessionQuery.unsupported');
             const value = typeof this.sessionQuery === 'string' ? this.sessionQuery.trim() : '';
-            return value || '未设置';
+            return value || this.t('dashboard.sessionQuery.unset');
         },
         inspectorHealthStatus() {
-            if (this.initError) return '读取失败';
-            if (this.loading) return '初始化中';
-            return '正常';
+            if (this.initError) return this.t('dashboard.healthStatus.failRead');
+            if (this.loading) return this.t('dashboard.healthStatus.initializing');
+            return this.t('dashboard.healthStatus.ok');
         },
         inspectorHealthTone() {
             if (this.initError) return 'error';
@@ -100,12 +102,12 @@ export function createDashboardComputed() {
         },
         inspectorModelLoadStatus() {
             if (this.codexModelsLoading || this.claudeModelsLoading) {
-                return '加载中';
+                return this.t('dashboard.modelStatus.loading');
             }
             if (this.modelsSource === 'error' || this.claudeModelsSource === 'error') {
-                return '加载异常';
+                return this.t('dashboard.modelStatus.error');
             }
-            return '正常';
+            return this.t('dashboard.modelStatus.ok');
         },
         installTroubleshootingTips() {
             const platform = this.resolveInstallPlatform();

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

@@ -136,6 +136,7 @@ function createTaskDraftReadiness(metrics) {
 export function createMainTabsComputed() {
     return {
         mainTabKicker() {
+            if (this.mainTab === 'dashboard') return this.t('kicker.dashboard');
             if (this.mainTab === 'config') return this.t('kicker.config');
             if (this.mainTab === 'sessions') return this.t('kicker.sessions');
             if (this.mainTab === 'usage') return this.t('kicker.usage');
@@ -146,6 +147,7 @@ export function createMainTabsComputed() {
             return this.t('kicker.settings');
         },
         mainTabTitle() {
+            if (this.mainTab === 'dashboard') return this.t('title.dashboard');
             if (this.mainTab === 'config') return this.t('title.config');
             if (this.mainTab === 'sessions') return this.t('title.sessions');
             if (this.mainTab === 'usage') return this.t('title.usage');
@@ -156,6 +158,7 @@ export function createMainTabsComputed() {
             return this.t('title.settings');
         },
         mainTabSubtitle() {
+            if (this.mainTab === 'dashboard') return this.t('subtitle.dashboard');
             if (this.mainTab === 'config') return this.t('subtitle.config');
             if (this.mainTab === 'sessions') return this.t('subtitle.sessions');
             if (this.mainTab === 'usage') return this.t('subtitle.usage');

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

@@ -549,6 +549,23 @@ export function createSessionComputed() {
             ];
         },
 
+        usageCurrentSessionStats() {
+            const summary = this.sessionUsageCharts && this.sessionUsageCharts.summary
+                ? this.sessionUsageCharts.summary
+                : null;
+            if (!summary) return null;
+            const t = typeof this.t === 'function' ? this.t : null;
+            return {
+                apiDurationLabel: formatUsageDuration(summary.activeDurationMs || 0, { compact: true, lang: this.lang }),
+                totalDurationLabel: formatUsageDuration(summary.totalDurationMs || 0, { compact: true, lang: this.lang }),
+                tokenLabel: formatCompactUsageSummaryNumber(summary.totalTokens || 0),
+                label: t ? t('usage.currentSession.title') : '当前会话',
+                apiDurationText: t ? t('usage.currentSession.apiDuration') : 'API时长',
+                totalDurationText: t ? t('usage.currentSession.totalDuration') : '总时长',
+                tokenText: t ? t('usage.currentSession.tokens') : 'Token'
+            };
+        },
+
         sessionUsageDaily() {
             const baseBuckets = this.sessionUsageCharts && Array.isArray(this.sessionUsageCharts.buckets)
                 ? this.sessionUsageCharts.buckets

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