burnwatch 0.14.0 → 0.14.1

package/dist/cli.js

@@ -639,9 +639,9 @@ var anthropicConnector = {
   async fetchSpend(apiKey) {
     const now = /* @__PURE__ */ new Date();
     const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1);
-    const startDate = startOfMonth.toISOString().split("T")[0];
-    const endDate = now.toISOString().split("T")[0];
-    const url3 = `https://api.anthropic.com/v1/organizations/usage?start_date=${startDate}&end_date=${endDate}`;
+    const startingAt = startOfMonth.toISOString();
+    const endingAt = now.toISOString();
+    const url3 = `https://api.anthropic.com/v1/organizations/cost_report?starting_at=${encodeURIComponent(startingAt)}&ending_at=${encodeURIComponent(endingAt)}&bucket_width=1m`;
     const result = await fetchJson(url3, {
       headers: {
         "x-api-key": apiKey,
@@ -654,17 +654,18 @@ var anthropicConnector = {
         spend: 0,
         isEstimate: true,
         tier: "est",
-        error: result.error ?? "Failed to fetch Anthropic usage"
+        error: result.error ?? "Failed to fetch Anthropic cost report"
       };
     }
     let totalSpend = 0;
-    if (result.data.total_cost_usd !== void 0) {
-      totalSpend = result.data.total_cost_usd;
-    } else if (result.data.data) {
-      totalSpend = result.data.data.reduce(
-        (sum, entry) => sum + (entry.total_cost_usd ?? entry.spend ?? 0),
-        0
-      );
+    if (result.data.data) {
+      for (const bucket of result.data.data) {
+        if (bucket.results) {
+          for (const entry of bucket.results) {
+            totalSpend += entry.cost_usd ?? 0;
+          }
+        }
+      }
     }
     return {
       serviceId: "anthropic",
@@ -1094,24 +1095,33 @@ function formatBrief(brief) {
   lines.push(formatRow("Service", "Spend", "Conf", "Budget", "Left"));
   lines.push(`\u2551  ${hrThin}`);
   for (const svc of brief.services.filter((s) => s.tier !== "excluded")) {
-    const spendStr = svc.tier === "blind" && svc.spend === 0 ? "\u2014" : svc.isEstimate ? `~$${svc.spend.toFixed(2)}` : `$${svc.spend.toFixed(2)}`;
+    const spendStr = formatSpendValue(svc);
     const badge = CONFIDENCE_BADGES[svc.tier];
     const budgetStr = svc.budget ? `$${svc.budget}` : "\u2014";
     const leftStr = formatLeft(svc);
     lines.push(formatRow(svc.serviceId, spendStr, badge, budgetStr, leftStr));
     if (svc.allowance) {
       const usedStr = formatCompact(svc.allowance.used);
-      const totalStr2 = formatCompact(svc.allowance.included);
+      const totalStr = formatCompact(svc.allowance.included);
       const pctStr = svc.allowance.percent.toFixed(0);
       const warn = svc.allowance.percent >= 75 ? " \u26A0\uFE0F" : "";
-      lines.push(`\u2551    \u21B3 ${usedStr}/${totalStr2} ${svc.allowance.unitName} (${pctStr}%)${warn}`);
+      lines.push(`\u2551    \u21B3 ${usedStr}/${totalStr} ${svc.allowance.unitName} (${pctStr}%)${warn}`);
     }
   }
   lines.push(`\u2560${hr}`);
-  const totalStr = brief.totalIsEstimate ? `~$${brief.totalSpend.toFixed(2)}` : `$${brief.totalSpend.toFixed(2)}`;
+  const parts = [];
+  if (brief.liveSpend > 0) {
+    parts.push(`Spend: $${brief.liveSpend.toFixed(2)}`);
+  }
+  if (brief.planCostTotal > 0) {
+    parts.push(`Plans: $${brief.planCostTotal.toFixed(0)}/mo`);
+  }
+  if (parts.length === 0) {
+    parts.push(`$${brief.totalSpend.toFixed(2)}`);
+  }
   const marginStr = brief.estimateMargin > 0 ? `  Est margin: \xB1$${brief.estimateMargin.toFixed(0)}` : "";
   const untrackedStr = brief.untrackedCount > 0 ? `No billing data: ${brief.untrackedCount} \u26A0\uFE0F` : `All tracked \u2705`;
-  lines.push(`\u2551  TOTAL: ${totalStr}   ${untrackedStr}${marginStr}`);
+  lines.push(`\u2551  ${parts.join("  |  ")}   ${untrackedStr}${marginStr}`);
   for (const alert of brief.alerts) {
     const icon = alert.severity === "critical" ? "\u{1F6A8}" : "\u26A0\uFE0F";
     lines.push(`\u2551  ${icon}  ${alert.message}`);
@@ -1126,11 +1136,18 @@ function buildBrief(projectName, snapshots, blindCount) {
     year: "numeric"
   });
   let totalSpend = 0;
+  let liveSpend = 0;
+  let planCostTotal = 0;
   let hasEstimates = false;
   let estimateMargin = 0;
   const alerts = [];
   for (const snap of snapshots) {
     totalSpend += snap.spend;
+    if (snap.isPlanCost) {
+      planCostTotal += snap.spend;
+    } else if (snap.tier === "live") {
+      liveSpend += snap.spend;
+    }
     if (snap.isEstimate) {
       hasEstimates = true;
       estimateMargin += snap.spend * 0.15;
@@ -1167,6 +1184,8 @@ function buildBrief(projectName, snapshots, blindCount) {
     period,
     services: snapshots,
     totalSpend,
+    liveSpend,
+    planCostTotal,
     totalIsEstimate: hasEstimates,
     estimateMargin,
     untrackedCount: blindCount,
@@ -1176,6 +1195,12 @@ function buildBrief(projectName, snapshots, blindCount) {
 function formatRow(service, spend, conf, budget, left) {
   return `\u2551  ${service.padEnd(14)} ${spend.padEnd(11)} ${conf.padEnd(9)} ${budget.padEnd(7)} ${left}`;
 }
+function formatSpendValue(svc) {
+  if (svc.tier === "blind" && svc.spend === 0) return "\u2014";
+  if (svc.isPlanCost) return `$${svc.spend.toFixed(0)}/mo`;
+  if (svc.isEstimate) return `~$${svc.spend.toFixed(2)}`;
+  return `$${svc.spend.toFixed(2)}`;
+}
 function formatLeft(snap) {
   if (!snap.budget) return "\u2014";
   if (snap.status === "over") return "\u26A0\uFE0F OVER";
@@ -1189,6 +1214,7 @@ function buildSnapshot(serviceId, tier, spend, budget, allowanceData, isEstimate
   if (isNaN(spend) || !isFinite(spend)) spend = 0;
   if (budget !== void 0 && (isNaN(budget) || !isFinite(budget))) budget = void 0;
   const isEstimate = isEstimateOverride ?? (tier === "est" || tier === "calc");
+  const isPlanCost = tier === "calc" && isFlatPlan === true;
   const budgetPercent = budget && budget > 0 ? spend / budget * 100 : void 0;
   let status = "unknown";
   let statusLabel = tier === "blind" ? "needs API key" : "no budget";
@@ -1229,6 +1255,7 @@ function buildSnapshot(serviceId, tier, spend, budget, allowanceData, isEstimate
     serviceId,
     spend,
     isEstimate,
+    isPlanCost,
     tier,
     budget,
     budgetPercent,
@@ -1626,6 +1653,31 @@ async function runInteractiveInit(detected) {
       } else {
         tracked2.budget = defaultBudget;
       }
+      if (tracked2.budget > 0 && tracked2.budget !== (chosen.monthlyBase ?? 0)) {
+        const betterPlan = plans.find(
+          (p) => p !== chosen && p.type !== "exclude" && p.monthlyBase === tracked2.budget
+        );
+        if (betterPlan) {
+          const switchAnswer = await ask(
+            rl,
+            `  Budget matches "${betterPlan.name}" \u2014 switch to that plan? [Y/n]: `
+          );
+          if (!switchAnswer || switchAnswer.toLowerCase() !== "n") {
+            chosen = betterPlan;
+            tracked2.planName = betterPlan.name;
+            if (betterPlan.type === "flat" && betterPlan.monthlyBase !== void 0) {
+              tracked2.planCost = betterPlan.monthlyBase;
+            }
+            if (betterPlan.includedUnits !== void 0 && betterPlan.unitName) {
+              tracked2.allowance = {
+                included: betterPlan.includedUnits,
+                unitName: betterPlan.unitName
+              };
+            }
+            console.log(`  -> Switched to ${betterPlan.name}`);
+          }
+        }
+      }
       services[service.id] = tracked2;
       const tierLabel = tracked2.hasApiKey ? "LIVE" : tracked2.planCost !== void 0 ? "CALC" : "BLIND";
       const allowanceStr = tracked2.allowance ? ` | ${formatUnits(tracked2.allowance.included)} ${tracked2.allowance.unitName}` : "";