codexmeter 1.0.27 → 1.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codexmeter",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "Local telemetry dashboard for Codex CLI usage",
   "type": "module",
   "bin": {

package/server/cost-catalog.js

@@ -3,6 +3,12 @@ import { fetchPricing } from './pricing-fetch.js';
 // Pricing map: populated by initPricing() from online lookup with local fallback
 let PRICING = null;
 
+const PRICE_CHANGE_DATE = '2026-07-30';
+const PREVIOUS_PRICING = {
+  'gpt-5.6-terra': { input: 2.50, output: 15.00, cached_input: 0.25, cache_write: 3.125 },
+  'gpt-5.6-luna': { input: 1.00, output: 6.00, cached_input: 0.10, cache_write: 1.25 },
+};
+
 /** Initialize pricing from online source; falls back to local catalog on timeout/failure. Call before cost calculations. */
 export async function initPricing() {
   PRICING = await fetchPricing();
@@ -14,15 +20,22 @@ function getPricing() {
   return PRICING;
 }
 
+function getPricingEntry(modelName, pricingDate) {
+  if (pricingDate && pricingDate < PRICE_CHANGE_DATE && PREVIOUS_PRICING[modelName]) {
+    return PREVIOUS_PRICING[modelName];
+  }
+  return getPricing()[modelName];
+}
+
 // Codex sessions: ~75% input (mostly cached), ~25% output
 // With ~95% prompt cache hit rate (from Codex Monitor)
 const INPUT_FRACTION = 0.75;
 const OUTPUT_FRACTION = 0.25;
 const CACHE_HIT_RATE = 0.95;
 
-export function getCacheAwareRate(modelName) {
+export function getCacheAwareRate(modelName, pricingDate = null) {
   if (!modelName) return null;
-  const entry = getPricing()[modelName];
+  const entry = getPricingEntry(modelName, pricingDate);
   if (!entry) return null;
 
   const effectiveInputRate =
@@ -32,9 +45,9 @@ export function getCacheAwareRate(modelName) {
   return INPUT_FRACTION * effectiveInputRate + OUTPUT_FRACTION * entry.output;
 }
 
-export function calculateCostFromUsage(modelName, usage) {
+export function calculateCostFromUsage(modelName, usage, pricingDate = null) {
   if (!modelName || !usage) return null;
-  const entry = getPricing()[modelName];
+  const entry = getPricingEntry(modelName, pricingDate);
   if (!entry) return null;
 
   const inputTokens = usage.input_tokens || 0;
@@ -52,19 +65,35 @@ export function calculateCostFromUsage(modelName, usage) {
   ) / 1_000_000;
 }
 
-function estimateCostFromTotalTokens(modelName, tokensUsed) {
-  const rate = getCacheAwareRate(modelName);
+function estimateCostFromTotalTokens(modelName, tokensUsed, pricingDate) {
+  const rate = getCacheAwareRate(modelName, pricingDate);
   if (rate === null) return null;
   return (tokensUsed / 1_000_000) * rate;
 }
 
-export function priceSession(modelName, { totalTokens = 0, usageBuckets = null } = {}) {
-  const exactCost = calculateCostFromUsage(modelName, usageBuckets);
+export function priceSession(modelName, {
+  totalTokens = 0,
+  usageBuckets = null,
+  usageByDay = null,
+  pricingDate = null,
+} = {}) {
+  const dailyUsage = Object.entries(usageByDay || {});
+  if (dailyUsage.length) {
+    let cost = 0;
+    for (const [day, usage] of dailyUsage) {
+      const dailyCost = calculateCostFromUsage(modelName, usage, day);
+      if (dailyCost === null) return { cost: null, source: 'unpriced' };
+      cost += dailyCost;
+    }
+    return { cost, source: 'exact' };
+  }
+
+  const exactCost = calculateCostFromUsage(modelName, usageBuckets, pricingDate);
   if (exactCost !== null) {
     return { cost: exactCost, source: 'exact' };
   }
 
-  const heuristicCost = estimateCostFromTotalTokens(modelName, totalTokens);
+  const heuristicCost = estimateCostFromTotalTokens(modelName, totalTokens, pricingDate);
   if (heuristicCost !== null) {
     return { cost: heuristicCost, source: 'heuristic' };
   }
@@ -80,7 +109,7 @@ export function getModelPricing(modelName) {
   return getPricing()[modelName] || null;
 }
 
-export const CATALOG_VERSION = '2026-07-08';
+export const CATALOG_VERSION = '2026-07-30';
 export const CACHE_ASSUMPTIONS = {
   input_fraction: INPUT_FRACTION,
   output_fraction: OUTPUT_FRACTION,

package/server/ingest.js

@@ -104,8 +104,8 @@ export async function runIngest(codexHome, state, opts = {}) {
         rollout_path: t.rollout_path,
         source_raw: t.source_raw,
         cwd_raw: t.cwd_raw,
-        repo_key: deriveRepoKey(nc),
-        repo_label: deriveRepoLabel(nc),
+        repo_key: deriveRepoKey(nc, t.git_origin_url),
+        repo_label: deriveRepoLabel(nc, t.git_origin_url),
         started_at: t.created_at,
         ended_at: t.updated_at,
         elapsed_seconds: null,
@@ -207,10 +207,10 @@ export async function runIngest(codexHome, state, opts = {}) {
           s.usage_by_day = buildUsageByDayMetrics(s.model_name, s._usage_by_day_raw);
           s.has_usage_by_day = s.usage_by_day.length > 0;
         }
-        delete s._usage_by_day_raw;
         delete s._first_usage_timestamp_ms;
         delete s._usage_reset_detected;
         finalizeSessionMetrics(s, toDayKey);
+        delete s._usage_by_day_raw;
         s.live_sort_day = deriveLiveSortDay(s, toDayKey);
         s.materialized = true;
       }
@@ -529,6 +529,8 @@ function finalizeSessionMetrics(session, toDayKey) {
     const priced = priceSession(session.model_name, {
       totalTokens: session.tokens_used,
       usageBuckets: session.usage_total,
+      usageByDay: session._usage_by_day_raw,
+      pricingDate: session.started_at ? toDayKey(session.started_at * 1000) : null,
     });
     session.cost = priced.cost;
     session.cost_source = priced.source;
@@ -539,7 +541,7 @@ function buildUsageByDayMetrics(modelName, usageByDay) {
   const entries = [];
   for (const [dayKey, usage] of Object.entries(usageByDay || {})) {
     const tokens = (usage?.input_tokens || 0) + (usage?.output_tokens || 0);
-    const cost = calculateCostFromUsage(modelName, usage);
+    const cost = calculateCostFromUsage(modelName, usage, dayKey);
     entries.push({
       day: dayKey,
       tokens,

package/server/normalize.js

@@ -25,13 +25,15 @@ export function normalizeCwd(cwd) {
   return p;
 }
 
-export function deriveRepoKey(normalizedCwd) {
-  const label = deriveRepoLabel(normalizedCwd);
+export function deriveRepoKey(normalizedCwd, gitOriginUrl) {
+  const label = deriveRepoLabel(normalizedCwd, gitOriginUrl);
   return label === 'unknown' ? 'unknown' : `repo:${label}`;
 }
 
-export function deriveRepoLabel(normalizedCwd) {
+export function deriveRepoLabel(normalizedCwd, gitOriginUrl) {
   if (!normalizedCwd) return 'unknown';
+  const originLabel = deriveOriginRepoLabel(gitOriginUrl);
+  if (originLabel) return originLabel;
   const worktreeMatch = normalizedCwd.match(/\.codex\/worktrees\/[^/]+\/([^/]+)/);
   if (worktreeMatch) return collapseWorktreeLabel(worktreeMatch[1]);
   if (normalizedCwd.includes('.codex')) return '.codex';
@@ -46,6 +48,15 @@ function collapseWorktreeLabel(label) {
     .replace(/-worktrees?-[a-z0-9._-]+$/i, '') || 'unknown';
 }
 
+function deriveOriginRepoLabel(gitOriginUrl) {
+  const clean = String(gitOriginUrl || '')
+    .trim()
+    .replace(/\\/g, '/')
+    .replace(/[?#].*$/, '')
+    .replace(/\/+$/, '');
+  return clean.split('/').pop()?.replace(/\.git$/i, '').toLowerCase() || null;
+}
+
 export function classifyAgentFamily(agentRole) {
   if (!agentRole) return 'generic';
   if (AGENT_FAMILY_MAP[agentRole]) return AGENT_FAMILY_MAP[agentRole];

package/server/pricing-fetch.js

@@ -1,8 +1,8 @@
 // Local pricing catalog for models used in codex-cli/codex app lifetime.
 const FALLBACK = {
   'gpt-5.6-sol':         { input: 5.00,  output: 30.00, cached_input: 0.50, cache_write: 6.25 },
-  'gpt-5.6-terra':       { input: 2.50,  output: 15.00, cached_input: 0.25, cache_write: 3.125 },
-  'gpt-5.6-luna':        { input: 1.00,  output:  6.00, cached_input: 0.10, cache_write: 1.25 },
+  'gpt-5.6-terra':       { input: 2.00,  output: 12.00, cached_input: 0.20, cache_write: 2.50 },
+  'gpt-5.6-luna':        { input: 0.20,  output:  1.20, cached_input: 0.02, cache_write: 0.25 },
   'gpt-5.5':             { input: 5.00,  output: 30.00, cached_input: 0.50 },
   'gpt-5.4':             { input: 2.50,  output: 15.00, cached_input: 0.25 },
   'gpt-5-mini':          { input: 0.75,  output:  4.50, cached_input: 0.075},

package/server/sqlite-reader.js

@@ -54,6 +54,7 @@ export function readThreads(codexHome, onProgress) {
         parent_thread_id: row.parent_thread_id || null,
         cli_version: row.cli_version || '',
         git_branch: row.git_branch || null,
+        git_origin_url: row.git_origin_url || null,
       });
       read++;
       if (onProgress && read % 200 === 0) {