@juliantanx/aiusage 1.5.2 → 1.5.4

package/dist/index.js

@@ -14,7 +14,7 @@ import { execSync as execSync5 } from "child_process";
 // src/commands/serve.ts
 import http2 from "http";
 import { readFileSync as readFileSync9, existsSync as existsSync10, statSync as statSync3, writeFileSync as writeFileSync6, unlinkSync as unlinkSync3 } from "fs";
-import { join as join11, extname as extname2, dirname as dirname3 } from "path";
+import { join as join11, extname as extname2, dirname as dirname4 } from "path";
 import { fileURLToPath } from "url";
 
 // src/api/server.ts
@@ -49,7 +49,8 @@ var TOOLS = [
   "omp",
   "pi",
   "craft",
-  "droid"
+  "droid",
+  "zcode"
 ];
 var MODEL_PROVIDER_MAP = [
   ["claude-", "anthropic"],
@@ -112,204 +113,22 @@ async function fetchExchangeRate() {
 function convertToUSD(cny, rate) {
   return cny * rate;
 }
-var DEFAULT_PRICE_TABLE = {
-  // Anthropic — https://platform.claude.com/docs/en/about-claude/pricing
-  "claude-opus-4-8": { input: 5, output: 25, cacheRead: 0.5, cacheWrite: 6.25 },
-  "claude-opus-4-7": { input: 5, output: 25, cacheRead: 0.5, cacheWrite: 6.25 },
-  "claude-opus-4-6": { input: 5, output: 25, cacheRead: 0.5, cacheWrite: 6.25 },
-  "claude-opus-4-5": { input: 5, output: 25, cacheRead: 0.5, cacheWrite: 6.25 },
-  "claude-opus-4-1": { input: 15, output: 75, cacheRead: 1.5, cacheWrite: 18.75 },
-  "claude-sonnet-4-6": { input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3.75 },
-  "claude-sonnet-4-5": { input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3.75 },
-  "claude-haiku-4-5": { input: 1, output: 5, cacheRead: 0.1, cacheWrite: 1.25 },
-  "claude-haiku-3-5": { input: 0.8, output: 4, cacheRead: 0.08, cacheWrite: 1 },
-  "claude-sonnet-4": { input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3.75 },
-  "claude-opus-4": { input: 15, output: 75, cacheRead: 1.5, cacheWrite: 18.75 },
-  "claude-3-5-sonnet": { input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3.75 },
-  "claude-3-5-haiku": { input: 0.8, output: 4, cacheRead: 0.08, cacheWrite: 1 },
-  // OpenAI — https://developers.openai.com/api/docs/pricing
-  "gpt-5.5-pro": { input: 30, output: 180 },
-  "gpt-5.5": { input: 5, output: 30, cacheRead: 0.5 },
-  "gpt-5.4-pro": { input: 30, output: 180 },
-  "gpt-5.4-mini": { input: 0.75, output: 4.5, cacheRead: 0.075 },
-  "gpt-5.4-nano": { input: 0.2, output: 1.25, cacheRead: 0.02 },
-  "gpt-5.4": { input: 2.5, output: 15, cacheRead: 0.25 },
-  "gpt-5.3-codex": { input: 1.75, output: 14, cacheRead: 0.175 },
-  "gpt-4o-mini": { input: 0.15, output: 0.6 },
-  "gpt-4o": { input: 2.5, output: 10 },
-  "gpt-4.1": { input: 2, output: 8 },
-  "o4-mini": { input: 1.1, output: 4.4 },
-  "o4-mini-deep-research": { input: 1, output: 4 },
-  "o3-pro": { input: 20, output: 80 },
-  "o3": { input: 2, output: 8 },
-  "o3-mini": { input: 0.55, output: 2.2, cacheRead: 0.55 },
-  "o3-deep-research": { input: 5, output: 20 },
-  "o1": { input: 15, output: 60, cacheRead: 7.5 },
-  "o1-mini": { input: 0.55, output: 2.2, cacheRead: 0.55 },
-  "codex-mini": { input: 0.75, output: 3, cacheRead: 0.025 },
-  "gpt-5.2-codex": { input: 1.75, output: 14, cacheRead: 0.175 },
-  "gpt-5.2": { input: 1.75, output: 14, cacheRead: 0.175 },
-  "gpt-5.1-codex": { input: 1.25, output: 10, cacheRead: 0.125 },
-  "gpt-5.1": { input: 1.25, output: 10, cacheRead: 0.125 },
-  "gpt-5-codex": { input: 1.25, output: 10, cacheRead: 0.125 },
-  "gpt-5": { input: 1.25, output: 10, cacheRead: 0.125 },
-  "gpt-5-mini": { input: 0.25, output: 2, cacheRead: 0.025 },
-  "gpt-5-nano": { input: 0.05, output: 0.4, cacheRead: 5e-3 },
-  "gpt-4.1-mini": { input: 0.4, output: 1.6, cacheRead: 0.1 },
-  "gpt-4.1-nano": { input: 0.1, output: 0.4, cacheRead: 0.025 },
-  // Google Gemini — https://ai.google.dev/gemini-api/docs/pricing
-  "gemini-3.5-flash": { input: 1.5, output: 9 },
-  "gemini-3.1-pro": { input: 2, output: 12 },
-  "gemini-3.1-flash-lite": { input: 0.25, output: 1.5 },
-  "gemini-3-pro-preview": { input: 2, output: 12 },
-  "gemini-3-flash-preview": { input: 0.5, output: 3 },
-  "gemini-3-flash": { input: 0.5, output: 3 },
-  "gemini-3-pro-image": { input: 2, output: 12 },
-  "gemini-3.1-pro-preview": { input: 2, output: 12 },
-  "gemini-3.1-flash-lite-preview": { input: 0.25, output: 1.5 },
-  "gemini-2.5-pro": { input: 1.25, output: 10 },
-  "gemini-2.5-flash-lite": { input: 0.1, output: 0.4 },
-  "gemini-2.5-flash": { input: 0.3, output: 2.5 },
-  "gemini-2.0-flash-lite": { input: 0.075, output: 0.3 },
-  "gemini-2.0-flash": { input: 0.1, output: 0.4 },
-  // DeepSeek — https://api-docs.deepseek.com/quick_start/pricing
-  "deepseek-v4-pro": { input: 3.13, output: 6.26, cacheRead: 0.026, currency: "CNY" },
-  "deepseek-v4-flash": { input: 1.01, output: 2.02, cacheRead: 0.02, currency: "CNY" },
-  "deepseek-v3.2": { input: 2.01, output: 3.01, cacheRead: 0.2, currency: "CNY" },
-  "deepseek-v3.1": { input: 3.94, output: 11.9, cacheRead: 0.39, currency: "CNY" },
-  "deepseek-v3": { input: 2.01, output: 7.94, cacheRead: 0.2, currency: "CNY" },
-  "deepseek-reasoner": { input: 3.94, output: 15.6, cacheRead: 1, currency: "CNY" },
-  "deepseek-chat": { input: 1.93, output: 7.87, cacheRead: 0.5, currency: "CNY" },
-  // Kimi (Moonshot AI) — https://platform.kimi.ai/docs/pricing/chat
-  "kimi-k2.6": { input: 6.9, output: 29, cacheRead: 1.15, currency: "CNY" },
-  "kimi-k2.5": { input: 4.3, output: 21.6, cacheRead: 0.72, currency: "CNY" },
-  "kimi-k2-turbo": { input: 8.3, output: 57.6, cacheRead: 1.08, currency: "CNY" },
-  "kimi-k2": { input: 4.3, output: 18, cacheRead: 1.08, currency: "CNY" },
-  "kimi-k2-thinking": { input: 3.94, output: 15.7, cacheRead: 0.71, currency: "CNY" },
-  "kimi-k2-0905": { input: 3.94, output: 15.7, cacheRead: 0.71, currency: "CNY" },
-  "moonshot-v1-128k": { input: 14.4, output: 36, currency: "CNY" },
-  "moonshot-v1-32k": { input: 7.2, output: 21.6, currency: "CNY" },
-  "moonshot-v1-8k": { input: 1.44, output: 14.4, currency: "CNY" },
-  // GLM (Z.ai / Zhipu AI) — https://docs.z.ai/guides/overview/pricing — TODO: verify against official pricing
-  "glm-5.1": { input: 10, output: 32, currency: "CNY" },
-  "glm-5p1": { input: 10, output: 32, currency: "CNY" },
-  // Fireworks alias (accounts/fireworks/models/glm-5p1)
-  "glm-5-turbo": { input: 8.5, output: 29, currency: "CNY" },
-  "glm-5": { input: 7, output: 23, currency: "CNY" },
-  "glm-4.7-flashx": { input: 0.5, output: 2.8, currency: "CNY" },
-  "glm-4.7": { input: 4, output: 16, currency: "CNY" },
-  "glm-4.6": { input: 4, output: 16, currency: "CNY" },
-  "glm-4.5-x": { input: 16, output: 64, currency: "CNY" },
-  "glm-4.5-airx": { input: 8, output: 32, currency: "CNY" },
-  "glm-4.5-air": { input: 1.4, output: 8, currency: "CNY" },
-  "glm-4.5": { input: 4, output: 16, currency: "CNY" },
-  // Qwen (Alibaba Cloud) — https://www.alibabacloud.com/help/en/model-studio/model-pricing
-  "qwen3.6-plus": { input: 2, output: 12, currency: "CNY" },
-  "qwen3-235b": { input: 5, output: 20, currency: "CNY" },
-  "qwen3-32b": { input: 1.12, output: 4.48, currency: "CNY" },
-  "qwen3-30b": { input: 1.4, output: 5.6, currency: "CNY" },
-  "qwen-max": { input: 11.5, output: 46, currency: "CNY" },
-  "qwen-plus": { input: 2.8, output: 8.4, currency: "CNY" },
-  "qwen-turbo": { input: 0.35, output: 1.4, currency: "CNY" },
-  "qwen-long": { input: 0.5, output: 2, currency: "CNY" },
-  "qwen2.5-72b": { input: 10, output: 40, currency: "CNY" },
-  "qwen2.5-7b": { input: 1.26, output: 5.04, currency: "CNY" },
-  "qwen3.5-plus": { input: 1.86, output: 11.2, currency: "CNY" },
-  "qwen3-max": { input: 5.59, output: 27.9, currency: "CNY" },
-  "qwen3-235b-a22b": { input: 5.01, output: 60.1, currency: "CNY" },
-  "qwen3-coder-plus": { input: 4.65, output: 23.3, currency: "CNY" },
-  "qwen3-coder-flash": { input: 1.4, output: 6.98, currency: "CNY" },
-  "qwen3-coder-next": { input: 0.86, output: 5.37, currency: "CNY" },
-  "qwq-plus": { input: 5.73, output: 17.2, currency: "CNY" },
-  "qwq-32b": { input: 1.43, output: 4.3, currency: "CNY" },
-  // Xiaomi MiMo — https://platform.xiaomimimo.com/docs/zh-CN/pricing
-  "mimo-v2.5-pro": { input: 3, output: 6, cacheRead: 0.025, currency: "CNY" },
-  "mimo-v2.5": { input: 1, output: 2, cacheRead: 0.02, currency: "CNY" },
-  "mimo-v2-flash": { input: 0.64, output: 2.08, cacheRead: 0.064, currency: "CNY" },
-  "mimo-v2-pro": { input: 7.17, output: 21.5, currency: "CNY" },
-  // MiniMax — https://platform.minimaxi.com/docs/guides/pricing-paygo
-  "minimax-m2.7": { input: 2.15, output: 8.59, cacheRead: 0.43, cacheWrite: 2.68, currency: "CNY" },
-  "minimax-m2.7-highspeed": { input: 4.3, output: 17.2, cacheRead: 0.43, cacheWrite: 2.68, currency: "CNY" },
-  "minimax-m2.5-lightning": { input: 2.15, output: 17.2, cacheRead: 0.21, currency: "CNY" },
-  "minimax-m2.5": { input: 0.86, output: 6.81, cacheRead: 0.21, currency: "CNY" },
-  "minimax-m2.1": { input: 1.93, output: 6.81, cacheRead: 0.21, currency: "CNY" },
-  "minimax-m2.1-lightning": { input: 1.93, output: 16.7, cacheRead: 0.21, currency: "CNY" },
-  "minimax-m2": { input: 1.93, output: 6.81, cacheRead: 0.21, currency: "CNY" },
-  // Mistral AI — https://mistral.ai/pricing
-  "mistral-large": { input: 0.5, output: 1.5 },
-  "mistral-large-3": { input: 0.5, output: 1.5 },
-  "mistral-medium": { input: 1.5, output: 7.5 },
-  "mistral-small": { input: 0.1, output: 0.3 },
-  "magistral-medium": { input: 2, output: 5 },
-  "magistral-small": { input: 0.5, output: 1.5 },
-  "devstral-medium": { input: 0.4, output: 2 },
-  "devstral-small": { input: 0.1, output: 0.3 },
-  "codestral": { input: 0.3, output: 0.9 },
-  "open-mistral-nemo": { input: 0.15, output: 0.15 },
-  "open-mixtral-8x22b": { input: 2, output: 6 },
-  "ministral-14b": { input: 0.2, output: 0.2 },
-  "ministral-8b": { input: 0.15, output: 0.15 },
-  "ministral-3b": { input: 0.1, output: 0.1 },
-  "pixtral-12b": { input: 0.1, output: 0.1 },
-  // xAI Grok — https://docs.x.ai/developers/models
-  "grok-4-1-fast": { input: 0.2, output: 0.5 },
-  "grok-4.3": { input: 1.25, output: 2.5 },
-  "grok-4.20-0309-reasoning": { input: 2, output: 6 },
-  "grok-4.20-0309-non-reasoning": { input: 2, output: 6 },
-  "grok-4": { input: 1.25, output: 2.5 },
-  "grok-build-0.1": { input: 1, output: 2 },
-  "grok-3": { input: 3, output: 15 },
-  "grok-3-mini": { input: 0.25, output: 0.5 },
-  // Cohere — https://cohere.com/pricing
-  "command-a": { input: 2.5, output: 10 },
-  "command-r-plus": { input: 2.5, output: 10 },
-  "command-r": { input: 0.15, output: 0.6 },
-  // Doubao (ByteDance) — https://www.volcengine.com/docs/82379/1544106
-  "doubao-seed-code": { input: 1.22, output: 7.95, currency: "CNY" },
-  "doubao-seed-2.0-pro": { input: 3.7, output: 18.5, currency: "CNY" },
-  "doubao-seed-2.0-code": { input: 3.36, output: 16.8, currency: "CNY" },
-  "doubao-seed-2.0-lite": { input: 0.63, output: 3.78, currency: "CNY" },
-  "doubao-seed-2.0-mini": { input: 0.21, output: 2.1, currency: "CNY" },
-  "doubao-seed-1.6-flash": { input: 0.16, output: 1.58, currency: "CNY" },
-  "doubao-seed-1.6-lite": { input: 0.32, output: 2.52, currency: "CNY" },
-  "doubao-seed-1.6": { input: 0.84, output: 8.4, currency: "CNY" },
-  "doubao-1.5-pro": { input: 0.84, output: 2.1, currency: "CNY" },
-  "doubao-1.5-lite": { input: 0.32, output: 0.63, currency: "CNY" },
-  // Hunyuan (Tencent) — https://cloud.tencent.com/document/product/1729 — TODO: verify against official pricing
-  "hunyuan-t1": { input: 0.48, output: 1.87, cacheRead: 0.21, currency: "CNY" },
-  "hunyuan-a13b": { input: 1, output: 4.1, currency: "CNY" },
-  // ERNIE (Baidu) — https://cloud.baidu.com/doc/WENXINWORKSHOP/s/Blfmc9dlf — TODO: verify against official pricing
-  "ernie-4.5-300b": { input: 2, output: 6.5, currency: "CNY" },
-  "ernie-4.5-21b": { input: 0.5, output: 2, currency: "CNY" },
-  "ernie-x1": { input: 2, output: 8, currency: "CNY" },
-  // StepFun (阶跃星辰)
-  "step-3.5-flash": { input: 0.72, output: 2.15, currency: "CNY" },
-  // Qoder credits — https://docs.qoder.com/user-guide/chat/model-tier-selector
-  // Qoder publishes credit multipliers and a $0.02 / credit pack price, but
-  // not a full per-token tariff. Estimate 1.0x as 1 credit / 10K tokens.
-  // Ultimate uses the current official limited-time 0.8x discount.
-  "qoder-auto": { input: 2, output: 2, cacheRead: 2, cacheWrite: 2 },
-  "qoder-ultimate": { input: 1.6, output: 1.6, cacheRead: 1.6, cacheWrite: 1.6 },
-  "qoder-performance": { input: 2.2, output: 2.2, cacheRead: 2.2, cacheWrite: 2.2 },
-  "qoder-efficient": { input: 0.6, output: 0.6, cacheRead: 0.6, cacheWrite: 0.6 },
-  "qoder-lite": { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }
-};
+var basePriceTable = {};
 var userOverrides = {};
-var PRICE_TABLE = { ...DEFAULT_PRICE_TABLE };
-function getPriceTable() {
-  return { ...DEFAULT_PRICE_TABLE, ...userOverrides };
+var PRICE_TABLE = {};
+function setRuntimePriceTable(base, overrides = {}) {
+  basePriceTable = { ...base };
+  userOverrides = { ...overrides };
+  PRICE_TABLE = { ...basePriceTable, ...userOverrides };
 }
 function setPriceOverride(model, entry) {
   userOverrides = { ...userOverrides, [model]: entry };
-  PRICE_TABLE = { ...DEFAULT_PRICE_TABLE, ...userOverrides };
+  PRICE_TABLE = { ...basePriceTable, ...userOverrides };
 }
 function removePriceOverride(model) {
   const { [model]: _, ...rest } = userOverrides;
   userOverrides = rest;
-  PRICE_TABLE = { ...DEFAULT_PRICE_TABLE, ...userOverrides };
-}
-function getUserOverrides() {
-  return { ...userOverrides };
+  PRICE_TABLE = { ...basePriceTable, ...userOverrides };
 }
 var PROVIDER_PREFIXES = [
   "accounts/fireworks/models/",
@@ -366,6 +185,15 @@ function calculateCostWithResolver(model, tokens, exchangeRate, resolver) {
 function calculateCost(model, tokens, exchangeRate) {
   return calculateCostWithResolver(model, tokens, exchangeRate, resolvePrice);
 }
+function calculateCostForPrice(price, tokens, exchangeRate) {
+  const inputCost = tokens.inputTokens / 1e6 * price.input;
+  const outputCost = tokens.outputTokens / 1e6 * price.output;
+  const cacheReadCost = tokens.cacheReadTokens / 1e6 * (price.cacheRead ?? 0);
+  const cacheWriteCost = tokens.cacheWriteTokens / 1e6 * (price.cacheWrite ?? 0);
+  const thinkingCost = tokens.thinkingTokens / 1e6 * price.output;
+  const rawCost = inputCost + outputCost + cacheReadCost + cacheWriteCost + thinkingCost;
+  return price.currency === "CNY" ? convertToUSD(rawCost, exchangeRate ?? FALLBACK_RATE) : rawCost;
+}
 var QODER_TIER_MODELS = /* @__PURE__ */ new Set([
   "auto",
   "ultimate",
@@ -430,8 +258,9 @@ var ClaudeCodeParser = class {
     }, context.exchangeRate);
     const costSource = model === "unknown" ? "unknown" : "pricing";
     const provider = inferProvider(model);
+    const messageId = parsed.message.id;
     const record = {
-      id: generateRecordId(context.deviceInstanceId, context.sourceFile, context.lineOffset),
+      id: messageId ? generateRecordId(context.deviceInstanceId, messageId, 0) : generateRecordId(context.deviceInstanceId, context.sourceFile, context.lineOffset),
       ts: ts22,
       ingestedAt: context.now,
       updatedAt: context.now,
@@ -1051,14 +880,14 @@ function usageFromAny(parsed) {
   const cachedFromDetails = num(details.cached_tokens);
   const rawInput = usage.input_tokens ?? usage.input ?? usage.prompt_tokens ?? usage.input_other ?? usage.tokensIn ?? 0;
   const cacheRead = num(
-    usage.cache_read_input_tokens ?? usage.cache_read_tokens ?? usage.input_cache_read ?? usage.cacheReads ?? cachedFromDetails
+    usage.cache_read_input_tokens ?? usage.cache_read_tokens ?? usage.input_cache_read ?? usage.cacheReads ?? usage.cacheRead ?? cachedFromDetails
   );
   return {
     inputTokens: Math.max(0, num(rawInput) - cachedFromDetails),
     outputTokens: num(usage.output_tokens ?? usage.output ?? usage.completion_tokens ?? usage.tokensOut),
     cacheReadTokens: cacheRead,
     cacheWriteTokens: num(
-      usage.cache_creation_input_tokens ?? usage.cache_write_input_tokens ?? usage.cache_write_tokens ?? usage.input_cache_creation ?? usage.cacheWrites
+      usage.cache_creation_input_tokens ?? usage.cache_write_input_tokens ?? usage.cache_write_tokens ?? usage.input_cache_creation ?? usage.cacheWrites ?? usage.cacheWrite
     ),
     thinkingTokens: num(
       usage.thinking_tokens ?? usage.reasoning_tokens ?? usage.reasoning_output_tokens ?? details.reasoning_tokens
@@ -1202,8 +1031,8 @@ var Aggregator = class {
 };
 
 // src/config.ts
-import { readFileSync, writeFileSync, existsSync } from "fs";
-import { join } from "path";
+import { readFileSync, writeFileSync, existsSync, mkdirSync } from "fs";
+import { join, dirname } from "path";
 import { homedir } from "os";
 var AIUSAGE_DIR = join(homedir(), ".aiusage");
 var CONFIG_PATH = join(AIUSAGE_DIR, "config.json");
@@ -1233,6 +1062,7 @@ function loadConfig() {
   }
 }
 function saveConfig(config) {
+  mkdirSync(dirname(CONFIG_PATH), { recursive: true, mode: 448 });
   writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2), { mode: 384 });
 }
 function buildConsentConfig(config) {
@@ -1260,7 +1090,7 @@ function loadCredential(key) {
 }
 
 // src/init.ts
-import { mkdirSync, readFileSync as readFileSync2, writeFileSync as writeFileSync2, existsSync as existsSync2 } from "fs";
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, existsSync as existsSync2 } from "fs";
 import { join as join2 } from "path";
 import { randomUUID } from "crypto";
 function getState(aiusageDir) {
@@ -1632,6 +1462,9 @@ function defaultZedDbPath() {
   }
   return join3(xdgDataDir(home, "zed"), "threads", "threads.db");
 }
+function defaultZcodeDbPath() {
+  return join3(homedir2(), ".zcode", "cli", "db", "db.sqlite");
+}
 function probeClaudeCode(ctx) {
   const override = envOverride("claude-code", ctx.env);
   if (override) return override;
@@ -1843,6 +1676,15 @@ function probeZed(ctx) {
   const dbPath = defaultZedDbPath();
   return existsSync3(dbPath) ? dbPath : null;
 }
+function probeZcode(ctx) {
+  const override = envOverride("zcode", ctx.env);
+  if (override) return override;
+  if (ctx.env.ZCODE_HOME) return join3(ctx.env.ZCODE_HOME, "cli", "db", "db.sqlite");
+  const legacy = ctx.legacySources?.["zcode"];
+  if (legacy) return legacy;
+  const dbPath = defaultZcodeDbPath();
+  return existsSync3(dbPath) ? dbPath : null;
+}
 function probeGoose(ctx) {
   const override = envOverride("goose", ctx.env);
   if (override) return override;
@@ -1925,6 +1767,7 @@ var TOOL_REGISTRY = [
   { tool: "antigravity", sourceKey: "antigravity", label: "Antigravity", probe: probeAntigravity },
   { tool: "roocode", sourceKey: "roocode", label: "Roo Code", probe: probeRooCode },
   { tool: "zed", sourceKey: "zed", label: "Zed", probe: probeZed },
+  { tool: "zcode", sourceKey: "zcode", label: "ZCode", probe: probeZcode },
   { tool: "goose", sourceKey: "goose", label: "Goose", probe: probeGoose },
   { tool: "omp", sourceKey: "omp", label: "oh-my-pi", probe: probeOmp },
   { tool: "pi", sourceKey: "pi", label: "pi", probe: probePi },
@@ -2640,14 +2483,14 @@ function sha256Buffer(data) {
 }
 
 // src/leaderboard/credentials.ts
-import { readFileSync as readFileSync5, writeFileSync as writeFileSync3, mkdirSync as mkdirSync2, unlinkSync, existsSync as existsSync6, renameSync } from "fs";
-import { join as join5, dirname } from "path";
+import { readFileSync as readFileSync5, writeFileSync as writeFileSync3, mkdirSync as mkdirSync3, unlinkSync, existsSync as existsSync6, renameSync } from "fs";
+import { join as join5, dirname as dirname2 } from "path";
 import { randomBytes as randomBytes2 } from "crypto";
 var CREDENTIALS_FILE = join5(AIUSAGE_DIR, "leaderboard-credentials.json");
 function saveCredentials(creds) {
-  const dir = dirname(CREDENTIALS_FILE);
+  const dir = dirname2(CREDENTIALS_FILE);
   if (!existsSync6(dir)) {
-    mkdirSync2(dir, { recursive: true });
+    mkdirSync3(dir, { recursive: true });
   }
   const tmpFile = `${CREDENTIALS_FILE}.${randomBytes2(4).toString("hex")}.tmp`;
   try {
@@ -2866,14 +2709,14 @@ async function fetchLeaderboardStatus(serverUrl) {
 
 // src/db/index.ts
 import Database from "better-sqlite3";
-import { mkdirSync as mkdirSync3 } from "fs";
-import { dirname as dirname2 } from "path";
+import { mkdirSync as mkdirSync4 } from "fs";
+import { dirname as dirname3 } from "path";
 
 // src/db/schema.ts
 function applyPragmas(db) {
   db.pragma("journal_mode = WAL");
   db.pragma("foreign_keys = ON");
-  db.pragma("busy_timeout = 5000");
+  db.pragma("busy_timeout = 30000");
 }
 function createReadonlyViews(db) {
   db.exec(`
@@ -3166,6 +3009,79 @@ function migrateV9(db) {
   `);
 }
 
+// src/db/migrations/v10.ts
+function migrateV10(db) {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS model_prices (
+      model_key        TEXT PRIMARY KEY,
+      provider         TEXT NOT NULL DEFAULT '',
+      input            REAL NOT NULL,
+      output           REAL NOT NULL,
+      cache_read       REAL,
+      cache_write      REAL,
+      currency         TEXT NOT NULL DEFAULT 'USD',
+      source           TEXT NOT NULL DEFAULT 'manual',
+      source_model_id  TEXT,
+      source_url       TEXT,
+      origin           TEXT NOT NULL DEFAULT 'user',
+      status           TEXT NOT NULL DEFAULT 'active',
+      last_synced_at   INTEGER,
+      created_at       INTEGER NOT NULL,
+      updated_at       INTEGER NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS model_price_aliases (
+      alias       TEXT PRIMARY KEY,
+      model_key   TEXT NOT NULL REFERENCES model_prices(model_key) ON DELETE CASCADE,
+      match_type  TEXT NOT NULL DEFAULT 'exact',
+      provider    TEXT NOT NULL DEFAULT '',
+      priority    INTEGER NOT NULL DEFAULT 100,
+      source      TEXT NOT NULL DEFAULT 'manual',
+      origin      TEXT NOT NULL DEFAULT 'user',
+      enabled     INTEGER NOT NULL DEFAULT 1,
+      created_at  INTEGER NOT NULL,
+      updated_at  INTEGER NOT NULL
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_model_prices_origin ON model_prices(origin);
+    CREATE INDEX IF NOT EXISTS idx_model_prices_source ON model_prices(source);
+    CREATE INDEX IF NOT EXISTS idx_model_price_aliases_model ON model_price_aliases(model_key);
+
+    INSERT INTO schema_version (version) VALUES (10);
+  `);
+}
+
+// src/db/migrations/v11.ts
+function migrateV11(db) {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS model_price_sync_baselines (
+      model_key        TEXT PRIMARY KEY,
+      provider         TEXT NOT NULL DEFAULT '',
+      input            REAL NOT NULL,
+      output           REAL NOT NULL,
+      cache_read       REAL,
+      cache_write      REAL,
+      currency         TEXT NOT NULL DEFAULT 'USD',
+      source           TEXT NOT NULL DEFAULT 'litellm',
+      source_model_id  TEXT,
+      source_url       TEXT,
+      last_synced_at   INTEGER NOT NULL,
+      updated_at       INTEGER NOT NULL
+    );
+
+    INSERT INTO model_price_sync_baselines (
+      model_key, provider, input, output, cache_read, cache_write, currency, source,
+      source_model_id, source_url, last_synced_at, updated_at
+    )
+    SELECT model_key, provider, input, output, cache_read, cache_write, currency, source,
+           source_model_id, source_url, COALESCE(last_synced_at, updated_at), updated_at
+    FROM model_prices
+    WHERE origin = 'builtin' AND source != 'manual';
+
+    INSERT INTO schema_version (version) VALUES (11);
+  `);
+}
+
 // src/db/migrations/index.ts
 var MIGRATIONS = [
   { version: 1, migrate: migrateV1 },
@@ -3176,7 +3092,9 @@ var MIGRATIONS = [
   { version: 6, migrate: migrateV6 },
   { version: 7, migrate: migrateV7 },
   { version: 8, migrate: migrateV8 },
-  { version: 9, migrate: migrateV9 }
+  { version: 9, migrate: migrateV9 },
+  { version: 10, migrate: migrateV10 },
+  { version: 11, migrate: migrateV11 }
 ];
 function runMigrations(db) {
   createSchemaVersionTable(db);
@@ -3193,13 +3111,591 @@ function runMigrations(db) {
   }
 }
 
+// src/pricing-registry.ts
+var LITELLM_PRICING_URL = "https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json";
+function rowToPrice(row) {
+  return {
+    input: Number(row.input),
+    output: Number(row.output),
+    cacheRead: row.cache_read == null ? void 0 : Number(row.cache_read),
+    cacheWrite: row.cache_write == null ? void 0 : Number(row.cache_write),
+    currency: row.currency
+  };
+}
+function normalizeProvider(provider) {
+  return (provider ?? "").trim().toLowerCase();
+}
+function normalizeModelKey(sourceModelId) {
+  const trimmed = sourceModelId.trim();
+  const slash = trimmed.indexOf("/");
+  return slash > 0 ? trimmed.slice(slash + 1) : trimmed;
+}
+function aliasesFor(sourceModelId, modelKey) {
+  const aliases = /* @__PURE__ */ new Set([modelKey, sourceModelId]);
+  if (modelKey.startsWith("claude-")) aliases.add(modelKey.replace(/-\d{8}$/, ""));
+  return [...aliases].filter(Boolean);
+}
+function litellmEntryToPrice(sourceModelId, entry) {
+  if (entry.mode && entry.mode !== "chat" && entry.mode !== "completion" && entry.mode !== "responses") return null;
+  if (entry.input_cost_per_second != null || entry.output_cost_per_second != null) return null;
+  if (typeof entry.input_cost_per_token !== "number" || typeof entry.output_cost_per_token !== "number") return null;
+  const modelKey = normalizeModelKey(sourceModelId);
+  if (!modelKey || modelKey.includes("*")) return null;
+  return {
+    modelKey,
+    provider: normalizeProvider(entry.litellm_provider),
+    price: {
+      input: entry.input_cost_per_token * 1e6,
+      output: entry.output_cost_per_token * 1e6,
+      cacheRead: typeof entry.cache_read_input_token_cost === "number" ? entry.cache_read_input_token_cost * 1e6 : void 0,
+      cacheWrite: typeof entry.cache_creation_input_token_cost === "number" ? entry.cache_creation_input_token_cost * 1e6 : void 0,
+      currency: "USD"
+    }
+  };
+}
+function loadBuiltinRows(db) {
+  return db.prepare(`
+    SELECT model_key, provider, input, output, cache_read, cache_write, currency, source, source_model_id,
+           source_url, origin, status, last_synced_at, updated_at
+    FROM model_prices
+    WHERE origin = 'builtin' AND status = 'active'
+  `).all();
+}
+function loadUserRows(db) {
+  return db.prepare(`
+    SELECT model_key, provider, input, output, cache_read, cache_write, currency, source, source_model_id,
+           source_url, origin, status, last_synced_at, updated_at
+    FROM model_prices
+    WHERE origin = 'user' AND status = 'active'
+  `).all();
+}
+function loadSyncedBaselineRows(db) {
+  return db.prepare(`
+    SELECT model_key, provider, input, output, cache_read, cache_write, currency, source, source_model_id,
+           source_url, last_synced_at, updated_at
+    FROM model_price_sync_baselines
+  `).all();
+}
+function loadAliasRows(db) {
+  return db.prepare(`
+    SELECT alias, model_key, match_type, provider, priority, source, origin, enabled
+    FROM model_price_aliases
+    WHERE enabled = 1
+    ORDER BY priority ASC
+  `).all();
+}
+function loadPricingRuntime(db, config) {
+  const builtin = {};
+  for (const row of loadBuiltinRows(db)) builtin[row.model_key] = rowToPrice(row);
+  const overrides = {};
+  const userRows = loadUserRows(db);
+  const configOverrides = config?.priceOverrides ?? {};
+  const activePrices = priceTableFromDb(db);
+  for (const alias of loadAliasRows(db)) {
+    const price = activePrices[alias.model_key];
+    if (!price) continue;
+    if (alias.origin === "user") overrides[alias.alias] = price;
+    else builtin[alias.alias] = price;
+  }
+  for (const row of userRows) overrides[row.model_key] = rowToPrice(row);
+  for (const [model, entry] of Object.entries(configOverrides)) overrides[model] = entry;
+  setRuntimePriceTable(builtin, overrides);
+}
+function setUserPrice(db, modelKey, entry) {
+  const now = Date.now();
+  const baseline = db.prepare(`
+    SELECT provider, source, source_model_id, source_url, last_synced_at
+    FROM model_price_sync_baselines
+    WHERE model_key = ?
+  `).get(modelKey);
+  db.prepare(`
+    INSERT INTO model_prices (
+      model_key, provider, input, output, cache_read, cache_write, currency, source, source_model_id,
+      source_url, origin, status, last_synced_at, created_at, updated_at
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, 'manual', ?, ?, 'user', 'active', ?, ?, ?)
+    ON CONFLICT(model_key) DO UPDATE SET
+      provider = excluded.provider,
+      input = excluded.input,
+      output = excluded.output,
+      cache_read = excluded.cache_read,
+      cache_write = excluded.cache_write,
+      currency = excluded.currency,
+      source = 'manual',
+      source_model_id = excluded.source_model_id,
+      source_url = excluded.source_url,
+      origin = 'user',
+      status = 'active',
+      last_synced_at = excluded.last_synced_at,
+      updated_at = excluded.updated_at
+  `).run(
+    modelKey,
+    baseline?.provider ?? "",
+    entry.input,
+    entry.output,
+    entry.cacheRead ?? null,
+    entry.cacheWrite ?? null,
+    entry.currency ?? "USD",
+    baseline?.source_model_id ?? modelKey,
+    baseline?.source_url ?? null,
+    baseline?.last_synced_at ?? null,
+    now,
+    now
+  );
+  setPriceOverride(modelKey, entry);
+}
+function resetUserPriceToSynced(db, modelKey) {
+  const baseline = db.prepare(`
+    SELECT model_key, provider, input, output, cache_read, cache_write, currency, source, source_model_id,
+           source_url, last_synced_at, updated_at
+    FROM model_price_sync_baselines
+    WHERE model_key = ?
+  `).get(modelKey);
+  if (!baseline) {
+    removeUserPrice(db, modelKey);
+    return;
+  }
+  const now = Date.now();
+  db.prepare("DELETE FROM model_price_aliases WHERE alias = ? AND model_key = ? AND origin = 'user'").run(modelKey, modelKey);
+  db.prepare(`
+    INSERT INTO model_prices (
+      model_key, provider, input, output, cache_read, cache_write, currency, source, source_model_id,
+      source_url, origin, status, last_synced_at, created_at, updated_at
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'builtin', 'active', ?, ?, ?)
+    ON CONFLICT(model_key) DO UPDATE SET
+      provider = excluded.provider,
+      input = excluded.input,
+      output = excluded.output,
+      cache_read = excluded.cache_read,
+      cache_write = excluded.cache_write,
+      currency = excluded.currency,
+      source = excluded.source,
+      source_model_id = excluded.source_model_id,
+      source_url = excluded.source_url,
+      origin = 'builtin',
+      status = 'active',
+      last_synced_at = excluded.last_synced_at,
+      updated_at = excluded.updated_at
+  `).run(
+    baseline.model_key,
+    baseline.provider,
+    baseline.input,
+    baseline.output,
+    baseline.cache_read,
+    baseline.cache_write,
+    baseline.currency,
+    baseline.source,
+    baseline.source_model_id,
+    baseline.source_url,
+    baseline.last_synced_at,
+    now,
+    now
+  );
+}
+function setUserPricingAlias(db, alias, modelKey) {
+  const aliasKey = alias.trim();
+  const targetKey = modelKey.trim();
+  if (!aliasKey || !targetKey) throw new Error("alias and modelKey required");
+  const target = db.prepare(`
+    SELECT provider
+    FROM model_prices
+    WHERE model_key = ? AND status = 'active'
+  `).get(targetKey);
+  if (!target) throw new Error("Pricing model not found");
+  const now = Date.now();
+  db.prepare(`
+    INSERT INTO model_price_aliases (alias, model_key, match_type, provider, priority, source, origin, enabled, created_at, updated_at)
+    VALUES (?, ?, 'exact', ?, 200, 'manual', 'user', 1, ?, ?)
+    ON CONFLICT(alias) DO UPDATE SET
+      model_key = excluded.model_key,
+      match_type = 'exact',
+      provider = excluded.provider,
+      priority = excluded.priority,
+      source = 'manual',
+      origin = 'user',
+      enabled = 1,
+      updated_at = excluded.updated_at
+  `).run(aliasKey, targetKey, target.provider ?? "", now, now);
+}
+function removeUserPricingAlias(db, alias) {
+  const aliasKey = alias.trim();
+  if (!aliasKey) throw new Error("alias required");
+  db.prepare("DELETE FROM model_price_aliases WHERE alias = ? AND origin = 'user'").run(aliasKey);
+}
+function removeUserPrice(db, modelKey) {
+  db.prepare("DELETE FROM model_price_aliases WHERE alias = ? AND model_key = ? AND origin = 'user'").run(modelKey, modelKey);
+  db.prepare("DELETE FROM model_prices WHERE model_key = ? AND origin = 'user'").run(modelKey);
+}
+function upsertBuiltinPrice(db, entry, now) {
+  db.prepare(`
+    INSERT INTO model_price_sync_baselines (
+      model_key, provider, input, output, cache_read, cache_write, currency, source,
+      source_model_id, source_url, last_synced_at, updated_at
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, 'litellm', ?, ?, ?, ?)
+    ON CONFLICT(model_key) DO UPDATE SET
+      provider = excluded.provider,
+      input = excluded.input,
+      output = excluded.output,
+      cache_read = excluded.cache_read,
+      cache_write = excluded.cache_write,
+      currency = excluded.currency,
+      source = excluded.source,
+      source_model_id = excluded.source_model_id,
+      source_url = excluded.source_url,
+      last_synced_at = excluded.last_synced_at,
+      updated_at = excluded.updated_at
+  `).run(
+    entry.modelKey,
+    entry.provider,
+    entry.price.input,
+    entry.price.output,
+    entry.price.cacheRead ?? null,
+    entry.price.cacheWrite ?? null,
+    entry.price.currency ?? "USD",
+    entry.sourceModelId,
+    entry.sourceUrl,
+    now,
+    now
+  );
+  const existing = db.prepare("SELECT origin, input, output, cache_read, cache_write, currency FROM model_prices WHERE model_key = ?").get(entry.modelKey);
+  if (existing?.origin === "user") return "user_preserved";
+  const next = [entry.price.input, entry.price.output, entry.price.cacheRead ?? null, entry.price.cacheWrite ?? null, entry.price.currency ?? "USD"];
+  if (!existing) {
+    db.prepare(`
+      INSERT INTO model_prices (
+        model_key, provider, input, output, cache_read, cache_write, currency, source, source_model_id,
+        source_url, origin, status, last_synced_at, created_at, updated_at
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, 'litellm', ?, ?, 'builtin', 'active', ?, ?, ?)
+    `).run(entry.modelKey, entry.provider, ...next, entry.sourceModelId, entry.sourceUrl, now, now, now);
+    return "added";
+  }
+  const current = [Number(existing.input), Number(existing.output), existing.cache_read == null ? null : Number(existing.cache_read), existing.cache_write == null ? null : Number(existing.cache_write), existing.currency];
+  const changed = current.some((value, index) => value !== next[index]);
+  if (!changed) {
+    db.prepare(`
+      UPDATE model_prices SET provider = ?, source = 'litellm', source_model_id = ?, source_url = ?, last_synced_at = ?, updated_at = ?
+      WHERE model_key = ? AND origin = 'builtin'
+    `).run(entry.provider, entry.sourceModelId, entry.sourceUrl, now, now, entry.modelKey);
+    return "unchanged";
+  }
+  db.prepare(`
+    UPDATE model_prices
+    SET provider = ?, input = ?, output = ?, cache_read = ?, cache_write = ?, currency = ?, source = 'litellm',
+        source_model_id = ?, source_url = ?, status = 'active', last_synced_at = ?, updated_at = ?
+    WHERE model_key = ? AND origin = 'builtin'
+  `).run(entry.provider, ...next, entry.sourceModelId, entry.sourceUrl, now, now, entry.modelKey);
+  return "updated";
+}
+function upsertBuiltinAlias(db, alias, modelKey, provider, source, now) {
+  const existing = db.prepare("SELECT origin, model_key, enabled FROM model_price_aliases WHERE alias = ?").get(alias);
+  if (existing?.origin === "user") return "user_preserved";
+  if (!existing) {
+    db.prepare(`
+      INSERT INTO model_price_aliases (alias, model_key, match_type, provider, priority, source, origin, enabled, created_at, updated_at)
+      VALUES (?, ?, 'exact', ?, 100, ?, 'builtin', 1, ?, ?)
+    `).run(alias, modelKey, provider, source, now, now);
+    return "added";
+  }
+  if (existing.model_key === modelKey && existing.enabled === 1) return "unchanged";
+  db.prepare(`
+    UPDATE model_price_aliases SET model_key = ?, provider = ?, source = ?, enabled = 1, updated_at = ?
+    WHERE alias = ? AND origin = 'builtin'
+  `).run(modelKey, provider, source, now, alias);
+  return "updated";
+}
+async function syncPricingFromLitellm(db) {
+  const response = await fetch(LITELLM_PRICING_URL, { headers: { Accept: "application/json" } });
+  if (!response.ok) throw new Error(`LiteLLM pricing fetch failed: HTTP ${response.status}`);
+  const data = await response.json();
+  const now = Date.now();
+  const summary = {
+    source: "litellm",
+    added: 0,
+    updated: 0,
+    unchanged: 0,
+    skipped: 0,
+    aliasesAdded: 0,
+    aliasesUpdated: 0,
+    userPreserved: 0,
+    dryRun: { totalModels: 0, matched: 0, unresolved: [] }
+  };
+  const tx = db.transaction(() => {
+    for (const [sourceModelId, rawEntry] of Object.entries(data)) {
+      const parsed = litellmEntryToPrice(sourceModelId, rawEntry);
+      if (!parsed) {
+        summary.skipped++;
+        continue;
+      }
+      const result = upsertBuiltinPrice(db, {
+        modelKey: parsed.modelKey,
+        provider: parsed.provider,
+        price: parsed.price,
+        sourceModelId,
+        sourceUrl: LITELLM_PRICING_URL
+      }, now);
+      if (result === "user_preserved") summary.userPreserved++;
+      else summary[result]++;
+      for (const alias of aliasesFor(sourceModelId, parsed.modelKey)) {
+        const aliasResult = upsertBuiltinAlias(db, alias, parsed.modelKey, parsed.provider, "litellm", now);
+        if (aliasResult === "added") summary.aliasesAdded++;
+        else if (aliasResult === "updated") summary.aliasesUpdated++;
+        else if (aliasResult === "user_preserved") summary.userPreserved++;
+      }
+    }
+  });
+  tx();
+  summary.dryRun = dryRunLocalModels(db);
+  return summary;
+}
+function priceTableFromDb(db) {
+  const table = {};
+  const rows = db.prepare(`
+    SELECT model_key, input, output, cache_read, cache_write, currency
+    FROM model_prices WHERE status = 'active'
+  `).all();
+  for (const row of rows) table[row.model_key] = rowToPrice(row);
+  return table;
+}
+function resolvePriceFromRegistry(db, model) {
+  const directUserPrice = db.prepare(`
+    SELECT input, output, cache_read, cache_write, currency
+    FROM model_prices
+    WHERE model_key = ? AND origin = 'user' AND status = 'active'
+  `).get(model);
+  if (directUserPrice) return rowToPrice(directUserPrice);
+  const exactAlias = db.prepare(`
+    SELECT p.input, p.output, p.cache_read, p.cache_write, p.currency
+    FROM model_price_aliases a
+    JOIN model_prices p ON p.model_key = a.model_key
+    WHERE a.alias = ? AND a.enabled = 1 AND p.status = 'active'
+    ORDER BY a.priority DESC LIMIT 1
+  `).get(model);
+  if (exactAlias) return rowToPrice(exactAlias);
+  return resolvePriceFromTable(model, priceTableFromDb(db));
+}
+function findMatch(db, model) {
+  const directUserMatch = db.prepare(`
+    SELECT model_key, provider, input, output, cache_read, cache_write, currency, source, source_model_id,
+           source_url, origin, status, last_synced_at, updated_at
+    FROM model_prices
+    WHERE model_key = ? AND origin = 'user' AND status = 'active'
+  `).get(model);
+  if (directUserMatch) return { price: rowToPrice(directUserMatch), row: directUserMatch, matchedBy: null };
+  const aliasMatch = db.prepare(`
+    SELECT p.model_key, p.provider, p.input, p.output, p.cache_read, p.cache_write, p.currency, p.source,
+           p.source_model_id, p.source_url, p.origin, p.status, p.last_synced_at, p.updated_at, a.alias
+    FROM model_price_aliases a
+    JOIN model_prices p ON p.model_key = a.model_key
+    WHERE a.alias = ? AND a.enabled = 1 AND p.status = 'active'
+    ORDER BY a.priority DESC LIMIT 1
+  `).get(model);
+  if (aliasMatch) {
+    const matchedBy = aliasMatch.alias === model ? aliasMatch.model_key === model ? null : aliasMatch.model_key : aliasMatch.alias;
+    return { price: rowToPrice(aliasMatch), row: aliasMatch, matchedBy };
+  }
+  const rows = db.prepare(`
+    SELECT model_key, provider, input, output, cache_read, cache_write, currency, source, source_model_id,
+           source_url, origin, status, last_synced_at, updated_at
+    FROM model_prices WHERE status = 'active'
+  `).all();
+  let best = null;
+  for (const row of rows) {
+    if (model === row.model_key) {
+      best = row;
+      break;
+    }
+    if (model.startsWith(row.model_key) && (!best || row.model_key.length > best.model_key.length)) best = row;
+  }
+  if (!best) return null;
+  return { price: rowToPrice(best), row: best, matchedBy: best.model_key === model ? null : best.model_key };
+}
+function listPricingModels(db) {
+  const dbModels = db.prepare("SELECT model, COUNT(*) as usage_count FROM records WHERE model != 'unknown' GROUP BY model ORDER BY usage_count DESC, model ASC").all();
+  const knownModels = new Set(dbModels.map((row) => row.model));
+  const userRows = loadUserRows(db);
+  for (const row of userRows) knownModels.add(row.model_key);
+  const syncedBaselines = new Set(loadSyncedBaselineRows(db).map((row) => row.model_key));
+  return [...knownModels].map((model) => {
+    const match = findMatch(db, model);
+    if (!match) {
+      return {
+        model,
+        provider: null,
+        price: null,
+        currency: "USD",
+        origin: null,
+        source: null,
+        sourceModelId: null,
+        lastSyncedAt: null,
+        isBuiltin: false,
+        isOverride: false,
+        isDefault: false,
+        hasSyncedBaseline: syncedBaselines.has(model),
+        matchedBy: null
+      };
+    }
+    return {
+      model,
+      provider: match.row.provider || null,
+      price: match.price,
+      currency: match.price.currency ?? "USD",
+      origin: match.row.origin,
+      source: match.row.source,
+      sourceModelId: match.row.source_model_id,
+      lastSyncedAt: match.row.last_synced_at,
+      isBuiltin: match.row.origin === "builtin",
+      isOverride: match.row.origin === "user",
+      isDefault: match.row.origin === "builtin",
+      hasSyncedBaseline: syncedBaselines.has(match.row.model_key),
+      matchedBy: match.matchedBy
+    };
+  });
+}
+function getPricingRegistrySummary(db) {
+  const priceCounts = db.prepare(`
+    SELECT
+      COUNT(*) AS totalPrices,
+      SUM(CASE WHEN origin = 'builtin' THEN 1 ELSE 0 END) AS builtinPrices,
+      SUM(CASE WHEN origin = 'user' THEN 1 ELSE 0 END) AS userPrices,
+      MAX(last_synced_at) AS lastSyncedAt
+    FROM model_prices
+    WHERE status = 'active'
+  `).get();
+  const aliasCounts = db.prepare(`
+    SELECT COUNT(*) AS activeAliases
+    FROM model_price_aliases
+    WHERE enabled = 1
+  `).get();
+  const dryRun = dryRunLocalModels(db);
+  return {
+    totalPrices: Number(priceCounts.totalPrices ?? 0),
+    builtinPrices: Number(priceCounts.builtinPrices ?? 0),
+    userPrices: Number(priceCounts.userPrices ?? 0),
+    activeAliases: Number(aliasCounts.activeAliases ?? 0),
+    lastSyncedAt: priceCounts.lastSyncedAt == null ? null : Number(priceCounts.lastSyncedAt),
+    localModels: dryRun.totalModels,
+    matchedLocalModels: dryRun.matched,
+    unresolvedLocalModels: dryRun.unresolved
+  };
+}
+function listPricingAliasTargets(db) {
+  const rows = db.prepare(`
+    SELECT model_key, provider, origin, source, source_model_id, currency
+    FROM model_prices
+    WHERE status = 'active'
+    ORDER BY origin DESC, provider ASC, model_key ASC
+  `).all();
+  return rows.map((row) => ({
+    model: row.model_key,
+    provider: row.provider,
+    origin: row.origin,
+    source: row.source,
+    sourceModelId: row.source_model_id,
+    currency: row.currency
+  }));
+}
+function listLocalModelBindings(db) {
+  const rows = db.prepare("SELECT DISTINCT model FROM records WHERE model != 'unknown' ORDER BY model ASC").all();
+  const priceRows = db.prepare(`
+    SELECT model_key, provider, input, output, cache_read, cache_write, currency, source, source_model_id,
+           source_url, origin, status, last_synced_at, updated_at
+    FROM model_prices WHERE status = 'active'
+  `).all();
+  return rows.map(({ model }) => {
+    const directUserPrice = db.prepare(`
+      SELECT model_key, provider, input, output, cache_read, cache_write, currency, source, source_model_id,
+             source_url, origin, status, last_synced_at, updated_at
+      FROM model_prices
+      WHERE model_key = ? AND origin = 'user' AND status = 'active'
+    `).get(model);
+    const aliasMatch = db.prepare(`
+      SELECT a.alias, a.model_key AS modelKey, a.origin, a.source, p.origin AS priceOrigin
+      FROM model_price_aliases a
+      JOIN model_prices p ON p.model_key = a.model_key
+      WHERE a.alias = ? AND a.enabled = 1 AND p.status = 'active'
+      ORDER BY a.priority DESC LIMIT 1
+    `).get(model);
+    if (directUserPrice) {
+      const hasManualBinding = Boolean(aliasMatch && aliasMatch.origin === "user" && !(aliasMatch.alias === model && aliasMatch.modelKey === model));
+      return {
+        model,
+        modelKey: hasManualBinding ? aliasMatch.modelKey : directUserPrice.model_key,
+        origin: hasManualBinding ? aliasMatch.origin : directUserPrice.origin,
+        priceOrigin: directUserPrice.origin,
+        source: directUserPrice.source,
+        matchType: "exact",
+        bindingType: "custom",
+        hasManualBinding,
+        hasPrice: true
+      };
+    }
+    if (aliasMatch) {
+      const selfAlias = aliasMatch.alias === model && aliasMatch.modelKey === model;
+      const hasManualBinding = aliasMatch.origin === "user" && !selfAlias;
+      return {
+        model,
+        modelKey: aliasMatch.modelKey,
+        origin: aliasMatch.origin,
+        priceOrigin: aliasMatch.priceOrigin,
+        source: aliasMatch.source,
+        matchType: selfAlias ? "exact" : "alias",
+        bindingType: aliasMatch.priceOrigin === "user" ? "custom" : hasManualBinding ? "manual" : "automatic",
+        hasManualBinding,
+        hasPrice: true
+      };
+    }
+    let best = null;
+    let matchType = null;
+    for (const row of priceRows) {
+      if (model === row.model_key) {
+        best = row;
+        matchType = "exact";
+        break;
+      }
+      if (model.startsWith(row.model_key) && (!best || row.model_key.length > best.model_key.length)) {
+        best = row;
+        matchType = "prefix";
+      }
+    }
+    return {
+      model,
+      modelKey: best?.model_key ?? null,
+      origin: best?.origin ?? null,
+      priceOrigin: best?.origin ?? null,
+      source: best?.source ?? null,
+      matchType,
+      bindingType: best?.origin === "user" ? "custom" : best ? "automatic" : "none",
+      hasManualBinding: false,
+      hasPrice: Boolean(best)
+    };
+  });
+}
+function dryRunLocalModels(db) {
+  const models = db.prepare("SELECT DISTINCT model FROM records WHERE model != 'unknown' ORDER BY model ASC").all();
+  const unresolved = [];
+  let matched = 0;
+  for (const row of models) {
+    if (resolvePriceFromRegistry(db, row.model)) matched++;
+    else unresolved.push(row.model);
+  }
+  return { totalModels: models.length, matched, unresolved: unresolved.slice(0, 50) };
+}
+function getUserAliasBindings(db) {
+  return db.prepare(`
+    SELECT alias, model_key AS modelKey, origin, source
+    FROM model_price_aliases
+    WHERE origin = 'user' AND enabled = 1
+    ORDER BY alias ASC
+  `).all();
+}
+
 // src/db/index.ts
 function initializeDatabase(db) {
   applyPragmas(db);
   runMigrations(db);
+  loadPricingRuntime(db, loadConfig());
 }
 function createDatabase(path3) {
-  mkdirSync3(dirname2(path3), { recursive: true, mode: 448 });
+  mkdirSync4(dirname3(path3), { recursive: true, mode: 448 });
   const db = new Database(path3);
   initializeDatabase(db);
   return db;
@@ -3912,6 +4408,31 @@ function mapRowToRecord(row) {
   };
 }
 
+// src/db/write-queue.ts
+var AsyncTaskQueue = class {
+  tail = Promise.resolve();
+  running = false;
+  pending = 0;
+  run(task) {
+    this.pending++;
+    const runTask = async () => {
+      this.pending--;
+      this.running = true;
+      try {
+        return await task();
+      } finally {
+        this.running = false;
+      }
+    };
+    const result = this.tail.then(runTask, runTask);
+    this.tail = result.catch(() => void 0);
+    return result;
+  }
+  getStatus() {
+    return { running: this.running, pending: this.pending };
+  }
+};
+
 // src/api/server.ts
 var pendingLeaderboardAuth = /* @__PURE__ */ new Map();
 function getManualImportMetadata(db) {
@@ -3946,11 +4467,39 @@ function countExistingRecordIds(db, ids) {
   }
   return count;
 }
-function recalcCosts(db) {
+function emptyPricingRecalcStatus() {
+  return {
+    state: "idle",
+    needsRecalc: false,
+    needsRecalcSince: null,
+    total: 0,
+    processed: 0,
+    updated: 0,
+    skipped: 0,
+    queueRunning: false,
+    queuePending: 0,
+    startedAt: null,
+    finishedAt: null,
+    error: null
+  };
+}
+async function recalcCosts(db, onProgress) {
   const BATCH_SIZE2 = 1e3;
   let updated = 0;
+  let processed = 0;
+  let skipped = 0;
   let lastId = "";
   const exchangeRate = resolveExchangeRate(loadConfig() ?? {});
+  const priceCache = /* @__PURE__ */ new Map();
+  const resolveCachedPrice = (model) => {
+    if (priceCache.has(model)) return priceCache.get(model) ?? void 0;
+    const price = resolvePriceFromRegistry(db, model) ?? null;
+    priceCache.set(model, price);
+    return price ?? void 0;
+  };
+  const totalRow = db.prepare("SELECT COUNT(*) AS total FROM records").get();
+  const total = totalRow.total;
+  onProgress?.({ total, processed, updated, skipped });
   while (true) {
     const records = db.prepare(
       "SELECT id, tool, model, provider, input_tokens, output_tokens, cache_read_tokens, cache_write_tokens, thinking_tokens, cost, cost_source FROM records WHERE id > ? ORDER BY id LIMIT ?"
@@ -3959,19 +4508,23 @@ function recalcCosts(db) {
     const updateStmt = db.prepare("UPDATE records SET model = ?, provider = ?, cost = ?, cost_source = ?, updated_at = ? WHERE id = ?");
     const tx = db.transaction((batch) => {
       for (const r of batch) {
-        if (r.cost_source === "log") continue;
+        processed++;
+        if (r.cost_source === "log") {
+          skipped++;
+          continue;
+        }
         const rawModel = r.tool === "qoder" ? normalizeQoderModel(r.model) : r.model;
         const model = rawModel === "unknown" ? r.tool === "qoder" ? "qoder-auto" : r.model : rawModel;
         const provider = model !== r.model ? inferProvider(model) : r.provider;
-        const hasPrice = resolvePrice(model) != null;
-        const cost = hasPrice ? calculateCost(model, {
+        const price = resolveCachedPrice(model);
+        const cost = price ? calculateCostForPrice(price, {
           inputTokens: r.input_tokens,
           outputTokens: r.output_tokens,
           cacheReadTokens: r.cache_read_tokens,
           cacheWriteTokens: r.cache_write_tokens,
           thinkingTokens: r.thinking_tokens
         }, exchangeRate) : 0;
-        const costSource = hasPrice ? "pricing" : "unknown";
+        const costSource = price ? "pricing" : "unknown";
         if (model === r.model && provider === r.provider && cost === r.cost && costSource === r.cost_source) continue;
         updateStmt.run(model, provider, cost, costSource, Date.now(), r.id);
         updated++;
@@ -3979,6 +4532,8 @@ function recalcCosts(db) {
     });
     tx(records);
     lastId = records[records.length - 1].id;
+    onProgress?.({ total, processed, updated, skipped });
+    await new Promise((resolve2) => setImmediate(resolve2));
   }
   return updated;
 }
@@ -4016,6 +4571,17 @@ function json(res, data, status = 200) {
   res.writeHead(status, { "Content-Type": "application/json" });
   res.end(JSON.stringify(data));
 }
+function isDatabaseLockedError(error) {
+  return error instanceof Error && /database is locked|SQLITE_BUSY/i.test(error.message);
+}
+function databaseBusy(res) {
+  json(res, {
+    error: {
+      code: "DATABASE_BUSY",
+      message: "Database is busy. Wait for the current refresh, sync, or import to finish and retry."
+    }
+  }, 503);
+}
 async function readJsonBody(req) {
   let body = "";
   for await (const chunk of req) body += chunk;
@@ -4101,6 +4667,23 @@ async function proxyLeaderboard(res, url) {
     json(res, getLeaderboardFallback(periodType));
   }
 }
+async function proxyCloudSyncStatus(res) {
+  const upstream = new URL("/api/cli/sync/status", getSiteUrl());
+  try {
+    const response = await fetch(upstream, {
+      headers: { Accept: "application/json" }
+    });
+    const contentType = response.headers.get("content-type") || "";
+    if (!response.ok || !contentType.includes("application/json")) {
+      json(res, { enabled: false });
+      return;
+    }
+    const data = await response.json().catch(() => null);
+    json(res, data && typeof data.enabled === "boolean" ? data : { enabled: false });
+  } catch {
+    json(res, { enabled: false });
+  }
+}
 function getToolFilter(tool, prefix = "") {
   if (!tool) return { where: "", params: {} };
   const col = prefix ? `${prefix}.tool` : "tool";
@@ -4154,6 +4737,90 @@ function createApiServer(db, options) {
   const cfg = loadConfig();
   let weekStart = cfg?.weekStart ?? 1;
   const dashboardPassword = getDashboardPassword();
+  const localWriteQueue = new AsyncTaskQueue();
+  const runDbWrite = options?.runDbWrite ?? ((task) => localWriteQueue.run(task));
+  const getDbWriteQueueStatus = options?.getDbWriteQueueStatus ?? (() => localWriteQueue.getStatus());
+  let pricingRecalcStatus = emptyPricingRecalcStatus();
+  let pricingNeedsRecalcSince = null;
+  let pricingRecalcGeneration = 0;
+  const currentPricingRecalcStatus = () => {
+    const status = {
+      ...pricingRecalcStatus,
+      needsRecalc: pricingNeedsRecalcSince != null,
+      needsRecalcSince: pricingNeedsRecalcSince
+    };
+    if (status.state !== "queued") return status;
+    const queueStatus = getDbWriteQueueStatus();
+    return {
+      ...status,
+      queueRunning: queueStatus.running,
+      queuePending: queueStatus.pending
+    };
+  };
+  const markPricingNeedsRecalc = () => {
+    pricingRecalcGeneration += 1;
+    pricingNeedsRecalcSince = Date.now();
+    return pricingNeedsRecalcSince;
+  };
+  const startPricingRecalc = () => {
+    if (pricingRecalcStatus.state === "queued" || pricingRecalcStatus.state === "running") {
+      return { accepted: false, status: currentPricingRecalcStatus() };
+    }
+    const startedAt = Date.now();
+    const startedGeneration = pricingRecalcGeneration;
+    pricingRecalcStatus = {
+      ...emptyPricingRecalcStatus(),
+      state: "running",
+      startedAt
+    };
+    const runRecalc = async () => {
+      pricingRecalcStatus = {
+        ...pricingRecalcStatus,
+        state: "running",
+        queueRunning: false,
+        queuePending: 0,
+        startedAt: pricingRecalcStatus.startedAt ?? Date.now()
+      };
+      try {
+        await recalcCosts(db, (progress) => {
+          pricingRecalcStatus = {
+            ...pricingRecalcStatus,
+            ...progress,
+            state: "running"
+          };
+        });
+        if (pricingNeedsRecalcSince != null && pricingRecalcGeneration === startedGeneration) {
+          pricingNeedsRecalcSince = null;
+        }
+        pricingRecalcStatus = {
+          ...pricingRecalcStatus,
+          state: "done",
+          needsRecalc: pricingNeedsRecalcSince != null,
+          needsRecalcSince: pricingNeedsRecalcSince,
+          finishedAt: Date.now(),
+          error: null
+        };
+      } catch (error) {
+        pricingRecalcStatus = {
+          ...pricingRecalcStatus,
+          state: "error",
+          finishedAt: Date.now(),
+          error: error instanceof Error ? error.message : String(error)
+        };
+      }
+    };
+    setImmediate(() => {
+      void runRecalc().catch((error) => {
+        pricingRecalcStatus = {
+          ...pricingRecalcStatus,
+          state: "error",
+          finishedAt: Date.now(),
+          error: error instanceof Error ? error.message : String(error)
+        };
+      });
+    });
+    return { accepted: true, status: currentPricingRecalcStatus() };
+  };
   const server = http.createServer(async (req, res) => {
     const url = new URL(req.url ?? "/", `http://${req.headers.host}`);
     res.setHeader("Access-Control-Allow-Origin", "*");
@@ -4192,6 +4859,10 @@ function createApiServer(db, options) {
       json(res, { ok: true });
       return;
     }
+    if (url.pathname === "/api/cli/sync/status" && req.method === "GET") {
+      await proxyCloudSyncStatus(res);
+      return;
+    }
     if (dashboardPassword && shouldProtectApiPath(url.pathname) && !isAuthenticated(dashboardPassword, req.headers.cookie)) {
       json(res, { error: { code: "UNAUTHORIZED", message: "Authentication required" } }, 401);
       return;
@@ -4301,22 +4972,28 @@ function createApiServer(db, options) {
           byTool[row.tool] = { tokens: row.tokens, cost: row.cost };
         }
         const drJoin = getDateRangeFilter(range, from, to, "r", weekStart);
-        const dfJoin = df.where ? df.where.replace(/device_instance_id/g, "r.device_instance_id") : "";
+        const drJoinO = drJoin.where.replaceAll("r.ts", "COALESCE(r.ts, tc.ts)");
+        const dfJoinRaw = df.where ? df.where.replace(/device_instance_id/g, "r.device_instance_id") : "";
+        const dfJoin = dfJoinRaw.replace(
+          /r\.device_instance_id\s*=\s*@\w+/,
+          "(r.device_instance_id IS NULL OR r.device_instance_id = @deviceId)"
+        );
         const tfJoin = getToolFilter(tool, "r");
+        const tfJoinO = tfJoin.where.replaceAll("r.tool", "COALESCE(r.tool, tc.tool)");
         const topToolCalls = db.prepare(`
           SELECT tc.name, COUNT(*) AS count
           FROM tool_calls tc
-          JOIN records r ON r.id = tc.record_id
-          WHERE 1=1 ${dfJoin} ${drJoin.where} ${tfJoin.where}
+          LEFT JOIN records r ON r.id = tc.record_id
+          WHERE 1=1 ${dfJoin} ${drJoinO} ${tfJoinO}
           GROUP BY tc.name ORDER BY count DESC LIMIT 10
         `).all({ ...drJoin.params, ...df.params, ...tfJoin.params });
         const topMcpServersRaw = db.prepare(`
           SELECT tc.name, COUNT(*) AS count
           FROM tool_calls tc
-          JOIN records r ON r.id = tc.record_id
+          LEFT JOIN records r ON r.id = tc.record_id
           WHERE tc.name LIKE 'mcp\\_\\_%' ESCAPE '\\'
             AND INSTR(SUBSTR(tc.name, 6), '__') > 0
-            ${dfJoin} ${drJoin.where} ${tfJoin.where}
+            ${dfJoin} ${drJoinO} ${tfJoinO}
           GROUP BY tc.name ORDER BY count DESC
         `).all({ ...drJoin.params, ...df.params, ...tfJoin.params });
         const mcpServerMap = /* @__PURE__ */ new Map();
@@ -4570,9 +5247,17 @@ function createApiServer(db, options) {
           json(res, { toolCalls: [] });
           return;
         }
-        const dr = getDateRangeFilter(range, from, to, "r", weekStart);
+        const drRaw = getDateRangeFilter(range, from, to, "r", weekStart);
+        const dr = {
+          where: drRaw.where.replaceAll("r.ts", "COALESCE(r.ts, tc.ts)"),
+          params: drRaw.params
+        };
         const tool = url.searchParams.get("tool");
-        const tf = getToolFilter(tool, "r");
+        const tfRaw = getToolFilter(tool, "r");
+        const tf = {
+          where: tfRaw.where.replaceAll("r.tool", "COALESCE(r.tool, tc.tool)"),
+          params: tfRaw.params
+        };
         const toolType = url.searchParams.get("toolType");
         if (toolType && !["mcp", "skill", "builtin"].includes(toolType)) {
           json(res, { error: { code: "INVALID_PARAM", message: "Invalid toolType" } }, 400);
@@ -4581,14 +5266,14 @@ function createApiServer(db, options) {
         const ttf = getToolTypeFilter(toolType);
         const totalRow = db.prepare(`
           SELECT COUNT(*) AS total FROM tool_calls tc
-          JOIN records r ON r.id = tc.record_id
+          LEFT JOIN records r ON r.id = tc.record_id
           WHERE 1=1 ${dr.where} ${tf.where} ${ttf}
         `).get({ ...dr.params, ...tf.params });
         const total = totalRow.total || 1;
         const rows = db.prepare(`
           SELECT tc.name, COUNT(*) AS count
           FROM tool_calls tc
-          JOIN records r ON r.id = tc.record_id
+          LEFT JOIN records r ON r.id = tc.record_id
           WHERE 1=1 ${dr.where} ${tf.where} ${ttf}
           GROUP BY tc.name ORDER BY count DESC
         `).all({ ...dr.params, ...tf.params });
@@ -4807,72 +5492,48 @@ function createApiServer(db, options) {
       }
       if (url.pathname === "/api/pricing") {
         if (req.method === "GET") {
-          const table = getPriceTable();
-          const overrides = getUserOverrides();
-          const dbModels = db.prepare("SELECT model, COUNT(*) as usage_count FROM records WHERE model != 'unknown' GROUP BY model ORDER BY usage_count DESC, model ASC").all();
-          const models = dbModels.map((r) => {
-            const model = r.model;
-            const exactPrice = table[model];
-            const resolvedPrice = resolvePrice(model);
-            const isOverride = model in overrides;
-            const isDefault = model in DEFAULT_PRICE_TABLE && !isOverride;
-            let matchedBy = null;
-            if (!exactPrice && resolvedPrice) {
-              for (const prefix of Object.keys(table)) {
-                if (model.startsWith(prefix) || model.toLowerCase().startsWith(prefix)) {
-                  matchedBy = prefix;
-                  break;
-                }
-              }
-              if (!matchedBy) {
-                const stripped = model.replace(/^[^/]+\//, "").toLowerCase();
-                for (const prefix of Object.keys(table)) {
-                  if (stripped.startsWith(prefix)) {
-                    matchedBy = prefix;
-                    break;
-                  }
-                }
-              }
-            }
-            return {
-              model,
-              price: resolvedPrice ?? null,
-              currency: resolvedPrice?.currency ?? "USD",
-              isDefault,
-              isOverride,
-              matchedBy
-            };
-          });
-          json(res, { models, overrides });
+          json(res, { models: listPricingModels(db), registry: getPricingRegistrySummary(db), targets: listPricingAliasTargets(db), aliasBindings: getUserAliasBindings(db), localBindings: listLocalModelBindings(db) });
           return;
         }
         if (req.method === "PUT") {
           let body = "";
           for await (const chunk of req) body += chunk;
+          let data;
           try {
-            const data = JSON.parse(body);
-            if (!data.model || typeof data.input !== "number" || typeof data.output !== "number") {
-              json(res, { error: { code: "INVALID_PARAM", message: "model, input, output required" } }, 400);
-              return;
-            }
-            const entry = {
-              input: data.input,
-              output: data.output,
-              cacheRead: data.cacheRead,
-              cacheWrite: data.cacheWrite
-            };
-            if (data.currency === "CNY") {
-              entry.currency = "CNY";
-            }
-            setPriceOverride(data.model, entry);
-            const cfg2 = loadConfig() ?? {};
-            cfg2.priceOverrides = { ...cfg2.priceOverrides, [data.model]: entry };
-            saveConfig(cfg2);
-            const recalculated = recalcCosts(db);
-            json(res, { ok: true, recalculated });
+            data = JSON.parse(body);
           } catch {
             json(res, { error: { code: "INVALID_JSON", message: "Invalid JSON body" } }, 400);
+            return;
+          }
+          if (!data.model || typeof data.input !== "number" || typeof data.output !== "number") {
+            json(res, { error: { code: "INVALID_PARAM", message: "model, input, output required" } }, 400);
+            return;
+          }
+          const entry = {
+            input: data.input,
+            output: data.output,
+            cacheRead: data.cacheRead,
+            cacheWrite: data.cacheWrite
+          };
+          if (data.currency === "CNY") {
+            entry.currency = "CNY";
           }
+          try {
+            await runDbWrite(() => {
+              setUserPrice(db, data.model, entry);
+              const cfg2 = loadConfig() ?? {};
+              cfg2.priceOverrides = { ...cfg2.priceOverrides, [data.model]: entry };
+              saveConfig(cfg2);
+              loadPricingRuntime(db, cfg2);
+            });
+          } catch (error) {
+            if (isDatabaseLockedError(error)) {
+              databaseBusy(res);
+              return;
+            }
+            throw error;
+          }
+          json(res, { ok: true, needsRecalc: true, needsRecalcSince: markPricingNeedsRecalc() });
           return;
         }
         if (req.method === "DELETE") {
@@ -4881,20 +5542,94 @@ function createApiServer(db, options) {
             json(res, { error: { code: "INVALID_PARAM", message: "model param required" } }, 400);
             return;
           }
-          removePriceOverride(model);
-          const cfg2 = loadConfig() ?? {};
-          if (cfg2.priceOverrides) {
-            delete cfg2.priceOverrides[model];
-            saveConfig(cfg2);
+          try {
+            await runDbWrite(() => {
+              resetUserPriceToSynced(db, model);
+              removePriceOverride(model);
+              const cfg2 = loadConfig() ?? {};
+              if (cfg2.priceOverrides) {
+                delete cfg2.priceOverrides[model];
+                saveConfig(cfg2);
+              }
+              loadPricingRuntime(db, cfg2);
+            });
+            json(res, { ok: true, needsRecalc: true, needsRecalcSince: markPricingNeedsRecalc() });
+          } catch (error) {
+            if (isDatabaseLockedError(error)) {
+              databaseBusy(res);
+              return;
+            }
+            throw error;
           }
-          const recalculated = recalcCosts(db);
-          json(res, { ok: true, recalculated });
           return;
         }
       }
+      if (url.pathname === "/api/pricing/alias" && req.method === "POST") {
+        try {
+          const data = await readJsonBody(req);
+          if (typeof data.alias !== "string" || typeof data.modelKey !== "string") {
+            json(res, { error: { code: "INVALID_PARAM", message: "alias and modelKey required" } }, 400);
+            return;
+          }
+          await runDbWrite(() => {
+            setUserPricingAlias(db, data.alias, data.modelKey);
+            loadPricingRuntime(db, loadConfig());
+          });
+          json(res, { ok: true, needsRecalc: true, needsRecalcSince: markPricingNeedsRecalc() });
+        } catch (error) {
+          if (isDatabaseLockedError(error)) {
+            databaseBusy(res);
+            return;
+          }
+          json(res, { error: { code: "INVALID_PARAM", message: error instanceof Error ? error.message : "Invalid pricing alias" } }, 400);
+        }
+        return;
+      }
+      if (url.pathname === "/api/pricing/alias" && req.method === "DELETE") {
+        const alias = url.searchParams.get("alias");
+        if (!alias) {
+          json(res, { error: { code: "INVALID_PARAM", message: "alias param required" } }, 400);
+          return;
+        }
+        try {
+          await runDbWrite(() => {
+            removeUserPricingAlias(db, alias);
+            loadPricingRuntime(db, loadConfig());
+          });
+          json(res, { ok: true, needsRecalc: true, needsRecalcSince: markPricingNeedsRecalc() });
+        } catch (error) {
+          if (isDatabaseLockedError(error)) {
+            databaseBusy(res);
+            return;
+          }
+          json(res, { error: { code: "INVALID_PARAM", message: error instanceof Error ? error.message : "Invalid pricing alias" } }, 400);
+        }
+        return;
+      }
+      if (url.pathname === "/api/pricing/sync" && req.method === "POST") {
+        try {
+          const summary = await runDbWrite(async () => {
+            const summary2 = await syncPricingFromLitellm(db);
+            loadPricingRuntime(db, loadConfig());
+            return summary2;
+          });
+          json(res, { ok: true, summary, needsRecalc: true, needsRecalcSince: markPricingNeedsRecalc() });
+        } catch (error) {
+          if (isDatabaseLockedError(error)) {
+            databaseBusy(res);
+            return;
+          }
+          json(res, { error: { code: "SYNC_FAILED", message: error instanceof Error ? error.message : "Pricing sync failed" } }, 502);
+        }
+        return;
+      }
+      if (url.pathname === "/api/pricing/recalc" && req.method === "GET") {
+        json(res, currentPricingRecalcStatus());
+        return;
+      }
       if (url.pathname === "/api/pricing/recalc" && req.method === "POST") {
-        const updated = recalcCosts(db);
-        json(res, { updated });
+        const result = startPricingRecalc();
+        json(res, result, result.accepted ? 202 : 200);
         return;
       }
       if (url.pathname === "/api/sync") {
@@ -4916,8 +5651,16 @@ function createApiServer(db, options) {
           json(res, { error: { code: "NOT_AVAILABLE", message: "Refresh not available" } }, 501);
           return;
         }
-        const result = await options.onRefresh();
-        json(res, result);
+        try {
+          const result = await runDbWrite(() => options.onRefresh());
+          json(res, result);
+        } catch (error) {
+          if (isDatabaseLockedError(error)) {
+            databaseBusy(res);
+            return;
+          }
+          throw error;
+        }
         return;
       }
       if (url.pathname === "/api/quotas" && req.method === "GET") {
@@ -5324,8 +6067,11 @@ function createApiServer(db, options) {
             json(res, { error: { code: "IMPORT_FAILED", message: result.errors[0] }, errors: result.errors }, 400);
             return;
           }
-          const existingCount = countExistingRecordIds(db, result.records.map((record) => record.id));
-          for (const record of result.records) insertRecord(db, record);
+          const existingCount = await runDbWrite(() => {
+            const existingCount2 = countExistingRecordIds(db, result.records.map((record) => record.id));
+            for (const record of result.records) insertRecord(db, record);
+            return existingCount2;
+          });
           const imported = result.records.length;
           const added = Math.max(0, new Set(result.records.map((record) => record.id)).size - existingCount);
           json(res, {
@@ -5392,7 +6138,8 @@ function defaultFileData() {
     "omp": {},
     "pi": {},
     "craft": {},
-    "droid": {}
+    "droid": {},
+    "zcode": {}
   };
 }
 var WatermarkManager = class {
@@ -5412,7 +6159,7 @@ var WatermarkManager = class {
       if (parsed && typeof parsed === "object" && !("files" in parsed)) {
         return { files: { ...defaultFileData(), ...parsed } };
       }
-      return { files: { ...defaultFileData(), ...parsed.files ?? {} }, opencode: parsed.opencode ?? null, hermes: parsed.hermes ?? null, qoder: parsed.qoder ?? null, cursor: parsed.cursor ?? null, goose: parsed.goose ?? null, zed: parsed.zed ?? null, kiro: parsed.kiro ?? null };
+      return { files: { ...defaultFileData(), ...parsed.files ?? {} }, opencode: parsed.opencode ?? null, hermes: parsed.hermes ?? null, qoder: parsed.qoder ?? null, cursor: parsed.cursor ?? null, goose: parsed.goose ?? null, zed: parsed.zed ?? null, kiro: parsed.kiro ?? null, zcode: parsed.zcode ?? null, zcodeTools: parsed.zcodeTools ?? null };
     } catch {
       return { files: defaultFileData() };
     }
@@ -5481,6 +6228,18 @@ var WatermarkManager = class {
   setKiroCursor(cursor) {
     this.data.kiro = cursor;
   }
+  getZcodeCursor() {
+    return this.data.zcode ?? null;
+  }
+  setZcodeCursor(cursor) {
+    this.data.zcode = cursor;
+  }
+  getZcodeToolCursor() {
+    return this.data.zcodeTools ?? null;
+  }
+  setZcodeToolCursor(cursor) {
+    this.data.zcodeTools = cursor;
+  }
 };
 
 // src/commands/parse-opencode.ts
@@ -6255,6 +7014,109 @@ function runParseKiro(db, options) {
   return { records: [], nextCursor: null, errors: ["no supported Kiro tables found"] };
 }
 
+// src/commands/parse-zcode.ts
+function normalizeZcodeModel(value) {
+  if (typeof value !== "string") return "unknown";
+  const trimmed = value.trim();
+  if (!trimmed) return "unknown";
+  return trimmed.toLowerCase();
+}
+function runParseZcode(db, options) {
+  const { dbPath, device, deviceInstanceId, platform: platform5, now, cursor, toolCursor, exchangeRate } = options;
+  const records = [];
+  const toolCalls = [];
+  const errors = [];
+  let nextCursor = null;
+  let nextToolCursor = null;
+  const modelRows = db.prepare(`
+    SELECT m.id, m.session_id, m.model_id, m.started_at,
+           m.input_tokens, m.output_tokens, m.reasoning_tokens,
+           m.cache_creation_input_tokens, m.cache_read_input_tokens,
+           s.directory
+    FROM model_usage m
+    LEFT JOIN session s ON s.id = m.session_id
+    WHERE m.status = 'completed'
+      AND (m.started_at > ? OR (m.started_at = ? AND m.id > ?))
+    ORDER BY m.started_at, m.id
+  `).all(
+    cursor?.lastStartedAt ?? 0,
+    cursor?.lastStartedAt ?? 0,
+    cursor?.lastId ?? ""
+  );
+  for (const row of modelRows) {
+    nextCursor = { lastStartedAt: Number(row.started_at), lastId: String(row.id) };
+    const inputTokens = Number(row.input_tokens) || 0;
+    const outputTokens = Number(row.output_tokens) || 0;
+    const thinkingTokens = Number(row.reasoning_tokens) || 0;
+    const cacheReadTokens = Number(row.cache_read_input_tokens) || 0;
+    const cacheWriteTokens = Number(row.cache_creation_input_tokens) || 0;
+    if (inputTokens + outputTokens + thinkingTokens + cacheReadTokens + cacheWriteTokens === 0) continue;
+    const model = normalizeZcodeModel(row.model_id);
+    const provider = inferProvider(model);
+    const ts3 = Number(row.started_at) || now;
+    const recordId = generateRecordId(deviceInstanceId, `${dbPath}:${row.id}`, ts3);
+    const tokenArgs = { inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens, thinkingTokens };
+    const calculatedCost = model !== "unknown" ? calculateCost(model, tokenArgs, exchangeRate) : 0;
+    records.push({
+      id: recordId,
+      ts: ts3,
+      ingestedAt: now,
+      updatedAt: now,
+      lineOffset: 0,
+      tool: "zcode",
+      model,
+      provider,
+      inputTokens,
+      outputTokens,
+      cacheReadTokens,
+      cacheWriteTokens,
+      thinkingTokens,
+      cost: calculatedCost,
+      costSource: calculatedCost > 0 ? "pricing" : "unknown",
+      sessionId: String(row.session_id ?? "unknown"),
+      sourceFile: dbPath,
+      device,
+      deviceInstanceId,
+      platform: platform5,
+      cwd: typeof row.directory === "string" && row.directory ? row.directory : ""
+    });
+  }
+  const toolRows = db.prepare(`
+    SELECT id, tool_name, started_at
+    FROM tool_usage
+    WHERE status = 'completed'
+      AND (started_at > ? OR (started_at = ? AND id > ?))
+    ORDER BY started_at, id
+  `).all(
+    toolCursor?.lastStartedAt ?? 0,
+    toolCursor?.lastStartedAt ?? 0,
+    toolCursor?.lastId ?? ""
+  );
+  let callIndex = 0;
+  for (const row of toolRows) {
+    nextToolCursor = { lastStartedAt: Number(row.started_at), lastId: String(row.id) };
+    const name = typeof row.tool_name === "string" && row.tool_name.trim() ? row.tool_name.trim() : "unknown";
+    const ts3 = Number(row.started_at) || now;
+    toolCalls.push({
+      id: generateOrphanToolCallId("zcode", name, ts3, callIndex),
+      recordId: null,
+      name,
+      ts: ts3,
+      callIndex,
+      // insertToolCall reads (tc as any).tool for orphan calls
+      tool: "zcode"
+    });
+    callIndex++;
+  }
+  return {
+    records,
+    toolCalls,
+    nextCursor: records.length > 0 ? nextCursor : null,
+    nextToolCursor: toolCalls.length > 0 ? nextToolCursor : null,
+    errors
+  };
+}
+
 // src/commands/parse.ts
 function extractCwdFromJson(data) {
   if (typeof data.cwd === "string" && data.cwd) return data.cwd;
@@ -6291,6 +7153,11 @@ function extractSessionId2(filePath, tool) {
     const parts = filePath.split("/");
     return (parts.pop() ?? "").replace(".jsonl", "");
   }
+  if (tool === "pi") {
+    const filename = filePath.split("/").pop() ?? "";
+    const match = filename.match(/_([^_]+)\.jsonl$/);
+    return match ? match[1] : filename.replace(".jsonl", "");
+  }
   return "unknown";
 }
 function toNumber2(value) {
@@ -6856,6 +7723,45 @@ async function runParse(db, filterTool, options) {
       errors.push(`${zedDbPath}: ${e instanceof Error ? e.message : e}`);
     }
   }
+  if (!filterTool || filterTool === "zcode") {
+    const zcodeDbPath = getDbPath("zcode") ?? "";
+    if (existsSync8(zcodeDbPath)) {
+      try {
+        const zcodeDb = new Database2(zcodeDbPath, { readonly: true });
+        try {
+          const result = runParseZcode(zcodeDb, {
+            dbPath: zcodeDbPath,
+            device,
+            deviceInstanceId,
+            platform: devicePlatform,
+            now: Date.now(),
+            cursor: wm.getZcodeCursor(),
+            toolCursor: wm.getZcodeToolCursor(),
+            exchangeRate
+          });
+          for (const record of result.records) insertRecord(db, record);
+          for (const tc of result.toolCalls) insertToolCall(db, tc);
+          if (result.nextCursor) {
+            wm.setZcodeCursor(result.nextCursor);
+          }
+          if (result.nextToolCursor) {
+            wm.setZcodeToolCursor(result.nextToolCursor);
+          }
+          if (result.nextCursor || result.nextToolCursor) {
+            wm.save();
+          }
+          parsedCount += result.records.length;
+          toolCallCount += result.toolCalls.length;
+          errors.push(...result.errors);
+          onProgress({ phase: "Parsing SQLite", tool: "zcode", current: 1, total: 1, records: parsedCount, toolCalls: toolCallCount });
+        } finally {
+          zcodeDb.close();
+        }
+      } catch (e) {
+        errors.push(`${zcodeDbPath}: ${e instanceof Error ? e.message : e}`);
+      }
+    }
+  }
   if (deviceInstanceId !== "unknown") {
     db.prepare(
       `UPDATE records SET device_instance_id = ?, device = ? WHERE device_instance_id = 'unknown'`
@@ -7097,7 +8003,7 @@ import { join as join9 } from "path";
 
 // src/db/synced-records.ts
 function insertSyncedRecord(db, record) {
-  db.prepare(`
+  const result = db.prepare(`
     INSERT INTO synced_records (
       id, ts, tool, model, provider, input_tokens, output_tokens,
       cache_read_tokens, cache_write_tokens, thinking_tokens,
@@ -7150,6 +8056,7 @@ function insertSyncedRecord(db, record) {
     sourceFile: record.sourceFile ?? "",
     cwd: record.cwd ?? ""
   });
+  return result.changes > 0;
 }
 function mergeSyncedRecordsIntoRecords(db) {
   const now = Date.now();
@@ -7214,7 +8121,8 @@ var RECORD_ID_SYNC_TOOLS = /* @__PURE__ */ new Set([
   "goose",
   "zed",
   "kiro",
-  "roocode"
+  "roocode",
+  "zcode"
 ]);
 function mapStatsRecordToSyncRecord(record) {
   const id = record.sourceFile.startsWith("synced/") ? record.id : RECORD_ID_SYNC_TOOLS.has(record.tool) ? record.id : generateSyncRecordId(record.deviceInstanceId, record.sourceFile, record.lineOffset);
@@ -7338,8 +8246,8 @@ var SyncOrchestrator = class {
           if (typeof record.updatedAt === "string") {
             record.updatedAt = new Date(record.updatedAt).getTime();
           }
-          insertSyncedRecord(this.db, record);
-          totalPulled++;
+          const changed = insertSyncedRecord(this.db, record);
+          if (changed) totalPulled++;
         } catch {
         }
       }
@@ -8245,6 +9153,7 @@ var RuntimeSettingsController = class {
   leaderboardUploadTimer = null;
   syncTimer = null;
   parseInFlight = false;
+  cleanupInFlight = false;
   leaderboardUploadInFlight = false;
   started = false;
   constructor(options) {
@@ -8297,11 +9206,7 @@ var RuntimeSettingsController = class {
     }
     if (retentionDays > 0) {
       this.cleanupTimer = setInterval(() => {
-        try {
-          this.runCleanupFn(this.db, retentionDays);
-        } catch (err) {
-          console.error("[settings-controller] cleanup failed:", err);
-        }
+        void this.runCleanupSafely(retentionDays);
       }, this.cleanupIntervalMs);
     }
     if (config?.leaderboardAutoUpload === true && leaderboardUploadInterval > 0 && this.runLeaderboardUploadFn) {
@@ -8334,6 +9239,17 @@ var RuntimeSettingsController = class {
       this.parseInFlight = false;
     }
   }
+  async runCleanupSafely(retentionDays) {
+    if (this.cleanupInFlight) return;
+    this.cleanupInFlight = true;
+    try {
+      await this.runCleanupFn(this.db, retentionDays);
+    } catch (err) {
+      console.error("[settings-controller] cleanup failed:", err);
+    } finally {
+      this.cleanupInFlight = false;
+    }
+  }
   async runLeaderboardUploadSafely() {
     if (this.leaderboardUploadInFlight) return;
     this.leaderboardUploadInFlight = true;
@@ -8365,11 +9281,8 @@ var MIME_TYPES = {
 };
 function serve(options) {
   const config = loadConfig();
-  if (config?.priceOverrides) {
-    for (const [model, entry] of Object.entries(config.priceOverrides)) {
-      setPriceOverride(model, entry);
-    }
-  }
+  const dbWriteQueue = new AsyncTaskQueue();
+  const runDbWrite = (task) => dbWriteQueue.run(task);
   if (config == null || config.exchangeRate == null) {
     const cacheAge = config?.exchangeRateCache ? Date.now() - config.exchangeRateCache.fetchedAt : Infinity;
     if (cacheAge >= CACHE_TTL_MS) {
@@ -8385,8 +9298,10 @@ function serve(options) {
   }
   const syncRuntime = new SyncRuntimeController({
     runSync: async (runtimeOptions) => {
-      await runParse(options.db);
-      await runSync(options.db, runtimeOptions);
+      await runDbWrite(async () => {
+        await runParse(options.db);
+        await runSync(options.db, runtimeOptions);
+      });
     },
     getPersistedState: () => getState(AIUSAGE_DIR),
     getCurrentTarget: () => getSyncTarget(loadConfig()?.sync)
@@ -8394,14 +9309,14 @@ function serve(options) {
   const runtimeSettings = new RuntimeSettingsController({
     db: options.db,
     loadConfig,
-    runParse,
-    runCleanup: cleanOldData,
+    runParse: (db) => runDbWrite(() => runParse(db)),
+    runCleanup: (db, retentionDays) => runDbWrite(() => cleanOldData(db, retentionDays)),
     runLeaderboardUpload: (db) => uploadLeaderboardData(db, getState(AIUSAGE_DIR)?.deviceInstanceId).then(() => void 0),
     runSync: () => syncRuntime.start(),
     onSyncScheduleChanged: (ts3) => syncRuntime.setNextSyncAt(ts3)
   });
   runtimeSettings.start();
-  runParse(options.db).catch((err) => {
+  runDbWrite(() => runParse(options.db)).catch((err) => {
     console.error("[serve] initial parse failed:", err);
   });
   const apiServer = createApiServer(options.db, {
@@ -8409,12 +9324,14 @@ function serve(options) {
     onRefresh: () => runParse(options.db),
     onSyncStart: () => syncRuntime.start(),
     getSyncStatus: () => syncRuntime.getStatus(),
-    onConfigUpdated: () => runtimeSettings.reload()
+    onConfigUpdated: () => runtimeSettings.reload(),
+    runDbWrite,
+    getDbWriteQueueStatus: () => dbWriteQueue.getStatus()
   });
   const webBuildDir = (() => {
-    const prodDir = join11(dirname3(fileURLToPath(import.meta.url)), "web");
+    const prodDir = join11(dirname4(fileURLToPath(import.meta.url)), "web");
     if (existsSync10(prodDir)) return prodDir;
-    return join11(dirname3(fileURLToPath(import.meta.url)), "..", "..", "..", "web", "build");
+    return join11(dirname4(fileURLToPath(import.meta.url)), "..", "..", "..", "web", "build");
   })();
   if (!existsSync10(webBuildDir)) {
     console.error("Web dashboard not found. Reinstall the package: npm install -g @juliantanx/aiusage");
@@ -8739,15 +9656,15 @@ function recalcPricing(db) {
       }
       const model = record.tool === "qoder" ? normalizeQoderModel(record.model) : record.model;
       const provider = model !== record.model ? inferProvider(model) : record.provider;
-      const hasPrice = resolvePrice(model) != null;
-      const newCost = hasPrice ? calculateCost(model, {
+      const price = resolvePriceFromRegistry(db, model);
+      const newCost = price ? calculateCostForPrice(price, {
         inputTokens: record.input_tokens,
         outputTokens: record.output_tokens,
         cacheReadTokens: record.cache_read_tokens,
         cacheWriteTokens: record.cache_write_tokens,
         thinkingTokens: record.thinking_tokens
       }, exchangeRate) : 0;
-      const costSource = hasPrice ? "pricing" : "unknown";
+      const costSource = price ? "pricing" : "unknown";
       if (model !== record.model || provider !== record.provider || newCost !== record.cost || costSource !== record.cost_source) {
         updateStmt.run(model, provider, newCost, costSource, Date.now(), record.id);
         updatedCount++;
@@ -9651,7 +10568,7 @@ ${dashboardStatusLine()}
 import { join as join15 } from "path";
 var DB_PATH2 = join15(AIUSAGE_DIR, "cache.db");
 var program = new Command();
-program.name("aiusage").version(true ? "1.5.2" : "dev").description("CLI tool for AI usage statistics");
+program.name("aiusage").version(true ? "1.5.4" : "dev").description("CLI tool for AI usage statistics");
 program.action(() => {
   const unknownCommand = program.args.find((arg) => typeof arg === "string");
   if (unknownCommand) {