archondev 2.19.53 → 2.19.54

package/dist/index.js

@@ -3106,43 +3106,68 @@ async function fetchByokUsageStatsFromSupabase(accessToken, authId) {
     const { SUPABASE_URL: SUPABASE_URL2, SUPABASE_ANON_KEY: SUPABASE_ANON_KEY2 } = await import("./constants-XDIWFFPN.js");
     const { createAuthedSupabaseClient: createAuthedSupabaseClient2 } = await import("./client-PHW2C2HB.js");
     const supabase = createAuthedSupabaseClient2(SUPABASE_URL2, SUPABASE_ANON_KEY2, accessToken);
-    const { data: rawProfile, error: profileError } = await supabase.from("user_profiles").select("id, current_period_start, current_period_end").eq("auth_id", authId).single();
-    const profile = rawProfile;
-    if (profileError || !profile?.id) {
+    const profileId = await resolveProfileIdForUsage(supabase, authId);
+    if (!profileId) {
       return null;
     }
     const now = /* @__PURE__ */ new Date();
-    const defaultStart = new Date(now.getFullYear(), now.getMonth(), 1);
-    const defaultEnd = new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59, 999);
-    const periodStart = profile.current_period_start ? new Date(profile.current_period_start) : defaultStart;
-    const periodEnd = profile.current_period_end ? new Date(profile.current_period_end) : defaultEnd;
-    const { data: rawUsageRows } = await supabase.from("token_usage").select("model, input_tokens, output_tokens, base_cost, total_cents, marked_up_cost").eq("user_id", profile.id).gte("created_at", periodStart.toISOString()).lte("created_at", periodEnd.toISOString());
-    const usageRows = rawUsageRows;
-    let totalInputTokens = 0;
-    let totalOutputTokens = 0;
-    let totalBaseCost = 0;
-    const byModelMap = /* @__PURE__ */ new Map();
-    for (const row of usageRows ?? []) {
-      totalInputTokens += row.input_tokens ?? 0;
-      totalOutputTokens += row.output_tokens ?? 0;
-      const baseCost = typeof row.base_cost === "number" ? row.base_cost : typeof row.total_cents === "number" ? row.total_cents / 100 : typeof row.marked_up_cost === "number" ? row.marked_up_cost : 0;
-      totalBaseCost += baseCost;
-      byModelMap.set(row.model, (byModelMap.get(row.model) ?? 0) + baseCost);
+    const monthStart = new Date(now.getFullYear(), now.getMonth(), 1);
+    const monthStats = await fetchByokUsageWindow(supabase, profileId, monthStart, now);
+    if (hasAnyByokUsage(monthStats)) {
+      return {
+        ...monthStats,
+        periodStart: monthStart.toISOString(),
+        periodEnd: now.toISOString(),
+        periodSource: "month"
+      };
     }
-    const byModel = Array.from(byModelMap.entries()).map(([model, cost]) => ({ model, cost })).sort((a, b) => b.cost - a.cost);
+    const trailingStart = new Date(now.getTime() - 30 * 24 * 60 * 60 * 1e3);
+    const trailingStats = await fetchByokUsageWindow(supabase, profileId, trailingStart, now);
     return {
-      totalInputTokens,
-      totalOutputTokens,
-      totalBaseCost,
-      byModel,
-      periodStart: periodStart.toISOString(),
-      periodEnd: periodEnd.toISOString(),
-      periodSource: profile.current_period_start ? "profile_period" : "month"
+      ...trailingStats,
+      periodStart: trailingStart.toISOString(),
+      periodEnd: now.toISOString(),
+      periodSource: "profile_period"
     };
   } catch {
     return null;
   }
 }
+async function resolveProfileIdForUsage(supabase, authId) {
+  const { data: byAuthRaw } = await supabase.from("user_profiles").select("id").eq("auth_id", authId).maybeSingle();
+  const byAuth = byAuthRaw;
+  if (byAuth?.id) {
+    return byAuth.id;
+  }
+  const { data: byProfileRaw } = await supabase.from("user_profiles").select("id").eq("id", authId).maybeSingle();
+  const byProfile = byProfileRaw;
+  return byProfile?.id ?? null;
+}
+async function fetchByokUsageWindow(supabase, profileId, start2, end) {
+  const { data: rawUsageRows } = await supabase.from("token_usage").select("model, input_tokens, output_tokens, base_cost, total_cents, marked_up_cost").eq("user_id", profileId).gte("created_at", start2.toISOString()).lte("created_at", end.toISOString());
+  const usageRows = rawUsageRows;
+  let totalInputTokens = 0;
+  let totalOutputTokens = 0;
+  let totalBaseCost = 0;
+  const byModelMap = /* @__PURE__ */ new Map();
+  for (const row of usageRows ?? []) {
+    totalInputTokens += row.input_tokens ?? 0;
+    totalOutputTokens += row.output_tokens ?? 0;
+    const baseCost = typeof row.base_cost === "number" ? row.base_cost : typeof row.total_cents === "number" ? row.total_cents / 100 : typeof row.marked_up_cost === "number" ? row.marked_up_cost : 0;
+    totalBaseCost += baseCost;
+    byModelMap.set(row.model, (byModelMap.get(row.model) ?? 0) + baseCost);
+  }
+  const byModel = Array.from(byModelMap.entries()).map(([model, cost]) => ({ model, cost })).sort((a, b) => b.cost - a.cost);
+  return {
+    totalInputTokens,
+    totalOutputTokens,
+    totalBaseCost,
+    byModel
+  };
+}
+function hasAnyByokUsage(stats) {
+  return stats.totalInputTokens > 0 || stats.totalOutputTokens > 0 || stats.totalBaseCost > 0 || stats.byModel.length > 0;
+}
 async function fetchCreditsUsageStatsFromSupabase(accessToken, authId) {
   try {
     const { SUPABASE_URL: SUPABASE_URL2, SUPABASE_ANON_KEY: SUPABASE_ANON_KEY2 } = await import("./constants-XDIWFFPN.js");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "archondev",
-  "version": "2.19.53",
+  "version": "2.19.54",
   "description": "Local-first AI-powered development governance system",
   "main": "dist/index.js",
   "bin": {