codexmate 0.0.28 → 0.0.30

package/lib/cli-webhook.js

@@ -0,0 +1,126 @@
+const path = require('path');
+const fs = require('fs');
+const http = require('http');
+const https = require('https');
+const os = require('os');
+
+const ALLOWED_EVENTS = ['provider-switch', 'claude-md-edit'];
+const DEFAULT_TIMEOUT_MS = 5000;
+
+function defaultConfigPath() {
+    return path.join(os.homedir(), '.codex', 'codexmate-webhook.json');
+}
+
+function normalizeConfig(cfg) {
+    const out = { enabled: false, url: '', events: ALLOWED_EVENTS.slice() };
+    if (!cfg || typeof cfg !== 'object') return out;
+    out.enabled = !!cfg.enabled;
+    out.url = typeof cfg.url === 'string' ? cfg.url.trim() : '';
+    if (Array.isArray(cfg.events)) {
+        const filtered = cfg.events.filter(function (e) { return ALLOWED_EVENTS.indexOf(e) !== -1; });
+        out.events = filtered.length ? filtered : ALLOWED_EVENTS.slice();
+    }
+    return out;
+}
+
+function loadWebhookConfig(filePath) {
+    const target = filePath || defaultConfigPath();
+    try {
+        if (!fs.existsSync(target)) {
+            return normalizeConfig({});
+        }
+        const raw = fs.readFileSync(target, 'utf-8');
+        return normalizeConfig(JSON.parse(raw));
+    } catch (_) {
+        return normalizeConfig({});
+    }
+}
+
+function saveWebhookConfig(cfg, filePath) {
+    const target = filePath || defaultConfigPath();
+    const normalized = normalizeConfig(cfg);
+    try {
+        fs.mkdirSync(path.dirname(target), { recursive: true });
+    } catch (_) {}
+    fs.writeFileSync(target, JSON.stringify(normalized, null, 2), 'utf-8');
+    return normalized;
+}
+
+function postJson(targetUrl, payload, timeoutMs) {
+    return new Promise(function (resolve) {
+        let parsed;
+        try {
+            parsed = new URL(targetUrl);
+        } catch (_) {
+            resolve({ ok: false, error: 'invalid-url' });
+            return;
+        }
+        const transport = parsed.protocol === 'https:' ? https : http;
+        const body = JSON.stringify(payload || {});
+        let req;
+        try {
+            req = transport.request({
+                method: 'POST',
+                protocol: parsed.protocol,
+                hostname: parsed.hostname,
+                port: parsed.port || (parsed.protocol === 'https:' ? 443 : 80),
+                path: (parsed.pathname || '/') + (parsed.search || ''),
+                headers: {
+                    'Content-Type': 'application/json; charset=utf-8',
+                    'Content-Length': Buffer.byteLength(body, 'utf-8'),
+                    'User-Agent': 'codexmate-webhook/1'
+                }
+            }, function (res) {
+                let raw = '';
+                res.on('data', function (chunk) {
+                    if (raw.length < 1024) raw += chunk.toString('utf-8');
+                });
+                res.on('end', function () {
+                    const status = res.statusCode || 0;
+                    resolve({ ok: status >= 200 && status < 300, status: status, body: raw.slice(0, 200) });
+                });
+            });
+        } catch (e) {
+            resolve({ ok: false, error: e && e.message ? e.message : String(e) });
+            return;
+        }
+        const wait = Number.isFinite(timeoutMs) && timeoutMs > 0 ? timeoutMs : DEFAULT_TIMEOUT_MS;
+        req.setTimeout(wait, function () { req.destroy(new Error('timeout')); });
+        req.on('error', function (err) { resolve({ ok: false, error: err && err.message ? err.message : String(err) }); });
+        req.write(body);
+        req.end();
+    });
+}
+
+function buildPayload(event, summary, details) {
+    return {
+        event: String(event || ''),
+        summary: String(summary || ''),
+        operator: process.env.USER || process.env.USERNAME || (os.userInfo && os.userInfo().username) || '',
+        timestamp: new Date().toISOString(),
+        details: details && typeof details === 'object' ? details : {}
+    };
+}
+
+function notifyWebhook(event, summary, details, options) {
+    const opts = options || {};
+    const cfg = opts.config ? normalizeConfig(opts.config) : loadWebhookConfig(opts.filePath);
+    if (!cfg.enabled || !cfg.url) {
+        return Promise.resolve({ ok: false, skipped: true, reason: 'disabled' });
+    }
+    if (cfg.events.indexOf(event) === -1) {
+        return Promise.resolve({ ok: false, skipped: true, reason: 'event-filtered' });
+    }
+    return postJson(cfg.url, buildPayload(event, summary, details), opts.timeoutMs);
+}
+
+module.exports = {
+    ALLOWED_EVENTS,
+    defaultConfigPath,
+    normalizeConfig,
+    loadWebhookConfig,
+    saveWebhookConfig,
+    notifyWebhook,
+    buildPayload,
+    postJson
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codexmate",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "description": "Codex/Claude Code/OpenClaw 配置、会话与任务编排 CLI + Web 工具",
   "main": "cli.js",
   "bin": {

package/web-ui/app.js

@@ -41,6 +41,7 @@ document.addEventListener('DOMContentLoaded', () => {
                 modelAutoCompactTokenLimitInput: String(DEFAULT_MODEL_AUTO_COMPACT_TOKEN_LIMIT),
                 editingCodexBudgetField: '',
                 providersList: [],
+                localBridgeExcluded: [],
                 models: [],
                 codexModelsLoading: false,
                 modelsSource: 'remote',
@@ -202,8 +203,8 @@ document.addEventListener('DOMContentLoaded', () => {
                 activeSessionDetailClipped: false,
                 sessionDetailLoading: false,
                 sessionDetailRequestSeq: 0,
-                sessionDetailInitialMessageLimit: 80,
-                sessionDetailFetchStep: 80,
+                sessionDetailInitialMessageLimit: 300,
+                sessionDetailFetchStep: 300,
                 sessionDetailMessageLimit: 80,
                 sessionDetailMessageLimitCap: 1000,
                 sessionTimelineActiveKey: '',
@@ -221,8 +222,8 @@ document.addEventListener('DOMContentLoaded', () => {
                 sessionPreviewHeaderResizeObserver: null,
                 sessionListRenderEnabled: false,
                 sessionListVisibleCount: 0,
-                sessionListInitialBatchSize: 20,
-                sessionListLoadStep: 40,
+                sessionListInitialBatchSize: 40,
+                sessionListLoadStep: 80,
                 sessionPreviewRenderEnabled: false,
                 sessionTabRenderTicket: 0,
                 sessionPreviewVisibleCount: 0,
@@ -274,8 +275,8 @@ document.addEventListener('DOMContentLoaded', () => {
                 newClaudeConfig: {
                     name: '',
                     apiKey: '',
-                    baseUrl: 'https://open.bigmodel.cn/api/anthropic',
-                    model: 'glm-4.7'
+                    baseUrl: '',
+                    model: ''
                 },
                 currentOpenclawConfig: '',
                 openclawConfigs: {
@@ -336,6 +337,8 @@ document.addEventListener('DOMContentLoaded', () => {
                 healthCheckLoading: false,
                 healthCheckResult: null,
                 healthCheckRemote: false,
+                providersHealthLoading: false,
+                providersHealthResult: null,
                 claudeDownloadLoading: false,
                 claudeDownloadProgress: 0,
                 claudeDownloadTimer: null,
@@ -398,7 +401,12 @@ document.addEventListener('DOMContentLoaded', () => {
                     lastLoadedAt: '',
                     lastError: ''
                 },
-                _taskOrchestrationPollTimer: 0
+                _taskOrchestrationPollTimer: 0,
+                webhookConfig: { enabled: false, url: '', events: ['provider-switch', 'claude-md-edit'] },
+                webhookEventOptions: ['provider-switch', 'claude-md-edit'],
+                webhookSaving: false,
+                webhookTestResult: null,
+                webhookTesting: false,
             };
         },
 
@@ -406,6 +414,9 @@ document.addEventListener('DOMContentLoaded', () => {
             if (typeof this.initI18n === 'function') {
                 this.initI18n();
             }
+            if (typeof this.loadWebhookSettings === 'function') {
+                this.loadWebhookSettings();
+            }
             if (typeof this.t === 'function') {
                 this.confirmDialogConfirmText = this.t('confirm.ok');
                 this.confirmDialogCancelText = this.t('confirm.cancel');
@@ -414,7 +425,7 @@ document.addEventListener('DOMContentLoaded', () => {
             }
             {
                 const NAV_STATE_STORAGE_KEY = 'codexmateNavState.v1';
-                const mainTabSet = new Set(['dashboard', 'config', 'sessions', 'usage', 'orchestration', 'market', 'plugins', 'docs', 'settings']);
+                const mainTabSet = new Set(['dashboard', 'config', 'sessions', 'usage', 'orchestration', 'market', 'plugins', 'docs', 'settings', 'trash']);
                 let restored = null;
                 try {
                     const raw = localStorage.getItem(NAV_STATE_STORAGE_KEY) || '';
@@ -428,6 +439,9 @@ document.addEventListener('DOMContentLoaded', () => {
                 const nextConfigMode = restored && typeof restored.configMode === 'string'
                     ? restored.configMode.trim().toLowerCase()
                     : '';
+                const nextSettingsTab = restored && typeof restored.settingsTab === 'string'
+                    ? restored.settingsTab.trim().toLowerCase()
+                    : '';
                 let urlMainTab = '';
                 try {
                     const url = new URL(window.location.href);
@@ -440,6 +454,9 @@ document.addEventListener('DOMContentLoaded', () => {
                 const resolvedMainTab = urlMainTab && mainTabSet.has(urlMainTab)
                     ? urlMainTab
                     : nextMainTab;
+                if (nextSettingsTab && (nextSettingsTab === 'general' || nextSettingsTab === 'data')) {
+                    this.settingsTab = nextSettingsTab;
+                }
                 if (nextConfigMode && typeof this.switchConfigMode === 'function') {
                     this.__navStateRestoring = true;
                     try {
@@ -554,6 +571,9 @@ document.addEventListener('DOMContentLoaded', () => {
                             if (typeof this.runHealthCheck === 'function') {
                                 void this.runHealthCheck({ doctor: true, silent: true });
                             }
+                            if (typeof this.runProvidersHealthCheck === 'function') {
+                                void this.runProvidersHealthCheck({ remote: true });
+                            }
                         }
                     }
                     void this.refreshClaudeSelectionFromSettings({ silent: true });

package/web-ui/index.html

@@ -21,6 +21,7 @@
     <!-- @include ./partials/index/panel-orchestration.html -->
     <!-- @include ./partials/index/panel-docs.html -->
     <!-- @include ./partials/index/panel-settings.html -->
+    <!-- @include ./partials/index/panel-trash.html -->
     <!-- @include ./partials/index/panel-market.html -->
     <!-- @include ./partials/index/panel-plugins.html -->
     <!-- @include ./partials/index/layout-footer.html -->

package/web-ui/logic.codex.mjs

@@ -52,5 +52,18 @@ export const CODEX_PROVIDER_TEMPLATES = Object.freeze([
         url: 'https://ai.muapi.cn/v1',
         model: 'mimo-v2-pro',
         useTransform: true
+    },
+    {
+        label: 'Telepub',
+        name: 'telepub',
+        url: 'https://voyage.prod.telepub.cn/voyage/api',
+        model: 'DeepSeek-V4-pro',
+        useTransform: true
+    },
+    {
+        label: 'AnyRouter',
+        name: 'anyrouter',
+        url: 'https://anyrouter.top/v1',
+        model: 'gpt-5.5'
     }
 ]);

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

@@ -35,6 +35,7 @@ export function createDashboardComputed() {
             return (name) => {
                 const target = String(name || '').trim();
                 if (!target) return '';
+                if (target === 'local') return '';
                 const dict = this.currentModels && typeof this.currentModels === 'object' ? this.currentModels : {};
                 const fromDict = typeof dict[target] === 'string' ? dict[target].trim() : '';
                 if (fromDict) return fromDict;
@@ -82,12 +83,20 @@ export function createDashboardComputed() {
             return current;
         },
         displayProvidersList() {
-            const list = Array.isArray(this.providersList) ? this.providersList : [];
+            const list = Array.isArray(this.providersList) ? [...this.providersList] : [];
+            list.sort((a, b) => {
+                if (a.name === 'local') return -1;
+                if (b.name === 'local') return 1;
+                return 0;
+            });
             return list;
         },
 
         displayProviderUrl() {
-            return (provider) => getProviderDisplayUrl(provider);
+            return (provider) => {
+                if (provider && provider.name === 'local') return '';
+                return getProviderDisplayUrl(provider);
+            };
         },
 
         isTransformProvider() {
@@ -220,6 +229,20 @@ export function createDashboardComputed() {
                 this.t('docs.tip.unix.2'),
                 this.t('docs.tip.unix.3')
             ];
+        },
+        providersHealthSummary() {
+            if (!this.providersHealthResult || !this.providersHealthResult.summary) {
+                return { total: 0, green: 0, yellow: 0, red: 0 };
+            }
+            return this.providersHealthResult.summary;
+        },
+        providersHealthTone() {
+            if (!this.providersHealthResult) return '';
+            const s = this.providersHealthResult.summary;
+            if (!s) return '';
+            if (s.red > 0) return 'error';
+            if (s.yellow > 0) return 'warn';
+            return 'ok';
         }
     };
 }

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

@@ -153,7 +153,14 @@ const KNOWN_USAGE_MODEL_PRICING = Object.freeze({
     'gpt-5.4': Object.freeze({ input: 2.5, output: 15, cacheRead: 0.25, cacheWrite: 0 }),
     'gpt-5.4-mini': Object.freeze({ input: 0.75, output: 4.5, cacheRead: 0.075, cacheWrite: 0 }),
     'gpt-5.3-codex': Object.freeze({ input: 1.75, output: 14, cacheRead: 0.175, cacheWrite: 0 }),
-    'gpt-5.2-codex': Object.freeze({ input: 1.75, output: 14, cacheRead: 0.175, cacheWrite: 0 })
+    'gpt-5.2-codex': Object.freeze({ input: 1.75, output: 14, cacheRead: 0.175, cacheWrite: 0 }),
+    'claude-opus-4-6': Object.freeze({ input: 15, output: 75, cacheRead: 1.5, cacheWrite: 18.75, reasoningOutput: 75 }),
+    'claude-opus-4-7': Object.freeze({ input: 15, output: 75, cacheRead: 1.5, cacheWrite: 18.75, reasoningOutput: 75 }),
+    'claude-sonnet-4-6': Object.freeze({ input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3.75, reasoningOutput: 15 }),
+    'claude-haiku-4-5': Object.freeze({ input: 0.8, output: 4, cacheRead: 0.08, cacheWrite: 1, reasoningOutput: 4 }),
+    'claude-3-5-sonnet': Object.freeze({ input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3.75, reasoningOutput: 15 }),
+    'claude-3-5-haiku': Object.freeze({ input: 0.8, output: 4, cacheRead: 0.08, cacheWrite: 1, reasoningOutput: 4 }),
+    'claude-3-opus': Object.freeze({ input: 15, output: 75, cacheRead: 1.5, cacheWrite: 18.75, reasoningOutput: 75 })
 });
 
 function createUsagePricingEntry(pricing, source) {
@@ -234,22 +241,17 @@ function resolveUsagePricingForSession(session, pricingIndex, fallbackProvider =
     if (knownPricing) {
         return knownPricing;
     }
+    const strippedModel = model.replace(/-\d{8}(?=[-_]|$)/, '');
+    if (strippedModel !== model) {
+        const strippedKnown = pricingIndex.knownByModel instanceof Map ? pricingIndex.knownByModel.get(strippedModel) : null;
+        if (strippedKnown) {
+            return strippedKnown;
+        }
+    }
     return null;
 }
 
-function shouldEstimateUsageCostForSession(session) {
-    if (!session || typeof session !== 'object') {
-        return false;
-    }
-    const source = typeof session.source === 'string' ? session.source.trim().toLowerCase() : '';
-    const provider = typeof session.provider === 'string' ? session.provider.trim().toLowerCase() : '';
-    const model = typeof session.model === 'string' ? session.model.trim().toLowerCase() : '';
-    if (source === 'claude' || provider === 'claude') {
-        return false;
-    }
-    if (/^claude(?:[-_]|$)/.test(model)) {
-        return false;
-    }
+function shouldEstimateUsageCostForSession() {
     return true;
 }
 
@@ -313,10 +315,11 @@ function estimateUsageCostSummary(sessions, providersList, currentProvider) {
 function estimateUsageCostForSession(session, pricingIndex, currentProvider) {
     const inputTokens = Number.isFinite(Number(session.inputTokens)) ? Math.max(0, Math.floor(Number(session.inputTokens))) : null;
     const cachedInputTokens = Number.isFinite(Number(session.cachedInputTokens)) ? Math.max(0, Math.floor(Number(session.cachedInputTokens))) : 0;
+    const cacheCreationInputTokens = Number.isFinite(Number(session.cacheCreationInputTokens)) ? Math.max(0, Math.floor(Number(session.cacheCreationInputTokens))) : 0;
     const outputTokens = Number.isFinite(Number(session.outputTokens)) ? Math.max(0, Math.floor(Number(session.outputTokens))) : null;
     const reasoningOutputTokens = Number.isFinite(Number(session.reasoningOutputTokens)) ? Math.max(0, Math.floor(Number(session.reasoningOutputTokens))) : 0;
-    const billableInputTokens = Math.max(0, (inputTokens || 0) - cachedInputTokens);
-    const fallbackSessionTokens = billableInputTokens + cachedInputTokens + (outputTokens || 0) + reasoningOutputTokens;
+    const billableInputTokens = Math.max(0, (inputTokens || 0) - cachedInputTokens - cacheCreationInputTokens);
+    const fallbackSessionTokens = billableInputTokens + cachedInputTokens + cacheCreationInputTokens + (outputTokens || 0) + reasoningOutputTokens;
     const totalSessionTokens = Number.isFinite(Number(session.totalTokens))
         ? Math.max(0, Math.floor(Number(session.totalTokens)))
         : fallbackSessionTokens;
@@ -325,12 +328,14 @@ function estimateUsageCostForSession(session, pricingIndex, currentProvider) {
     const reasoningRate = pricing
         ? ((pricing.reasoningOutput != null ? pricing.reasoningOutput : pricing.output) || 0)
         : 0;
+    const visibleOutputTokens = Math.max(0, (outputTokens || 0) - reasoningOutputTokens);
     const estimatedUsd = pricing && hasTokenBreakdown
         ? (
             ((pricing.input || 0) * billableInputTokens)
             + ((pricing.cacheRead || 0) * cachedInputTokens)
+            + ((pricing.cacheWrite || 0) * cacheCreationInputTokens)
             + (reasoningRate * reasoningOutputTokens)
-            + ((pricing.output || 0) * (outputTokens || 0))
+            + ((pricing.output || 0) * visibleOutputTokens)
         ) / 1000000
         : 0;
     return {

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

@@ -43,6 +43,16 @@ export function createClaudeConfigMethods(options = {}) {
             }
         },
 
+        openCloneClaudeConfigModal(name, config) {
+            this.newClaudeConfig = {
+                name: '',
+                apiKey: config.apiKey || '',
+                baseUrl: config.baseUrl || '',
+                model: config.model || ''
+            };
+            this.showClaudeConfigModal = true;
+        },
+
         openEditConfigModal(name) {
             const config = this.claudeConfigs[name];
             this.editingConfig = {
@@ -182,8 +192,8 @@ export function createClaudeConfigMethods(options = {}) {
             this.newClaudeConfig = {
                 name: '',
                 apiKey: '',
-                baseUrl: 'https://open.bigmodel.cn/api/anthropic',
-                model: 'glm-4.7'
+                baseUrl: '',
+                model: ''
             };
         }
     };

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

@@ -236,6 +236,10 @@ export function createCodexConfigMethods(options = {}) {
                     }
                 }
             }
+
+            if (typeof this.loadLocalBridgeExcluded === 'function') {
+                this.loadLocalBridgeExcluded();
+            }
         },
 
         async switchProvider(name) {
@@ -557,6 +561,27 @@ export function createCodexConfigMethods(options = {}) {
                 this.healthCheckBatchTotal = this.healthCheckBatchTotal || 0;
                 this.healthCheckBatchDone = Math.min(this.healthCheckBatchDone || 0, this.healthCheckBatchTotal || 0);
                 this.healthCheckLoading = false;
+                if (typeof this.runProvidersHealthCheck === 'function' && this.configMode === 'codex') {
+                    void this.runProvidersHealthCheck({ remote: true });
+                }
+            }
+        },
+
+        async runProvidersHealthCheck(options = {}) {
+            this.providersHealthLoading = true;
+            try {
+                const res = await api('providers-health', {
+                    remote: options.remote !== false
+                });
+                if (res && typeof res === 'object' && !res.error) {
+                    this.providersHealthResult = res;
+                } else {
+                    this.providersHealthResult = null;
+                }
+            } catch (e) {
+                this.providersHealthResult = null;
+            } finally {
+                this.providersHealthLoading = false;
             }
         },
 

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

@@ -29,6 +29,7 @@ import { createStartupClaudeMethods } from './app.methods.startup-claude.mjs';
 import { createSkillsMethods } from './skills.methods.mjs';
 import { createPluginsMethods } from './plugins.methods.mjs';
 import { createI18nMethods } from './i18n.mjs';
+import { createWebhookMethods } from './app.methods.webhook.mjs';
 import {
     CONFIG_MODE_SET,
     getProviderConfigModeMeta
@@ -43,6 +44,7 @@ import {
 export function createAppMethods() {
     return {
         ...createI18nMethods(),
+        ...createWebhookMethods(),
         ...createStartupClaudeMethods({
             api,
             defaultModelContextWindow: DEFAULT_MODEL_CONTEXT_WINDOW,

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

@@ -1,4 +1,4 @@
-export function createNavigationMethods(options = {}) {
+export function createNavigationMethods(options = {}) {
     const {
         configModeSet,
         switchMainTabHelper,
@@ -14,7 +14,8 @@ export function createNavigationMethods(options = {}) {
         'market',
         'plugins',
         'docs',
-        'settings'
+        'settings',
+        'trash'
     ]);
     const loadDoctorOverview = async (vm, options = {}) => {
         if (!vm || typeof vm !== 'object') return false;
@@ -67,9 +68,15 @@ export function createNavigationMethods(options = {}) {
             : vm.configMode;
         const mainTab = typeof mainTabSource === 'string' ? mainTabSource.trim().toLowerCase() : '';
         const configMode = typeof configModeSource === 'string' ? configModeSource.trim().toLowerCase() : '';
+        const settingsTab = typeof vm.settingsTab === 'string' ? vm.settingsTab.trim().toLowerCase() : 'general';
+        const skillsTargetApp = typeof vm.skillsTargetApp === 'string' && (vm.skillsTargetApp === 'codex' || vm.skillsTargetApp === 'claude') ? vm.skillsTargetApp : 'codex';
+        const promptTemplatesMode = typeof vm.promptTemplatesMode === 'string' && (vm.promptTemplatesMode === 'compose' || vm.promptTemplatesMode === 'manage') ? vm.promptTemplatesMode : 'compose';
         const snapshot = {
+            settingsTab: settingsTab === 'data' ? 'data' : 'general',
             mainTab: MAIN_TAB_SET.has(mainTab) ? mainTab : 'dashboard',
-            configMode: configModeSet && configModeSet.has(configMode) ? configMode : 'codex'
+            configMode: configModeSet && configModeSet.has(configMode) ? configMode : 'codex',
+            skillsTargetApp,
+            promptTemplatesMode
         };
         try {
             localStorage.setItem(NAV_STATE_STORAGE_KEY, JSON.stringify(snapshot));
@@ -77,6 +84,9 @@ export function createNavigationMethods(options = {}) {
     };
 
     return {
+        saveNavState() {
+            persistNavState(this);
+        },
         restoreNavStateFromStorage() {
             if (this.__navStateRestoring) return false;
             const restored = readNavState();
@@ -89,7 +99,17 @@ export function createNavigationMethods(options = {}) {
                 : '';
             const shouldUpdateConfigMode = !!(nextConfigMode && configModeSet && configModeSet.has(nextConfigMode));
             const shouldUpdateMainTab = !!(nextMainTab && MAIN_TAB_SET.has(nextMainTab) && nextMainTab !== this.mainTab);
-            if (!shouldUpdateConfigMode && !shouldUpdateMainTab) {
+            const nextSettingsTab = restored && typeof restored.settingsTab === 'string'
+                ? restored.settingsTab.trim().toLowerCase()
+                : '';
+            const shouldUpdateSettingsTab = !!(nextSettingsTab && (nextSettingsTab === 'general' || nextSettingsTab === 'data') && nextSettingsTab !== this.settingsTab);
+            const nextSkillsTargetApp = restored && typeof restored.skillsTargetApp === 'string' && (restored.skillsTargetApp === 'codex' || restored.skillsTargetApp === 'claude')
+                ? restored.skillsTargetApp : '';
+            const shouldUpdateSkillsTargetApp = !!(nextSkillsTargetApp && nextSkillsTargetApp !== this.skillsTargetApp);
+            const nextPromptTemplatesMode = restored && typeof restored.promptTemplatesMode === 'string' && (restored.promptTemplatesMode === 'compose' || restored.promptTemplatesMode === 'manage')
+                ? restored.promptTemplatesMode : '';
+            const shouldUpdatePromptTemplatesMode = !!(nextPromptTemplatesMode && nextPromptTemplatesMode !== this.promptTemplatesMode);
+            if (!shouldUpdateConfigMode && !shouldUpdateMainTab && !shouldUpdateSettingsTab && !shouldUpdateSkillsTargetApp && !shouldUpdatePromptTemplatesMode) {
                 return false;
             }
             this.__navStateRestoring = true;
@@ -97,9 +117,18 @@ export function createNavigationMethods(options = {}) {
                 if (shouldUpdateConfigMode) {
                     this.configMode = nextConfigMode;
                 }
+                if (shouldUpdateSettingsTab) {
+                    this.settingsTab = nextSettingsTab;
+                }
                 if (shouldUpdateMainTab) {
                     this.switchMainTab(nextMainTab);
                 }
+                if (shouldUpdateSkillsTargetApp) {
+                    this.skillsTargetApp = nextSkillsTargetApp;
+                }
+                if (shouldUpdatePromptTemplatesMode) {
+                    this.promptTemplatesMode = nextPromptTemplatesMode;
+                }
             } finally {
                 this.__navStateRestoring = false;
             }
@@ -411,6 +440,11 @@ export function createNavigationMethods(options = {}) {
                 switchState.ticket += 1;
                 switchState.pendingTarget = '';
                 if (targetTab === 'dashboard' && !this.__doctorLoadedOnce) {
+                if (targetTab === 'trash' && !this.sessionTrashLoadedOnce) {
+                    if (typeof this.loadSessionTrash === 'function') {
+                        void this.loadSessionTrash({ forceRefresh: false });
+                    }
+                }
                     void loadDoctorOverview(this);
                 }
                 if (
@@ -656,10 +690,7 @@ export function createNavigationMethods(options = {}) {
                 ? this.activeSessionMessages.length
                 : 0;
             if (total <= 0) return;
-            const baseSize = Number.isFinite(this.sessionPreviewInitialBatchSize)
-                ? Math.max(1, Math.floor(this.sessionPreviewInitialBatchSize))
-                : 40;
-            this.sessionPreviewVisibleCount = Math.min(baseSize, total);
+            this.sessionPreviewVisibleCount = total;
             this.invalidateSessionTimelineMeasurementCache();
         },