@hasna/economy 0.5.2 → 0.5.3

package/dist/mcp/index.js

@@ -56,6 +56,7 @@ import {
   queryZeroCostTokenizedModels,
   requireCurrentBillingSummary,
   requireCurrentCostSummary,
+  resolveReportingInterval,
   rollupSession,
   scanReceiptId,
   sessionOverlapWhere,
@@ -74,7 +75,7 @@ import {
   upsertUsageSnapshot,
   usageSnapshotFilterForPeriod,
   validateIngest
-} from "../chunks/index-2hwzmfgv.js";
+} from "../chunks/index-vajzfzgv.js";
 import {
   __require
 } from "../chunks/index-p35cyhc4.js";
@@ -84,7 +85,7 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.2",
+  version: "0.5.3",
   description: "AI coding cost tracker \u2014 CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   repository: {
     type: "git",
@@ -3579,7 +3580,7 @@ function backfillMachineId(db) {
   return { requests: Number(reqCount.changes), sessions: Number(sessCount.changes) };
 }
 async function recalculateZeroCostRequests(db) {
-  const { assessCostFromDb: assessCostFromDb2 } = await import("../chunks/pricing-vf2pycmh.js");
+  const { assessCostFromDb: assessCostFromDb2 } = await import("../chunks/pricing-vxejj1qa.js");
   const zeroRows = db.prepare(`SELECT id, model, input_tokens, output_tokens, cache_read_tokens, cache_create_tokens, cache_create_5m_tokens, cache_create_1h_tokens
      FROM requests
      WHERE cost_usd = 0
@@ -3788,7 +3789,7 @@ async function postIngest(cloud, body) {
 }
 async function syncAllToCloud(cloud, opts = {}) {
   await runIngestJournalOperation(cloud, { action: "reconcile" });
-  const { openDatabase } = await import("../chunks/sqlite-store-st99garx.js");
+  const { openDatabase } = await import("../chunks/sqlite-store-gamn65xp.js");
   const scratch = openDatabase(":memory:", true);
   ensurePricingSeeded(scratch);
   const cachePath = opts.cachePath ?? getIngestCachePath();
@@ -4714,7 +4715,8 @@ function buildBrief(db, opts = {}) {
 }
 
 // src/lib/analytics.ts
-function queryProjectDetail(db, nameOrPath) {
+function queryProjectDetail(db, nameOrPath, now2 = new Date) {
+  const dailyBounds = resolveReportingInterval({ kind: "rolling", unit: "day", count: 14 }, now2);
   const like = `%${nameOrPath}%`;
   const sessions = db.prepare(`SELECT id, project_name, project_path, total_cost_usd, total_tokens, started_at
      FROM economy_effective_sessions
@@ -4728,8 +4730,8 @@ function queryProjectDetail(db, nameOrPath) {
   const daily = db.prepare(`SELECT DATE(r.timestamp) as date, COALESCE(SUM(r.cost_usd), 0) as cost_usd
      FROM economy_effective_requests r JOIN economy_effective_sessions s ON r.session_id = s.id
      WHERE (s.project_name LIKE ? OR s.project_path LIKE ?)
-       AND r.timestamp >= DATE('now', '-14 days')
-     GROUP BY date ORDER BY date ASC`).all(like, like);
+       AND r.timestamp >= ? AND r.timestamp < ?
+     GROUP BY date ORDER BY date ASC`).all(like, like, dailyBounds.start, dailyBounds.end_exclusive);
   const models = db.prepare(`SELECT r.model as model, COUNT(*) as requests, COALESCE(SUM(r.cost_usd), 0) as cost_usd
      FROM economy_effective_requests r JOIN economy_effective_sessions s ON r.session_id = s.id
      WHERE s.project_name LIKE ? OR s.project_path LIKE ?
@@ -4768,18 +4770,17 @@ function queryRangeStats(db, from, to) {
   return { cost: r.cost, requests: r.requests, tokens: r.tokens, sessions: s.sessions };
 }
 function queryForecast(db, now2 = new Date) {
-  const daysInMonth = new Date(now2.getFullYear(), now2.getMonth() + 1, 0).getDate();
-  const dayOfMonth = now2.getDate();
-  const monthStart = `${now2.getFullYear()}-${String(now2.getMonth() + 1).padStart(2, "0")}-01`;
-  const monthSoFar = db.prepare(`SELECT COALESCE(SUM(cost_usd),0) as cost FROM economy_effective_requests WHERE DATE(timestamp) >= ?`).get(monthStart);
+  const month = resolveReportingInterval({ kind: "calendar", period: "month" }, now2);
+  const recent = resolveReportingInterval({ kind: "rolling", unit: "day", count: 7 }, now2);
+  const daysInMonth = new Date(Date.UTC(now2.getUTCFullYear(), now2.getUTCMonth() + 1, 0)).getUTCDate();
+  const dayOfMonth = now2.getUTCDate();
+  const monthSoFar = db.prepare(`SELECT COALESCE(SUM(cost_usd),0) as cost FROM economy_effective_requests WHERE timestamp >= ? AND timestamp < ?`).get(month.start, recent.end_exclusive);
   const dailyAvg = dayOfMonth > 0 ? monthSoFar.cost / dayOfMonth : 0;
   const projected = dailyAvg * daysInMonth;
-  const sevenDaysAgo = new Date(now2);
-  sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
-  const last7 = db.prepare(`SELECT COALESCE(SUM(cost_usd),0) as cost FROM economy_effective_requests WHERE DATE(timestamp) >= ?`).get(sevenDaysAgo.toISOString().substring(0, 10));
+  const last7 = db.prepare(`SELECT COALESCE(SUM(cost_usd),0) as cost FROM economy_effective_requests WHERE timestamp >= ? AND timestamp < ?`).get(recent.start, recent.end_exclusive);
   const last7DailyAvg = last7.cost / 7;
   const dailyCosts = db.prepare(`SELECT DATE(timestamp) as date, COALESCE(SUM(cost_usd),0) as cost_usd
-     FROM economy_effective_requests WHERE DATE(timestamp) >= ? GROUP BY date ORDER BY cost_usd ASC`).all(monthStart);
+     FROM economy_effective_requests WHERE timestamp >= ? AND timestamp < ? GROUP BY date ORDER BY cost_usd ASC`).all(month.start, recent.end_exclusive);
   return {
     day_of_month: dayOfMonth,
     days_in_month: daysInMonth,
@@ -4830,7 +4831,7 @@ class LocalStore2 {
   _db;
   async db() {
     if (!this._db) {
-      const { openDatabase } = await import("../chunks/sqlite-store-st99garx.js");
+      const { openDatabase } = await import("../chunks/sqlite-store-gamn65xp.js");
       this._db = openDatabase();
       ensurePricingSeeded(this._db);
     }
@@ -5193,7 +5194,7 @@ function buildServer() {
   let _db;
   const localDb = async () => {
     if (!_db) {
-      const { openDatabase } = await import("../chunks/sqlite-store-st99garx.js");
+      const { openDatabase } = await import("../chunks/sqlite-store-gamn65xp.js");
       _db = openDatabase();
       ensurePricingSeeded(_db);
     }

package/dist/otel/index.js

@@ -3458,7 +3458,7 @@ async function pushIngestRows(cloud, scratch) {
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.2",
+  version: "0.5.3",
   description: "AI coding cost tracker \u2014 CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   repository: {
     type: "git",

package/dist/server/index.js

@@ -1118,12 +1118,32 @@ function meteredBudgetAmounts(groups, limit, threshold) {
 function ymd(date2) {
   return date2.toISOString().substring(0, 10);
 }
-function calendarPeriodBounds(period, now = new Date) {
+function resolveReportingInterval(interval, now = new Date) {
   if (!Number.isFinite(now.getTime()))
     throw new RangeError("Invalid reporting clock");
-  const start = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()));
+  const start = new Date(now);
+  start.setUTCHours(0, 0, 0, 0);
   const end = new Date(start);
-  switch (period) {
+  if (interval.kind === "rolling") {
+    if (!Number.isSafeInteger(interval.count) || interval.count < 1)
+      throw new RangeError("Invalid reporting window");
+    if (interval.unit === "hour") {
+      start.setTime(now.getTime() - interval.count * 3600000);
+      if (!Number.isFinite(start.getTime()))
+        throw new RangeError("Invalid reporting window");
+      return { time_zone: "UTC", start: start.toISOString(), end_exclusive: now.toISOString() };
+    }
+    if (interval.unit !== "day")
+      throw new RangeError("Invalid reporting unit");
+    start.setUTCDate(start.getUTCDate() - interval.count + 1);
+    end.setUTCDate(end.getUTCDate() + 1);
+    if (!Number.isFinite(start.getTime()) || !Number.isFinite(end.getTime()))
+      throw new RangeError("Invalid reporting window");
+    return { time_zone: "UTC", start: ymd(start), end_exclusive: ymd(end) };
+  }
+  if (interval.kind !== "calendar")
+    throw new RangeError("Invalid reporting interval");
+  switch (interval.period) {
     case "today":
       end.setUTCDate(end.getUTCDate() + 1);
       break;
@@ -1146,11 +1166,15 @@ function calendarPeriodBounds(period, now = new Date) {
       end.setUTCFullYear(end.getUTCFullYear() + 1);
       break;
     case "all":
-      return { time_zone: "UTC", start_date: null, end_date_exclusive: null };
+      return { time_zone: "UTC", start: null, end_exclusive: null };
     default:
       throw new RangeError("Invalid reporting period");
   }
-  return { time_zone: "UTC", start_date: ymd(start), end_date_exclusive: ymd(end) };
+  return { time_zone: "UTC", start: ymd(start), end_exclusive: ymd(end) };
+}
+function calendarPeriodBounds(period, now = new Date) {
+  const bounds = resolveReportingInterval({ kind: "calendar", period }, now);
+  return { time_zone: bounds.time_zone, start_date: bounds.start, end_date_exclusive: bounds.end_exclusive };
 }
 function calendarPeriodWhere(period, column, now = new Date) {
   if (!/^[a-z_][a-z0-9_]*(?:\.[a-z_][a-z0-9_]*)?$/i.test(column)) {
@@ -2209,20 +2233,22 @@ function queryAccountBreakdownSince(db, since) {
     ORDER BY api_equivalent_usd DESC
   `).all(since, since);
 }
-function queryDailyBreakdown(db, days = 30, machine) {
+function queryDailyBreakdown(db, days = 30, machine, now = new Date) {
+  const bounds = resolveReportingInterval({ kind: "rolling", unit: "day", count: days }, now);
   const machineClause = machine ? " AND machine_id = ?" : "";
-  const params = machine ? [`-${days}`, machine] : [`-${days}`];
+  const params = machine ? [bounds.start, bounds.end_exclusive, machine] : [bounds.start, bounds.end_exclusive];
   return db.prepare(`
     SELECT DATE(timestamp) as date, agent, COALESCE(SUM(cost_usd), 0) as cost_usd
     FROM economy_effective_requests
-    WHERE timestamp >= DATE('now', ? || ' days')${machineClause}
+    WHERE timestamp >= ? AND timestamp < ?${machineClause}
     GROUP BY DATE(timestamp), agent
     ORDER BY date ASC
   `).all(...params);
 }
-function queryHourlyBreakdown(db, machine, hours) {
-  const clauses = hours == null ? [`DATE(timestamp) = DATE('now')`] : [`DATETIME(timestamp) >= DATETIME('now', ?)`];
-  const params = hours == null ? [] : [`-${hours} hours`];
+function queryHourlyBreakdown(db, machine, hours, now = new Date) {
+  const bounds = resolveReportingInterval(hours == null ? { kind: "calendar", period: "today" } : { kind: "rolling", unit: "hour", count: hours }, now);
+  const clauses = hours == null ? ["timestamp >= ? AND timestamp < ?"] : ["STRFTIME('%Y-%m-%dT%H:%M:%fZ', timestamp) >= ? AND STRFTIME('%Y-%m-%dT%H:%M:%fZ', timestamp) < ?"];
+  const params = [bounds.start, bounds.end_exclusive];
   if (machine) {
     clauses.push("machine_id = ?");
     params.push(machine);
@@ -3143,15 +3169,16 @@ function translateSqliteDates(sql) {
   s = s.replace(/DATE\('now',\s*(\$\d+)\s*\|\|\s*' days'\)/gi, (_m, p) => isoDate(`now() + ((${p}) || ' days')::interval`));
   s = s.replace(/DATETIME\('now',\s*(\$\d+)\)/gi, (_m, p) => `(now() + (${p})::interval)`);
   s = s.replace(/DATETIME\('now',\s*'([^']+)'\)/gi, (_m, lit) => `(now() + interval '${lit}')`);
+  s = s.replace(/STRFTIME\('%Y-%m-%dT%H:%M:%fZ',\s*([A-Za-z_][A-Za-z0-9_]*)\)/gi, (_m, col) => `to_char(CAST("${col}" AS timestamptz) AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"')`);
   const strftimeMap = { "%H": "HH24", "%Y": "YYYY", "%m": "MM", "%d": "DD", "%M": "MI", "%S": "SS" };
   s = s.replace(/STRFTIME\('([^']+)',\s*([A-Za-z_][A-Za-z0-9_]*)\)/gi, (_m, fmt, col) => {
     const pgFmt = Object.entries(strftimeMap).reduce((acc, [k, v]) => acc.split(k).join(v), fmt);
-    return `to_char(CAST("${col}" AS timestamptz), '${pgFmt}')`;
+    return `to_char(CAST("${col}" AS timestamptz) AT TIME ZONE 'UTC', '${pgFmt}')`;
   });
   s = s.replace(/\bDATE\('now'\)/gi, isoDate("now()"));
   s = s.replace(/\bDATETIME\('now'\)/gi, "now()");
   s = s.replace(/\bDATETIME\(\s*([A-Za-z_][A-Za-z0-9_]*)\s*\)/gi, (_m, col) => `CAST("${col}" AS timestamptz)`);
-  s = s.replace(/\bDATE\(\s*([A-Za-z_][A-Za-z0-9_]*)\s*\)/gi, (_m, col) => `substr("${col}", 1, 10)`);
+  s = s.replace(/\bDATE\(\s*([A-Za-z_][A-Za-z0-9_]*(?:\.[A-Za-z_][A-Za-z0-9_]*)?)\s*\)/gi, (_m, col) => `substr(${col.split(".").map((part) => `"${part}"`).join(".")}, 1, 10)`);
   return s;
 }
 function resolveWorkerPath() {
@@ -4029,12 +4056,21 @@ var init_config = __esm(() => {
 function detectCostSpikes(dailyTotals, opts) {
   const windowDays = opts?.windowDays ?? 7;
   const multiplier = opts?.multiplier ?? 2;
+  if (!Number.isSafeInteger(windowDays) || windowDays < 1)
+    throw new RangeError("Invalid spike window");
+  if (!Number.isFinite(multiplier) || multiplier <= 0)
+    throw new RangeError("Invalid spike multiplier");
   const sorted = [...dailyTotals].sort((a, b) => a.date.localeCompare(b.date));
   const spikes = [];
   for (let i = windowDays;i < sorted.length; i++) {
     const window = sorted.slice(i - windowDays, i);
-    const avg = window.reduce((s, d) => s + d.cost_usd, 0) / window.length;
     const current = sorted[i];
+    const previous = new Date(current.date + "T00:00:00.000Z");
+    previous.setUTCDate(previous.getUTCDate() - 1);
+    const bounds = resolveReportingInterval({ kind: "rolling", unit: "day", count: windowDays }, previous);
+    if (window[0].date !== bounds.start || window[window.length - 1].date !== previous.toISOString().slice(0, 10) || new Set(window.map((day) => day.date)).size !== windowDays)
+      continue;
+    const avg = window.reduce((s, d) => s + d.cost_usd, 0) / window.length;
     if (avg > 0 && current.cost_usd > avg * multiplier) {
       spikes.push({
         date: current.date,
@@ -4046,21 +4082,23 @@ function detectCostSpikes(dailyTotals, opts) {
   }
   return spikes;
 }
-function queryRecentSpikes(db, days = 14) {
+function queryRecentSpikes(db, days = 14, now = new Date) {
+  const bounds = resolveReportingInterval({ kind: "rolling", unit: "day", count: days }, now);
   const rows = db.prepare(`
     SELECT DATE(timestamp) as date, COALESCE(SUM(cost_usd), 0) as cost_usd
     FROM economy_effective_requests
-    WHERE timestamp >= DATE('now', ? || ' days')
+    WHERE timestamp >= ? AND timestamp < ?
     GROUP BY DATE(timestamp)
     ORDER BY date ASC
-  `).all(-days);
+  `).all(bounds.start, bounds.end_exclusive);
   return detectCostSpikes(rows);
 }
-function getTodaySpike(db) {
-  const today = new Date().toISOString().substring(0, 10);
-  const spikes = queryRecentSpikes(db, 14);
+function getTodaySpike(db, now = new Date) {
+  const today = resolveReportingInterval({ kind: "calendar", period: "today" }, now).start;
+  const spikes = queryRecentSpikes(db, 14, now);
   return spikes.find((s) => s.date === today) ?? null;
 }
+var init_spikes = () => {};
 
 // src/lib/webhooks.ts
 var exports_webhooks = {};
@@ -4127,6 +4165,7 @@ async function fireWebhook(url, payload) {
 var init_webhooks = __esm(() => {
   init_config();
   init_database();
+  init_spikes();
 });
 
 // src/db/pg-migrate.ts
@@ -5490,7 +5529,7 @@ function isAuthorizedRequest(req, path) {
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.2",
+  version: "0.5.3",
   description: "AI coding cost tracker \u2014 CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   repository: {
     type: "git",
@@ -11629,7 +11668,8 @@ function buildBrief(db, opts = {}) {
 }
 
 // src/lib/analytics.ts
-function queryProjectDetail(db, nameOrPath) {
+function queryProjectDetail(db, nameOrPath, now = new Date) {
+  const dailyBounds = resolveReportingInterval({ kind: "rolling", unit: "day", count: 14 }, now);
   const like = `%${nameOrPath}%`;
   const sessions = db.prepare(`SELECT id, project_name, project_path, total_cost_usd, total_tokens, started_at
      FROM economy_effective_sessions
@@ -11643,8 +11683,8 @@ function queryProjectDetail(db, nameOrPath) {
   const daily = db.prepare(`SELECT DATE(r.timestamp) as date, COALESCE(SUM(r.cost_usd), 0) as cost_usd
      FROM economy_effective_requests r JOIN economy_effective_sessions s ON r.session_id = s.id
      WHERE (s.project_name LIKE ? OR s.project_path LIKE ?)
-       AND r.timestamp >= DATE('now', '-14 days')
-     GROUP BY date ORDER BY date ASC`).all(like, like);
+       AND r.timestamp >= ? AND r.timestamp < ?
+     GROUP BY date ORDER BY date ASC`).all(like, like, dailyBounds.start, dailyBounds.end_exclusive);
   const models = db.prepare(`SELECT r.model as model, COUNT(*) as requests, COALESCE(SUM(r.cost_usd), 0) as cost_usd
      FROM economy_effective_requests r JOIN economy_effective_sessions s ON r.session_id = s.id
      WHERE s.project_name LIKE ? OR s.project_path LIKE ?
@@ -11683,18 +11723,17 @@ function queryRangeStats(db, from, to) {
   return { cost: r.cost, requests: r.requests, tokens: r.tokens, sessions: s.sessions };
 }
 function queryForecast(db, now = new Date) {
-  const daysInMonth = new Date(now.getFullYear(), now.getMonth() + 1, 0).getDate();
-  const dayOfMonth = now.getDate();
-  const monthStart = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-01`;
-  const monthSoFar = db.prepare(`SELECT COALESCE(SUM(cost_usd),0) as cost FROM economy_effective_requests WHERE DATE(timestamp) >= ?`).get(monthStart);
+  const month = resolveReportingInterval({ kind: "calendar", period: "month" }, now);
+  const recent = resolveReportingInterval({ kind: "rolling", unit: "day", count: 7 }, now);
+  const daysInMonth = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth() + 1, 0)).getUTCDate();
+  const dayOfMonth = now.getUTCDate();
+  const monthSoFar = db.prepare(`SELECT COALESCE(SUM(cost_usd),0) as cost FROM economy_effective_requests WHERE timestamp >= ? AND timestamp < ?`).get(month.start, recent.end_exclusive);
   const dailyAvg = dayOfMonth > 0 ? monthSoFar.cost / dayOfMonth : 0;
   const projected = dailyAvg * daysInMonth;
-  const sevenDaysAgo = new Date(now);
-  sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
-  const last7 = db.prepare(`SELECT COALESCE(SUM(cost_usd),0) as cost FROM economy_effective_requests WHERE DATE(timestamp) >= ?`).get(sevenDaysAgo.toISOString().substring(0, 10));
+  const last7 = db.prepare(`SELECT COALESCE(SUM(cost_usd),0) as cost FROM economy_effective_requests WHERE timestamp >= ? AND timestamp < ?`).get(recent.start, recent.end_exclusive);
   const last7DailyAvg = last7.cost / 7;
   const dailyCosts = db.prepare(`SELECT DATE(timestamp) as date, COALESCE(SUM(cost_usd),0) as cost_usd
-     FROM economy_effective_requests WHERE DATE(timestamp) >= ? GROUP BY date ORDER BY cost_usd ASC`).all(monthStart);
+     FROM economy_effective_requests WHERE timestamp >= ? AND timestamp < ? GROUP BY date ORDER BY cost_usd ASC`).all(month.start, recent.end_exclusive);
   return {
     day_of_month: dayOfMonth,
     days_in_month: daysInMonth,
@@ -11871,7 +11910,13 @@ function createDataHandler(db, actorId) {
     if (path === "/api/daily" && method === "GET") {
       const days = Number(url.searchParams.get("days") ?? 30);
       const machine = url.searchParams.get("machine") ?? undefined;
-      return ok(queryDailyBreakdown(db, days, machine));
+      const now = new Date;
+      try {
+        resolveReportingInterval({ kind: "rolling", unit: "day", count: days }, now);
+      } catch {
+        return err("days must be a positive integer within the supported UTC date range");
+      }
+      return ok(queryDailyBreakdown(db, days, machine, now));
     }
     if (path === "/api/hourly" && method === "GET") {
       const machine = url.searchParams.get("machine") ?? undefined;

package/dist/server/service-operations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-operations.d.ts","sourceRoot":"","sources":["../../src/server/service-operations.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAuCxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AA6jB5E,gHAAgH;AAChH,wBAAsB,uBAAuB,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAe/G"}
+{"version":3,"file":"service-operations.d.ts","sourceRoot":"","sources":["../../src/server/service-operations.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAuCxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAgkB5E,gHAAgH;AAChH,wBAAsB,uBAAuB,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAe/G"}

package/dist/server/service-worker.js

@@ -1117,12 +1117,32 @@ function meteredBudgetAmounts(groups, limit, threshold) {
 function ymd(date2) {
   return date2.toISOString().substring(0, 10);
 }
-function calendarPeriodBounds(period, now = new Date) {
+function resolveReportingInterval(interval, now = new Date) {
   if (!Number.isFinite(now.getTime()))
     throw new RangeError("Invalid reporting clock");
-  const start = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()));
+  const start = new Date(now);
+  start.setUTCHours(0, 0, 0, 0);
   const end = new Date(start);
-  switch (period) {
+  if (interval.kind === "rolling") {
+    if (!Number.isSafeInteger(interval.count) || interval.count < 1)
+      throw new RangeError("Invalid reporting window");
+    if (interval.unit === "hour") {
+      start.setTime(now.getTime() - interval.count * 3600000);
+      if (!Number.isFinite(start.getTime()))
+        throw new RangeError("Invalid reporting window");
+      return { time_zone: "UTC", start: start.toISOString(), end_exclusive: now.toISOString() };
+    }
+    if (interval.unit !== "day")
+      throw new RangeError("Invalid reporting unit");
+    start.setUTCDate(start.getUTCDate() - interval.count + 1);
+    end.setUTCDate(end.getUTCDate() + 1);
+    if (!Number.isFinite(start.getTime()) || !Number.isFinite(end.getTime()))
+      throw new RangeError("Invalid reporting window");
+    return { time_zone: "UTC", start: ymd(start), end_exclusive: ymd(end) };
+  }
+  if (interval.kind !== "calendar")
+    throw new RangeError("Invalid reporting interval");
+  switch (interval.period) {
     case "today":
       end.setUTCDate(end.getUTCDate() + 1);
       break;
@@ -1145,11 +1165,15 @@ function calendarPeriodBounds(period, now = new Date) {
       end.setUTCFullYear(end.getUTCFullYear() + 1);
       break;
     case "all":
-      return { time_zone: "UTC", start_date: null, end_date_exclusive: null };
+      return { time_zone: "UTC", start: null, end_exclusive: null };
     default:
       throw new RangeError("Invalid reporting period");
   }
-  return { time_zone: "UTC", start_date: ymd(start), end_date_exclusive: ymd(end) };
+  return { time_zone: "UTC", start: ymd(start), end_exclusive: ymd(end) };
+}
+function calendarPeriodBounds(period, now = new Date) {
+  const bounds = resolveReportingInterval({ kind: "calendar", period }, now);
+  return { time_zone: bounds.time_zone, start_date: bounds.start, end_date_exclusive: bounds.end_exclusive };
 }
 function calendarPeriodWhere(period, column, now = new Date) {
   if (!/^[a-z_][a-z0-9_]*(?:\.[a-z_][a-z0-9_]*)?$/i.test(column)) {
@@ -3020,20 +3044,22 @@ function queryAccountBreakdownSince(db, since) {
     ORDER BY api_equivalent_usd DESC
   `).all(since, since);
 }
-function queryDailyBreakdown(db, days = 30, machine) {
+function queryDailyBreakdown(db, days = 30, machine, now = new Date) {
+  const bounds = resolveReportingInterval({ kind: "rolling", unit: "day", count: days }, now);
   const machineClause = machine ? " AND machine_id = ?" : "";
-  const params = machine ? [`-${days}`, machine] : [`-${days}`];
+  const params = machine ? [bounds.start, bounds.end_exclusive, machine] : [bounds.start, bounds.end_exclusive];
   return db.prepare(`
     SELECT DATE(timestamp) as date, agent, COALESCE(SUM(cost_usd), 0) as cost_usd
     FROM economy_effective_requests
-    WHERE timestamp >= DATE('now', ? || ' days')${machineClause}
+    WHERE timestamp >= ? AND timestamp < ?${machineClause}
     GROUP BY DATE(timestamp), agent
     ORDER BY date ASC
   `).all(...params);
 }
-function queryHourlyBreakdown(db, machine, hours) {
-  const clauses = hours == null ? [`DATE(timestamp) = DATE('now')`] : [`DATETIME(timestamp) >= DATETIME('now', ?)`];
-  const params = hours == null ? [] : [`-${hours} hours`];
+function queryHourlyBreakdown(db, machine, hours, now = new Date) {
+  const bounds = resolveReportingInterval(hours == null ? { kind: "calendar", period: "today" } : { kind: "rolling", unit: "hour", count: hours }, now);
+  const clauses = hours == null ? ["timestamp >= ? AND timestamp < ?"] : ["STRFTIME('%Y-%m-%dT%H:%M:%fZ', timestamp) >= ? AND STRFTIME('%Y-%m-%dT%H:%M:%fZ', timestamp) < ?"];
+  const params = [bounds.start, bounds.end_exclusive];
   if (machine) {
     clauses.push("machine_id = ?");
     params.push(machine);
@@ -3723,12 +3749,21 @@ var init_config = __esm(() => {
 function detectCostSpikes(dailyTotals, opts) {
   const windowDays = opts?.windowDays ?? 7;
   const multiplier = opts?.multiplier ?? 2;
+  if (!Number.isSafeInteger(windowDays) || windowDays < 1)
+    throw new RangeError("Invalid spike window");
+  if (!Number.isFinite(multiplier) || multiplier <= 0)
+    throw new RangeError("Invalid spike multiplier");
   const sorted = [...dailyTotals].sort((a, b) => a.date.localeCompare(b.date));
   const spikes = [];
   for (let i = windowDays;i < sorted.length; i++) {
     const window = sorted.slice(i - windowDays, i);
-    const avg = window.reduce((s, d) => s + d.cost_usd, 0) / window.length;
     const current = sorted[i];
+    const previous = new Date(current.date + "T00:00:00.000Z");
+    previous.setUTCDate(previous.getUTCDate() - 1);
+    const bounds = resolveReportingInterval({ kind: "rolling", unit: "day", count: windowDays }, previous);
+    if (window[0].date !== bounds.start || window[window.length - 1].date !== previous.toISOString().slice(0, 10) || new Set(window.map((day) => day.date)).size !== windowDays)
+      continue;
+    const avg = window.reduce((s, d) => s + d.cost_usd, 0) / window.length;
     if (avg > 0 && current.cost_usd > avg * multiplier) {
       spikes.push({
         date: current.date,
@@ -3740,21 +3775,23 @@ function detectCostSpikes(dailyTotals, opts) {
   }
   return spikes;
 }
-function queryRecentSpikes(db, days = 14) {
+function queryRecentSpikes(db, days = 14, now = new Date) {
+  const bounds = resolveReportingInterval({ kind: "rolling", unit: "day", count: days }, now);
   const rows = db.prepare(`
     SELECT DATE(timestamp) as date, COALESCE(SUM(cost_usd), 0) as cost_usd
     FROM economy_effective_requests
-    WHERE timestamp >= DATE('now', ? || ' days')
+    WHERE timestamp >= ? AND timestamp < ?
     GROUP BY DATE(timestamp)
     ORDER BY date ASC
-  `).all(-days);
+  `).all(bounds.start, bounds.end_exclusive);
   return detectCostSpikes(rows);
 }
-function getTodaySpike(db) {
-  const today = new Date().toISOString().substring(0, 10);
-  const spikes = queryRecentSpikes(db, 14);
+function getTodaySpike(db, now = new Date) {
+  const today = resolveReportingInterval({ kind: "calendar", period: "today" }, now).start;
+  const spikes = queryRecentSpikes(db, 14, now);
   return spikes.find((s) => s.date === today) ?? null;
 }
+var init_spikes = () => {};
 
 // src/lib/webhooks.ts
 var exports_webhooks = {};
@@ -3821,6 +3858,7 @@ async function fireWebhook(url, payload) {
 var init_webhooks = __esm(() => {
   init_config();
   init_database();
+  init_spikes();
 });
 
 // src/db/sync-pg.ts
@@ -3882,15 +3920,16 @@ function translateSqliteDates(sql) {
   s = s.replace(/DATE\('now',\s*(\$\d+)\s*\|\|\s*' days'\)/gi, (_m, p) => isoDate(`now() + ((${p}) || ' days')::interval`));
   s = s.replace(/DATETIME\('now',\s*(\$\d+)\)/gi, (_m, p) => `(now() + (${p})::interval)`);
   s = s.replace(/DATETIME\('now',\s*'([^']+)'\)/gi, (_m, lit) => `(now() + interval '${lit}')`);
+  s = s.replace(/STRFTIME\('%Y-%m-%dT%H:%M:%fZ',\s*([A-Za-z_][A-Za-z0-9_]*)\)/gi, (_m, col) => `to_char(CAST("${col}" AS timestamptz) AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"')`);
   const strftimeMap = { "%H": "HH24", "%Y": "YYYY", "%m": "MM", "%d": "DD", "%M": "MI", "%S": "SS" };
   s = s.replace(/STRFTIME\('([^']+)',\s*([A-Za-z_][A-Za-z0-9_]*)\)/gi, (_m, fmt, col) => {
     const pgFmt = Object.entries(strftimeMap).reduce((acc, [k, v]) => acc.split(k).join(v), fmt);
-    return `to_char(CAST("${col}" AS timestamptz), '${pgFmt}')`;
+    return `to_char(CAST("${col}" AS timestamptz) AT TIME ZONE 'UTC', '${pgFmt}')`;
   });
   s = s.replace(/\bDATE\('now'\)/gi, isoDate("now()"));
   s = s.replace(/\bDATETIME\('now'\)/gi, "now()");
   s = s.replace(/\bDATETIME\(\s*([A-Za-z_][A-Za-z0-9_]*)\s*\)/gi, (_m, col) => `CAST("${col}" AS timestamptz)`);
-  s = s.replace(/\bDATE\(\s*([A-Za-z_][A-Za-z0-9_]*)\s*\)/gi, (_m, col) => `substr("${col}", 1, 10)`);
+  s = s.replace(/\bDATE\(\s*([A-Za-z_][A-Za-z0-9_]*(?:\.[A-Za-z_][A-Za-z0-9_]*)?)\s*\)/gi, (_m, col) => `substr(${col.split(".").map((part) => `"${part}"`).join(".")}, 1, 10)`);
   return s;
 }
 function resolveWorkerPath() {
@@ -7105,7 +7144,8 @@ function buildBrief(db, opts = {}) {
 }
 
 // src/lib/analytics.ts
-function queryProjectDetail(db, nameOrPath) {
+function queryProjectDetail(db, nameOrPath, now = new Date) {
+  const dailyBounds = resolveReportingInterval({ kind: "rolling", unit: "day", count: 14 }, now);
   const like = `%${nameOrPath}%`;
   const sessions = db.prepare(`SELECT id, project_name, project_path, total_cost_usd, total_tokens, started_at
      FROM economy_effective_sessions
@@ -7119,8 +7159,8 @@ function queryProjectDetail(db, nameOrPath) {
   const daily = db.prepare(`SELECT DATE(r.timestamp) as date, COALESCE(SUM(r.cost_usd), 0) as cost_usd
      FROM economy_effective_requests r JOIN economy_effective_sessions s ON r.session_id = s.id
      WHERE (s.project_name LIKE ? OR s.project_path LIKE ?)
-       AND r.timestamp >= DATE('now', '-14 days')
-     GROUP BY date ORDER BY date ASC`).all(like, like);
+       AND r.timestamp >= ? AND r.timestamp < ?
+     GROUP BY date ORDER BY date ASC`).all(like, like, dailyBounds.start, dailyBounds.end_exclusive);
   const models = db.prepare(`SELECT r.model as model, COUNT(*) as requests, COALESCE(SUM(r.cost_usd), 0) as cost_usd
      FROM economy_effective_requests r JOIN economy_effective_sessions s ON r.session_id = s.id
      WHERE s.project_name LIKE ? OR s.project_path LIKE ?
@@ -7159,18 +7199,17 @@ function queryRangeStats(db, from, to) {
   return { cost: r.cost, requests: r.requests, tokens: r.tokens, sessions: s.sessions };
 }
 function queryForecast(db, now = new Date) {
-  const daysInMonth = new Date(now.getFullYear(), now.getMonth() + 1, 0).getDate();
-  const dayOfMonth = now.getDate();
-  const monthStart = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-01`;
-  const monthSoFar = db.prepare(`SELECT COALESCE(SUM(cost_usd),0) as cost FROM economy_effective_requests WHERE DATE(timestamp) >= ?`).get(monthStart);
+  const month = resolveReportingInterval({ kind: "calendar", period: "month" }, now);
+  const recent = resolveReportingInterval({ kind: "rolling", unit: "day", count: 7 }, now);
+  const daysInMonth = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth() + 1, 0)).getUTCDate();
+  const dayOfMonth = now.getUTCDate();
+  const monthSoFar = db.prepare(`SELECT COALESCE(SUM(cost_usd),0) as cost FROM economy_effective_requests WHERE timestamp >= ? AND timestamp < ?`).get(month.start, recent.end_exclusive);
   const dailyAvg = dayOfMonth > 0 ? monthSoFar.cost / dayOfMonth : 0;
   const projected = dailyAvg * daysInMonth;
-  const sevenDaysAgo = new Date(now);
-  sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
-  const last7 = db.prepare(`SELECT COALESCE(SUM(cost_usd),0) as cost FROM economy_effective_requests WHERE DATE(timestamp) >= ?`).get(sevenDaysAgo.toISOString().substring(0, 10));
+  const last7 = db.prepare(`SELECT COALESCE(SUM(cost_usd),0) as cost FROM economy_effective_requests WHERE timestamp >= ? AND timestamp < ?`).get(recent.start, recent.end_exclusive);
   const last7DailyAvg = last7.cost / 7;
   const dailyCosts = db.prepare(`SELECT DATE(timestamp) as date, COALESCE(SUM(cost_usd),0) as cost_usd
-     FROM economy_effective_requests WHERE DATE(timestamp) >= ? GROUP BY date ORDER BY cost_usd ASC`).all(monthStart);
+     FROM economy_effective_requests WHERE timestamp >= ? AND timestamp < ? GROUP BY date ORDER BY cost_usd ASC`).all(month.start, recent.end_exclusive);
   return {
     day_of_month: dayOfMonth,
     days_in_month: daysInMonth,
@@ -7266,7 +7305,7 @@ import { randomUUID } from "crypto";
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.2",
+  version: "0.5.3",
   description: "AI coding cost tracker \u2014 CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   repository: {
     type: "git",
@@ -7471,7 +7510,13 @@ function createDataHandler(db, actorId) {
     if (path === "/api/daily" && method === "GET") {
       const days = Number(url.searchParams.get("days") ?? 30);
       const machine = url.searchParams.get("machine") ?? undefined;
-      return ok(queryDailyBreakdown(db, days, machine));
+      const now = new Date;
+      try {
+        resolveReportingInterval({ kind: "rolling", unit: "day", count: days }, now);
+      } catch {
+        return err("days must be a positive integer within the supported UTC date range");
+      }
+      return ok(queryDailyBreakdown(db, days, machine, now));
     }
     if (path === "/api/hourly" && method === "GET") {
       const machine = url.searchParams.get("machine") ?? undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/economy",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "AI coding cost tracker — CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   "repository": {
     "type": "git",