@hasna/economy 0.5.1 → 0.5.3

package/dist/index.js

@@ -45,6 +45,7 @@ import {
   queryUsageSnapshots,
   requireCurrentBillingSummary,
   requireCurrentCostSummary,
+  resolveReportingInterval,
   sessionOverlapWhere,
   stableJson,
   subscriptionId,
@@ -55,13 +56,13 @@ import {
   upsertSubscription,
   usageSnapshotFilterForPeriod,
   validateIngest
-} from "./chunks/index-zpvea08j.js";
+} from "./chunks/index-c7h2rxx1.js";
 // src/lib/store/index.ts
 import { randomUUID } from "crypto";
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.1",
+  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",
@@ -1070,7 +1071,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
@@ -1084,8 +1086,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 ?
@@ -1124,18 +1126,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,
@@ -1337,7 +1338,7 @@ class LocalStore {
   _db;
   async db() {
     if (!this._db) {
-      const { openDatabase } = await import("./chunks/sqlite-store-fq4natnf.js");
+      const { openDatabase } = await import("./chunks/sqlite-store-ht6frztj.js");
       this._db = openDatabase();
       ensurePricingSeeded(this._db);
     }

package/dist/lib/analytics.d.ts

@@ -23,7 +23,7 @@ export interface ProjectDetail {
     top_sessions: ProjectDetailSession[];
 }
 /** Detailed breakdown for a single project matched by name or path substring. */
-export declare function queryProjectDetail(db: Database, nameOrPath: string): ProjectDetail | null;
+export declare function queryProjectDetail(db: Database, nameOrPath: string, now?: Date): ProjectDetail | null;
 export type ExportType = 'sessions' | 'requests';
 /** Raw rows for a CSV export. CSV formatting stays in the caller. */
 export declare function queryExportRows(db: Database, type: ExportType, period: string): Array<Record<string, unknown>>;

package/dist/lib/analytics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../src/lib/analytics.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAIxE,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAA;IACV,cAAc,EAAE,MAAM,CAAA;IACtB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAChD,MAAM,EAAE,kBAAkB,EAAE,CAAA;IAC5B,YAAY,EAAE,oBAAoB,EAAE,CAAA;CACrC;AAED,iFAAiF;AACjF,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAmDzF;AAID,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,UAAU,CAAA;AAShD,qEAAqE;AACrE,wBAAgB,eAAe,CAC7B,EAAE,EAAE,QAAQ,EACZ,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,GACb,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAOhC;AAID,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,+EAA+E;AAC/E,wBAAgB,eAAe,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,UAAU,CAUlF;AAID,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,gBAAgB,EAAE,MAAM,CAAA;IACxB,aAAa,EAAE,MAAM,CAAA;IACrB,aAAa,EAAE,MAAM,CAAA;IACrB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,mBAAmB,EAAE,MAAM,CAAA;IAC3B,YAAY,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;IACvD,kBAAkB,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;CAC9D;AAED,0DAA0D;AAC1D,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,GAAE,IAAiB,GAAG,YAAY,CAkChF;AAID,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;CACb;AAED,iFAAiF;AACjF,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,QAAQ,GAAG,eAAe,EAAE,CAWpE"}
+{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../src/lib/analytics.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAIxE,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAA;IACV,cAAc,EAAE,MAAM,CAAA;IACtB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAChD,MAAM,EAAE,kBAAkB,EAAE,CAAA;IAC5B,YAAY,EAAE,oBAAoB,EAAE,CAAA;CACrC;AAED,iFAAiF;AACjF,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAa,GAAG,aAAa,GAAG,IAAI,CAoD3G;AAID,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,UAAU,CAAA;AAShD,qEAAqE;AACrE,wBAAgB,eAAe,CAC7B,EAAE,EAAE,QAAQ,EACZ,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,GACb,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAOhC;AAID,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,+EAA+E;AAC/E,wBAAgB,eAAe,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,UAAU,CAUlF;AAID,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,gBAAgB,EAAE,MAAM,CAAA;IACxB,aAAa,EAAE,MAAM,CAAA;IACrB,aAAa,EAAE,MAAM,CAAA;IACrB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,mBAAmB,EAAE,MAAM,CAAA;IAC3B,YAAY,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;IACvD,kBAAkB,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;CAC9D;AAED,0DAA0D;AAC1D,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,GAAE,IAAiB,GAAG,YAAY,CAiChF;AAID,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;CACb;AAED,iFAAiF;AACjF,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,QAAQ,GAAG,eAAe,EAAE,CAWpE"}

package/dist/lib/periods.d.ts

@@ -4,7 +4,26 @@ export interface CalendarPeriodBounds {
     start_date: string | null;
     end_date_exclusive: string | null;
 }
-/** Existing daily records use UTC. A week starts on Sunday; ranges are half-open. */
+export type ReportingInterval = {
+    kind: 'calendar';
+    period: Period;
+} | {
+    kind: 'rolling';
+    unit: 'day' | 'hour';
+    count: number;
+};
+export interface ReportingBounds {
+    time_zone: 'UTC';
+    start: string | null;
+    end_exclusive: string | null;
+}
+/**
+ * All ranges are half-open and use one supplied clock. Calendar weeks start on
+ * Sunday. N rolling days means N UTC dates including today (which is partial),
+ * while N rolling hours means the elapsed N hours ending at the supplied clock.
+ */
+export declare function resolveReportingInterval(interval: ReportingInterval, now?: Date): ReportingBounds;
+/** Retain the calendar report's existing public field names. */
 export declare function calendarPeriodBounds(period: Period, now?: Date): CalendarPeriodBounds;
 /** Column names are code-owned identifiers; only generated ISO dates enter SQL. */
 export declare function calendarPeriodWhere(period: Period, column: string, now?: Date): string;

package/dist/lib/periods.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"periods.d.ts","sourceRoot":"","sources":["../../src/lib/periods.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAM/C,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,KAAK,CAAA;IAChB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAA;CAClC;AAED,qFAAqF;AACrF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAa,GAAG,oBAAoB,CAgC3F;AAED,mFAAmF;AACnF,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAa,GAAG,MAAM,CAO5F;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAK/G;AAED,kFAAkF;AAClF,wBAAgB,mBAAmB,CAAC,MAAM,EAAC,MAAM,EAAC,KAAK,EAAC,MAAM,EAAC,GAAG,OAAW,GAAE,MAAM,CAIpF"}
+{"version":3,"file":"periods.d.ts","sourceRoot":"","sources":["../../src/lib/periods.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAM/C,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,KAAK,CAAA;IAChB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAA;CAClC;AAED,MAAM,MAAM,iBAAiB,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAE5D,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,KAAK,CAAA;IAChB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;CAC7B;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,iBAAiB,EAAE,GAAG,OAAa,GAAG,eAAe,CA+CvG;AAED,gEAAgE;AAChE,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAa,GAAG,oBAAoB,CAG3F;AAED,mFAAmF;AACnF,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAa,GAAG,MAAM,CAO5F;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAK/G;AAED,kFAAkF;AAClF,wBAAgB,mBAAmB,CAAC,MAAM,EAAC,MAAM,EAAC,KAAK,EAAC,MAAM,EAAC,GAAG,OAAW,GAAE,MAAM,CAIpF"}

package/dist/lib/spikes.d.ts

@@ -5,7 +5,7 @@ export interface SpikeInfo {
     average_usd: number;
     ratio: number;
 }
-/** Detect daily cost spikes: today > 2× rolling 7-day mean (min 7 days history). */
+/** Detect spikes against consecutive observed UTC days; a missing day is unknown. */
 export declare function detectCostSpikes(dailyTotals: Array<{
     date: string;
     cost_usd: number;
@@ -13,6 +13,6 @@ export declare function detectCostSpikes(dailyTotals: Array<{
     windowDays?: number;
     multiplier?: number;
 }): SpikeInfo[];
-export declare function queryRecentSpikes(db: Database, days?: number): SpikeInfo[];
-export declare function getTodaySpike(db: Database): SpikeInfo | null;
+export declare function queryRecentSpikes(db: Database, days?: number, now?: Date): SpikeInfo[];
+export declare function getTodaySpike(db: Database, now?: Date): SpikeInfo | null;
 //# sourceMappingURL=spikes.d.ts.map

package/dist/lib/spikes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spikes.d.ts","sourceRoot":"","sources":["../../src/lib/spikes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAExE,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;CACd;AAED,oFAAoF;AACpF,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,EACtD,IAAI,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAClD,SAAS,EAAE,CAqBb;AAED,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,SAAK,GAAG,SAAS,EAAE,CAUtE;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,GAAG,SAAS,GAAG,IAAI,CAI5D"}
+{"version":3,"file":"spikes.d.ts","sourceRoot":"","sources":["../../src/lib/spikes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,IAAI,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAGxE,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;CACd;AAED,qFAAqF;AACrF,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,EACtD,IAAI,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAClD,SAAS,EAAE,CA8Bb;AAED,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,SAAK,EAAE,GAAG,OAAa,GAAG,SAAS,EAAE,CAWxF;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,OAAa,GAAG,SAAS,GAAG,IAAI,CAI9E"}

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.1",
+  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.1",
+  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",