Revert "feat: 🎸 stripe managed payments"

2026-06-09 17:20:48 +01:00
parent b9110f69fb
commit 68d50c5522
39 changed files with 573 additions and 709 deletions
--- a/.superset/config.json
+++ b/.superset/config.json
@@ -1,5 +1,5 @@
 {
-	"setup": ["bun i", "bun dw setup"],
+	"setup": ["bun dw setup"],
 	"run": ["bun dw run"],
 	"teardown": ["bun dw teardown"]
 }
--- a/apps/sdk-test/package.json
+++ b/apps/sdk-test/package.json
@@ -1,43 +1,43 @@
 {
-	"name": "sdk-test",
-	"version": "0.1.0",
-	"private": true,
-	"scripts": {
-		"atmn": "bunx atmn",
-		"dev": "infisical run --recursive --env=dev -- next dev -p 3002",
-		"build": "next build",
-		"start": "next start",
-		"lint": "biome check",
-		"format": "biome format --write",
-		"typecheck": "tsc -p tsconfig.check.json --noEmit --skipLibCheck"
-	},
-	"dependencies": {
-		"atmn": "workspace:*",
-		"autumn-js": "workspace:*",
-		"better-auth": "catalog:",
-		"kysely": "^0.28.11",
-		"next": "16.2.6",
-		"pg": "^8.18.0",
-		"radix-ui": "^1.4.3",
-		"react": "19.2.3",
-		"react-dom": "19.2.3"
-	},
-	"devDependencies": {
-		"@biomejs/biome": "2.2.0",
-		"@tailwindcss/postcss": "^4",
-		"@types/node": "^20",
-		"@types/pg": "^8.16.0",
-		"@types/react": "^19",
-		"@types/react-dom": "^19",
-		"tailwindcss": "^4",
-		"typescript": "^5"
-	},
-	"ignoreScripts": [
-		"sharp",
-		"unrs-resolver"
-	],
-	"trustedDependencies": [
-		"sharp",
-		"unrs-resolver"
-	]
+  "name": "sdk-test",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "atmn": "bunx atmn",
+    "dev": "infisical run --recursive --env=dev -- next dev -p 3002",
+    "build": "next build",
+    "start": "next start",
+    "lint": "biome check",
+    "format": "biome format --write",
+    "typecheck": "tsc -p tsconfig.check.json --noEmit --skipLibCheck"
+  },
+  "dependencies": {
+    "atmn": "workspace:*",
+    "autumn-js": "workspace:*",
+    "better-auth": "catalog:",
+    "kysely": "^0.28.11",
+    "next": "16.1.6",
+    "pg": "^8.18.0",
+    "radix-ui": "^1.4.3",
+    "react": "19.2.3",
+    "react-dom": "19.2.3"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "2.2.0",
+    "@tailwindcss/postcss": "^4",
+    "@types/node": "^20",
+    "@types/pg": "^8.16.0",
+    "@types/react": "^19",
+    "@types/react-dom": "^19",
+    "tailwindcss": "^4",
+    "typescript": "^5"
+  },
+  "ignoreScripts": [
+    "sharp",
+    "unrs-resolver"
+  ],
+  "trustedDependencies": [
+    "sharp",
+    "unrs-resolver"
+  ]
 }
--- a/apps/website/package.json
+++ b/apps/website/package.json
@@ -21,7 +21,7 @@
 		"lottie-react": "^2.4.1",
 		"lottie-web": "^5.13.0",
 		"motion": "^12.38.0",
-		"next": "16.2.6",
+		"next": "16.2.4",
 		"ngrok": "^5.0.0-beta.2",
 		"react": "19.2.4",
 		"react-dom": "19.2.4",
--- a/bun.lock
+++ b/bun.lock
--- a/package.json
+++ b/package.json
@@ -25,10 +25,10 @@
 			"packages/stripe-sync"
 		],
 		"catalog": {
-			"stripe": "22.1.0",
+			"stripe": "19.3.0-beta.1",
 			"drizzle-orm": "0.43.1",
 			"drizzle-kit": "^0.31.1",
-			"@typescript/native-preview": "7.0.0-dev.20260527.2",
+			"@typescript/native-preview": "7.0.0-dev.20260220.1",
 			"@tailwindcss/vite": "4.2.1",
 			"@vitejs/plugin-react": "5.2.0",
 			"@sentry/bun": "10.38.0",
--- a/packages/autumn-js/package.json
+++ b/packages/autumn-js/package.json
@@ -108,7 +108,7 @@
 		"@useautumn/sdk": "workspace:*",
 		"esbuild-plugin-path-alias": "^1.0.7",
 		"hono": "4.12.7",
-		"next": "^15.5.18",
+		"next": "^15.2.3",
 		"react-dom": "^19.1.0",
 		"tsup": "^8.4.0",
 		"typescript": "^5.8.3"
--- a/server/package.json
+++ b/server/package.json
@@ -88,7 +88,7 @@
 		"@trigger.dev/sdk": "4.4.6",
 		"@types/qs": "^6.14.0",
 		"@types/semver": "^7.7.1",
-		"@typescript/native-preview": "^7.0.0-dev.20260527.2",
+		"@typescript/native-preview": "^7.0.0-dev.20251114.1",
 		"@upstash/ratelimit": "^2.0.7",
 		"@upstash/redis": "^1.35.6",
 		"@vercel/sdk": "^1.17.0",
--- a/server/src/external/stripe/stripeSubUtils/getSubItemAmount.ts
+++ b/server/src/external/stripe/stripeSubUtils/getSubItemAmount.ts
@@ -13,7 +13,7 @@ const calculateTieredAmount = ({
 	let quantityCursor = quantity;
 	for (const tier of tiers) {
 		const unitAmount = new Decimal(
-			tier.unit_amount_decimal?.toString() ?? tier.unit_amount ?? 0,
+			tier.unit_amount_decimal || tier.unit_amount!,
 		);

 		if (notNullish(tier.up_to)) {
@@ -54,9 +54,7 @@ export const getSubItemAmount = ({

 	if (price.billing_scheme === "per_unit") {
 		if (price.unit_amount_decimal) {
-			return new Decimal(price.unit_amount_decimal.toString())
-				.mul(quantity)
-				.toNumber();
+			return new Decimal(price.unit_amount_decimal).mul(quantity).toNumber();
 		} else {
 			return new Decimal(price.unit_amount || 0).mul(quantity).toNumber();
 		}
--- a/server/src/honoMiddlewares/errorSkipMiddleware.ts
+++ b/server/src/honoMiddlewares/errorSkipMiddleware.ts
@@ -258,7 +258,7 @@ export const handleErrorSkip = (err: Error, c: Context<HonoEnv>) => {
 	// 4. Check Stripe-specific rules
 	for (const rule of STRIPE_RULES) {
 		if (rule.match(err, c)) {
-			const stripeErr = err as Stripe.ErrorType.StripeError;
+			const stripeErr = err as Stripe.errors.StripeError;
 			logger.warn(`${rule.name}, org: ${ctx.org?.slug || "unknown"}`);
 			return createErrorResponse({
 				c,
--- a/server/src/internal/admin/handleGetMasterStripeAccount.ts
+++ b/server/src/internal/admin/handleGetMasterStripeAccount.ts
@@ -1,5 +1,5 @@
-import { Scopes } from "@autumn/shared";
 import { initMasterStripe } from "@/external/connect/initStripeCli";
+import { Scopes } from "@autumn/shared";
 import { createRoute } from "../../honoMiddlewares/routeHandler";

 export const handleGetMasterStripeAccount = createRoute({
@@ -10,7 +10,7 @@ export const handleGetMasterStripeAccount = createRoute({

 		try {
 			const masterStripe = initMasterStripe({ env });
-			const account = await masterStripe.accounts.retrieve(null);
+			const account = await masterStripe.accounts.retrieve();

 			return c.json({
 				id: account.id,
--- a/server/src/internal/billing/v2/providers/stripe/actionBuilders/buildStripeCheckoutSessionAction.ts
+++ b/server/src/internal/billing/v2/providers/stripe/actionBuilders/buildStripeCheckoutSessionAction.ts
@@ -10,7 +10,6 @@ import type { AutumnContext } from "@/honoUtils/HonoEnv";
 import { buildStripeCheckoutSessionItems } from "@/internal/billing/v2/providers/stripe/utils/checkoutSessions/buildStripeCheckoutSessionItems";
 import { buildAutumnSubscriptionMetadata } from "@/internal/billing/v2/providers/stripe/utils/common/autumnStripeMetadata";
 import { stripeDiscountsToCheckoutParams } from "@/internal/billing/v2/providers/stripe/utils/discounts/stripeDiscountsToParams";
-import type { Checkout as CheckoutSessions } from "stripe/resources/Checkout/Sessions.js";

 export const buildStripeCheckoutSessionAction = ({
 	ctx,
@@ -46,11 +45,11 @@ export const buildStripeCheckoutSessionAction = ({
 	// Payment-mode checkout has no top-level default_tax_rates, so one-off items take per-line tax_rates.
 	const taxRateId = billingContext.taxRateId;
 	const applyTaxRateToLineItem = (
-		item: CheckoutSessions.SessionCreateParams.LineItem,
-	): CheckoutSessions.SessionCreateParams.LineItem =>
+		item: Stripe.Checkout.SessionCreateParams.LineItem,
+	): Stripe.Checkout.SessionCreateParams.LineItem =>
 		taxRateId ? { ...item, tax_rates: [taxRateId] } : item;

-	const lineItems: CheckoutSessions.SessionCreateParams.LineItem[] = [
+	const lineItems: Stripe.Checkout.SessionCreateParams.LineItem[] = [
 		...recurringLineItems.filter((item) => item.quantity !== 0),
 		...oneOffLineItems
 			.filter((item) => item.quantity !== 0)
@@ -65,7 +64,7 @@ export const buildStripeCheckoutSessionAction = ({

 	// 5. Build subscription_data (only for subscription mode)
 	const subscriptionData:
-		| CheckoutSessions.SessionCreateParams.SubscriptionData
+		| Stripe.Checkout.SessionCreateParams.SubscriptionData
 		| undefined =
 		mode === "subscription"
 			? {
@@ -89,7 +88,7 @@ export const buildStripeCheckoutSessionAction = ({

 	// 7. Build params. Tax policy is baked in here (not at execute time) so
 	// the action object is self-describing in logs/EXTRA_LOGS.
-	const autumnAutoTax: Partial<CheckoutSessions.SessionCreateParams> = org.config
+	const autumnAutoTax: Partial<Stripe.Checkout.SessionCreateParams> = org.config
 		.automatic_tax
 		? {
 				automatic_tax: { enabled: true },
@@ -99,7 +98,7 @@ export const buildStripeCheckoutSessionAction = ({
 			}
 		: {};

-	const params: CheckoutSessions.SessionCreateParams = {
+	const params: Stripe.Checkout.SessionCreateParams = {
 		customer: stripeCustomer?.id ?? "none",
 		mode,
 		line_items: lineItems,
@@ -113,6 +112,6 @@ export const buildStripeCheckoutSessionAction = ({
 		type: "create",
 		params,
 		checkoutSessionParams:
-			checkoutSessionParams as Partial<CheckoutSessions.SessionCreateParams>,
+			checkoutSessionParams as Partial<Stripe.Checkout.SessionCreateParams>,
 	};
 };
--- a/server/src/internal/billing/v2/providers/stripe/utils/checkoutSessions/buildCheckoutSessionParams.ts
+++ b/server/src/internal/billing/v2/providers/stripe/utils/checkoutSessions/buildCheckoutSessionParams.ts
@@ -1,7 +1,6 @@
 import type Stripe from "stripe";
 import { mergeStripeMetadata } from "@/internal/billing/v2/providers/stripe/utils/common/mergeStripeMetadata";
 import { buildCheckoutSessionMetadata } from "./buildCheckoutSessionMetadata";
-import type { Checkout as CheckoutSessions } from "stripe/resources/Checkout/Sessions.js";

 /**
 * Deep-merges subscription_data so user-provided fields (e.g. metadata)
@@ -13,9 +12,9 @@ const mergeSubscriptionData = ({
 	userSubscriptionData,
 }: {
 	userMetadata?: Record<string, string>;
-	paramsSubscriptionData?: CheckoutSessions.SessionCreateParams.SubscriptionData;
-	userSubscriptionData?: CheckoutSessions.SessionCreateParams.SubscriptionData;
-}): CheckoutSessions.SessionCreateParams.SubscriptionData | undefined => {
+	paramsSubscriptionData?: Stripe.Checkout.SessionCreateParams.SubscriptionData;
+	userSubscriptionData?: Stripe.Checkout.SessionCreateParams.SubscriptionData;
+}): Stripe.Checkout.SessionCreateParams.SubscriptionData | undefined => {
 	if (!paramsSubscriptionData && !userSubscriptionData && !userMetadata) {
 		return undefined;
 	}
@@ -42,16 +41,16 @@ export const buildCheckoutSessionParams = ({
 	autumnMetadataId,
 	userMetadata,
 }: {
-	params: CheckoutSessions.SessionCreateParams;
-	checkoutSessionParams?: Partial<CheckoutSessions.SessionCreateParams>;
+	params: Stripe.Checkout.SessionCreateParams;
+	checkoutSessionParams?: Partial<Stripe.Checkout.SessionCreateParams>;
 	currency?: string;
 	defaultAllowPromotionCodes?: boolean;
-	defaultInvoiceCreation?: CheckoutSessions.SessionCreateParams.InvoiceCreation;
-	defaultSavedPaymentMethodOptions?: CheckoutSessions.SessionCreateParams.SavedPaymentMethodOptions;
+	defaultInvoiceCreation?: Stripe.Checkout.SessionCreateParams.InvoiceCreation;
+	defaultSavedPaymentMethodOptions?: Stripe.Checkout.SessionCreateParams.SavedPaymentMethodOptions;
 	autumnMetadataId?: string;
 	userMetadata?: Record<string, string>;
-}): CheckoutSessions.SessionCreateParams => {
-	const mergedParams: CheckoutSessions.SessionCreateParams = {
+}): Stripe.Checkout.SessionCreateParams => {
+	const mergedParams: Stripe.Checkout.SessionCreateParams = {
 		...(checkoutSessionParams ?? {}),
 		...params,
 	};
@@ -84,11 +83,11 @@ export const buildCheckoutSessionParams = ({
 				: mergeSubscriptionData({
 						userMetadata,
 						paramsSubscriptionData: params.subscription_data as
-							| CheckoutSessions.SessionCreateParams.SubscriptionData
+							| Stripe.Checkout.SessionCreateParams.SubscriptionData
 							| undefined,
 						userSubscriptionData:
 							checkoutSessionParams?.subscription_data as
-								| CheckoutSessions.SessionCreateParams.SubscriptionData
+								| Stripe.Checkout.SessionCreateParams.SubscriptionData
 								| undefined,
 					}),
 	};
--- a/server/src/internal/billing/v2/providers/stripe/utils/checkoutSessions/buildStripeCheckoutSessionItems.ts
+++ b/server/src/internal/billing/v2/providers/stripe/utils/checkoutSessions/buildStripeCheckoutSessionItems.ts
@@ -6,7 +6,7 @@ import {
 	priceUtils,
 	type StripeItemSpec,
 } from "@autumn/shared";
-import type { Checkout as CheckoutSessions } from "stripe/resources/Checkout/Sessions.js";
+import type Stripe from "stripe";
 import type { AutumnContext } from "@/honoUtils/HonoEnv";
 import { customerProductsToOneOffStripeItemSpecs } from "@/internal/billing/v2/providers/stripe/utils/stripeItemSpec/customerProductsToOneOffStripeItemSpecs";
 import { customerProductsToRecurringStripeItemSpecs } from "@/internal/billing/v2/providers/stripe/utils/stripeItemSpec/customerProductsToRecurringStripeItemSpecs";
@@ -17,13 +17,13 @@ import { updateOneOffTieredItems } from "./updateOneOffTieredItems";
 const isZeroAmountInlineLineItem = ({
 	lineItem,
 }: {
-	lineItem: CheckoutSessions.SessionCreateParams.LineItem;
+	lineItem: Stripe.Checkout.SessionCreateParams.LineItem;
 }) => {
 	if (!("price_data" in lineItem) || !lineItem.price_data) return false;

 	return (
 		lineItem.price_data.unit_amount === 0 ||
-		lineItem.price_data.unit_amount_decimal?.toNumber() === 0
+		lineItem.price_data.unit_amount_decimal === "0"
 	);
 };

@@ -34,7 +34,7 @@ const isZeroAmountInlineRecurringStripeItemSpec = ({
 }) => {
 	if (!stripeItemSpec.stripeInlinePrice?.recurring) return false;

-	return stripeItemSpec.stripeInlinePrice.unit_amount_decimal.toNumber() === 0;
+	return stripeItemSpec.stripeInlinePrice.unit_amount_decimal === "0";
 };

 const getRecurringCadenceKey = ({
@@ -94,10 +94,10 @@ const applyAdjustableQuantityToPrepaidLineItem = ({
 	spec,
 	billingContext,
 }: {
-	lineItem: CheckoutSessions.SessionCreateParams.LineItem;
+	lineItem: Stripe.Checkout.SessionCreateParams.LineItem;
 	spec: StripeItemSpec;
 	billingContext: BillingContext;
-}): CheckoutSessions.SessionCreateParams.LineItem => {
+}): Stripe.Checkout.SessionCreateParams.LineItem => {
 	const { autumnPrice, autumnEntitlement, autumnProduct } = spec;

 	if (!autumnPrice || !autumnEntitlement || !isPrepaidPrice(autumnPrice)) {
@@ -132,7 +132,7 @@ const applyAdjustableQuantityToPrepaidLineItem = ({
 			}),
 			maximum: 999999,
 		},
-	} as CheckoutSessions.SessionCreateParams.LineItem;
+	} as Stripe.Checkout.SessionCreateParams.LineItem;
 };

 export const buildStripeCheckoutSessionItems = ({
@@ -144,8 +144,8 @@ export const buildStripeCheckoutSessionItems = ({
 	billingContext: BillingContext;
 	newCustomerProducts: FullCusProduct[];
 }): {
-	recurringLineItems: CheckoutSessions.SessionCreateParams.LineItem[];
-	oneOffLineItems: CheckoutSessions.SessionCreateParams.LineItem[];
+	recurringLineItems: Stripe.Checkout.SessionCreateParams.LineItem[];
+	oneOffLineItems: Stripe.Checkout.SessionCreateParams.LineItem[];
 } => {
 	// 1. Filter customer products by active statuses
 	const activeCustomerProducts = filterCustomerProductsByActiveStatuses({
--- a/server/src/internal/billing/v2/providers/stripe/utils/checkoutSessions/updateOneOffTieredItems.ts
+++ b/server/src/internal/billing/v2/providers/stripe/utils/checkoutSessions/updateOneOffTieredItems.ts
@@ -10,7 +10,6 @@ import {
 } from "@autumn/shared";
 import type Stripe from "stripe";
 import { stripeItemSpecToCheckoutLineItem } from "../stripeItemSpec/stripeItemSpecToStripeParam";
-import type { Checkout as CheckoutSessions } from "stripe/resources/Checkout/Sessions.js";

 /**
 * Update one-off items to use inline price_data if they're tiered.
@@ -23,7 +22,7 @@ export const updateOneOffTieredItems = ({
 }: {
 	oneOffItemSpecs: StripeItemSpec[];
 	org: Organization;
-}): CheckoutSessions.SessionCreateParams.LineItem[] => {
+}): Stripe.Checkout.SessionCreateParams.LineItem[] => {
 	const currency = orgToCurrency({ org });

 	return oneOffItemSpecs.map((item) => {
--- a/server/src/internal/billing/v2/providers/stripe/utils/invoiceLines/convertToDbLineItem/stripeLineItemGroupToDbLineItems.ts
+++ b/server/src/internal/billing/v2/providers/stripe/utils/invoiceLines/convertToDbLineItem/stripeLineItemGroupToDbLineItems.ts
@@ -256,10 +256,7 @@ const mergeStripeAndBillingLineItems = ({
 			stripeLineItem.parent?.invoice_item_details?.invoice_item ?? null,
 		stripe_subscription_item_id: stripeSubscriptionItemId,
 		stripe_product_id: (priceDetails?.product as string) ?? null,
-		stripe_price_id:
-			typeof priceDetails?.price === "string"
-				? priceDetails?.price
-				: (priceDetails?.price?.id ?? null),
+		stripe_price_id: priceDetails?.price ?? null,
 		stripe_discountable: stripeLineItem.discountable,

 		// Amounts (from Stripe or Autumn depending on discountable flag)
@@ -343,10 +340,7 @@ const createDbLineItemFromStripeOnly = ({
 			stripeLineItem.parent?.invoice_item_details?.invoice_item ?? null,
 		stripe_subscription_item_id: stripeSubscriptionItemId,
 		stripe_product_id: (priceDetails?.product as string) ?? null,
-		stripe_price_id:
-			typeof priceDetails?.price === "string"
-				? priceDetails?.price
-				: (priceDetails?.price?.id ?? null),
+		stripe_price_id: priceDetails?.price ?? null,
 		stripe_discountable: stripeLineItem.discountable,

 		amount,
--- a/server/src/internal/billing/v2/providers/stripe/utils/invoices/handleInvoicePaymentFailure.ts
+++ b/server/src/internal/billing/v2/providers/stripe/utils/invoices/handleInvoicePaymentFailure.ts
@@ -12,7 +12,7 @@ import type { PayInvoiceResult } from "./payStripeInvoice";
 const getFailureCodeFromStripeError = ({
 	stripeError,
 }: {
-	stripeError: Stripe.ErrorType.StripeError;
+	stripeError: Stripe.errors.StripeError;
 }): "3ds_required" | "payment_failed" => {
 	const authCodes = ["authentication_required", "authentication_not_handled"];

@@ -61,7 +61,7 @@ export const handleInvoicePaymentFailure = ({
 	}

 	// 2. Check if it's a Stripe error
-	const stripeError = error as Stripe.ErrorType.StripeError;
+	const stripeError = error as Stripe.errors.StripeError;
 	const isStripeError = stripeError.type !== undefined;

 	if (!isStripeError) throw error;
--- a/server/src/internal/billing/v2/providers/stripe/utils/invoices/payStripeInvoice.ts
+++ b/server/src/internal/billing/v2/providers/stripe/utils/invoices/payStripeInvoice.ts
@@ -13,7 +13,7 @@ export type PayInvoiceResult = {
 		code: PaymentFailureCode;
 		reason: string;
 	};
-	stripeError?: Stripe.ErrorType.StripeError;
+	stripeError?: Stripe.errors.StripeError;
 };

 type PayStripeInvoiceParams = {
--- a/server/src/internal/billing/v2/providers/stripe/utils/matchUtils/stripePriceShape.ts
+++ b/server/src/internal/billing/v2/providers/stripe/utils/matchUtils/stripePriceShape.ts
@@ -13,11 +13,7 @@ type InlinePriceLike = {
 		divide_by?: number;
 		round?: string;
 	} | null;
-	unit_amount_decimal?:
-		| string
-		| number
-		| ReturnType<typeof Stripe.Decimal.from>
-		| null;
+	unit_amount_decimal?: string | number | null;
 };

 export type StripePriceShape = {
@@ -69,7 +65,7 @@ export const stripePriceToShape = ({
 	intervalCount: price.recurring?.interval_count,
 	tiersMode: price.tiers_mode ?? undefined,
 	transformQuantity: transformQuantityKey(price.transform_quantity),
-	unitAmountDecimal: decimalAmount(price.unit_amount_decimal?.toString()),
+	unitAmountDecimal: decimalAmount(price.unit_amount_decimal),
 });

 export const inlinePriceToShape = ({
@@ -84,7 +80,7 @@ export const inlinePriceToShape = ({
 	interval: price.recurring?.interval,
 	intervalCount: price.recurring?.interval_count,
 	transformQuantity: transformQuantityKey(price.transform_quantity),
-	unitAmountDecimal: decimalAmount(price.unit_amount_decimal?.toString()),
+	unitAmountDecimal: decimalAmount(price.unit_amount_decimal),
 });

 export const stripePriceShapesEqual = (
--- a/server/src/internal/billing/v2/providers/stripe/utils/stripeItemSpec/stripeItemSpecToStripeParam.ts
+++ b/server/src/internal/billing/v2/providers/stripe/utils/stripeItemSpec/stripeItemSpecToStripeParam.ts
@@ -3,21 +3,13 @@ import {
 	type StripeInlinePrice,
 	type StripeItemSpec,
 } from "@autumn/shared";
-import Stripe from "stripe";
-import type { Checkout as CheckoutSessions } from "stripe/resources/Checkout/Sessions.js";
+import type Stripe from "stripe";

 type StoredPriceParam = { price: string };
 type RecurringInlinePriceParam = {
 	price_data: Stripe.SubscriptionCreateParams.Item["price_data"];
 };

-const toStripeInlinePriceData = (stripeInlinePrice: StripeInlinePrice) => ({
-	...stripeInlinePrice,
-	unit_amount_decimal: Stripe.Decimal.from(
-		stripeInlinePrice.unit_amount_decimal.toString(),
-	),
-});
-
 /**
 * Returns the price param for a StripeItemSpec — either a stored price ID or inline price_data.
 * For inline prices, asserts that `recurring` is present (one-off items should not reach this path).
@@ -37,7 +29,7 @@ const toRecurringPriceParam = ({
 		}
 		return {
 			price_data: {
-				...toStripeInlinePriceData(spec.stripeInlinePrice),
+				...spec.stripeInlinePrice,
 				recurring: spec.stripeInlinePrice.recurring,
 			},
 		};
@@ -64,11 +56,9 @@ const toPriceParam = ({
 	spec,
 }: {
 	spec: StripeItemSpec;
-}):
-	| StoredPriceParam
-	| { price_data: ReturnType<typeof toStripeInlinePriceData> } => {
+}): StoredPriceParam | { price_data: StripeInlinePrice } => {
 	if (spec.stripeInlinePrice) {
-		return { price_data: toStripeInlinePriceData(spec.stripeInlinePrice) };
+		return { price_data: spec.stripeInlinePrice };
 	}
 	return { price: spec.stripePriceId! };
 };
@@ -78,7 +68,7 @@ export const stripeItemSpecToCheckoutLineItem = ({
 	spec,
 }: {
 	spec: StripeItemSpec;
-}): CheckoutSessions.SessionCreateParams.LineItem => {
+}): Stripe.Checkout.SessionCreateParams.LineItem => {
 	return {
 		...toPriceParam({ spec }),
 		quantity: spec.quantity,
--- a/server/src/internal/billing/v2/workflows/storeInvoiceLineItems/storeInvoiceLineItems.ts
+++ b/server/src/internal/billing/v2/workflows/storeInvoiceLineItems/storeInvoiceLineItems.ts
@@ -77,7 +77,7 @@ export const storeInvoiceLineItems = async ({
 			if (info?.isMetered) return false;

 			// Filter $0 empty price placeholders (e.g. stripe_empty_price_id)
-			if (li.pricing?.unit_amount_decimal?.toNumber() === 0) return false;
+			if (li.pricing?.unit_amount_decimal === "0") return false;

 			return true;
 		});
--- a/server/src/internal/customers/add-product/handleCreateCheckout.ts
+++ b/server/src/internal/customers/add-product/handleCreateCheckout.ts
@@ -18,7 +18,6 @@ import { notNullish } from "@/utils/genUtils.js";
 import type { AutumnContext } from "../../../honoUtils/HonoEnv.js";
 import { attachParamsToMetadata } from "../../billing/attach/utils/attachParamsToMetadata.js";
 import type { AttachParams } from "../cusProducts/AttachParams.js";
-import type { Checkout as CheckoutSessions } from "stripe/resources/Checkout/Sessions.js";

 export const handleCreateCheckout = async ({
 	ctx,
@@ -86,10 +85,10 @@ export const handleCreateCheckout = async ({
 	}

 	const checkoutParams = attachParams.checkoutSessionParams as
-		| Partial<CheckoutSessions.SessionCreateParams>
+		| Partial<Stripe.Checkout.SessionCreateParams>
 		| undefined;
 	const checkoutSubscriptionData = checkoutParams?.subscription_data as
-		| CheckoutSessions.SessionCreateParams.SubscriptionData
+		| Stripe.Checkout.SessionCreateParams.SubscriptionData
 		| undefined;
 	const trialEnd =
 		freeTrial && !attachParams.disableFreeTrial
@@ -105,7 +104,7 @@ export const handleCreateCheckout = async ({
 			: undefined;

 	const subscriptionData:
-		| CheckoutSessions.SessionCreateParams.SubscriptionData
+		| Stripe.Checkout.SessionCreateParams.SubscriptionData
 		| undefined = isRecurring
 		? {
 				...(checkoutSubscriptionData ?? {}),
@@ -140,7 +139,7 @@ export const handleCreateCheckout = async ({
 		notNullish(checkoutParams?.payment_method_types) ||
 		notNullish(checkoutParams?.payment_method_configuration);

-	let sessionParams: CheckoutSessions.SessionCreateParams = {
+	let sessionParams: Stripe.Checkout.SessionCreateParams = {
 		customer: customer.processor.id,
 		line_items: items,
 		mode: isRecurring ? "subscription" : "payment",
--- a/server/src/internal/orgs/deleteOrg/deletePlatformSubOrg.ts
+++ b/server/src/internal/orgs/deleteOrg/deletePlatformSubOrg.ts
@@ -1,17 +1,13 @@
 import {
 	AppEnv,
-	customerEntitlements,
-	customerPrices,
-	customerProducts,
 	customers,
 	ErrCode,
 	member,
 	organizations,
 	type Organization,
-	products,
 	RecaseError,
 } from "@autumn/shared";
-import { and, eq, inArray } from "drizzle-orm";
+import { and, eq } from "drizzle-orm";
 import type { DrizzleCli } from "@server/db/initDrizzle.js";
 import type { Logger } from "@/external/logtail/logtailUtils.js";
 import {
@@ -70,40 +66,6 @@ export const deletePlatformSubOrg = async ({
 	logger.info("5. Deleting org memberships");
 	await db.delete(member).where(eq(member.organizationId, org.id));

-	// products.org_id cascades on org delete, but customer_products RESTRICTs
-	// the product delete — so tear down the customer-side rows first, deepest
-	// FK child to shallowest: cusEnts/cusPrices → customer_products → products.
-	logger.info("6. Deleting customer products and products");
-	const orgProductIds = (
-		await db
-			.select({ internalId: products.internal_id })
-			.from(products)
-			.where(eq(products.org_id, org.id))
-	).map((p) => p.internalId);
-
-	if (orgProductIds.length > 0) {
-		const cusProductIds = (
-			await db
-				.select({ id: customerProducts.id })
-				.from(customerProducts)
-				.where(inArray(customerProducts.internal_product_id, orgProductIds))
-		).map((cp) => cp.id);
-
-		if (cusProductIds.length > 0) {
-			await db
-				.delete(customerEntitlements)
-				.where(inArray(customerEntitlements.customer_product_id, cusProductIds));
-			await db
-				.delete(customerPrices)
-				.where(inArray(customerPrices.customer_product_id, cusProductIds));
-			await db
-				.delete(customerProducts)
-				.where(inArray(customerProducts.id, cusProductIds));
-		}
-
-		await db.delete(products).where(eq(products.org_id, org.id));
-	}
-
-	logger.info("7. Deleting organization");
+	logger.info("6. Deleting organization");
 	await db.delete(organizations).where(eq(organizations.id, org.id));
 };
--- a/server/src/internal/orgs/handlers/stripeHandlers/handleGetStripeAccount.ts
+++ b/server/src/internal/orgs/handlers/stripeHandlers/handleGetStripeAccount.ts
@@ -1,5 +1,5 @@
-import { Scopes } from "@autumn/shared";
 import { createStripeCli } from "@/external/connect/createStripeCli.js";
+import { Scopes } from "@autumn/shared";
 import { createRoute } from "@/honoMiddlewares/routeHandler.js";
 import { isStripeConnected } from "../../orgUtils.js";

@@ -15,7 +15,7 @@ export const handleGetStripeAccount = createRoute({

 		try {
 			const stripeCli = createStripeCli({ org, env });
-			const accountDetails = await stripeCli.accounts.retrieve(null);
+			const accountDetails = await stripeCli.accounts.retrieve();
 			return c.json(accountDetails);
 		} catch (error) {
 			logger.warn(
--- a/server/src/internal/orgs/orgUtils.ts
+++ b/server/src/internal/orgs/orgUtils.ts
@@ -46,8 +46,8 @@ export const shouldReconnectStripe = async ({
 		const stripeCli = createStripeCli({ org, env });
 		const newKey = new Stripe(stripeKey);

-		const oldAccount = await stripeCli.accounts.retrieve(null);
-		const newAccount = await newKey.accounts.retrieve(null);
+		const oldAccount = await stripeCli.accounts.retrieve();
+		const newAccount = await newKey.accounts.retrieve();

 		return oldAccount.id !== newAccount.id;
 	} catch (error) {
--- a/server/src/internal/orgs/orgUtils/handleStripeSecretKey.ts
+++ b/server/src/internal/orgs/orgUtils/handleStripeSecretKey.ts
@@ -19,7 +19,7 @@ export const handleStripeSecretKey = async ({
 	// 1. Check if key is valid
 	await checkKeyValid(secretKey);
 	const stripe = new Stripe(secretKey);
-	const account = await stripe.accounts.retrieve(null);
+	const account = await stripe.accounts.retrieve();

 	// 2. Disconnect existing webhook endpoints
 	const curWebhooks = await stripe.webhookEndpoints.list();
--- a/server/src/utils/otel/instrumentStripe.ts
+++ b/server/src/utils/otel/instrumentStripe.ts
@@ -6,14 +6,13 @@ import {
 	trace,
 } from "@opentelemetry/api";
 import type Stripe from "stripe";
-import type { StripeConfig } from "stripe/lib.js";
 import { otelConfig } from "./otelConfig.js";

 const TRACER_NAME = "autumn.stripe";
 const SPAN_NAME = "stripe.api";
 const INSTRUMENTED = new WeakSet<object>();

-type StripeHttpClient = NonNullable<StripeConfig["httpClient"]>;
+type StripeHttpClient = NonNullable<Stripe.StripeConfig["httpClient"]>;

 type StripeApiLike = {
 	httpClient?: StripeHttpClient;
--- a/server/tests/integration/billing/attach/params/start-date/utils/index.ts
+++ b/server/tests/integration/billing/attach/params/start-date/utils/index.ts
@@ -84,7 +84,7 @@ export const triggerSubscriptionCreated = async ({
 		created: getUnixTime(subscriptionCreatedAtMs ?? Date.now()),
 		schedule: scheduleId ?? null,
 	} as Stripe.Subscription;
-	const retrieveSubscription: Stripe.SubscriptionResource["retrieve"] =
+	const retrieveSubscription: Stripe.SubscriptionsResource["retrieve"] =
 		async () =>
 			stripeResponse({ object: subscription, requestId: `req_${stripeSubId}` });

--- a/server/tests/integration/billing/utils/expectStripeSubCorrect/helpers/compareItems.ts
+++ b/server/tests/integration/billing/utils/expectStripeSubCorrect/helpers/compareItems.ts
@@ -16,7 +16,7 @@ export const normalizeActualSubItem = ({
 		quantity: item.quantity ?? 0,
 		isInline: !!autumnCusPriceId,
 		unitAmountDecimal: autumnCusPriceId
-			? (item.price.unit_amount_decimal?.toString() ?? undefined)
+			? (item.price.unit_amount_decimal ?? undefined)
 			: undefined,
 	};
 };
@@ -42,7 +42,7 @@ export const normalizeActualPhaseItem = ({
 		autumnCustomerPriceId: autumnCusPriceId || undefined,
 		quantity: item.quantity ?? 0,
 		isInline: !!autumnCusPriceId,
-		unitAmountDecimal: unitAmountDecimal?.toString(),
+		unitAmountDecimal,
 	};
 };

@@ -58,7 +58,7 @@ export const normalizeExpectedPhaseItem = ({
 	let unitAmountDecimal: string | undefined;
 	if (hasInlinePrice) {
 		const priceData = (item as { price_data: StripeInlinePrice }).price_data;
-		unitAmountDecimal = priceData.unit_amount_decimal.toString();
+		unitAmountDecimal = priceData.unit_amount_decimal;
 	}

 	return {
--- a/server/tests/integration/billing/utils/stripe/expectStripeInvoiceLineItemPeriodCorrect.ts
+++ b/server/tests/integration/billing/utils/stripe/expectStripeInvoiceLineItemPeriodCorrect.ts
@@ -58,10 +58,7 @@ export const expectStripeInvoiceLineItemPeriodCorrect = async ({
 			Boolean(
 				findPriceFromStripeId({
 					prices: usagePrices,
-					stripePriceId:
-						typeof line.pricing?.price_details?.price === "string"
-							? line.pricing?.price_details?.price
-							: (line.pricing?.price_details?.price?.id ?? ""),
+					stripePriceId: line.pricing?.price_details?.price ?? "",
 				}),
 			),
 		),
--- a/server/tests/integration/crud/customers/get-customer-aggregated-balances.test.ts
+++ b/server/tests/integration/crud/customers/get-customer-aggregated-balances.test.ts
@@ -11,8 +11,6 @@ import { expireAllCusEntsForReset } from "@tests/utils/cusProductUtils/resetTest
 import { products } from "@tests/utils/fixtures/products.js";
 import { initScenario, s } from "@tests/utils/testInitUtils/initScenario.js";
 import chalk from "chalk";
-import { sql } from "drizzle-orm";
-import { syncItemV4 } from "@/internal/balances/utils/sync/syncItemV4.js";
 import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";

 // ─────────────────────────────────────────────────────────────────
@@ -51,40 +49,6 @@ test.concurrent(`${chalk.yellowBright("customer aggregated balance: rollover bal
 			actions: [s.attach({ productId: base.id })],
 		});

-	const syncMessagesBalance = async () => {
-		const cusEntRows = await ctx.db.execute(
-			sql`SELECT ce.id
-				FROM customer_entitlements ce
-				JOIN customers c ON c.internal_id = ce.internal_customer_id
-				WHERE c.id = ${customerId}
-					AND ce.feature_id = ${TestFeature.Messages}`,
-		);
-		const cusEntIds = cusEntRows.map((row) => row.id as string);
-
-		const rolloverRows = cusEntIds.length
-			? await ctx.db.execute(
-					sql`SELECT id FROM rollovers WHERE cus_ent_id IN (${sql.join(
-						cusEntIds.map((id) => sql`${id}`),
-						sql`, `,
-					)})`,
-				)
-			: [];
-
-		await syncItemV4({
-			ctx,
-			payload: {
-				customerId,
-				orgId: ctx.org.id,
-				env: ctx.env,
-				timestamp: Date.now(),
-				rolloverIds: rolloverRows.map((row) => row.id as string),
-				modifiedCusEntIdsByFeatureId: {
-					[TestFeature.Messages]: cusEntIds,
-				},
-			},
-		});
-	};
-
 	// ── Step 1: Track 60 on ent-0, 30 on ent-1 ──
 	// Expected per-entity balance: ent-0 = 40, ent-1 = 70.
 	// Customer aggregated: remaining = 110, usage = 90.
@@ -94,14 +58,12 @@ test.concurrent(`${chalk.yellowBright("customer aggregated balance: rollover bal
 		feature_id: TestFeature.Messages,
 		value: 60,
 	});
-	await syncMessagesBalance();
 	await autumnV1.track({
 		customer_id: customerId,
 		entity_id: entities[1].id,
 		feature_id: TestFeature.Messages,
 		value: 30,
 	});
-	await syncMessagesBalance();

 	await new Promise((resolve) => setTimeout(resolve, 2000));

@@ -170,7 +132,6 @@ test.concurrent(`${chalk.yellowBright("customer aggregated balance: rollover bal
 		feature_id: TestFeature.Messages,
 		value: 50,
 	});
-	await syncMessagesBalance();

 	await new Promise((resolve) => setTimeout(resolve, 1500));

--- a/server/tests/unit/billing/execute-stripe-subscription-schedule-action.test.ts
+++ b/server/tests/unit/billing/execute-stripe-subscription-schedule-action.test.ts
@@ -1,6 +1,6 @@
 import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
 import type { BillingContext } from "@autumn/shared";
-import Stripe from "stripe";
+import type Stripe from "stripe";
 import type { AutumnContext } from "@/honoUtils/HonoEnv";

 const mockState = {
@@ -112,7 +112,7 @@ describe("executeStripeSubscriptionScheduleAction", () => {
 			product: "stripe_prod_inline",
 			currency: "usd",
 			recurring: { interval: "month" as const, interval_count: 1 },
-			unit_amount_decimal: Stripe.Decimal.from("1000"),
+			unit_amount_decimal: "1000",
 		};
 		const params = {
 			phases: [
@@ -152,7 +152,7 @@ describe("executeStripeSubscriptionScheduleAction", () => {
 							product: "stripe_prod_inline",
 							currency: "usd",
 							recurring: { interval: "month", interval_count: 1 },
-							unit_amount_decimal: Stripe.Decimal.from("1000"),
+							unit_amount_decimal: "1000",
 						},
 					},
 				],
@@ -189,7 +189,7 @@ describe("executeStripeSubscriptionScheduleAction", () => {
 			product: "stripe_prod_inline",
 			currency: "usd",
 			recurring: { interval: "month" as const, interval_count: 1 },
-			unit_amount_decimal: Stripe.Decimal.from("1000"),
+			unit_amount_decimal: "1000",
 		};
 		const params = {
 			phases: [
@@ -242,7 +242,7 @@ describe("executeStripeSubscriptionScheduleAction", () => {
 							product: "stripe_prod_inline",
 							currency: "usd",
 							recurring: { interval: "month", interval_count: 1 },
-							unit_amount_decimal: Stripe.Decimal.from("1000"),
+							unit_amount_decimal: "1000",
 						},
 					},
 				],
--- a/server/tests/unit/billing/stripe/match-utils/match-stripe-inline-price.spec.ts
+++ b/server/tests/unit/billing/stripe/match-utils/match-stripe-inline-price.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import Stripe from "stripe";
+import type Stripe from "stripe";
 import {
 	findMatchingInlinePriceIdForPhaseItem,
 	findMatchingInlineSubscriptionItem,
@@ -10,7 +10,7 @@ const inlinePrice = {
 	product: "stripe_prod_inline",
 	currency: "usd",
 	recurring: { interval: "month" as const, interval_count: 1 },
-	unit_amount_decimal: Stripe.Decimal.from("1000"),
+	unit_amount_decimal: "1000",
 };

 const subscriptionItem = ({
--- a/server/tests/unit/billing/stripe/subscriptions/build-subscription-items-update.spec.ts
+++ b/server/tests/unit/billing/stripe/subscriptions/build-subscription-items-update.spec.ts
@@ -15,7 +15,7 @@ import { customerProducts } from "@tests/utils/fixtures/db/customerProducts";
 import { prices } from "@tests/utils/fixtures/db/prices";
 import { stripeSubscriptions } from "@tests/utils/fixtures/stripe/subscriptions";
 import chalk from "chalk";
-import Stripe from "stripe";
+import type Stripe from "stripe";
 import { buildStripeSubscriptionItemsUpdate } from "@/internal/billing/v2/providers/stripe/utils/subscriptionItems/buildStripeSubscriptionItemsUpdate";
 import {
 	createCustomerPricesForProduct,
@@ -968,7 +968,7 @@ describe(
 				const changedItem = currentItems.find(
 					(item) => item.metadata.inline_price === "true",
 				)!;
-				changedItem.price.unit_amount_decimal = Stripe.Decimal.from("999999");
+				changedItem.price.unit_amount_decimal = "999999";

 				const result = buildUpdateWithItems({ currentItems });

--- a/server/tests/utils/productUtils.ts
+++ b/server/tests/utils/productUtils.ts
@@ -7,7 +7,6 @@ import {
 } from "@autumn/shared";
 import type { DrizzleCli } from "@/db/initDrizzle.js";
 import type { AutumnInt } from "@/external/autumn/autumnCli.js";
-import { CusProductService } from "@/internal/customers/cusProducts/CusProductService.js";
 import { ProductService } from "@/internal/products/ProductService.js";
 import { eq } from "drizzle-orm";

@@ -48,20 +47,12 @@ export const createProduct = async ({
 		const batchDelete = [];
 		for (const prod of products) {
 			batchDelete.push(
-				(async () => {
-					await CusProductService.deleteByProduct({
-						db,
-						internalProductId: prod.internal_id,
-						orgId,
-						env,
-					});
-					await ProductService.deleteByInternalId({
-						db,
-						internalId: prod.internal_id,
-						orgId,
-						env,
-					});
-				})(),
+				ProductService.deleteByInternalId({
+					db,
+					internalId: prod.internal_id,
+					orgId,
+					env,
+				}),
 			);
 		}

@@ -128,15 +119,7 @@ export const createProducts = async ({
 	const batchCreate = [];
 	for (const product of products) {
 		batchCreate.push(
-			createProduct({
-				db,
-				orgId,
-				env,
-				autumn,
-				product,
-				prefix,
-				createInStripe,
-			}),
+			createProduct({ db, orgId, env, autumn, product, prefix, createInStripe }),
 		);
 	}

--- a/server/tsconfig.json
+++ b/server/tsconfig.json
@@ -8,11 +8,12 @@
 		"target": "ES2020",
 		"moduleResolution": "bundler",
 		"module": "Preserve",
-		"rootDirs": [".", ".."],
+
 		"typeRoots": ["./node_modules/@types", "../node_modules/@types"],
    "types": ["bun", "node"],
 		// "declaration": true,
 		"jsx": "react-jsx",
+		"outDir": "./dist",
 		"strict": true,
 		"esModuleInterop": true,
 		"allowSyntheticDefaultImports": true,
@@ -40,9 +41,7 @@

 			// Explicitly set drizzle-orm path to avoid monorepo issues
 			"drizzle-orm": ["../node_modules/drizzle-orm"],
-			"drizzle-orm/*": ["../node_modules/drizzle-orm/*"],
-			"stripe": ["../node_modules/.bun/node_modules/stripe/esm/stripe.esm.node"],
-			"stripe/*": ["../node_modules/.bun/node_modules/stripe/esm/*"]
+			"drizzle-orm/*": ["../node_modules/drizzle-orm/*"]
 		}
 	},
 	"include": ["src", "tests", "scripts", "experiments", "perf"],
--- a/shared/models/billingModels/stripe/stripeItemSpec.ts
+++ b/shared/models/billingModels/stripe/stripeItemSpec.ts
@@ -13,7 +13,7 @@ export type StripeInlinePrice = {
 	product: string;
 	currency: string;
 	recurring?: Stripe.PriceCreateParams.Recurring;
-	unit_amount_decimal: ReturnType<typeof Stripe.Decimal.from>;
+	unit_amount_decimal: string;
 };

 /**
--- a/shared/tsconfig.json
+++ b/shared/tsconfig.json
@@ -15,9 +15,7 @@
 			"@api/*": ["./api/*"],
 			"@models/*": ["./models/*"],
 			"@utils/*": ["./utils/*"],
-			"@autumn/ksuid": ["../packages/ksuid/src/index.ts"],
-			"stripe": ["../node_modules/.bun/node_modules/stripe/esm/stripe.esm.node"],
-			"stripe/*": ["../node_modules/.bun/node_modules/stripe/esm/*"]
+			"@autumn/ksuid": ["../packages/ksuid/src/index.ts"]
 		}
 	},
 	"include": ["./**/*"],
--- a/shared/utils/productUtils/priceUtils/convertAmountUtils.ts
+++ b/shared/utils/productUtils/priceUtils/convertAmountUtils.ts
@@ -1,8 +1,5 @@
-import { Decimal as DecimalJS } from "decimal.js";
-import type Stripe from "stripe";
+import { Decimal } from "decimal.js";

-type DecimalLike = { toString(): string };
-type StripeDecimal = string & ReturnType<typeof Stripe.Decimal.from>;
 /**
 * Zero-decimal currencies that Stripe handles without decimal places.
 * These currencies don't require multiplying/dividing by 100.
@@ -41,11 +38,11 @@ export const atmnToStripeAmount = ({
 	if (ZERO_DECIMAL_CURRENCIES.includes(currency.toUpperCase())) {
 		return amount;
 	}
-	return new DecimalJS(amount).mul(100).round().toNumber();
+	return new Decimal(amount).mul(100).round().toNumber();
 };

 /**
- * Converts an Autumn amount to a Stripe Decimal class.
+ * Converts an Autumn amount to a Stripe decimal string.
 * For most currencies, multiplies by 100 and returns as string with decimal places.
 * For zero-decimal currencies like JPY, returns the amount as-is with decimal places.
 * Used for Stripe API calls that require unit_amount_decimal as a string.
@@ -55,19 +52,16 @@ export const atmnToStripeAmountDecimal = ({
 	currency = "USD",
 	decimalPlaces = 10,
 }: {
-	amount: number | DecimalJS;
+	amount: number | Decimal;
 	currency?: string;
 	decimalPlaces?: number;
-}): StripeDecimal => {
-	const decimal = amount instanceof DecimalJS ? amount : new DecimalJS(amount);
+}): string => {
+	const decimal = amount instanceof Decimal ? amount : new Decimal(amount);

 	if (ZERO_DECIMAL_CURRENCIES.includes(currency.toUpperCase())) {
-		return decimal.toDecimalPlaces(decimalPlaces).toString() as StripeDecimal;
+		return decimal.toDecimalPlaces(decimalPlaces).toString();
 	}
-	return decimal
-		.mul(100)
-		.toDecimalPlaces(decimalPlaces)
-		.toString() as StripeDecimal;
+	return decimal.mul(100).toDecimalPlaces(decimalPlaces).toString();
 };

 /**
@@ -81,26 +75,24 @@ export const stripeToAtmnAmount = ({
 	decimalPlaces = 10,
 	round = true,
 }: {
-	amount: number | string | DecimalLike;
+	amount: number;
 	currency?: string;
 	decimalPlaces?: number;
 	round?: boolean;
 }): number => {
-	let finalAmount = new DecimalJS(
-		typeof amount === "number" ? amount : amount.toString(),
-	);
+	let finalAmount = amount;

 	if (!ZERO_DECIMAL_CURRENCIES.includes(currency.toUpperCase())) {
-		finalAmount = finalAmount.div(100);
+		finalAmount = new Decimal(amount).div(100).toNumber();
 	}

 	if (round) {
-		return finalAmount.toDecimalPlaces(decimalPlaces).toNumber();
+		return new Decimal(finalAmount).toDecimalPlaces(decimalPlaces).toNumber();
 	}

 	if (decimalPlaces) {
-		return finalAmount.toDecimalPlaces(decimalPlaces).toNumber();
+		return new Decimal(finalAmount).toDecimalPlaces(decimalPlaces).toNumber();
 	}

-	return finalAmount.toNumber();
+	return finalAmount;
 };
--- a/shared/utils/productUtils/priceUtils/convertPrice/priceToStripePrepaidV2Tiers.ts
+++ b/shared/utils/productUtils/priceUtils/convertPrice/priceToStripePrepaidV2Tiers.ts
@@ -11,8 +11,6 @@ import { atmnToStripeAmountDecimal } from "@utils/productUtils/priceUtils/conver
 import { Decimal } from "decimal.js";
 import type Stripe from "stripe";

-type StripeDecimal = string & ReturnType<typeof Stripe.Decimal.from>;
-
 /**
 * Builds the Stripe tier array for a V2 prepaid price.
 *
@@ -35,7 +33,7 @@ export const priceToStripePrepaidV2Tiers = ({
 	price: Price;
 	entitlement: Entitlement;
 	org: Organization;
-}): Stripe.PriceCreateParams.Tier[] => {
+}) => {
 	const config = price.config as UsagePriceConfig;

 	const tiers: Stripe.PriceCreateParams.Tier[] = [];
@@ -44,7 +42,7 @@ export const priceToStripePrepaidV2Tiers = ({
 	// allowance. Applies to both graduated and volume pricing.
 	if (entitlement.allowance) {
 		tiers.push({
-			unit_amount_decimal: "0" as StripeDecimal,
+			unit_amount_decimal: "0",
 			up_to: entitlement.allowance,
 		});
 	}
@@ -86,15 +84,15 @@ export const priceToStripePrepaidV2Tiers = ({

 		up_to:
 			index === tiers.length - 1
-				? ("inf" as const)
+				? "inf"
 				: new Decimal(tier.up_to ?? 0)
 						.div(config.billing_units ?? 1)
 						.ceil()
 						.toNumber(),

-		unit_amount_decimal: new Decimal(tier.unit_amount_decimal?.toString() ?? "0")
+		unit_amount_decimal: new Decimal(tier.unit_amount_decimal ?? 0)
 			.mul(config.billing_units ?? 1)
-			.toString() as StripeDecimal,
+			.toString(),
 	}));

 	return dividedTiers;