codexmate 0.0.27 → 0.0.29

package/package.json

@@ -1,74 +1,76 @@
-{
-  "name": "codexmate",
-  "version": "0.0.27",
-  "description": "Codex/Claude Code/OpenClaw 配置、会话与任务编排 CLI + Web 工具",
-  "main": "cli.js",
-  "bin": {
-    "codexmate": "./cli.js"
-  },
-  "files": [
-    "cli.js",
-    "cli/",
-    "plugins/",
-    "web-ui.html",
-    "lib/",
-    "web-ui/",
-    "doc/",
-    "README.md",
-    "README.zh.md",
-    "LICENSE"
-  ],
-  "exports": {
-    ".": "./cli.js",
-    "./lib/*": "./lib/*.js",
-    "./web-ui/*": "./web-ui/*",
-    "./res/*": "./web-ui/res/*"
-  },
-  "scripts": {
-    "dev": "node cli.js run",
-    "start": "node cli.js",
-    "reset": "node tools/dev/reset-main.js",
-    "release:npm": "node tools/release/publish-npm.js",
-    "docs:dev": "node ./node_modules/vitepress/dist/node/cli.js dev site",
-    "docs:build": "node ./node_modules/vitepress/dist/node/cli.js build site",
-    "docs:preview": "node ./node_modules/vitepress/dist/node/cli.js preview site",
-    "ci:install": "node tools/ci/run-check.js install",
-    "ci:lint": "node tools/ci/run-check.js lint",
-    "ci:test": "node tools/ci/run-check.js test",
-    "lint": "node tools/dev/lint.js",
-    "test": "npm run test:unit && npm run test:e2e",
-    "test:ci": "node tools/ci/run-check.js all",
-    "test:unit": "node tests/unit/run.mjs",
-    "test:e2e": "node tests/e2e/run.js",
-    "pretest": "node tools/ci/ensure-test-deps.js"
-  },
-  "dependencies": {
-    "@iarna/toml": "^2.2.5",
-    "json5": "^2.2.3",
-    "yauzl": "^3.2.1",
-    "zip-lib": "^1.2.1"
-  },
-  "engines": {
-    "node": ">=14"
-  },
-  "keywords": [
-    "codex",
-    "claude",
-    "claude-code",
-    "openclaw",
-    "config",
-    "session",
-    "task-orchestration",
-    "workflow",
-    "web-ui",
-    "provider",
-    "ai",
-    "llm",
-    "cli"
-  ],
-  "author": "ymkiux",
-  "license": "Apache-2.0",
-  "devDependencies": {
-    "vitepress": "^1.6.4"
-  }
-}
+{
+  "name": "codexmate",
+  "version": "0.0.29",
+  "description": "Codex/Claude Code/OpenClaw 配置、会话与任务编排 CLI + Web 工具",
+  "main": "cli.js",
+  "bin": {
+    "codexmate": "./cli.js"
+  },
+  "files": [
+    "cli.js",
+    "cli/",
+    "plugins/",
+    "web-ui.html",
+    "lib/",
+    "web-ui/",
+    "doc/",
+    "README.md",
+    "README.zh.md",
+    "LICENSE"
+  ],
+  "exports": {
+    ".": "./cli.js",
+    "./lib/*": "./lib/*.js",
+    "./web-ui/*": "./web-ui/*",
+    "./res/*": "./web-ui/res/*"
+  },
+  "scripts": {
+    "dev": "node cli.js run",
+    "start": "node cli.js",
+    "reset": "node tools/dev/reset-main.js",
+    "release:npm": "node tools/release/publish-npm.js",
+    "docs:dev": "node ./node_modules/vitepress/dist/node/cli.js dev site",
+    "docs:build": "node ./node_modules/vitepress/dist/node/cli.js build site",
+    "docs:preview": "node ./node_modules/vitepress/dist/node/cli.js preview site",
+    "ci:install": "node tools/ci/run-check.js install",
+    "ci:lint": "node tools/ci/run-check.js lint",
+    "ci:test": "node tools/ci/run-check.js test",
+    "lint": "node tools/dev/lint.js",
+    "test": "npm run test:unit && npm run test:e2e",
+    "test:ci": "node tools/ci/run-check.js all",
+    "test:unit": "node tests/unit/run.mjs",
+    "test:e2e": "node tests/e2e/run.js",
+    "setup:git": "git remote set-url origin https://github.com/SakuraByteCore/codexmate.git && gh auth setup-git",
+    "reset:dev": "node tools/dev/reset-and-dev.js",
+    "pretest": "node tools/ci/ensure-test-deps.js"
+  },
+  "dependencies": {
+    "@iarna/toml": "^2.2.5",
+    "json5": "^2.2.3",
+    "yauzl": "^3.2.1",
+    "zip-lib": "^1.2.1"
+  },
+  "engines": {
+    "node": ">=14"
+  },
+  "keywords": [
+    "codex",
+    "claude",
+    "claude-code",
+    "openclaw",
+    "config",
+    "session",
+    "task-orchestration",
+    "workflow",
+    "web-ui",
+    "provider",
+    "ai",
+    "llm",
+    "cli"
+  ],
+  "author": "ymkiux",
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "vitepress": "^1.6.4"
+  }
+}

package/plugins/prompt-templates/computed.mjs

@@ -98,7 +98,7 @@ function renderTemplate(templateText, values = {}) {
         const name = String(key || '').trim();
         if (!name) return '';
         const value = map[name];
-        return value == null ? '' : String(value);
+        return value == null || String(value).trim() === '' ? _whole : String(value);
     });
 }
 

package/plugins/prompt-templates/methods.mjs

@@ -358,72 +358,6 @@ export function createPluginsMethods() {
             this.promptTemplateVarValuesRaw = {};
         },
 
-        addPromptTemplateVariable() {
-            const draft = normalizePromptTemplateDraft(this.promptTemplateDraftRaw);
-            if (!draft || !draft.id) return;
-            if (draft.isBuiltin) {
-                this.showMessage(typeof this.t === 'function' ? this.t('toast.templates.builtinNotEditable') : 'Built-in templates are not editable', 'error');
-                return;
-            }
-            this.promptTemplateVarDraftName = 'var';
-            this.promptTemplateVarDraftError = '';
-            this.showPromptTemplateVarModal = true;
-            if (typeof this.$nextTick === 'function') {
-                this.$nextTick(() => {
-                    const input = this.$refs && this.$refs.promptTemplateVarNameInput
-                        ? this.$refs.promptTemplateVarNameInput
-                        : null;
-                    if (input && typeof input.focus === 'function') input.focus();
-                });
-            }
-        },
-
-        closePromptTemplateVarModal() {
-            this.showPromptTemplateVarModal = false;
-            this.promptTemplateVarDraftError = '';
-        },
-
-        confirmAddPromptTemplateVariable() {
-            const draft = normalizePromptTemplateDraft(this.promptTemplateDraftRaw);
-            if (!draft || !draft.id) return;
-            if (draft.isBuiltin) {
-                this.promptTemplateVarDraftError = typeof this.t === 'function'
-                    ? this.t('toast.templates.builtinNotEditable')
-                    : 'Built-in templates are not editable';
-                return;
-            }
-            const key = typeof this.promptTemplateVarDraftName === 'string'
-                ? this.promptTemplateVarDraftName.trim()
-                : '';
-            if (!key) {
-                this.promptTemplateVarDraftError = typeof this.t === 'function'
-                    ? this.t('toast.templates.varNameRequired')
-                    : 'Variable name is required';
-                return;
-            }
-            if (!/^[a-zA-Z0-9_.-]+$/.test(key)) {
-                this.promptTemplateVarDraftError = typeof this.t === 'function'
-                    ? this.t('toast.templates.varNameInvalid')
-                    : 'Variable name may only contain letters, numbers, underscore, dash, dot';
-                return;
-            }
-            const placeholder = `{{${key}}}`;
-            const current = typeof draft.template === 'string' ? draft.template : '';
-            if (current.includes(placeholder)) {
-                this.promptTemplateVarDraftError = typeof this.t === 'function'
-                    ? this.t('toast.templates.varExists')
-                    : 'Variable already exists';
-                return;
-            }
-            const nextText = current && !current.endsWith('\n')
-                ? `${current}\n${placeholder}\n`
-                : `${current}${placeholder}\n`;
-            this.promptTemplateDraftRaw = { ...draft, template: nextText };
-            this.showPromptTemplateVarModal = false;
-            this.promptTemplateVarDraftError = '';
-            this.showMessage(typeof this.t === 'function' ? this.t('toast.templates.varAdded') : 'Variable added', 'success');
-        },
-
         setPromptVariableValue(name, value) {
             const key = typeof name === 'string' ? name.trim() : '';
             if (!key) return;

package/plugins/prompt-templates/overview.mjs

@@ -7,6 +7,7 @@ import {
 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) : [];

package/web-ui/app.js

@@ -34,6 +34,7 @@ document.addEventListener('DOMContentLoaded', () => {
                 configMode: 'codex',
                 currentProvider: '',
                 currentModel: '',
+                currentModels: {},
                 serviceTier: 'fast',
                 modelReasoningEffort: 'medium',
                 modelContextWindowInput: String(DEFAULT_MODEL_CONTEXT_WINDOW),
@@ -81,9 +82,6 @@ document.addEventListener('DOMContentLoaded', () => {
                 promptComposerPickerKeyword: '',
                 promptComposerSelectedTemplateId: '',
                 promptComposerVarValuesRaw: {},
-                showPromptTemplateVarModal: false,
-                promptTemplateVarDraftName: '',
-                promptTemplateVarDraftError: '',
                 showConfirmDialog: false,
                 confirmDialogTitle: '',
                 confirmDialogMessage: '',
@@ -174,7 +172,6 @@ document.addEventListener('DOMContentLoaded', () => {
                 sessionRoleFilter: 'all',
                 sessionTimePreset: 'all',
                 sessionSortMode: 'time',
-                sessionResumeWithYolo: true,
                 sessionPathOptions: [],
                 sessionPathOptionsLoading: false,
                 sessionPathOptionsMap: {
@@ -258,7 +255,7 @@ document.addEventListener('DOMContentLoaded', () => {
                 installRegistryPreset: 'default',
                 installRegistryCustom: '',
                 installStatusTargets: null,
-                newProvider: { name: '', url: '', key: '', useTransform: false },
+                newProvider: { name: '', url: '', key: '', useTransform: false, _suggestedModel: '' },
                 resetConfigLoading: false,
                 editingProvider: { name: '', url: '', key: '', readOnly: false, nonEditable: false },
                 newModelName: '',
@@ -277,8 +274,8 @@ document.addEventListener('DOMContentLoaded', () => {
                 newClaudeConfig: {
                     name: '',
                     apiKey: '',
-                    baseUrl: 'https://open.bigmodel.cn/api/anthropic',
-                    model: 'glm-4.7'
+                    baseUrl: '',
+                    model: ''
                 },
                 currentOpenclawConfig: '',
                 openclawConfigs: {
@@ -345,7 +342,7 @@ document.addEventListener('DOMContentLoaded', () => {
                 codexDownloadLoading: false,
                 codexDownloadProgress: 0,
                 codexDownloadTimer: null,
-                settingsTab: 'backup',
+                settingsTab: 'general',
                 sessionTrashEnabled: true,
                 sessionTrashItems: [],
                 sessionTrashVisibleCount: SESSION_TRASH_PAGE_SIZE,
@@ -401,7 +398,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,
             };
         },
 
@@ -409,6 +411,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');
@@ -417,7 +422,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) || '';
@@ -431,6 +436,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);
@@ -443,6 +451,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 {
@@ -469,12 +480,6 @@ document.addEventListener('DOMContentLoaded', () => {
             if (!this.taskOrchestrationTabEnabled && this.mainTab === 'orchestration') {
                 this.mainTab = 'config';
             }
-            const savedSessionYolo = localStorage.getItem('codexmateSessionResumeYolo');
-            if (savedSessionYolo === '0' || savedSessionYolo === 'false') {
-                this.sessionResumeWithYolo = false;
-            } else if (savedSessionYolo === '1' || savedSessionYolo === 'true') {
-                this.sessionResumeWithYolo = true;
-            }
             this.restoreSessionFilterCache();
             this.restoreSessionPinnedMap();
             this.shareCommandPrefix = this.normalizeShareCommandPrefix(localStorage.getItem('codexmateShareCommandPrefix'));

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

@@ -0,0 +1,69 @@
+// 仅供 web-ui 的 codex 模型选择器与新增 provider 模板按钮使用。
+// 镜像 logic.claude.mjs 的派生方式，但 codex provider 元信息不带 wire_api，
+// 所以 catalog 仅按 baseUrl 的 host/path 命中。
+
+const DEFAULT_OPENAI_CODEX_CATALOG = Object.freeze([
+    'gpt-5-codex',
+    'gpt-5',
+    'gpt-5-mini',
+    'gpt-4.1',
+    'o4-mini',
+    'o3-mini'
+]);
+
+const HOST_RULES = Object.freeze([
+    { match: (u) => /api\.openai\.com/i.test(u), models: DEFAULT_OPENAI_CODEX_CATALOG },
+    { match: (u) => /api\.deepseek\.com/i.test(u), models: ['deepseek-chat', 'deepseek-coder', 'deepseek-reasoner'] },
+    { match: (u) => /dashscope\.aliyuncs\.com/i.test(u), models: ['qwen3-coder-plus', 'qwen3-coder-flash', 'qwen-max', 'qwen-plus'] },
+    { match: (u) => /ark\..*volces\.com/i.test(u), models: ['doubao-seed-1-6-thinking', 'doubao-seed-1-6', 'doubao-1-5-pro-32k', 'doubao-pro-32k'] },
+    { match: (u) => /open\.bigmodel\.cn/i.test(u), models: ['glm-4.6', 'glm-4.5', 'glm-4-plus', 'glm-coding'] },
+    { match: (u) => /api\.moonshot\.cn|api\.kimi\.com/i.test(u), models: ['moonshot-v1-32k', 'moonshot-v1-128k', 'kimi-latest'] },
+    { match: (u) => /api\.minimax/i.test(u), models: ['MiniMax-M2', 'abab6.5s-chat', 'abab6.5-chat'] },
+    { match: (u) => /api-inference\.modelscope\.cn/i.test(u), models: ['Qwen/Qwen3-Coder-480B-A35B-Instruct', 'ZhipuAI/GLM-4.5'] },
+    { match: (u) => /xiaomimimo\.com/i.test(u), models: ['mimo-v2-pro', 'mimo-v2'] },
+    { match: (u) => /ai\.muapi\.cn/i.test(u), models: ['mimo-v2-pro'] }
+]);
+
+function normalizeUrl(url) {
+    return typeof url === 'string' ? url.trim().toLowerCase() : '';
+}
+
+export function getCodexModelCatalogForProvider(provider) {
+    if (!provider || typeof provider !== 'object') return [];
+    const url = normalizeUrl(provider.url || provider.baseUrl || '');
+    const name = typeof provider.name === 'string' ? provider.name.toLowerCase() : '';
+    if (!url) {
+        if (/openai/.test(name)) return [...DEFAULT_OPENAI_CODEX_CATALOG];
+        return [];
+    }
+    for (const rule of HOST_RULES) {
+        if (rule.match(url)) return [...rule.models];
+    }
+    return [];
+}
+
+// 服务模板表：供面板上的预设按钮使用。
+// model 字段为可选首选项（添加后由前端写入内存字典 currentModels[name]）。
+// useTransform=true 表示该服务需通过内建 OpenAI bridge 转发。
+export const CODEX_PROVIDER_TEMPLATES = Object.freeze([
+    {
+        label: 'MuAPI',
+        name: 'muapi',
+        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

@@ -1,3 +1,5 @@
+import { getProviderDisplayUrl, checkIsTransformProvider } from './provider-url-display.mjs';
+import { getCodexModelCatalogForProvider, CODEX_PROVIDER_TEMPLATES } from '../logic.codex.mjs';
 export function createDashboardComputed() {
     return {
         agentsDiffHasChanges() {
@@ -29,6 +31,50 @@ export function createDashboardComputed() {
             }
             return list;
         },
+        activeProviderModel() {
+            return (name) => {
+                const target = String(name || '').trim();
+                if (!target) return '';
+                const dict = this.currentModels && typeof this.currentModels === 'object' ? this.currentModels : {};
+                const fromDict = typeof dict[target] === 'string' ? dict[target].trim() : '';
+                if (fromDict) return fromDict;
+                const activeName = String(this.currentProvider || '').trim();
+                if (target === activeName) {
+                    const top = typeof this.currentModel === 'string' ? this.currentModel.trim() : '';
+                    if (top && top !== '未设置') return top;
+                }
+                return '';
+            };
+        },
+        codexModelOptions() {
+            const seen = new Set();
+            const out = [];
+            const push = (val) => {
+                const s = typeof val === 'string' ? val.trim() : '';
+                if (!s || seen.has(s)) return;
+                seen.add(s);
+                out.push(s);
+            };
+            const activeName = String(this.displayCurrentProvider || '').trim();
+            const current = typeof this.currentModel === 'string' ? this.currentModel.trim() : '';
+            if (current && current !== '未设置') push(current);
+            const dict = this.currentModels && typeof this.currentModels === 'object' ? this.currentModels : {};
+            if (activeName && typeof dict[activeName] === 'string') push(dict[activeName]);
+            const remote = Array.isArray(this.models) ? this.models : [];
+            for (const m of remote) push(m);
+            const list = Array.isArray(this.providersList) ? this.providersList : [];
+            const activeProvider = list.find((p) => p && p.name === activeName);
+            if (activeProvider) {
+                for (const m of getCodexModelCatalogForProvider(activeProvider)) push(m);
+            }
+            return out;
+        },
+        codexModelHasList() {
+            return this.codexModelOptions.length > 0;
+        },
+        codexProviderTemplates() {
+            return CODEX_PROVIDER_TEMPLATES;
+        },
         displayCurrentProvider() {
             const switching = String(this.providerSwitchDisplayTarget || '').trim();
             if (switching) return switching;
@@ -39,6 +85,14 @@ export function createDashboardComputed() {
             const list = Array.isArray(this.providersList) ? this.providersList : [];
             return list;
         },
+
+        displayProviderUrl() {
+            return (provider) => getProviderDisplayUrl(provider);
+        },
+
+        isTransformProvider() {
+            return (provider) => checkIsTransformProvider(provider);
+        },
         installTargetCards() {
             const targets = Array.isArray(this.installStatusTargets) && this.installStatusTargets.length
                 ? this.installStatusTargets

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 {