From f294a8638c206c8f2437cd6d0bdcab84fb350c3f Mon Sep 17 00:00:00 2001
From: Addison LeClair <me@addi.lol>
Date: Fri, 30 Oct 2026 16:58:34 +0000
Subject: [PATCH] fix: drain usage sync backlog and stop starving failed
 retries

---
 .../src/lib/server/billing/metering.ts        | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/apps/dashboard/src/lib/server/billing/metering.ts b/apps/dashboard/src/lib/server/billing/metering.ts
index 4f1149f9..ed01974d 100644
--- a/apps/dashboard/src/lib/server/billing/metering.ts
+++ b/apps/dashboard/src/lib/server/billing/metering.ts
@@ -1,4 +1,4 @@
-import { and, asc, eq, inArray, isNotNull, isNull, lt, ne, or, sql } from 'drizzle-orm';
+import { and, asc, eq, inArray, isNotNull, isNull, lt, ne, or } from 'drizzle-orm';
 import { organization } from '#lib/server/db/auth.schema.js';
 import { initDrizzle } from '#lib/server/db/index.js';
 import {
@@ -738,6 +738,17 @@ async function ensureEventTarget(
 	return 'ready';
 }
 
+function isDuplicateIdempotencyKey(err: unknown) {
+	return (
+		autumnStatus(err) === 409 &&
+		typeof err === 'object' &&
+		err !== null &&
+		'body' in err &&
+		typeof err.body === 'string' &&
+		err.body.includes('duplicate_idempotency_key')
+	);
+}
+
 async function trackUsageEvent(event: BillingUsageEvent) {
 	if (!isBillingConfigured()) {
 		await markUsageEventSynced(event.id);
@@ -774,6 +785,10 @@ async function trackUsageEvent(event: BillingUsageEvent) {
 			await markUsageEventAbandoned(event.id, formatAutumnError(err));
 			return 'abandoned' as const;
 		}
+		if (isDuplicateIdempotencyKey(err)) {
+			await markUsageEventSynced(event.id);
+			return 'synced' as const;
+		}
 		await markUsageEventFailed(event.id, formatAutumnError(err));
 		return 'failed' as const;
 	}
@@ -870,17 +885,14 @@ async function abandonStaleFailedEvents(now: number) {
 	return stale.length;
 }
 
-export async function syncPendingUsage(limit = 50) {
+export async function syncPendingUsage(limit = 400) {
 	const db = initDrizzle();
 	const expired = await abandonStaleFailedEvents(Date.now());
 	const events = await db
 		.select()
 		.from(billingUsageEvents)
 		.where(inArray(billingUsageEvents.syncStatus, ['pending', 'failed']))
-		.orderBy(
-			sql`case when ${billingUsageEvents.syncStatus} = 'pending' then 0 else 1 end`,
-			asc(billingUsageEvents.createdAt)
-		)
+		.orderBy(asc(billingUsageEvents.createdAt))
 		.limit(limit);
 
 	const { synced, failed, abandoned } = await syncUsageEvents(events);
@@ -899,10 +911,7 @@ export async function syncProjectUsage(projectId: string, limit = 50) {
 				inArray(billingUsageEvents.syncStatus, ['pending', 'failed'])
 			)
 		)
-		.orderBy(
-			sql`case when ${billingUsageEvents.syncStatus} = 'pending' then 0 else 1 end`,
-			asc(billingUsageEvents.createdAt)
-		)
+		.orderBy(asc(billingUsageEvents.createdAt))
 		.limit(limit);
 
 	const { synced, failed, abandoned } = await syncUsageEvents(events);