@hasna/economy 0.5.2 → 0.5.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.5.4
+
+### Patch Changes
+
+- Resolve account attribution through the current hosted Subscriptions client using its station-local paths and applied bindings. Preserve explicit legacy Accounts connections, reject ambiguous bindings, and avoid attributing an unmatched local profile to another station's shared selection.
+
+## 0.5.3
+
+### Patch Changes
+
+- Use consistent UTC calendar and rolling intervals for charts, forecasts and spike detection. Bound report windows on both ends, preserve millisecond boundaries for rolling hours, and require consecutive observed days before detecting a daily cost spike.
+
 ## 0.5.2
 
 ### Patch Changes

package/README.md

@@ -9,7 +9,7 @@ AI coding cost tracker for Claude Code, Takumi, Codex, Gemini, OpenCode, Cursor,
 
 - Ingests local Claude Code, Takumi, Codex, Gemini, OpenCode, Cursor, Pi, and Hermes usage.
 - Tracks sessions, requests, projects, machines, models, cache tokens, cost centers, budgets, goals, and provider billing.
-- Attributes usage to `@hasna/accounts` profiles when agents run under managed account/profile config dirs.
+- Attributes usage to hosted Subscriptions profiles using their station-local configuration directories or applied bindings; explicit legacy Accounts connections remain supported.
 - Breaks down API-equivalent, metered API, subscription-included, estimated, and unknown cost by account, coding agent, and cost center.
 - Seeds editable model pricing with input, output, cache-read, 5-minute cache-write, 1-hour cache-write, and context-cache storage rates.
 - Handles tiered pricing such as Gemini long-prompt rates and OpenAI long-context rates.
@@ -130,7 +130,9 @@ economy sync --backfill-machine
 
 Full sync also imports active project metadata from `@hasna/projects` when the registry is available. The Codex source reads both `~/.codex/state_5.sqlite` and the Codewith store at `~/.codewith/state_5.sqlite` by default; explicit `HASNA_ECONOMY_CODEX_DB_PATH` and `HASNA_ECONOMY_CODEWITH_DB_PATH` values override those locations.
 
-Account attribution is automatic when the accounts API (`HASNA_ACCOUNTS_API_KEY`, the accounts credentials file, or the Keychain item `hasna.credentials.accounts.api-key`) resolves a matching active, applied, or env-dir profile for the agent. With **no** accounts credential the on-box registry `~/.hasna/accounts/accounts.json` is **not** read unless `HASNA_ECONOMY_LOCAL=1` is set: attribution is simply omitted, announced once on stderr, rather than filling hosted rows from an on-box file. Account identity is the email address plus coding agent, so `work@example.com` under Codex and Claude is reported as two accounts. You can also force attribution for a process with `ECONOMY_ACCOUNT=tool:name` or agent-specific overrides such as `ECONOMY_CODEX_ACCOUNT=codex:work`.
+Account attribution uses the hosted Subscriptions registry through the installed `subscriptions` CLI and its own credential resolver. Economy reads `subscriptions list --json` and `subscriptions tools list --json` once per resolution, retaining the owning package's station-local paths and applied bindings. It does not activate a profile or copy credentials. A matching explicit agent directory takes precedence; an unmatched or ambiguous directory cannot inherit another profile. With no explicit directory, a station's applied binding can supply attribution; the shared registry's current selection alone cannot identify the local account.
+
+An explicitly configured legacy Accounts connection (`HASNA_ACCOUNTS_API_KEY`, its credentials file or Keychain entry) keeps its authority and compatibility behavior. A configured but unusable legacy or Subscriptions connection fails closed. If neither is configured, `~/.hasna/accounts/accounts.json` is **not** read unless `HASNA_ECONOMY_LOCAL=1` is set; attribution is omitted with a diagnostic. The Subscriptions CLI is required when using its registry. Profile counts are not paid-subscription counts, and this read path does not create subscription fees or backfill historical usage. Account identity remains email plus coding agent (profile name when email is unknown). Explicit process overrides such as `ECONOMY_ACCOUNT=tool:name` or `ECONOMY_CODEX_ACCOUNT=codex:work` still take precedence.
 
 Session drilldown can be scoped to an account key, account name, or email:
 

package/dist/chunks/{billing-bkpxy4kv.js → billing-22az60hy.js}

@@ -3,8 +3,8 @@ import {
   syncAnthropicBilling,
   syncGeminiBilling,
   syncOpenAIBilling
-} from "./index-k540hfww.js";
-import"./index-ez9thsr7.js";
+} from "./index-dk5rq1rq.js";
+import"./index-f5jv6q5q.js";
 import"./index-p35cyhc4.js";
 export {
   syncOpenAIBilling,

package/dist/chunks/{config-j9mv3ehk.js → config-hsp7ndhj.js}

@@ -4,8 +4,8 @@ import {
   loadConfig,
   saveConfig,
   setConfigValue
-} from "./index-hesxq90g.js";
-import"./index-ez9thsr7.js";
+} from "./index-9wa1f2kv.js";
+import"./index-f5jv6q5q.js";
 import"./index-p35cyhc4.js";
 export {
   setConfigValue,

package/dist/chunks/{index-npsjjv96.js → index-9arv0b1j.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   LOCAL_STORAGE_OPT_IN_KEYS
-} from "./index-dj3tctqh.js";
+} from "./index-n1wwqxfe.js";
 import {
   assessCostFromDb,
   getIngestState,
@@ -19,7 +19,7 @@ import {
   upsertSession,
   upsertSubscription,
   upsertUsageSnapshot
-} from "./index-ez9thsr7.js";
+} from "./index-f5jv6q5q.js";
 import {
   __require
 } from "./index-p35cyhc4.js";
@@ -78,34 +78,141 @@ import { join as join2, basename } from "path";
 import { existsSync, readFileSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
-import { z } from "zod";
+import { z as z2 } from "zod";
 import { resolveClientTransport, resolveCredential } from "@hasna/contracts/client";
-var ACCOUNTS_APP = "accounts";
-var profileNameSchema = z.string().min(1).max(64).regex(/^[a-z0-9][a-z0-9-]*$/, "must be lowercase alphanumeric/hyphen and start with a letter or digit");
+
+// src/lib/subscriptions-registry.ts
+import { execFile } from "child_process";
+import { promisify } from "util";
+import { isAbsolute } from "path";
+import { z } from "zod";
+var execute = promisify(execFile);
+var readSubscriptionsMetadata = async (args, env) => {
+  let stdout;
+  try {
+    const result = await execute("subscriptions", args, {
+      env,
+      encoding: "utf8",
+      timeout: 30000,
+      maxBuffer: 16 * 1024 * 1024,
+      windowsHide: true
+    });
+    stdout = result.stdout;
+  } catch (error) {
+    const code = error?.code;
+    if (code === "ENOENT")
+      throw new Error("subscriptions: CLI not found on PATH; install the Subscriptions CLI to resolve station account metadata");
+    const status = typeof code === "number" && Number.isInteger(code) ? `exit ${code}` : "execution limit or transport failure";
+    throw new Error(`subscriptions: read-only metadata command failed (${status}); verify the installed CLI and its hosted credentials`);
+  }
+  try {
+    return JSON.parse(stdout);
+  } catch {
+    throw new Error("subscriptions: metadata command returned invalid JSON");
+  }
+};
+var nonempty = z.string().min(1);
 var profileSchema = z.object({
-  name: z.string(),
-  tool: z.string(),
+  name: nonempty,
+  tool: nonempty,
   email: z.string().optional(),
   displayName: z.string().optional(),
-  dir: z.string(),
+  dir: nonempty.refine(isAbsolute).refine((value) => !/[\0\r\n]/.test(value)),
+  createdAt: nonempty,
+  lastUsedAt: z.string().optional(),
   description: z.string().optional(),
-  createdAt: z.string(),
-  lastUsedAt: z.string().optional()
+  active: z.boolean(),
+  applied: z.boolean(),
+  switchedAway: z.object({ profile: nonempty, email: z.string().optional() }).optional()
 });
-var toolDefSchema = z.object({
-  id: z.string(),
-  label: z.string(),
-  envVar: z.string(),
-  defaultDir: z.string(),
-  bin: z.string()
+var toolsSchema = z.array(z.object({
+  id: nonempty,
+  label: nonempty,
+  envVar: nonempty,
+  defaultDir: nonempty,
+  bin: nonempty
+}));
+function unique(rows, identity) {
+  if (new Set(rows.map(identity)).size !== rows.length) {
+    throw new Error("subscriptions: duplicate identity in metadata response");
+  }
+  return rows;
+}
+
+class SubscriptionsRegistry {
+  read;
+  transport = "api";
+  registry = "subscriptions";
+  env;
+  profiles;
+  tools;
+  constructor(baseUrl, env, read = readSubscriptionsMetadata) {
+    this.read = read;
+    this.env = { ...env, HASNA_SUBSCRIPTIONS_API_URL: baseUrl.replace(/\/v1\/?$/, "") };
+  }
+  allProfiles() {
+    return this.profiles ??= this.read(["list", "--json"], this.env).then((raw) => {
+      const parsed = z.array(profileSchema).safeParse(raw);
+      if (!parsed.success)
+        throw new Error("subscriptions: invalid profile metadata response");
+      return unique(parsed.data, (row) => JSON.stringify([row.tool, row.name]));
+    });
+  }
+  async listProfiles(tool) {
+    const rows = await this.allProfiles();
+    return rows.filter((row) => !tool || row.tool === tool);
+  }
+  async findProfile(name, tool) {
+    const matches = (await this.listProfiles(tool)).filter((row) => row.name === name);
+    return matches.length === 1 ? matches[0] : undefined;
+  }
+  async appliedProfile(tool) {
+    const matches = (await this.allProfiles()).filter((row) => row.tool === tool && row.applied);
+    if (matches.length > 1)
+      throw new Error("subscriptions: ambiguous station applied-profile binding");
+    return matches[0];
+  }
+  async currentProfile(_tool) {
+    return;
+  }
+  async listTools() {
+    return this.tools ??= this.read(["tools", "list", "--json"], this.env).then((raw) => {
+      const parsed = toolsSchema.safeParse(raw);
+      if (!parsed.success)
+        throw new Error("subscriptions: invalid tool metadata response");
+      return unique(parsed.data, (row) => row.id);
+    });
+  }
+}
+
+// src/lib/accounts-store.ts
+var ACCOUNTS_APP = "accounts";
+var profileNameSchema = z2.string().min(1).max(64).regex(/^[a-z0-9][a-z0-9-]*$/, "must be lowercase alphanumeric/hyphen and start with a letter or digit");
+var profileSchema2 = z2.object({
+  name: z2.string(),
+  tool: z2.string(),
+  email: z2.string().optional(),
+  displayName: z2.string().optional(),
+  dir: z2.string(),
+  description: z2.string().optional(),
+  createdAt: z2.string(),
+  lastUsedAt: z2.string().optional(),
+  switchedAway: z2.object({ profile: z2.string().min(1), email: z2.string().optional() }).optional()
+});
+var toolDefSchema = z2.object({
+  id: z2.string(),
+  label: z2.string(),
+  envVar: z2.string(),
+  defaultDir: z2.string(),
+  bin: z2.string()
 });
-var storeSchema = z.object({
-  version: z.literal(1),
-  current: z.record(z.string(), z.string()).default({}),
-  applied: z.record(z.string(), z.string()).default({}),
-  toolLocks: z.record(z.string(), z.string()).default({}),
-  profiles: z.array(profileSchema).default([]),
-  tools: z.array(toolDefSchema).default([])
+var storeSchema = z2.object({
+  version: z2.literal(1),
+  current: z2.record(z2.string(), z2.string()).default({}),
+  applied: z2.record(z2.string(), z2.string()).default({}),
+  toolLocks: z2.record(z2.string(), z2.string()).default({}),
+  profiles: z2.array(profileSchema2).default([]),
+  tools: z2.array(toolDefSchema).default([])
 });
 function localRegistryAllowed(env = process.env) {
   return LOCAL_STORAGE_OPT_IN_KEYS.some((key) => {
@@ -387,25 +494,34 @@ class ApiStore {
   }
 }
 function resolveStore(env = process.env, options = {}) {
+  const legacy = resolveRegistryTransport(ACCOUNTS_APP, env, options.credentials);
+  if (legacy)
+    return new ApiStore(legacy.baseUrl, legacy.apiKey);
+  const current = resolveRegistryTransport("subscriptions", env, options.subscriptionsCredentials);
+  if (current)
+    return new SubscriptionsRegistry(current.baseUrl, env, options.readSubscriptionsMetadata);
+  return unconfiguredStore(env);
+}
+function resolveRegistryTransport(app, env, credentials) {
   const clientEnv = env;
-  const credential = resolveCredential(ACCOUNTS_APP, clientEnv, options.credentials);
+  const credential = resolveCredential(app, clientEnv, credentials);
   if (credential === null) {
     try {
-      resolveClientTransport(ACCOUNTS_APP, clientEnv, options.credentials ? { credentials: options.credentials } : {});
+      resolveClientTransport(app, clientEnv, credentials ? { credentials } : {});
     } catch (err) {
       if (isNoAccountsCredentialConfigurationError(err))
-        return unconfiguredStore(env);
+        return null;
       throw err;
     }
-    return unconfiguredStore(env);
+    return null;
   }
   if (credential.tier === "pointer") {
-    throw new Error(`accounts: ${credential.source} names a secrets-vault item, and the local accounts API store resolves ` + "credentials synchronously, so it cannot complete the pointer per request. It is a deliberate " + "selection and is not resolved around. Use a literal tier instead \u2014 the Keychain item " + "hasna.credentials.accounts.api-key, ~/.hasna/accounts/config/credentials, or HASNA_ACCOUNTS_API_KEY.");
+    throw new Error(`${app}: ${credential.source} names a secrets-vault item, and the registry adapter resolves ` + "credentials synchronously, so it cannot complete the pointer per request. It is a deliberate " + "selection and is not resolved around. Use a literal tier instead \u2014 the Keychain item " + `hasna.credentials.${app}.api-key, ~/.hasna/${app}/config/credentials, or HASNA_${app.toUpperCase()}_API_KEY.`);
   }
-  const resolution = resolveClientTransport(ACCOUNTS_APP, clientEnv, {
-    credentials: { ...options.credentials, apiKey: credential.apiKey }
+  const resolution = resolveClientTransport(app, clientEnv, {
+    credentials: { ...credentials, apiKey: credential.apiKey }
   });
-  return new ApiStore(resolution.baseUrl, credential.apiKey);
+  return { baseUrl: resolution.baseUrl, apiKey: credential.apiKey };
 }
 function isNoAccountsCredentialConfigurationError(error) {
   if (typeof error !== "object" || error === null)
@@ -422,10 +538,10 @@ function unconfiguredStore(env) {
   return new NoRegistryStore;
 }
 function accountsLocalModeNotice() {
-  return `accounts: LOCAL mode (${LOCAL_STORAGE_OPT_IN_KEYS[0]}=1) \u2014 no Hasna Accounts credential resolved, so ` + "attribution reads the on-box JSON registry (~/.hasna/accounts/accounts.json) instead of accounts-serve. " + "To go hosted, put the fleet key in the Keychain item hasna.credentials.accounts.api-key, write " + "~/.hasna/accounts/config/credentials, or set HASNA_ACCOUNTS_API_KEY.";
+  return `accounts: LOCAL mode (${LOCAL_STORAGE_OPT_IN_KEYS[0]}=1) \u2014 neither Accounts nor Subscriptions credentials resolved, so ` + "attribution reads the on-box JSON registry (~/.hasna/accounts/accounts.json) instead of accounts-serve. " + "For hosted attribution, configure the Subscriptions CLI through its normal sign-in or credential resolver.";
 }
 function accountsRefusalNotice() {
-  return "accounts: no Hasna Accounts credential resolved (Keychain item hasna.credentials.accounts.api-key, " + "~/.hasna/accounts/config/credentials, HASNA_ACCOUNTS_API_KEY), so spend attribution is omitted. The " + `on-box registry (~/.hasna/accounts/accounts.json) is NOT read without ${LOCAL_STORAGE_OPT_IN_KEYS[0]}=1 \u2014 ` + "economy fails closed instead of attributing hosted spend from an on-box file.";
+  return "accounts: neither Accounts nor Subscriptions credentials resolved (legacy hasna.credentials.accounts.api-key, " + "~/.hasna/accounts/config/credentials, HASNA_ACCOUNTS_API_KEY; current hasna.credentials.subscriptions.api-key, " + "~/.hasna/subscriptions/config/credentials, HASNA_SUBSCRIPTIONS_API_KEY), so spend attribution is omitted. The " + `on-box registry (~/.hasna/accounts/accounts.json) is NOT read without ${LOCAL_STORAGE_OPT_IN_KEYS[0]}=1 \u2014 ` + "economy fails closed instead of attributing hosted spend from an on-box file.";
 }
 var accountsLocalNoticePrinted = false;
 function announceAccountsLocalMode() {
@@ -513,7 +629,10 @@ async function profileForEnvDir(store, tool, env) {
   if (!configuredDir)
     return null;
   const normalized = normalizeDir(configuredDir);
-  return (await store.listProfiles(tool.id)).find((profile) => normalizeDir(profile.dir) === normalized) ?? null;
+  const matches = (await store.listProfiles(tool.id)).filter((profile) => normalizeDir(profile.dir) === normalized);
+  if (matches.length > 1)
+    throw new Error("account attribution: multiple profiles match the configured directory");
+  return matches[0] ?? null;
 }
 async function resolveAccountForAgent(agent, env = process.env, options = {}) {
   const override = envOverride(agent, env);
@@ -527,8 +646,15 @@ async function resolveAccountForAgent(agent, env = process.env, options = {}) {
       continue;
     const envProfile = await profileForEnvDir(store, tool, env);
     if (envProfile)
-      return fromProfile(envProfile, "env");
-    const appliedName = appliedProfileName(toolId);
+      return envProfile.switchedAway ? null : fromProfile(envProfile, "env");
+    if (store.registry === "subscriptions" && env[tool.envVar])
+      return null;
+    if (store.appliedProfile) {
+      const applied = await store.appliedProfile(toolId);
+      if (applied)
+        return applied.switchedAway ? null : fromProfile(applied, "applied");
+    }
+    const appliedName = store.registry === "subscriptions" ? undefined : appliedProfileName(toolId);
     if (appliedName) {
       const applied = await store.findProfile(appliedName, toolId);
       if (applied)

package/dist/chunks/{index-hesxq90g.js → index-9wa1f2kv.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   getDataDir
-} from "./index-ez9thsr7.js";
+} from "./index-f5jv6q5q.js";
 
 // src/lib/config.ts
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "fs";

package/dist/chunks/{index-zpvea08j.js → index-c7h2rxx1.js}

@@ -1072,12 +1072,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;
@@ -1100,11 +1120,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)) {
@@ -2450,20 +2474,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);
@@ -3369,4 +3395,4 @@ function computeCostWithPricing(model, pricing, inputTokens, outputTokens, cache
   return (inputTokens * effective.inputPer1M + outputTokens * effective.outputPer1M + cacheReadTokens * effective.cacheReadPer1M + cacheWriteTokens * effective.cacheWritePer1M + cacheWrite1hTokens * (effective.cacheWrite1hPer1M ?? effective.cacheWritePer1M) + cacheStorageTokenHours * (effective.cacheStoragePer1MHour ?? 0)) / 1e6;
 }
 
-export { __require, AGENTS, COST_BASIS, isAgent, subscriptionId, MAX_INGEST_BYTES, stableJson, canonicalIngestBodyHash, validateIngest, calendarPeriodBounds, calendarPeriodWhere, usageSnapshotFilterForPeriod, sessionOverlapWhere, dataDir, cacheDir, getMachineId, getHomeDir, getResolverDataRoot, getLegacyDataRoot, adoptResolverDataRoot, getExactDataRoot, getDataDir, getDbPath, initSchema, upsertCostCenter, getCostCenter, upsertRequest, upsertSession, rollupSession, querySessions, queryTopSessions, querySummary, queryZeroCostTokenizedModels, queryModelBreakdown, queryAgentBreakdown, queryProjectBreakdown, queryAccountBreakdown, queryCostCenterBreakdown, queryProjectBreakdownSince, queryAgentBreakdownSince, queryModelBreakdownSince, queryAccountBreakdownSince, queryDailyBreakdown, queryHourlyBreakdown, upsertProject, getProject, listProjects, deleteProject, upsertBudget, listBudgets, deleteBudget, getBudgetStatuses, upsertGoal, deleteGoal, listGoals, getGoalStatuses, getIngestState, loadIngestState, setIngestState, queryRequestsSince, insertFeedback, upsertBillingDaily, clearBillingRange, queryBillingSummary, countBillingRecords, getSessionDetail, listMachines, upsertModelPricing, getModelPricing, listModelPricing, deleteModelPricing, seedModelPricing, upsertSubscription, listSubscriptions, deleteSubscription, upsertUsageSnapshot, upsertScanReceipt, queryScanReceipts, queryUsageSnapshots, listMachineRegistry, dedupeRequests, bulkIngest, DEFAULT_PRICING, normalizeModelName, ensurePricingSeeded, getPricingFromDb, getPricing, computeCost, computeCostFromDb, UnknownModelPricingError, assessCostFromDb, getPricingFromRows, estimateCostFromRows, assessCostFromRows, hasKnownUsagePrice, requireCurrentCostSummary, requireCurrentBillingSummary };
+export { __require, AGENTS, COST_BASIS, isAgent, subscriptionId, MAX_INGEST_BYTES, stableJson, canonicalIngestBodyHash, validateIngest, resolveReportingInterval, calendarPeriodBounds, calendarPeriodWhere, usageSnapshotFilterForPeriod, sessionOverlapWhere, dataDir, cacheDir, getMachineId, getHomeDir, getResolverDataRoot, getLegacyDataRoot, adoptResolverDataRoot, getExactDataRoot, getDataDir, getDbPath, initSchema, upsertCostCenter, getCostCenter, upsertRequest, upsertSession, rollupSession, querySessions, queryTopSessions, querySummary, queryZeroCostTokenizedModels, queryModelBreakdown, queryAgentBreakdown, queryProjectBreakdown, queryAccountBreakdown, queryCostCenterBreakdown, queryProjectBreakdownSince, queryAgentBreakdownSince, queryModelBreakdownSince, queryAccountBreakdownSince, queryDailyBreakdown, queryHourlyBreakdown, upsertProject, getProject, listProjects, deleteProject, upsertBudget, listBudgets, deleteBudget, getBudgetStatuses, upsertGoal, deleteGoal, listGoals, getGoalStatuses, getIngestState, loadIngestState, setIngestState, queryRequestsSince, insertFeedback, upsertBillingDaily, clearBillingRange, queryBillingSummary, countBillingRecords, getSessionDetail, listMachines, upsertModelPricing, getModelPricing, listModelPricing, deleteModelPricing, seedModelPricing, upsertSubscription, listSubscriptions, deleteSubscription, upsertUsageSnapshot, upsertScanReceipt, queryScanReceipts, queryUsageSnapshots, listMachineRegistry, dedupeRequests, bulkIngest, DEFAULT_PRICING, normalizeModelName, ensurePricingSeeded, getPricingFromDb, getPricing, computeCost, computeCostFromDb, UnknownModelPricingError, assessCostFromDb, getPricingFromRows, estimateCostFromRows, assessCostFromRows, hasKnownUsagePrice, requireCurrentCostSummary, requireCurrentBillingSummary };

package/dist/chunks/{index-9d2aky06.js → index-ct3zdefz.js}

@@ -14,7 +14,7 @@ import {
   querySavingsSummary,
   requireCurrentBillingDiffSummary,
   requireCurrentSavingsReport
-} from "./index-dj3tctqh.js";
+} from "./index-n1wwqxfe.js";
 import {
   deleteBudget,
   deleteGoal,
@@ -59,7 +59,7 @@ import {
   upsertSubscription,
   usageSnapshotFilterForPeriod,
   validateIngest
-} from "./index-ez9thsr7.js";
+} from "./index-f5jv6q5q.js";
 import {
   __require
 } from "./index-p35cyhc4.js";
@@ -92,7 +92,7 @@ class LocalStore {
   _db;
   async db() {
     if (!this._db) {
-      const { openDatabase } = await import("./sqlite-store-501f32ts.js");
+      const { openDatabase } = await import("./sqlite-store-13nhr1z0.js");
       this._db = openDatabase();
       ensurePricingSeeded(this._db);
     }

package/dist/chunks/{index-k540hfww.js → index-dk5rq1rq.js}

@@ -2,7 +2,7 @@
 import {
   clearBillingRange,
   upsertBillingDaily
-} from "./index-ez9thsr7.js";
+} from "./index-f5jv6q5q.js";
 
 // src/ingest/billing.ts
 import { readFileSync } from "fs";

package/dist/chunks/{index-ez9thsr7.js → index-f5jv6q5q.js}

@@ -1097,12 +1097,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;
@@ -1125,11 +1145,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)) {
@@ -2518,20 +2542,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);
@@ -3437,4 +3463,4 @@ function computeCostWithPricing(model, pricing, inputTokens, outputTokens, cache
   return (inputTokens * effective.inputPer1M + outputTokens * effective.outputPer1M + cacheReadTokens * effective.cacheReadPer1M + cacheWriteTokens * effective.cacheWritePer1M + cacheWrite1hTokens * (effective.cacheWrite1hPer1M ?? effective.cacheWritePer1M) + cacheStorageTokenHours * (effective.cacheStoragePer1MHour ?? 0)) / 1e6;
 }
 
-export { OBSERVATION_PG_MIGRATIONS, IngestError, observationId, subscriptionId, scanReceiptId, AGENTS, isAgent, parseAgent, MAX_INGEST_ROWS, MAX_INGEST_BYTES, stableJson, canonicalIngestBodyHash, validateIngest, INGEST_SCHEMA_SQL, LEGACY_PG_SQL, reconcileIngestReceipt, calendarPeriodBounds, calendarPeriodWhere, usageSnapshotFilterForPeriod, sessionOverlapWhere, dataDir, cacheDir, getMachineId, getHomeDir, getResolverDataRoot, getLegacyDataRoot, adoptResolverDataRoot, getExactDataRoot, getDataDir, getDbPath, initSchema, upsertCostCenter, getCostCenter, upsertRequest, upsertSession, rollupSession, querySessions, queryTopSessions, querySummary, queryZeroCostTokenizedModels, queryModelBreakdown, queryAgentBreakdown, queryProjectBreakdown, queryAccountBreakdown, queryCostCenterBreakdown, queryProjectBreakdownSince, queryAgentBreakdownSince, queryModelBreakdownSince, queryAccountBreakdownSince, queryDailyBreakdown, queryHourlyBreakdown, upsertProject, getProject, listProjects, deleteProject, upsertBudget, listBudgets, deleteBudget, getBudgetStatuses, upsertGoal, deleteGoal, listGoals, getGoalStatuses, getIngestState, loadIngestState, setIngestState, queryRequestsSince, insertFeedback, upsertBillingDaily, clearBillingRange, queryBillingSummary, countBillingRecords, getSessionDetail, listMachines, upsertModelPricing, getModelPricing, listModelPricing, deleteModelPricing, seedModelPricing, upsertSubscription, listSubscriptions, deleteSubscription, upsertUsageSnapshot, upsertScanReceipt, queryScanReceipts, queryUsageSnapshots, listMachineRegistry, dedupeRequests, bulkIngest, DEFAULT_PRICING, normalizeModelName, ensurePricingSeeded, getPricingFromDb, getPricing, computeCost, computeCostFromDb, UnknownModelPricingError, assessCostFromDb, getPricingFromRows, estimateCostFromRows, assessCostFromRows, formatReportedUsd, formatPlanMoney, hasKnownUsagePrice, requireCurrentCostSummary, formatSummaryValue, formatSummaryCoverage, requireCurrentBillingSummary, formatBillingValue };
+export { OBSERVATION_PG_MIGRATIONS, IngestError, observationId, subscriptionId, scanReceiptId, AGENTS, isAgent, parseAgent, MAX_INGEST_ROWS, MAX_INGEST_BYTES, stableJson, canonicalIngestBodyHash, validateIngest, INGEST_SCHEMA_SQL, LEGACY_PG_SQL, reconcileIngestReceipt, resolveReportingInterval, calendarPeriodBounds, calendarPeriodWhere, usageSnapshotFilterForPeriod, sessionOverlapWhere, dataDir, cacheDir, getMachineId, getHomeDir, getResolverDataRoot, getLegacyDataRoot, adoptResolverDataRoot, getExactDataRoot, getDataDir, getDbPath, initSchema, upsertCostCenter, getCostCenter, upsertRequest, upsertSession, rollupSession, querySessions, queryTopSessions, querySummary, queryZeroCostTokenizedModels, queryModelBreakdown, queryAgentBreakdown, queryProjectBreakdown, queryAccountBreakdown, queryCostCenterBreakdown, queryProjectBreakdownSince, queryAgentBreakdownSince, queryModelBreakdownSince, queryAccountBreakdownSince, queryDailyBreakdown, queryHourlyBreakdown, upsertProject, getProject, listProjects, deleteProject, upsertBudget, listBudgets, deleteBudget, getBudgetStatuses, upsertGoal, deleteGoal, listGoals, getGoalStatuses, getIngestState, loadIngestState, setIngestState, queryRequestsSince, insertFeedback, upsertBillingDaily, clearBillingRange, queryBillingSummary, countBillingRecords, getSessionDetail, listMachines, upsertModelPricing, getModelPricing, listModelPricing, deleteModelPricing, seedModelPricing, upsertSubscription, listSubscriptions, deleteSubscription, upsertUsageSnapshot, upsertScanReceipt, queryScanReceipts, queryUsageSnapshots, listMachineRegistry, dedupeRequests, bulkIngest, DEFAULT_PRICING, normalizeModelName, ensurePricingSeeded, getPricingFromDb, getPricing, computeCost, computeCostFromDb, UnknownModelPricingError, assessCostFromDb, getPricingFromRows, estimateCostFromRows, assessCostFromRows, formatReportedUsd, formatPlanMoney, hasKnownUsagePrice, requireCurrentCostSummary, formatSummaryValue, formatSummaryCoverage, requireCurrentBillingSummary, formatBillingValue };

package/dist/chunks/{index-dj3tctqh.js → index-n1wwqxfe.js}

@@ -14,12 +14,13 @@ import {
   querySummary,
   requireCurrentBillingSummary,
   requireCurrentCostSummary,
+  resolveReportingInterval,
   sessionOverlapWhere
-} from "./index-ez9thsr7.js";
+} from "./index-f5jv6q5q.js";
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.2",
+  version: "0.5.4",
   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",
@@ -1230,7 +1231,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
@@ -1244,8 +1246,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 ?
@@ -1284,18 +1286,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,