codexmate 0.0.26 → 0.0.28

package/web-ui/modules/i18n.dict.mjs

@@ -108,8 +108,6 @@ const DICT = Object.freeze({
         'placeholder.apiKeyExampleClaude': 'sk-ant-...',
         'placeholder.baseUrlExampleClaude': 'https://open.bigmodel.cn/api/anthropic',
         'placeholder.selectProvider': '请选择提供商',
-        'placeholder.varNameExample': '例如: code',
-        'hint.varNameRules': '仅支持字母/数字/下划线/中划线/点，将插入为 {{var}}。',
 
         // Roles / labels
         'role.you': '你',
@@ -332,7 +330,6 @@ const DICT = Object.freeze({
         'plugins.promptTemplates.editor.templatePlaceholder': '在这里编写模板。使用 {{var}} 占位符。',
         'plugins.promptTemplates.vars.title': '变量',
         'plugins.promptTemplates.vars.hint': '从模板中检测。填写后可渲染最终提示词。',
-        'plugins.promptTemplates.vars.add': '新增变量',
         'plugins.promptTemplates.vars.reset': '重置',
         'plugins.promptTemplates.vars.empty': '未检测到变量。',
         'plugins.promptTemplates.vars.valuePlaceholder': '变量值：{name}',
@@ -341,10 +338,6 @@ const DICT = Object.freeze({
         'plugins.promptTemplates.preview.copy': '复制',
         'plugins.promptTemplates.preview.outputAria': '渲染结果（提示词）',
         'plugins.promptTemplates.noPluginSelected': '请先从左侧选择一个插件。',
-        'plugins.promptTemplates.varModal.title': '新增变量',
-        'plugins.promptTemplates.varModal.nameLabel': '变量名',
-        'plugins.promptTemplates.varModal.cancel': '取消',
-        'plugins.promptTemplates.varModal.add': '添加',
 
         'plugins.meta.attribution': '创建者：{createdBy} · 维护者：{maintainers}',
         'plugins.meta.createdBy': '创建者：{createdBy}',
@@ -378,12 +371,8 @@ const DICT = Object.freeze({
         'toast.export.notSupported': '当前不支持导出',
         'toast.plugins.loadFail': '加载 Plugins 失败',
         'toast.templates.builtinNotEditable': '内置模板不可编辑',
-        'toast.templates.varAdded': '已添加变量',
         'toast.templates.builtinNotModifiable': '内置模板不可修改，请先复制再编辑',
         'toast.templates.nameRequired': '模板名称不能为空',
-        'toast.templates.varNameRequired': '请输入变量名',
-        'toast.templates.varNameInvalid': '变量名仅支持字母/数字/下划线/中划线/点',
-        'toast.templates.varExists': '变量已存在',
         'toast.templates.builtinNotDuplicable': '内置模板不可复制',
         'toast.templates.builtinNotDeletable': '内置模板不可删除',
         'toast.templates.deleteTitle': '删除模板',
@@ -545,7 +534,6 @@ const DICT = Object.freeze({
         'sessions.pin': '置顶',
         'sessions.unpin': '取消置顶',
         'sessions.copyResume': '复制恢复命令',
-        'sessions.resumeYolo': '复制恢复命令附带 --yolo',
         'sessions.preview.refresh': '刷新内容',
         'sessions.preview.loading': '加载中...',
         'sessions.preview.deleteHard': '直接删除',
@@ -622,6 +610,11 @@ const DICT = Object.freeze({
         'usage.heatmap.legend.more': '多',
         'usage.heatmap.tooltip': '{date} · {sessions} 会话 · {messages} 消息 · {tokens} token',
         'usage.heatmap.aria': '{date}，{sessions} 会话',
+        'usage.hourlyHeatmap.title': '7×24 活跃热力图',
+        'usage.hourlyHeatmap.subtitle': '按星期 × 小时聚合会话分布，深色 = 高活跃。',
+        'usage.hourlyHeatmap.tooltip': '{weekday} {hour}:00 · {sessions} 会话 · {messages} 消息 · {tokens} token',
+        'usage.hourlyHeatmap.legend.less': '少',
+        'usage.hourlyHeatmap.legend.more': '多',
         'usage.legend.tokens': 'Token',
         'usage.legend.cost': '预估费用',
         'usage.table.date': '日期',
@@ -705,6 +698,7 @@ const DICT = Object.freeze({
 
         // Config panel (Codex)
         'config.addProvider': '新增提供商',
+        'config.providerTemplate.title': '预设供应商',
         'config.models': '模型',
         'config.modelLoading': '加载中...',
         'config.models.unlimited': '当前无模型列表，可手填。',
@@ -740,6 +734,7 @@ const DICT = Object.freeze({
         'modal.agents.title.openclawWorkspaceFile': 'OpenClaw 工作区文件: {fileName}',
         'modal.agents.hint.openclawWorkspaceFile': '保存后会写入 OpenClaw Workspace 下的 {fileName}。',
         'config.url.unset': '未设 URL',
+        'config.model.unset': '未设置模型',
         'config.badge.system': '系统',
         'config.availabilityTest': '可用性测试',
         'config.availabilityTestAria': '测试 {name} 可用性',
@@ -904,10 +899,9 @@ const DICT = Object.freeze({
         ,
 
         // Settings panel
-        'settings.tab.backup': '备份与导入',
-        'settings.tab.trash': '回收站',
-        'settings.tab.device': '设备',
-        'settings.tabs.aria': '设置标签页',
+        'settings.tab.general': '通用',
+        'settings.tab.data': '数据',
+        'settings.tabs.aria': '设置分类',
         'settings.sharePrefix.title': '分享命令前缀',
         'settings.sharePrefix.meta': '影响 Web UI 里“复制分享命令”的前缀',
         'settings.sharePrefix.label': '前缀',
@@ -944,6 +938,10 @@ const DICT = Object.freeze({
         'settings.trash.workspace': '工作区',
         'settings.trash.originalFile': '原文件',
         'settings.trash.loadMore': '加载更多（剩余 {count} 项）',
+        'settings.trash.retention': '自动清理',
+        'settings.trash.retentionMeta': '超过保留天数的回收站记录将自动清除',
+        'settings.trash.retentionLabel': '保留天数',
+        'settings.trash.retentionHint': '范围 1-365 天，默认 30 天。每次加载回收站时自动清理过期记录。',
 
         'settings.templateConfirm.title': '配置模板二次确认',
         'settings.templateConfirm.meta': '降低误写入风险',
@@ -1162,8 +1160,6 @@ const DICT = Object.freeze({
         'placeholder.apiKeyExampleClaude': 'sk-ant-...',
         'placeholder.baseUrlExampleClaude': 'https://open.bigmodel.cn/api/anthropic',
         'placeholder.selectProvider': 'Select a provider',
-        'placeholder.varNameExample': 'e.g. code',
-        'hint.varNameRules': 'Allowed: letters/numbers/underscore/dash/dot. Will be inserted as {{var}}.',
 
         // Roles / labels
         'role.you': 'You',
@@ -1386,7 +1382,6 @@ const DICT = Object.freeze({
         'plugins.promptTemplates.editor.templatePlaceholder': 'Write your template here. Use {{var}} placeholders.',
         'plugins.promptTemplates.vars.title': 'Variables',
         'plugins.promptTemplates.vars.hint': 'Detected from the template. Fill them to render the final prompt.',
-        'plugins.promptTemplates.vars.add': 'Add variable',
         'plugins.promptTemplates.vars.reset': 'Reset',
         'plugins.promptTemplates.vars.empty': 'No variables detected.',
         'plugins.promptTemplates.vars.valuePlaceholder': 'Value for {name}',
@@ -1395,10 +1390,6 @@ const DICT = Object.freeze({
         'plugins.promptTemplates.preview.copy': 'Copy',
         'plugins.promptTemplates.preview.outputAria': 'Rendered prompt',
         'plugins.promptTemplates.noPluginSelected': 'Select a plugin from the left panel first.',
-        'plugins.promptTemplates.varModal.title': 'Add variable',
-        'plugins.promptTemplates.varModal.nameLabel': 'Variable name',
-        'plugins.promptTemplates.varModal.cancel': 'Cancel',
-        'plugins.promptTemplates.varModal.add': 'Add',
 
         'plugins.meta.attribution': 'Created by {createdBy} · Maintained by {maintainers}',
         'plugins.meta.createdBy': 'Created by {createdBy}',
@@ -1432,12 +1423,8 @@ const DICT = Object.freeze({
         'toast.export.notSupported': 'Export not supported',
         'toast.plugins.loadFail': 'Failed to load plugins',
         'toast.templates.builtinNotEditable': 'Built-in templates are not editable',
-        'toast.templates.varAdded': 'Variable added',
         'toast.templates.builtinNotModifiable': 'Built-in templates are read-only. Duplicate first.',
         'toast.templates.nameRequired': 'Template name is required',
-        'toast.templates.varNameRequired': 'Variable name is required',
-        'toast.templates.varNameInvalid': 'Variable name may only contain letters, numbers, underscore, dash, dot',
-        'toast.templates.varExists': 'Variable already exists',
         'toast.templates.builtinNotDuplicable': 'Built-in templates cannot be duplicated',
         'toast.templates.builtinNotDeletable': 'Built-in templates cannot be deleted',
         'toast.templates.deleteTitle': 'Delete template',
@@ -1599,7 +1586,6 @@ const DICT = Object.freeze({
         'sessions.pin': 'Pin',
         'sessions.unpin': 'Unpin',
         'sessions.copyResume': 'Copy resume command',
-        'sessions.resumeYolo': 'Append --yolo to resume command',
         'sessions.preview.refresh': 'Refresh content',
         'sessions.preview.loading': 'Loading...',
         'sessions.preview.deleteHard': 'Delete permanently',
@@ -1676,6 +1662,11 @@ const DICT = Object.freeze({
         'usage.heatmap.legend.more': 'More',
         'usage.heatmap.tooltip': '{date} · {sessions} sessions · {messages} messages · {tokens} tokens',
         'usage.heatmap.aria': '{date}, {sessions} sessions',
+        'usage.hourlyHeatmap.title': '7×24 Activity Heatmap',
+        'usage.hourlyHeatmap.subtitle': 'Session distribution by weekday × hour; darker = more active.',
+        'usage.hourlyHeatmap.tooltip': '{weekday} {hour}:00 · {sessions} sessions · {messages} messages · {tokens} tokens',
+        'usage.hourlyHeatmap.legend.less': 'Less',
+        'usage.hourlyHeatmap.legend.more': 'More',
         'usage.legend.tokens': 'Tokens',
         'usage.legend.cost': 'Estimated cost',
         'usage.table.date': 'Date',
@@ -1759,6 +1750,7 @@ const DICT = Object.freeze({
 
         // Config panel (Codex)
         'config.addProvider': 'Add provider',
+        'config.providerTemplate.title': 'Provider presets',
         'config.models': 'Model',
         'config.modelLoading': 'Loading...',
         'config.models.unlimited': 'No model list available. Enter manually.',
@@ -1794,6 +1786,7 @@ const DICT = Object.freeze({
         'modal.agents.title.openclawWorkspaceFile': 'OpenClaw workspace file: {fileName}',
         'modal.agents.hint.openclawWorkspaceFile': 'Saved content will be written to OpenClaw workspace {fileName}.',
         'config.url.unset': 'URL not set',
+        'config.model.unset': 'Model not set',
         'config.badge.system': 'System',
         'config.availabilityTest': 'Availability test',
         'config.availabilityTestAria': 'Test availability for {name}',
@@ -1958,10 +1951,9 @@ const DICT = Object.freeze({
         ,
 
         // Settings panel
-        'settings.tab.backup': 'Backup & Import',
-        'settings.tab.trash': 'Trash',
-        'settings.tab.device': 'Device',
-        'settings.tabs.aria': 'Settings tabs',
+        'settings.tab.general': 'General',
+        'settings.tab.data': 'Data',
+        'settings.tabs.aria': 'Settings categories',
         'settings.sharePrefix.title': 'Share command prefix',
         'settings.sharePrefix.meta': 'Used as the prefix for “Copy share command” in the Web UI',
         'settings.sharePrefix.label': 'Prefix',
@@ -1998,6 +1990,10 @@ const DICT = Object.freeze({
         'settings.trash.workspace': 'Workspace',
         'settings.trash.originalFile': 'Original file',
         'settings.trash.loadMore': 'Load more (remaining {count})',
+        'settings.trash.retention': 'Auto-purge',
+        'settings.trash.retentionMeta': 'Trash entries older than retention days are auto-purged',
+        'settings.trash.retentionLabel': 'Retention days',
+        'settings.trash.retentionHint': 'Range 1-365 days, default 30. Expired entries are purged on each trash load.',
 
         'settings.templateConfirm.title': 'Template apply confirmation',
         'settings.templateConfirm.meta': 'Reduce accidental writes',

package/web-ui/modules/provider-url-display.mjs

@@ -0,0 +1,17 @@
+export function getProviderDisplayUrl(provider) {
+    if (!provider) return '';
+    const bridge = typeof provider.codexmate_bridge === 'string' ? provider.codexmate_bridge.trim() : '';
+    if (bridge === 'openai') {
+        const upstream = typeof provider.upstreamUrl === 'string' ? provider.upstreamUrl.trim() : '';
+        if (upstream) return upstream;
+    }
+    return provider.url || '';
+}
+
+export function checkIsTransformProvider(provider) {
+    if (!provider || typeof provider !== 'object') return false;
+    const bridge = typeof provider.codexmate_bridge === 'string' ? provider.codexmate_bridge.trim() : '';
+    if (bridge === 'openai') return true;
+    const url = String(provider.url || '');
+    return url.includes('/bridge/openai/');
+}

package/web-ui/partials/index/panel-config-claude.html

@@ -64,6 +64,9 @@
                         <button type="button" class="btn-mini" @click="newClaudeConfig.name = 'AiHubMix'; newClaudeConfig.apiKey = ''; newClaudeConfig.baseUrl = 'https://aihubmix.com'; newClaudeConfig.model = 'glm-4.7'; showClaudeConfigModal = true">AiHubMix</button>
                         <button type="button" class="btn-mini" @click="newClaudeConfig.name = 'DMXAPI'; newClaudeConfig.apiKey = ''; newClaudeConfig.baseUrl = 'https://www.dmxapi.cn'; newClaudeConfig.model = 'glm-4.7'; showClaudeConfigModal = true">DMXAPI</button>
                         <button type="button" class="btn-mini" @click="newClaudeConfig.name = 'PackyCode'; newClaudeConfig.apiKey = ''; newClaudeConfig.baseUrl = 'https://www.packyapi.com'; newClaudeConfig.model = 'glm-4.7'; showClaudeConfigModal = true">PackyCode</button>
+                        <button type="button" class="btn-mini" @click="newClaudeConfig.name = 'AnyRouter'; newClaudeConfig.apiKey = ''; newClaudeConfig.baseUrl = 'https://anyrouter.top'; newClaudeConfig.model = 'claude-opus-4-7[1m]'; showClaudeConfigModal = true">AnyRouter</button>
+                        <button type="button" class="btn-mini" @click="newClaudeConfig.name = 'Xiaomi MiMo'; newClaudeConfig.apiKey = ''; newClaudeConfig.baseUrl = 'https://api.xiaomimimo.com/anthropic'; newClaudeConfig.model = 'mimo-v2.5-pro'; showClaudeConfigModal = true">Xiaomi MiMo</button>
+                        <button type="button" class="btn-mini" @click="newClaudeConfig.name = 'Xiaomi Token Plan'; newClaudeConfig.apiKey = ''; newClaudeConfig.baseUrl = 'https://token-plan-cn.xiaomimimo.com/anthropic'; newClaudeConfig.model = 'mimo-v2.5-pro'; showClaudeConfigModal = true">Xiaomi Token Plan</button>
                     </div>
                 </div>
 
@@ -146,7 +149,8 @@
                             <div class="card-icon">{{ name.charAt(0).toUpperCase() }}</div>
                             <div class="card-content">
                                 <div class="card-title">{{ name }}</div>
-                                <div class="card-subtitle">{{ config.model || t('claude.model.unset') }}</div>
+                                <div class="card-subtitle card-subtitle-model">{{ config.model || t('claude.model.unset') }}</div>
+                                <div class="card-subtitle card-subtitle-url" v-if="config.baseUrl">{{ config.baseUrl }}</div>
                             </div>
                         </div>
                         <div class="card-trailing">

package/web-ui/partials/index/panel-config-codex.html

@@ -38,6 +38,27 @@
                     {{ t('config.addProvider') }}
                 </button>
 
+                <!-- 服务预设 -->
+                <div class="selector-section" v-if="isCodexConfigMode && codexProviderTemplates.length">
+                    <div class="selector-header">
+                        <span class="selector-title">{{ t('config.providerTemplate.title') }}</span>
+                    </div>
+                    <div class="btn-group" style="flex-wrap: wrap; gap: 8px;">
+                        <button
+                            v-for="tpl in codexProviderTemplates"
+                            :key="tpl.name"
+                            type="button"
+                            class="btn-mini"
+                            @click="newProvider.name = tpl.name;
+                                    newProvider.url = tpl.url;
+                                    newProvider._suggestedModel = tpl.model || '';
+                                    newProvider.useTransform = !!tpl.useTransform;
+                                    showAddModal = true">
+                            {{ tpl.label }}
+                        </button>
+                    </div>
+                </div>
+
                 <!-- 模型选择器 -->
                 <div class="selector-section">
                     <div class="selector-header">
@@ -55,15 +76,20 @@
                         :disabled="codexModelsLoading"
                     >
                         <option v-if="codexModelsLoading" value="">{{ t('config.modelLoading') }}</option>
-                        <option v-else v-for="model in models" :key="model" :value="model">{{ model }}</option>
+                        <option v-else v-for="model in codexModelOptions" :key="model" :value="model">{{ model }}</option>
                     </select>
                     <input
                         v-if="!codexModelsLoading && (modelsSource !== 'remote' || !modelsHasCurrent)"
                         class="model-input"
                         v-model="currentModel"
                         @blur="onModelChange"
+                        @keyup.enter="onModelChange"
                         :placeholder="activeProviderModelPlaceholder"
+                        :list="codexModelHasList ? 'codex-model-options' : null"
                     >
+                    <datalist v-if="codexModelHasList" id="codex-model-options">
+                        <option v-for="model in codexModelOptions" :key="model" :value="model"></option>
+                    </datalist>
                     <div class="config-template-hint" v-if="modelsSource === 'unlimited'">
                         {{ t('config.models.unlimited') }}
                     </div>
@@ -204,14 +230,17 @@
                          role="button"
                          :aria-current="displayCurrentProvider === provider.name ? 'true' : null">
                         <div class="card-leading">
-                            <div class="card-icon">{{ provider.name.charAt(0).toUpperCase() }}</div>
+                            <div class="card-icon">{{ provider.name.charAt(0).toUpperCase() }}<span v-if="isTransformProvider(provider)" class="card-icon-dot" title="通过内建转换适配"></span></div>
                             <div class="card-content">
                                 <div class="card-title">
                                     <span>{{ provider.name }}</span>
                                     <span v-if="provider.readOnly" class="provider-readonly-badge">{{ t('config.badge.system') }}</span>
                                 </div>
-                                <div class="card-subtitle">
-                                    {{ provider.url || t('config.url.unset') }}
+                                <div class="card-subtitle card-subtitle-model">
+                                    {{ activeProviderModel(provider.name) || t('config.model.unset') }}
+                                </div>
+                                <div class="card-subtitle card-subtitle-url">
+                                    {{ displayProviderUrl(provider) || t('config.url.unset') }}
                                 </div>
                             </div>
                         </div>

package/web-ui/partials/index/panel-plugins.html

@@ -176,7 +176,7 @@
                                         <template v-else>
                                             <div class="prompt-editor-head">
                                                 <div class="prompt-editor-title-row">
-                                                    <input class="form-input prompt-editor-name" type="text" v-model.trim="promptTemplateDraft.name" :disabled="promptTemplateDraft.isBuiltin" :placeholder="t('plugins.promptTemplates.editor.namePlaceholder')" :aria-label="t('plugins.promptTemplates.editor.nameAria')">
+                                                    <input class="form-input prompt-editor-name" type="text" v-model.trim="promptTemplateDraftRaw.name" :disabled="promptTemplateDraft.isBuiltin" :placeholder="t('plugins.promptTemplates.editor.namePlaceholder')" :aria-label="t('plugins.promptTemplates.editor.nameAria')">
                                                     <div v-if="!promptTemplateDraft.isBuiltin" class="prompt-editor-actions">
                                                         <button type="button" class="btn-mini" @click="duplicatePromptTemplate" :disabled="pluginsLoading">{{ t('plugins.promptTemplates.editor.duplicate') }}</button>
                                                         <button type="button" class="btn-mini delete" @click="deletePromptTemplate" :disabled="pluginsLoading">{{ t('plugins.promptTemplates.editor.delete') }}</button>
@@ -189,14 +189,14 @@
                                                 <div v-if="promptTemplateDraft.isBuiltin && (promptTemplateDraft.createdBy || (promptTemplateDraft.maintainers && promptTemplateDraft.maintainers.length))" class="plugins-panel-note">
                                                     {{ t('plugins.meta.attribution', { createdBy: promptTemplateDraft.createdBy || '', maintainers: (promptTemplateDraft.maintainers || []).join(', ') }) }}
                                                 </div>
-                                                <input class="form-input" type="text" v-model.trim="promptTemplateDraft.description" :disabled="promptTemplateDraft.isBuiltin" :placeholder="t('plugins.promptTemplates.editor.descPlaceholder')" :aria-label="t('plugins.promptTemplates.editor.descAria')">
+                                                <input class="form-input" type="text" v-model.trim="promptTemplateDraftRaw.description" :disabled="promptTemplateDraft.isBuiltin" :placeholder="t('plugins.promptTemplates.editor.descPlaceholder')" :aria-label="t('plugins.promptTemplates.editor.descAria')">
                                             </div>
 
                                             <div class="prompt-editor-body">
                                                 <label class="form-label">{{ t('plugins.promptTemplates.editor.templateLabel') }}</label>
                                                 <textarea
                                                     class="form-input prompt-editor-textarea"
-                                                    v-model="promptTemplateDraft.template"
+                                                    v-model="promptTemplateDraftRaw.template"
                                                     :disabled="promptTemplateDraft.isBuiltin"
                                                     rows="10"
                                                     spellcheck="false"
@@ -210,7 +210,6 @@
                                                             <div class="plugins-panel-note">{{ t('plugins.promptTemplates.vars.hint') }}</div>
                                                         </div>
                                                         <div v-if="!promptTemplateDraft.isBuiltin" class="prompt-editor-actions">
-                                                            <button type="button" class="btn-mini" @click="addPromptTemplateVariable" :disabled="pluginsLoading">{{ t('plugins.promptTemplates.vars.add') }}</button>
                                                             <button type="button" class="btn-mini" @click="resetPromptVariableValues" :disabled="pluginsLoading">{{ t('plugins.promptTemplates.vars.reset') }}</button>
                                                         </div>
                                                     </div>
@@ -252,28 +251,3 @@
                     style="display:none"
                     @change="handlePromptTemplatesImportChange">
 
-                <!-- 新增变量（Prompt Templates） -->
-                <div v-if="showPromptTemplateVarModal" class="modal-overlay" @click.self="closePromptTemplateVarModal">
-                    <div class="modal" role="dialog" aria-modal="true" aria-labelledby="add-prompt-var-modal-title">
-                        <div class="modal-title" id="add-prompt-var-modal-title">{{ t('plugins.promptTemplates.varModal.title') }}</div>
-
-                        <div class="form-group">
-                            <label class="form-label">{{ t('plugins.promptTemplates.varModal.nameLabel') }}</label>
-                            <input
-                                ref="promptTemplateVarNameInput"
-                                v-model.trim="promptTemplateVarDraftName"
-                                :class="['form-input', { invalid: !!promptTemplateVarDraftError }]"
-                                :placeholder="t('placeholder.varNameExample')"
-                                autocomplete="off"
-                                spellcheck="false"
-                                @keydown.enter.prevent="confirmAddPromptTemplateVariable">
-                            <div v-if="promptTemplateVarDraftError" class="form-hint form-error">{{ promptTemplateVarDraftError }}</div>
-                            <div v-else class="form-hint">{{ t('hint.varNameRules') }}</div>
-                        </div>
-
-                        <div class="btn-group">
-                            <button class="btn btn-cancel" @click="closePromptTemplateVarModal">{{ t('plugins.promptTemplates.varModal.cancel') }}</button>
-                            <button class="btn btn-confirm" @click="confirmAddPromptTemplateVariable">{{ t('plugins.promptTemplates.varModal.add') }}</button>
-                        </div>
-                    </div>
-                </div>

package/web-ui/partials/index/panel-sessions.html

@@ -97,16 +97,6 @@
                             </button>
                         </div>
                     </div>
-                    <div class="session-toolbar-footer">
-                        <label class="quick-option">
-                            <input
-                                type="checkbox"
-                                v-model="sessionResumeWithYolo"
-                                @change="onSessionResumeYoloChange"
-                            >
-                            {{ t('sessions.resumeYolo') }}
-                        </label>
-                    </div>
                     <div v-if="hasActiveSessionFilters()" class="session-filter-chips" :aria-label="t('sessions.filters.copyLink')">
                         <button
                             v-for="chip in getSessionFilterChips()"

package/web-ui/partials/index/panel-settings.html

@@ -7,43 +7,32 @@
                     :aria-labelledby="'tab-settings'">
                     <div class="config-subtabs settings-subtabs" role="tablist" :aria-label="t('settings.tabs.aria')">
                         <button
-                            id="settings-tab-backup"
+                            id="settings-tab-general"
                             role="tab"
-                            aria-controls="settings-panel-backup"
-                            :aria-selected="settingsTab === 'backup'"
-                            :tabindex="settingsTab === 'backup' ? 0 : -1"
-                            :class="['config-subtab', { active: settingsTab === 'backup' }]"
-                            @click="onSettingsTabClick('backup')">
-                            {{ t('settings.tab.backup') }}
+                            aria-controls="settings-panel-general"
+                            :aria-selected="settingsTab === 'general'"
+                            :tabindex="settingsTab === 'general' ? 0 : -1"
+                            :class="['config-subtab', { active: settingsTab === 'general' }]"
+                            @click="onSettingsTabClick('general')">
+                            {{ t('settings.tab.general') }}
                         </button>
                         <button
-                            id="settings-tab-trash"
+                            id="settings-tab-data"
                             role="tab"
-                            aria-controls="settings-panel-trash"
-                            :aria-selected="settingsTab === 'trash'"
-                            :tabindex="settingsTab === 'trash' ? 0 : -1"
-                            :class="['config-subtab', { active: settingsTab === 'trash' }]"
-                            @click="onSettingsTabClick('trash')">
-                            {{ t('settings.tab.trash') }}
-                            <span class="settings-tab-badge">{{ sessionTrashCount }}</span>
-                        </button>
-                        <button
-                            id="settings-tab-device"
-                            role="tab"
-                            aria-controls="settings-panel-device"
-                            :aria-selected="settingsTab === 'device'"
-                            :tabindex="settingsTab === 'device' ? 0 : -1"
-                            :class="['config-subtab', { active: settingsTab === 'device' }]"
-                            @click="onSettingsTabClick('device')">
-                            {{ t('settings.tab.device') }}
+                            aria-controls="settings-panel-data"
+                            :aria-selected="settingsTab === 'data'"
+                            :tabindex="settingsTab === 'data' ? 0 : -1"
+                            :class="['config-subtab', { active: settingsTab === 'data' }]"
+                            @click="onSettingsTabClick('data')">
+                            {{ t('settings.tab.data') }}
                         </button>
                     </div>
 
                     <div
-                        v-show="settingsTab === 'backup'"
-                        id="settings-panel-backup"
+                        v-show="settingsTab === 'general'"
+                        id="settings-panel-general"
                         role="tabpanel"
-                        aria-labelledby="settings-tab-backup">
+                        aria-labelledby="settings-tab-general">
                         <div class="settings-layout">
                             <div class="settings-grid">
                                 <section class="settings-card settings-card--wide" :aria-label="t('settings.sharePrefix.title')">
@@ -69,6 +58,35 @@
                                     </div>
                                 </section>
 
+                                <section class="settings-card settings-card--wide" :aria-label="t('settings.templateConfirm.title')">
+                                    <div class="settings-card-header">
+                                        <div class="settings-card-title">{{ t('settings.templateConfirm.title') }}</div>
+                                        <div class="settings-card-meta">{{ t('settings.templateConfirm.meta') }}</div>
+                                    </div>
+                                    <div class="settings-card-body">
+                                        <label class="health-remote-toggle settings-toggle">
+                                            <input
+                                                type="checkbox"
+                                                :checked="configTemplateDiffConfirmEnabled"
+                                                @change="setConfigTemplateDiffConfirmEnabled($event.target.checked)">
+                                            <span>{{ t('settings.templateConfirm.toggle') }}</span>
+                                        </label>
+                                        <div class="settings-card-hint">
+                                            {{ t('settings.templateConfirm.hint') }}
+                                        </div>
+                                    </div>
+                                </section>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div
+                        v-show="settingsTab === 'data'"
+                        id="settings-panel-data"
+                        role="tabpanel"
+                        aria-labelledby="settings-tab-data">
+                        <div class="settings-layout">
+                            <div class="settings-grid">
                                 <section class="settings-card" :aria-label="t('settings.claude.title')">
                                     <div class="settings-card-header">
                                         <div class="settings-card-title">{{ t('settings.claude.title') }}</div>
@@ -114,17 +132,7 @@
                                             @change="handleCodexImportChange">
                                     </div>
                                 </section>
-                            </div>
-                        </div>
-                    </div>
 
-                    <div
-                        v-show="settingsTab === 'trash'"
-                        id="settings-panel-trash"
-                        role="tabpanel"
-                        aria-labelledby="settings-tab-trash">
-                        <div class="settings-layout">
-                            <div class="settings-grid">
                                 <section class="settings-card settings-card--wide" :aria-label="t('settings.deleteBehavior.title')">
                                     <div class="settings-card-header">
                                         <div class="settings-card-title">{{ t('settings.deleteBehavior.title') }}</div>
@@ -141,6 +149,22 @@
                                     </div>
                                 </section>
 
+                                <section class="settings-card settings-card--wide" :aria-label="t('settings.trash.retention')">
+                                    <div class="settings-card-header">
+                                        <div class="settings-card-title">{{ t('settings.trash.retention') }}</div>
+                                        <div class="settings-card-meta">{{ t('settings.trash.retentionMeta') }}</div>
+                                    </div>
+                                    <div class="settings-card-body">
+                                        <label class="settings-retention-row">
+                                            <span>{{ t('settings.trash.retentionLabel') }}</span>
+                                            <input type="number" min="1" max="365" :value="sessionTrashRetentionDays" @change="setSessionTrashRetentionDays(Number($event.target.value))" class="settings-retention-input" />
+                                        </label>
+                                        <div class="settings-card-hint">
+                                            {{ t('settings.trash.retentionHint') }}
+                                        </div>
+                                    </div>
+                                </section>
+
                                 <section class="settings-card settings-card--wide" :aria-label="t('settings.trash.title')">
                                     <div class="settings-card-header settings-card-header-row">
                                         <div>
@@ -208,35 +232,6 @@
                                         </div>
                                     </div>
                                 </section>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div
-                        v-show="settingsTab === 'device'"
-                        id="settings-panel-device"
-                        role="tabpanel"
-                        aria-labelledby="settings-tab-device">
-                        <div class="settings-layout">
-                            <div class="settings-grid">
-                                <section class="settings-card settings-card--wide" :aria-label="t('settings.templateConfirm.title')">
-                                    <div class="settings-card-header">
-                                        <div class="settings-card-title">{{ t('settings.templateConfirm.title') }}</div>
-                                        <div class="settings-card-meta">{{ t('settings.templateConfirm.meta') }}</div>
-                                    </div>
-                                    <div class="settings-card-body">
-                                        <label class="health-remote-toggle settings-toggle">
-                                            <input
-                                                type="checkbox"
-                                                :checked="configTemplateDiffConfirmEnabled"
-                                                @change="setConfigTemplateDiffConfirmEnabled($event.target.checked)">
-                                            <span>{{ t('settings.templateConfirm.toggle') }}</span>
-                                        </label>
-                                        <div class="settings-card-hint">
-                                            {{ t('settings.templateConfirm.hint') }}
-                                        </div>
-                                    </div>
-                                </section>
 
                                 <section class="settings-card settings-card--wide settings-card--danger" :aria-label="t('settings.reset.title')">
                                     <div class="settings-card-header">

package/web-ui/partials/index/panel-usage.html

@@ -96,9 +96,8 @@
                                     <div class="usage-daydetail-controls">
                                         <select
                                             class="usage-daydetail-select"
-                                            :value="sessionsUsageSelectedDayKey || ''"
+                                            :value="sessionsUsageSelectedDayKey || (sessionUsageDailyTableRows[0] && sessionUsageDailyTableRows[0].key) || ''"
                                             @change="selectSessionsUsageDay(($event.target && $event.target.value) ? String($event.target.value) : '')">
-                                            <option value="">{{ t('usage.dayDetail.pick') }}</option>
                                             <option v-for="day in sessionUsageDailyTableRows" :key="'day-select-' + day.key" :value="day.key">{{ day.key }}</option>
                                         </select>
                                         <button
@@ -288,6 +287,36 @@
                                 </div>
                             </section>
 
+                            <section class="usage-card usage-card-hourly-heatmap">
+                                <div class="usage-card-title">{{ t('usage.hourlyHeatmap.title') }}</div>
+                                <div class="usage-card-subtitle">{{ t('usage.hourlyHeatmap.subtitle') }}</div>
+                                <div class="hourly-heatmap-wrapper">
+                                    <div class="hourly-heatmap-header">
+                                        <div class="hourly-heatmap-corner"></div>
+                                        <div v-for="h in sessionUsageHourlyHeatmap.hourLabels" :key="'hh-' + h" class="hourly-heatmap-hour-label">{{ h }}</div>
+                                    </div>
+                                    <div v-for="(row, dayIndex) in sessionUsageHourlyHeatmap.rows" :key="'hd-' + dayIndex" class="hourly-heatmap-row">
+                                        <div class="hourly-heatmap-weekday-label">{{ row.weekday }}</div>
+                                        <div
+                                            v-for="(cell, hourIndex) in row.cells"
+                                            :key="'hc-' + dayIndex + '-' + hourIndex"
+                                            :class="['hourly-heatmap-cell', 'level-' + cell.level]"
+                                            :title="cell.tooltip"
+                                            :aria-label="cell.tooltip">
+                                        </div>
+                                    </div>
+                                    <div class="hourly-heatmap-legend">
+                                        <span class="hourly-heatmap-legend-label">{{ t('usage.hourlyHeatmap.legend.less') }}</span>
+                                        <span class="hourly-heatmap-cell level-0"></span>
+                                        <span class="hourly-heatmap-cell level-1"></span>
+                                        <span class="hourly-heatmap-cell level-2"></span>
+                                        <span class="hourly-heatmap-cell level-3"></span>
+                                        <span class="hourly-heatmap-cell level-4"></span>
+                                        <span class="hourly-heatmap-legend-label">{{ t('usage.hourlyHeatmap.legend.more') }}</span>
+                                    </div>
+                                </div>
+                            </section>
+
                             <section class="usage-card usage-card-top-paths">
                                 <div class="usage-card-title">{{ t('usage.paths.title') }}</div>
                                 <div v-if="!sessionUsageCharts.topPaths.length" class="usage-list-value">{{ t('usage.paths.empty') }}</div>