@geekmidas/constructs 3.0.5 → 3.0.7

package/dist/subscribers/TestSubscriberAdaptor.d.cts

@@ -1,4 +1,4 @@
 import "../Construct-CX7HyFfT.cjs";
 import "../Subscriber-1rDE7HuM.cjs";
-import { TestSubscriberAdaptor, TestSubscriberRequest } from "../TestSubscriberAdaptor-DQk5xzb0.cjs";
+import { TestSubscriberAdaptor, TestSubscriberRequest } from "../TestSubscriberAdaptor-BknOLRQw.cjs";
 export { TestSubscriberAdaptor, TestSubscriberRequest };

package/dist/subscribers/TestSubscriberAdaptor.d.mts

@@ -1,4 +1,4 @@
-import "../Construct-C2SyofdS.mjs";
-import "../Subscriber-BgB3RRxb.mjs";
-import { TestSubscriberAdaptor, TestSubscriberRequest } from "../TestSubscriberAdaptor-CPEiqSfE.mjs";
+import "../Construct-BjpXFNxy.mjs";
+import "../Subscriber-9ObcUdcC.mjs";
+import { TestSubscriberAdaptor, TestSubscriberRequest } from "../TestSubscriberAdaptor-BEyCFP9G.mjs";
 export { TestSubscriberAdaptor, TestSubscriberRequest };

package/dist/subscribers/TestSubscriberAdaptor.mjs

@@ -1,4 +1,4 @@
 import "../publisher-Bw4770Hi.mjs";
-import { TestSubscriberAdaptor } from "../TestSubscriberAdaptor-CwP3qNJ4.mjs";
+import { TestSubscriberAdaptor } from "../TestSubscriberAdaptor-CCcviuKa.mjs";
 
 export { TestSubscriberAdaptor };

package/dist/subscribers/index.cjs

@@ -1,6 +1,6 @@
 require('../Construct-BXG8cFSm.cjs');
-const require_Subscriber = require('../Subscriber-Scz7hrV6.cjs');
-const require_SubscriberBuilder = require('../SubscriberBuilder-B82h4v-S.cjs');
+const require_Subscriber = require('../Subscriber-BgspJeS4.cjs');
+const require_SubscriberBuilder = require('../SubscriberBuilder-BtL22ZJ9.cjs');
 
 //#region src/subscribers/index.ts
 const s = new require_SubscriberBuilder.SubscriberBuilder();

package/dist/subscribers/index.d.cts

@@ -1,10 +1,10 @@
 import "../Construct-CX7HyFfT.cjs";
 import { Subscriber } from "../Subscriber-1rDE7HuM.cjs";
-import { SubscriberBuilder } from "../SubscriberBuilder-B9uva8fZ.cjs";
-import * as _geekmidas_logger8 from "@geekmidas/logger";
+import { SubscriberBuilder } from "../SubscriberBuilder-Be7WBbCL.cjs";
+import * as _geekmidas_logger10 from "@geekmidas/logger";
 
 //#region src/subscribers/index.d.ts
-declare const s: SubscriberBuilder<[], _geekmidas_logger8.Logger, undefined, undefined, string, []>;
+declare const s: SubscriberBuilder<[], _geekmidas_logger10.Logger, undefined, undefined, string, []>;
 //# sourceMappingURL=index.d.ts.map
 
 //#endregion

package/dist/subscribers/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","names":[],"sources":["../../src/subscribers/index.ts"],"sourcesContent":[],"mappings":";;;;;;cAKa,GAAC,sBAA0B,kBAAA,CAA1B,MAAA"}
+{"version":3,"file":"index.d.cts","names":[],"sources":["../../src/subscribers/index.ts"],"sourcesContent":[],"mappings":";;;;;;cAKa,GAAC,sBAA0B,mBAAA,CAA1B,MAAA"}

package/dist/subscribers/index.d.mts

@@ -1,6 +1,6 @@
-import "../Construct-C2SyofdS.mjs";
-import { Subscriber } from "../Subscriber-BgB3RRxb.mjs";
-import { SubscriberBuilder } from "../SubscriberBuilder-DaQkh2Nt.mjs";
+import "../Construct-BjpXFNxy.mjs";
+import { Subscriber } from "../Subscriber-9ObcUdcC.mjs";
+import { SubscriberBuilder } from "../SubscriberBuilder-DsfIkgTF.mjs";
 import * as _geekmidas_logger10 from "@geekmidas/logger";
 
 //#region src/subscribers/index.d.ts

package/dist/subscribers/index.mjs

@@ -1,6 +1,6 @@
 import "../Construct-CQ9zV58W.mjs";
-import { Subscriber } from "../Subscriber-BEhOdNQi.mjs";
-import { SubscriberBuilder } from "../SubscriberBuilder-DlUaG0Ej.mjs";
+import { Subscriber } from "../Subscriber-BH76wgkL.mjs";
+import { SubscriberBuilder } from "../SubscriberBuilder-B4md5wzs.mjs";
 
 //#region src/subscribers/index.ts
 const s = new SubscriberBuilder();

package/dist/{telemetry-C-kNOW3C.d.mts → telemetry-BJo1gcV1.d.mts}

@@ -92,4 +92,4 @@ interface Telemetry {
 //# sourceMappingURL=telemetry.d.ts.map
 //#endregion
 export { Telemetry, TelemetryContext, TelemetryRequest, TelemetryResponse };
-//# sourceMappingURL=telemetry-C-kNOW3C.d.mts.map
+//# sourceMappingURL=telemetry-BJo1gcV1.d.mts.map

package/dist/{telemetry-C-kNOW3C.d.mts.map → telemetry-BJo1gcV1.d.mts.map}

@@ -1 +1 @@
-{"version":3,"file":"telemetry-C-kNOW3C.d.mts","names":[],"sources":["../src/telemetry.ts"],"sourcesContent":[],"mappings":";;;;;;;AA6FmB,UAlFF,gBAAA,CAkFE;EAAgB;;;EAQgB,CAAA,GAAA,EAAA,MAAA,CAAA,EAAA,OAAA;;;;;UAhFlC,gBAAA;;;;;;;;WASP;;;;;UAMO,iBAAA;;;;;;;;;;;;YAcN;;;;;;;;;;;;;;;;;;;;;;;;;;;UA4BM,SAAA;;;;;;;0BAOQ,mBAAmB;;;;;;;oBAQzB,4BAA4B;;;;;;;sBAQ1B,yBAAyB"}
+{"version":3,"file":"telemetry-BJo1gcV1.d.mts","names":[],"sources":["../src/telemetry.ts"],"sourcesContent":[],"mappings":";;;;;;;AA6FmB,UAlFF,gBAAA,CAkFE;EAAgB;;;EAQgB,CAAA,GAAA,EAAA,MAAA,CAAA,EAAA,OAAA;;;;;UAhFlC,gBAAA;;;;;;;;WASP;;;;;UAMO,iBAAA;;;;;;;;;;;;YAcN;;;;;;;;;;;;;;;;;;;;;;;;;;;UA4BM,SAAA;;;;;;;0BAOQ,mBAAmB;;;;;;;oBAQzB,4BAA4B;;;;;;;sBAQ1B,yBAAyB"}

package/dist/telemetry.d.mts

@@ -1,2 +1,2 @@
-import { Telemetry, TelemetryContext, TelemetryRequest, TelemetryResponse } from "./telemetry-C-kNOW3C.mjs";
+import { Telemetry, TelemetryContext, TelemetryRequest, TelemetryResponse } from "./telemetry-BJo1gcV1.mjs";
 export { Telemetry, TelemetryContext, TelemetryRequest, TelemetryResponse };

package/dist/{types-aFmq5cKh.d.mts → types-BqPOdHEm.d.mts}

@@ -6,4 +6,4 @@ type LowerHttpMethod<T extends HttpMethod> = Lowercase<T>;
 
 //#endregion
 export { HttpMethod, LowerHttpMethod, RemoveUndefined };
-//# sourceMappingURL=types-aFmq5cKh.d.mts.map
+//# sourceMappingURL=types-BqPOdHEm.d.mts.map

package/dist/{types-aFmq5cKh.d.mts.map → types-BqPOdHEm.d.mts.map}

@@ -1 +1 @@
-{"version":3,"file":"types-aFmq5cKh.d.mts","names":[],"sources":["../src/types.ts"],"sourcesContent":[],"mappings":";KAAY,6BAAA,MACC,CADD,IACM,CADS,CACP,CADO,CAAA,SAAA,SAAA,GAAA,KAAA,GACwB,CADxB,GAC4B,CAD5B,CAC8B,CAD9B,CAAA,EAAA;AACd,KAGD,UAAA,GAHC,KAAA,GAAA,MAAA,GAAA,KAAA,GAAA,OAAA,GAAA,QAAA,GAAA,SAAA;AAAK,KAWN,eAXM,CAAA,UAWoB,UAXpB,CAAA,GAWkC,SAXlC,CAW4C,CAX5C,CAAA"}
+{"version":3,"file":"types-BqPOdHEm.d.mts","names":[],"sources":["../src/types.ts"],"sourcesContent":[],"mappings":";KAAY,6BAAA,MACC,CADD,IACM,CADS,CACP,CADO,CAAA,SAAA,SAAA,GAAA,KAAA,GACwB,CADxB,GAC4B,CAD5B,CAC8B,CAD9B,CAAA,EAAA;AACd,KAGD,UAAA,GAHC,KAAA,GAAA,MAAA,GAAA,KAAA,GAAA,OAAA,GAAA,QAAA,GAAA,SAAA;AAAK,KAWN,eAXM,CAAA,UAWoB,UAXpB,CAAA,GAWkC,SAXlC,CAW4C,CAX5C,CAAA"}

package/dist/types.d.mts

@@ -1,2 +1,2 @@
-import { HttpMethod, LowerHttpMethod, RemoveUndefined } from "./types-aFmq5cKh.mjs";
+import { HttpMethod, LowerHttpMethod, RemoveUndefined } from "./types-BqPOdHEm.mjs";
 export { HttpMethod, LowerHttpMethod, RemoveUndefined };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekmidas/constructs",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "private": false,
   "type": "module",
   "exports": {
@@ -79,14 +79,15 @@
     "better-auth": "~1.4.18",
     "kysely": "~0.28.8",
     "pg": "~8.16.3",
+    "msw": "~2.10.3",
     "zod": "~4.1.13",
     "@geekmidas/audit": "^2.0.0",
-    "@geekmidas/db": "^1.0.1",
     "@geekmidas/cache": "^1.1.0",
+    "@geekmidas/db": "^1.0.1",
     "@geekmidas/envkit": "^1.0.4",
     "@geekmidas/errors": "^1.0.0",
-    "@geekmidas/logger": "^1.0.0",
     "@geekmidas/events": "^1.1.0",
+    "@geekmidas/logger": "^1.0.0",
     "@geekmidas/rate-limit": "^2.0.0",
     "@geekmidas/schema": "^1.0.0",
     "@geekmidas/services": "^1.0.1",
@@ -96,16 +97,17 @@
     "@middy/core": ">=6.3.1",
     "@types/aws-lambda": ">=8.10.92",
     "hono": ">=4.8.2",
+    "msw": ">=2.0.0",
+    "@geekmidas/db": "^1.0.1",
     "@geekmidas/audit": "^2.0.0",
     "@geekmidas/cache": "^1.1.0",
-    "@geekmidas/db": "^1.0.1",
     "@geekmidas/envkit": "^1.0.4",
     "@geekmidas/events": "^1.1.0",
-    "@geekmidas/errors": "^1.0.0",
     "@geekmidas/logger": "^1.0.0",
-    "@geekmidas/services": "^1.0.1",
+    "@geekmidas/errors": "^1.0.0",
     "@geekmidas/rate-limit": "^2.0.0",
-    "@geekmidas/schema": "^1.0.0"
+    "@geekmidas/schema": "^1.0.0",
+    "@geekmidas/services": "^1.0.1"
   },
   "peerDependenciesMeta": {
     "@geekmidas/audit": {
@@ -146,6 +148,9 @@
     },
     "hono": {
       "optional": true
+    },
+    "msw": {
+      "optional": true
     }
   },
   "scripts": {

package/src/adaptors/testing.ts

@@ -1,3 +1,10 @@
+export {
+	type CreateMswHandlersOptions,
+	type CreateMswHandlersResult,
+	createMswHandlers,
+	type RegisterContextOptions,
+	TEST_CONTEXT_HEADER,
+} from '../endpoints/MswEndpointAdaptor';
 export { TestEndpointAdaptor } from '../endpoints/TestEndpointAdaptor';
 export { TestFunctionAdaptor } from '../functions/TestFunctionAdaptor';
 export { TestSubscriberAdaptor } from '../subscribers/TestSubscriberAdaptor';

package/src/endpoints/AmazonApiGatewayEndpointAdaptor.ts

@@ -258,6 +258,9 @@ export abstract class AmazonApiGatewayEndpoint<
 					services,
 					logger,
 					session,
+					...((req.event as any).db !== undefined && {
+						db: (req.event as any).db,
+					}),
 					body: (req.event as any).body,
 					query: (req.event as any).query,
 					params: (req.event as any).params,

package/src/endpoints/Endpoint.ts

@@ -113,8 +113,13 @@ export class Endpoint<
 	public getSession: SessionFn<TServices, TLogger, TSession, TDatabase> = () =>
 		({}) as TSession;
 	/** Function to determine if the request is authorized */
-	public authorize: AuthorizeFn<TServices, TLogger, TSession, TInput> = () =>
-		true;
+	public authorize: AuthorizeFn<
+		TServices,
+		TLogger,
+		TSession,
+		TInput,
+		TDatabase
+	> = () => true;
 	/** Optional rate limiting configuration */
 	public rateLimit?: RateLimitConfig;
 	/** Optional authorizer for this endpoint */
@@ -750,7 +755,9 @@ export interface EndpointOptions<
 		TAuditAction
 	>;
 	/** Optional authorization check function */
-	authorize: AuthorizeFn<TServices, TLogger, TSession, TInput> | undefined;
+	authorize:
+		| AuthorizeFn<TServices, TLogger, TSession, TInput, TDatabase>
+		| undefined;
 	/** Optional description for documentation */
 	description: string | undefined;
 	/** Optional tags for OpenAPI documentation */
@@ -815,13 +822,15 @@ export type AuthorizeContext<
 	TLogger extends Logger = Logger,
 	TSession = unknown,
 	TInput extends EndpointSchemas | undefined = undefined,
+	TDatabase = undefined,
 > = {
 	services: ServiceRecord<TServices>;
 	logger: TLogger;
 	header: HeaderFn;
 	cookie: CookieFn;
 	session: TSession;
-} & InferComposableStandardSchema<TInput>;
+} & InferComposableStandardSchema<TInput> &
+	SessionDatabaseContext<TDatabase>;
 /**
  * Function type for endpoint authorization checks.
  *
@@ -844,8 +853,9 @@ export type AuthorizeFn<
 	TLogger extends Logger = Logger,
 	TSession = unknown,
 	TInput extends EndpointSchemas | undefined = undefined,
+	TDatabase = undefined,
 > = (
-	ctx: AuthorizeContext<TServices, TLogger, TSession, TInput>,
+	ctx: AuthorizeContext<TServices, TLogger, TSession, TInput, TDatabase>,
 ) => Promise<boolean> | boolean;
 
 /**

package/src/endpoints/EndpointBuilder.ts

@@ -63,7 +63,8 @@ export class EndpointBuilder<
 	protected _memorySize?: number;
 	_getSession: SessionFn<TServices, TLogger, TSession, TDatabase> = () =>
 		({}) as TSession;
-	_authorize: AuthorizeFn<TServices, TLogger, TSession, TInput> = () => true;
+	_authorize: AuthorizeFn<TServices, TLogger, TSession, TInput, TDatabase> =
+		() => true;
 	_rateLimit?: RateLimitConfig;
 	_availableAuthorizers: Authorizer[] = [];
 	_authorizerName?: TAuthorizers[number];
@@ -263,7 +264,9 @@ export class EndpointBuilder<
 		return this;
 	}
 
-	authorize(fn: AuthorizeFn<TServices, TLogger, TSession, TInput>): this {
+	authorize(
+		fn: AuthorizeFn<TServices, TLogger, TSession, TInput, TDatabase>,
+	): this {
 		this._authorize = fn;
 		return this;
 	}

package/src/endpoints/EndpointFactory.ts

@@ -51,7 +51,13 @@ export class EndpointFactory<
 > {
 	private defaultServices: TServices = [] as unknown as TServices;
 	private basePath: TBasePath = '' as TBasePath;
-	private defaultAuthorizeFn?: AuthorizeFn<TServices, TLogger, TSession>;
+	private defaultAuthorizeFn?: AuthorizeFn<
+		TServices,
+		TLogger,
+		TSession,
+		undefined,
+		TDatabase
+	>;
 	private defaultEventPublisher:
 		| Service<TEventPublisherServiceName, TEventPublisher>
 		| undefined;
@@ -419,7 +425,7 @@ export class EndpointFactory<
 
 	// Create a new factory with authorization
 	authorize(
-		fn: AuthorizeFn<TServices, TLogger, TSession>,
+		fn: AuthorizeFn<TServices, TLogger, TSession, undefined, TDatabase>,
 	): EndpointFactory<
 		TServices,
 		TBasePath,
@@ -749,7 +755,9 @@ export class EndpointFactory<
 		>({
 			defaultServices: this.defaultServices,
 			basePath: this.basePath,
-			defaultAuthorizeFn: this.defaultAuthorizeFn,
+			defaultAuthorizeFn: this.defaultAuthorizeFn as unknown as
+				| AuthorizeFn<TServices, TLogger, TSession, undefined, T>
+				| undefined,
 			defaultLogger: this.defaultLogger,
 			// Reset session extractor when database changes - user should call .session() after .database()
 			// to get proper type inference for the new database type
@@ -1117,7 +1125,13 @@ export interface EndpointFactoryOptions<
 > {
 	defaultServices?: TServices;
 	basePath?: TBasePath;
-	defaultAuthorizeFn?: AuthorizeFn<TServices, TLogger, TSession>;
+	defaultAuthorizeFn?: AuthorizeFn<
+		TServices,
+		TLogger,
+		TSession,
+		undefined,
+		TDatabase
+	>;
 	defaultLogger?: TLogger;
 	defaultSessionExtractor?: SessionFn<TServices, TLogger, TSession, TDatabase>;
 	defaultEventPublisher?: Service<TEventPublisherServiceName, TEventPublisher>;

package/src/endpoints/HonoEndpointAdaptor.ts

@@ -393,6 +393,7 @@ export class HonoEndpoint<
 							services,
 							logger,
 							session,
+							...(rawDb !== undefined && { db: rawDb }),
 							body: features.hasBodyValidation
 								? (c.req.valid as any)('json')
 								: undefined,
@@ -402,7 +403,7 @@ export class HonoEndpoint<
 							params: features.hasParamValidation
 								? (c.req.valid as any)('param')
 								: undefined,
-						});
+						} as any);
 
 						if (!isAuthorized) {
 							logger.warn('Unauthorized access attempt');

package/src/endpoints/MswEndpointAdaptor.ts

@@ -0,0 +1,226 @@
+import { EnvironmentParser } from '@geekmidas/envkit';
+import type { Service } from '@geekmidas/services';
+import { ServiceDiscovery } from '@geekmidas/services';
+import { Hono } from 'hono';
+import { type HttpHandler, http } from 'msw';
+import type { Endpoint } from './Endpoint';
+import { HonoEndpoint } from './HonoEndpointAdaptor';
+
+/**
+ * Header used to identify which test context a request belongs to.
+ * Each concurrent test registers its own context (services, db transaction, etc.)
+ * and the MSW handler looks it up by this header value.
+ */
+export const TEST_CONTEXT_HEADER = 'x-test-context-id';
+
+/**
+ * Per-test context containing an isolated ServiceDiscovery instance.
+ * Registered in the context map and looked up per-request via the context ID header.
+ */
+export interface MswTestContext {
+	serviceDiscovery: ServiceDiscovery<any>;
+}
+
+/**
+ * Options for creating MSW handlers from endpoint constructs.
+ *
+ * @example
+ * ```typescript
+ * import { createMswHandlers, registerTestContext } from '@geekmidas/constructs/testing';
+ * import { setupServer } from 'msw/node';
+ *
+ * // Create handlers once (global)
+ * const { handlers, registerContext, removeContext } = createMswHandlers(
+ *   [getUsers, createUser],
+ *   { baseURL: 'http://localhost:3000' },
+ * );
+ * const server = setupServer(...handlers);
+ *
+ * // Per test: register an isolated context with its own services/transaction
+ * it('should list users', async ({ db }) => {
+ *   const contextId = crypto.randomUUID();
+ *   registerContext(contextId, {
+ *     services: { database: db, auth: mockAuth },
+ *   });
+ *
+ *   const api = createApi({
+ *     baseURL: 'http://localhost:3000',
+ *     headers: { [TEST_CONTEXT_HEADER]: contextId },
+ *   });
+ *
+ *   const result = await api('GET /users');
+ *   expect(result).toBeDefined();
+ *
+ *   removeContext(contextId);
+ * });
+ * ```
+ */
+export interface CreateMswHandlersOptions {
+	/** Base URL the client fetches from (e.g., 'http://localhost:3000') */
+	baseURL: string;
+}
+
+/**
+ * Options for registering a per-test context.
+ * Follows the same pattern as TestRequestAdaptor — services, database,
+ * publisher, and auditorStorage are provided explicitly.
+ */
+export interface RegisterContextOptions {
+	/** Service instances keyed by serviceName */
+	services?: Record<string, unknown>;
+	/** Database instance — required when endpoints use .database() */
+	database?: unknown;
+	/** Event publisher service definition */
+	publisher?: Service;
+	/** Audit storage instance — required when endpoints use .auditor() */
+	auditorStorage?: unknown;
+}
+
+const MSW_HTTP_METHODS = [
+	'get',
+	'post',
+	'put',
+	'patch',
+	'delete',
+	'options',
+] as const;
+
+type MswHttpMethod = (typeof MSW_HTTP_METHODS)[number];
+
+/**
+ * Result of creating MSW handlers from endpoint constructs.
+ */
+export interface CreateMswHandlersResult {
+	/** MSW handlers to pass to setupServer() */
+	handlers: HttpHandler[];
+	/** Register an isolated context for a test */
+	registerContext: (id: string, options: RegisterContextOptions) => void;
+}
+
+/**
+ * Creates MSW HTTP handlers from endpoint constructs.
+ *
+ * Mounts endpoints on a Hono app and creates MSW handlers that intercept
+ * fetch requests and route them through `app.request()` — giving frontend
+ * tests full endpoint behavior (validation, auth, sessions) without HTTP.
+ *
+ * Each test registers its own isolated context via `registerContext()`,
+ * which is resolved per-request using the `x-test-context-id` header.
+ * This allows concurrent tests with their own transactions and services.
+ *
+ * @param endpoints - Array of endpoint constructs to create handlers for
+ * @param options - Configuration including baseURL
+ * @returns MSW handlers, the Hono app, and context management functions
+ */
+export function createMswHandlers(
+	endpoints: Endpoint<any, any, any, any, any, any>[],
+	options: CreateMswHandlersOptions,
+): CreateMswHandlersResult {
+	const { baseURL } = options;
+	const contexts = new Map<string, MswTestContext>();
+
+	/**
+	 * Register an isolated context for a test.
+	 * Creates a fresh ServiceDiscovery and pre-registers all provided services.
+	 */
+	function registerContext(id: string, ctxOptions: RegisterContextOptions) {
+		const envParser = new EnvironmentParser({});
+		const serviceDiscovery = new ServiceDiscovery(envParser);
+
+		const serviceDefs: Service[] = [];
+
+		// Register explicit services
+		if (ctxOptions.services) {
+			for (const [name, instance] of Object.entries(ctxOptions.services)) {
+				serviceDefs.push({
+					serviceName: name,
+					register: () => instance,
+				} as Service);
+			}
+		}
+
+		// Register database service from endpoint metadata
+		if (ctxOptions.database !== undefined) {
+			for (const endpoint of endpoints) {
+				if (endpoint.databaseService) {
+					serviceDefs.push({
+						serviceName: endpoint.databaseService.serviceName,
+						register: () => ctxOptions.database,
+					} as Service);
+					break;
+				}
+			}
+		}
+
+		// Register publisher service
+		if (ctxOptions.publisher) {
+			serviceDefs.push(ctxOptions.publisher);
+		}
+
+		// Register auditor storage service from endpoint metadata
+		if (ctxOptions.auditorStorage !== undefined) {
+			for (const endpoint of endpoints) {
+				if (endpoint.auditorStorageService) {
+					serviceDefs.push({
+						serviceName: endpoint.auditorStorageService.serviceName,
+						register: () => ctxOptions.auditorStorage,
+					} as Service);
+					break;
+				}
+			}
+		}
+
+		if (serviceDefs.length > 0) {
+			serviceDiscovery.register(serviceDefs);
+		}
+
+		contexts.set(id, { serviceDiscovery });
+	}
+
+	// Create a Hono app per-request that uses the correct ServiceDiscovery.
+	// We use a wrapper app that resolves the context from the header,
+	// then delegates to a context-specific Hono app.
+	const handlers: HttpHandler[] = [];
+
+	for (const endpoint of endpoints) {
+		const method = endpoint.method.toLowerCase() as MswHttpMethod;
+		if (!MSW_HTTP_METHODS.includes(method)) continue;
+
+		const mswUrl = `${baseURL}${endpoint.route}`;
+		const mswMethod = http[method];
+
+		handlers.push(
+			mswMethod(mswUrl, async ({ request }) => {
+				const contextId = request.headers.get(TEST_CONTEXT_HEADER);
+				const ctx = contextId ? contexts.get(contextId) : undefined;
+
+				if (!ctx) {
+					return new Response(
+						JSON.stringify({
+							error: 'Missing or unknown test context ID',
+							hint: `Set the '${TEST_CONTEXT_HEADER}' header to a registered context ID`,
+						}),
+						{ status: 500, headers: { 'content-type': 'application/json' } },
+					);
+				}
+
+				// Build a fresh Hono app with this context's ServiceDiscovery
+				const app = new Hono();
+				HonoEndpoint.addRoute(endpoint, ctx.serviceDiscovery as any, app);
+
+				const response = await app.request(request);
+
+				return new Response(response.body, {
+					status: response.status,
+					statusText: response.statusText,
+					headers: response.headers,
+				});
+			}),
+		);
+	}
+
+	return {
+		handlers,
+		registerContext,
+	};
+}

package/src/endpoints/TestEndpointAdaptor.ts

@@ -216,10 +216,11 @@ export class TestEndpointAdaptor<
 				services: ctx.services,
 				logger,
 				session,
+				...(rawDb !== undefined && { db: rawDb }),
 				body,
 				query,
 				params,
-			});
+			} as any);
 
 			if (!isAuthorized) {
 				logger.warn('Unauthorized access attempt');