refactor: consolidate customer schemas for clearer naming

- Rename McpCustomerSchema to CustomerSchema (pure customer data)
- Create CustomerWithSubscriptionsSchema for SDK endpoint (customer + full subscriptions)
- Remove CustomerSubscriptionSchema (now uses full SubscriptionSchema instead)
- Update all imports and exports across contracts

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: npslaney

src/contracts/checkout.ts

@@ -2,7 +2,7 @@ import { oc } from "@orpc/contract";
 import { z } from "zod";
 import { CheckoutSchema } from "../schemas/checkout";
 import { CurrencySchema } from "../schemas/currency";
-import { McpCustomerSchema } from "../schemas/customer";
+import { CustomerSchema } from "../schemas/customer";
 import {
 	PaginationInputSchema,
 	PaginationOutputSchema,
@@ -173,7 +173,7 @@ export const listCheckoutsContract = oc
 	.output(ListCheckoutsOutputSchema);
 
 // MCP-specific embedded customer schema (uses admin customer schema, not SDK customer)
-const CheckoutCustomerSchema = McpCustomerSchema.nullable();
+const CheckoutCustomerSchema = CustomerSchema.nullable();
 
 // MCP-specific summary schema for list (simpler than full CheckoutSchema)
 const CheckoutListItemSchema = z.object({

src/contracts/customer.ts

@@ -2,7 +2,7 @@ import { oc } from "@orpc/contract";
 import { z } from "zod";
 import {
 	CustomerSchema,
-	McpCustomerSchema,
+	CustomerWithSubscriptionsSchema,
 	GetCustomerInputSchema as SdkGetCustomerInputSchema,
 } from "../schemas/customer";
 import {
@@ -13,7 +13,7 @@ import {
 // MCP-specific schemas
 const ListCustomersInputSchema = PaginationInputSchema;
 const ListCustomersOutputSchema = PaginationOutputSchema.extend({
-	customers: z.array(McpCustomerSchema),
+	customers: z.array(CustomerSchema),
 });
 
 const McpGetCustomerInputSchema = z.object({ id: z.string() });
@@ -35,7 +35,7 @@ const DeleteCustomerInputSchema = z.object({ id: z.string() });
 // SDK contract - uses flexible lookup (externalId/email/customerId)
 export const getSdkCustomerContract = oc
 	.input(SdkGetCustomerInputSchema)
-	.output(CustomerSchema);
+	.output(CustomerWithSubscriptionsSchema);
 
 // MCP contracts
 export const listCustomersContract = oc
@@ -44,15 +44,15 @@ export const listCustomersContract = oc
 
 export const getCustomerContract = oc
 	.input(McpGetCustomerInputSchema)
-	.output(McpCustomerSchema);
+	.output(CustomerSchema);
 
 export const createCustomerContract = oc
 	.input(CreateCustomerInputSchema)
-	.output(McpCustomerSchema);
+	.output(CustomerSchema);
 
 export const updateCustomerContract = oc
 	.input(UpdateCustomerInputSchema)
-	.output(McpCustomerSchema);
+	.output(CustomerSchema);
 
 export const deleteCustomerContract = oc
 	.input(DeleteCustomerInputSchema)

src/contracts/order.ts

@@ -1,15 +1,15 @@
 import { oc } from "@orpc/contract";
 import { z } from "zod";
-import { McpCustomerSchema } from "../schemas/customer";
+import { CustomerSchema } from "../schemas/customer";
 import { OrderItemSchema, OrderSchema } from "../schemas/order";
 import {
 	PaginationInputSchema,
 	PaginationOutputSchema,
 } from "../schemas/pagination";
 
-// Order with related data for list and get views (MCP uses admin customer schema)
+// Order with related data for list and get views
 const OrderWithRelationsSchema = OrderSchema.extend({
-	customer: McpCustomerSchema.nullable(),
+	customer: CustomerSchema.nullable(),
 	orderItems: z.array(OrderItemSchema),
 });
 

src/index.ts

@@ -56,16 +56,11 @@ export {
 	SubscriptionWebhookEventSchema,
 	SubscriptionWebhookPayloadSchema,
 } from "./schemas/subscription";
-export type {
-	Customer,
-	CustomerSubscription,
-	McpCustomer,
-} from "./schemas/customer";
+export type { Customer, CustomerWithSubscriptions } from "./schemas/customer";
 export {
 	CustomerSchema,
-	CustomerSubscriptionSchema,
+	CustomerWithSubscriptionsSchema,
 	GetCustomerInputSchema,
-	McpCustomerSchema,
 } from "./schemas/customer";
 
 // New MCP schemas

src/schemas/customer.ts

@@ -1,36 +1,33 @@
 import { z } from "zod";
-import { CurrencySchema } from "./currency";
-import {
-	RecurringIntervalSchema,
-	SubscriptionStatusSchema,
-} from "./subscription";
+import { SubscriptionSchema } from "./subscription";
 
 /**
- * Summary of a subscription for the customer response.
- * Contains the essential fields needed for displaying subscription status.
+ * Customer schema for API responses.
+ * Represents a customer in the organization (admin view).
+ * Note: Uses modifiedAt to match Prisma schema naming.
  */
-export const CustomerSubscriptionSchema = z.object({
+export const CustomerSchema = z.object({
 	id: z.string(),
-	productId: z.string(),
-	status: SubscriptionStatusSchema,
-	currentPeriodStart: z.string().datetime(),
-	currentPeriodEnd: z.string().datetime(),
-	cancelAtPeriodEnd: z.boolean().optional(),
-	amount: z.number(),
-	currency: CurrencySchema,
-	recurringInterval: RecurringIntervalSchema,
+	name: z.string().nullable(),
+	email: z.string().nullable(),
+	emailVerified: z.boolean(),
+	externalId: z.string().nullable(),
+	userMetadata: z.record(z.string(), z.any()).nullable(),
+	organizationId: z.string(),
+	createdAt: z.date(),
+	modifiedAt: z.date().nullable(),
 });
 
 /**
- * Customer data with their subscriptions.
+ * Customer data with their full subscriptions.
  * Returned by the SDK customer.get endpoint.
  */
-export const CustomerSchema = z.object({
+export const CustomerWithSubscriptionsSchema = z.object({
 	id: z.string(),
 	email: z.string().nullable().optional(),
 	name: z.string().nullable().optional(),
 	externalId: z.string().nullable().optional(),
-	subscriptions: z.array(CustomerSubscriptionSchema),
+	subscriptions: z.array(SubscriptionSchema),
 });
 
 /**
@@ -56,24 +53,8 @@ export const GetCustomerInputSchema = z
 		},
 	);
 
-/**
- * Customer schema for MCP API responses.
- * Represents a customer in the organization (admin view).
- * Note: Uses modifiedAt to match Prisma schema naming.
- */
-export const McpCustomerSchema = z.object({
-	id: z.string(),
-	name: z.string().nullable(),
-	email: z.string().nullable(),
-	emailVerified: z.boolean(),
-	externalId: z.string().nullable(),
-	userMetadata: z.record(z.string(), z.any()).nullable(),
-	organizationId: z.string(),
-	createdAt: z.date(),
-	modifiedAt: z.date().nullable(),
-});
-
-export type CustomerSubscription = z.infer<typeof CustomerSubscriptionSchema>;
 export type Customer = z.infer<typeof CustomerSchema>;
-export type McpCustomer = z.infer<typeof McpCustomerSchema>;
+export type CustomerWithSubscriptions = z.infer<
+	typeof CustomerWithSubscriptionsSchema
+>;
 export type GetCustomerInput = z.infer<typeof GetCustomerInputSchema>;