archondev 2.19.49 → 2.19.50

package/dist/{chunk-O22UMAM5.js → chunk-TXUHANIN.js}

@@ -5071,11 +5071,17 @@ ${conflictReport.blockerCount} blocking conflict(s) found.`));
     const config = await loadConfig();
     let billingContext;
     if (config.userId && config.accessToken) {
+      const profileId = await resolveProfileId(config.userId, config.accessToken);
+      if (!profileId) {
+        console.log(chalk2.dim("Billing context unavailable: could not resolve profile ID. Usage tracking skipped for this execution."));
+      }
       const supabase = createAuthedSupabaseClient(SUPABASE_URL, SUPABASE_ANON_KEY, config.accessToken);
-      billingContext = {
-        userId: config.userId,
-        supabase
-      };
+      if (profileId) {
+        billingContext = {
+          userId: profileId,
+          supabase
+        };
+      }
     }
     const roleOverrides = await loadRoleOverrides(cwd);
     const executorConfig = roleOverrides?.executor?.model ? { model: roleOverrides.executor.model } : void 0;
@@ -5284,6 +5290,19 @@ Running quality gates for ${targetEnvName}...`));
     prompt.close();
   }
 }
+async function resolveProfileId(authId, accessToken) {
+  try {
+    const supabase = createAuthedSupabaseClient(SUPABASE_URL, SUPABASE_ANON_KEY, accessToken);
+    const { data: rawData, error } = await supabase.from("user_profiles").select("id").eq("auth_id", authId).single();
+    const data = rawData;
+    if (error || !data?.id) {
+      return null;
+    }
+    return data.id;
+  } catch {
+    return null;
+  }
+}
 function printExecuteNextActions(atomExternalId, success, context = "generic") {
   console.log();
   console.log(chalk2.bold("Next best action:"));

package/dist/{execute-AQWHZKDH.js → execute-QQ3OPP6H.js}

@@ -1,6 +1,6 @@
 import {
   execute
-} from "./chunk-O22UMAM5.js";
+} from "./chunk-TXUHANIN.js";
 import "./chunk-EBHHIUCB.js";
 import "./chunk-RH64CSQU.js";
 import "./chunk-WGLVDEZC.js";

package/dist/index.js

@@ -56,7 +56,7 @@ import {
   EnvironmentConfigLoader,
   EnvironmentValidator,
   execute
-} from "./chunk-O22UMAM5.js";
+} from "./chunk-TXUHANIN.js";
 import {
   cloudCancel,
   cloudLogs,
@@ -2843,7 +2843,15 @@ async function start(options = {}) {
   }
   if (currentTier === "BYOK" && config.accessToken) {
     try {
+      const resolvedAuthId = await resolveAuthIdFromToken(config.accessToken, config.userId);
       let usageStats = await fetchByokUsageStats(config.accessToken);
+      const apiLooksEmpty = !!usageStats && usageStats.totalInputTokens === 0 && usageStats.totalOutputTokens === 0 && usageStats.totalBaseCost === 0 && usageStats.byModel.length === 0;
+      if (!usageStats || apiLooksEmpty && resolvedAuthId) {
+        const supabaseStats = resolvedAuthId ? await fetchByokUsageStatsFromSupabase(config.accessToken, resolvedAuthId) : null;
+        if (supabaseStats) {
+          usageStats = supabaseStats;
+        }
+      }
       const usageStatsUnavailable = !usageStats;
       if (!usageStats) {
         usageStats = {
@@ -3094,6 +3102,48 @@ async function fetchByokUsageStats(accessToken) {
     return null;
   }
 }
+async function fetchByokUsageStatsFromSupabase(accessToken, authId) {
+  try {
+    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) {
+      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 byModel = Array.from(byModelMap.entries()).map(([model, cost]) => ({ model, cost })).sort((a, b) => b.cost - a.cost);
+    return {
+      totalInputTokens,
+      totalOutputTokens,
+      totalBaseCost,
+      byModel,
+      periodStart: periodStart.toISOString(),
+      periodEnd: periodEnd.toISOString(),
+      periodSource: profile.current_period_start ? "profile_period" : "month"
+    };
+  } catch {
+    return null;
+  }
+}
 async function fetchCreditsUsageStatsFromSupabase(accessToken, authId) {
   try {
     const { SUPABASE_URL: SUPABASE_URL2, SUPABASE_ANON_KEY: SUPABASE_ANON_KEY2 } = await import("./constants-XDIWFFPN.js");
@@ -4224,7 +4274,7 @@ async function continueWithCurrentTask(cwd, options = {}) {
     const bTime = new Date(String(b.updatedAt ?? b.createdAt ?? "")).getTime() || 0;
     return bTime - aTime;
   };
-  const { execute: execute2 } = await import("./execute-AQWHZKDH.js");
+  const { execute: execute2 } = await import("./execute-QQ3OPP6H.js");
   const runAllReady = options.runAllReady === true;
   const scopeIds = options.onlyAtomIds ? new Set(options.onlyAtomIds) : null;
   const attempted = /* @__PURE__ */ new Set();
@@ -4639,7 +4689,7 @@ async function executeNext() {
   const atomId = await prompt("Enter atom ID to execute (or press Enter for first pending)");
   const targetId = atomId.trim() || pendingAtoms[0]?.id;
   if (targetId) {
-    const { execute: execute2 } = await import("./execute-AQWHZKDH.js");
+    const { execute: execute2 } = await import("./execute-QQ3OPP6H.js");
     await execute2(targetId, {});
   } else {
     console.log(chalk6.yellow("No atom to execute."));

package/package.json

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