@interfere/next 0.0.15-alpha.8 → 0.1.0-alpha.11

package/dist/server/middleware.mjs

@@ -1,22 +1,21 @@
-import { ConfigServiceLive } from "./services/config.service.mjs";
+import { NextConfigLive } from "./services/config.service.mjs";
 import { ErrorTrackingService, ErrorTrackingServiceLive } from "./services/error-tracking.service.mjs";
 import { withInterfereLogger } from "@interfere/effect-utils/observability";
 import { Data, Effect, Layer } from "effect";
-import { withSpan } from "@interfere/react/effect/layers/tracer.layer";
 
 //#region src/server/middleware.ts
 var MiddlewareError = class extends Data.TaggedError("MiddlewareError") {};
 function withInterfereMiddleware(middleware) {
-	const layer = Layer.mergeAll(ConfigServiceLive, ErrorTrackingServiceLive);
+	const layer = Layer.mergeAll(NextConfigLive, ErrorTrackingServiceLive);
 	return async (request) => {
 		if (request.nextUrl.pathname.startsWith("/api/interfere")) return middleware(request);
 		const startTime = Date.now();
 		const program = Effect.gen(function* () {
 			const errorTracking = yield* ErrorTrackingService;
-			return yield* withSpan("middleware.request", Effect.tryPromise({
+			return yield* Effect.tryPromise({
 				try: () => Promise.resolve(middleware(request)),
 				catch: (cause) => new MiddlewareError({ cause })
-			}), { attributes: { path: request.nextUrl.pathname } }).pipe(Effect.tapError((error) => errorTracking.captureError(error.cause instanceof Error ? error.cause : new Error(String(error.cause)), request, {
+			}).pipe(Effect.annotateLogs({ path: request.nextUrl.pathname }), Effect.withSpan("middleware.request", { attributes: { path: request.nextUrl.pathname } }), Effect.tapError((error) => errorTracking.captureError(error.cause instanceof Error ? error.cause : new Error(String(error.cause)), request, {
 				pathname: request.nextUrl.pathname,
 				middleware: true,
 				duration: Date.now() - startTime
@@ -26,16 +25,16 @@ function withInterfereMiddleware(middleware) {
 	};
 }
 function withInterfereApiRoute(handler) {
-	const layer = Layer.mergeAll(ConfigServiceLive, ErrorTrackingServiceLive);
+	const layer = Layer.mergeAll(NextConfigLive, ErrorTrackingServiceLive);
 	return async (req) => {
 		if (req.nextUrl.pathname.startsWith("/api/interfere")) return handler(req);
 		const startTime = Date.now();
 		const program = Effect.gen(function* () {
 			const errorTracking = yield* ErrorTrackingService;
-			return yield* withSpan("api.request", Effect.tryPromise({
+			return yield* Effect.tryPromise({
 				try: () => handler(req),
 				catch: (cause) => new MiddlewareError({ cause })
-			}), { attributes: { path: req.nextUrl.pathname } }).pipe(Effect.tapError((error) => errorTracking.captureError(error.cause instanceof Error ? error.cause : new Error(String(error.cause)), req, {
+			}).pipe(Effect.annotateLogs({ path: req.nextUrl.pathname }), Effect.withSpan("api.request", { attributes: { path: req.nextUrl.pathname } }), Effect.tapError((error) => errorTracking.captureError(error.cause instanceof Error ? error.cause : new Error(String(error.cause)), req, {
 				pathname: req.nextUrl.pathname,
 				type: "api_route",
 				duration: Date.now() - startTime
@@ -45,20 +44,28 @@ function withInterfereApiRoute(handler) {
 	};
 }
 function withInterfereServerComponent(component, componentName) {
-	const layer = Layer.mergeAll(ConfigServiceLive, ErrorTrackingServiceLive);
+	const layer = Layer.mergeAll(NextConfigLive, ErrorTrackingServiceLive);
 	async function wrapped(...args) {
 		const self = this;
+		let originalError = null;
 		const program = Effect.gen(function* () {
 			const errorTracking = yield* ErrorTrackingService;
 			return yield* Effect.tryPromise({
 				try: () => component.apply(self, args),
-				catch: (cause) => new MiddlewareError({ cause })
+				catch: (cause) => {
+					originalError = cause;
+					return new MiddlewareError({ cause });
+				}
 			}).pipe(Effect.tapError((error) => errorTracking.captureError(error.cause instanceof Error ? error.cause : new Error(String(error.cause)), void 0, {
 				type: "server_component",
 				componentName: componentName || component.name
 			})));
 		}).pipe(Effect.provide(layer));
-		return await Effect.runPromise(withInterfereLogger("next", program));
+		try {
+			return await Effect.runPromise(withInterfereLogger("next", program));
+		} catch (error) {
+			throw originalError ?? error;
+		}
 	}
 	try {
 		Object.defineProperty(wrapped, "name", {
@@ -69,14 +76,14 @@ function withInterfereServerComponent(component, componentName) {
 	return wrapped;
 }
 function createInterfereErrorHandler() {
-	const layer = Layer.mergeAll(ConfigServiceLive, ErrorTrackingServiceLive);
+	const layer = Layer.mergeAll(NextConfigLive, ErrorTrackingServiceLive);
 	return async (error, errorInfo) => {
 		const program = Effect.gen(function* () {
 			yield* (yield* ErrorTrackingService).captureError(error, void 0, {
 				digest: errorInfo.digest,
 				type: "app_directory_error"
 			});
-		}).pipe(Effect.provide(layer), Effect.catchAll(() => Effect.void));
+		}).pipe(Effect.provide(layer));
 		await Effect.runPromise(withInterfereLogger("next", program));
 	};
 }

package/dist/server/middleware.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.mjs","names":[],"sources":["../../src/server/middleware.ts"],"sourcesContent":["import { withInterfereLogger } from \"@interfere/effect-utils/observability\";\nimport { withSpan } from \"@interfere/react/effect/layers/tracer.layer\";\n\nimport { Data, Effect, Layer } from \"effect\";\nimport type { NextRequest, NextResponse } from \"next/server\";\n\nclass MiddlewareError extends Data.TaggedError(\"MiddlewareError\")<{\n  cause: unknown;\n}> {}\n\nimport { ConfigServiceLive } from \"./services/config.service\";\nimport {\n  ErrorTrackingService,\n  ErrorTrackingServiceLive,\n} from \"./services/error-tracking.service\";\n\n// Middleware wrapper to capture errors with proper Effect handling\nexport function withInterfereMiddleware(\n  middleware: (request: NextRequest) => Promise<NextResponse> | NextResponse\n) {\n  const layer = Layer.mergeAll(ConfigServiceLive, ErrorTrackingServiceLive);\n\n  return async (request: NextRequest) => {\n    // Skip capturing for Interfere's own endpoint to avoid recursion\n    if (request.nextUrl.pathname.startsWith(\"/api/interfere\")) {\n      return middleware(request);\n    }\n\n    const startTime = Date.now();\n\n    const program = Effect.gen(function* () {\n      const errorTracking = yield* ErrorTrackingService;\n\n      const response = yield* withSpan(\n        \"middleware.request\",\n        Effect.tryPromise({\n          try: () => Promise.resolve(middleware(request)),\n          catch: (cause) => new MiddlewareError({ cause }),\n        }),\n        { attributes: { path: request.nextUrl.pathname } }\n      ).pipe(\n        Effect.tapError((error) =>\n          errorTracking.captureError(\n            error.cause instanceof Error\n              ? error.cause\n              : new Error(String(error.cause)),\n            request,\n            {\n              pathname: request.nextUrl.pathname,\n              middleware: true,\n              duration: Date.now() - startTime,\n            }\n          )\n        )\n      );\n\n      return response;\n    }).pipe(Effect.provide(layer));\n\n    return await Effect.runPromise(withInterfereLogger(\"next\", program));\n  };\n}\n\n// Helper for API route error handling with Effect\nexport function withInterfereApiRoute(\n  handler: (req: NextRequest) => Promise<Response>\n) {\n  const layer = Layer.mergeAll(ConfigServiceLive, ErrorTrackingServiceLive);\n\n  return async (req: NextRequest) => {\n    // Skip capturing for Interfere's own endpoint to avoid recursion\n    if (req.nextUrl.pathname.startsWith(\"/api/interfere\")) {\n      return handler(req);\n    }\n\n    const startTime = Date.now();\n\n    const program = Effect.gen(function* () {\n      const errorTracking = yield* ErrorTrackingService;\n\n      const response = yield* withSpan(\n        \"api.request\",\n        Effect.tryPromise({\n          try: () => handler(req),\n          catch: (cause) => new MiddlewareError({ cause }),\n        }),\n        { attributes: { path: req.nextUrl.pathname } }\n      ).pipe(\n        Effect.tapError((error) =>\n          errorTracking.captureError(\n            error.cause instanceof Error\n              ? error.cause\n              : new Error(String(error.cause)),\n            req,\n            {\n              pathname: req.nextUrl.pathname,\n              type: \"api_route\",\n              duration: Date.now() - startTime,\n            }\n          )\n        )\n      );\n\n      return response;\n    }).pipe(Effect.provide(layer));\n\n    return await Effect.runPromise(withInterfereLogger(\"next\", program));\n  };\n}\n\n// Helper for server component error handling with Effect\nexport function withInterfereServerComponent<\n  T extends (...args: unknown[]) => Promise<unknown>,\n>(component: T, componentName?: string): T {\n  const layer = Layer.mergeAll(ConfigServiceLive, ErrorTrackingServiceLive);\n\n  async function wrapped(this: unknown, ...args: Parameters<T>) {\n    const self = this;\n\n    const program = Effect.gen(function* () {\n      const errorTracking = yield* ErrorTrackingService;\n\n      const result = yield* Effect.tryPromise({\n        try: () => component.apply(self as never, args as never),\n        catch: (cause) => new MiddlewareError({ cause }),\n      }).pipe(\n        Effect.tapError((error) =>\n          errorTracking.captureError(\n            error.cause instanceof Error\n              ? error.cause\n              : new Error(String(error.cause)),\n            undefined,\n            {\n              type: \"server_component\",\n              componentName: componentName || component.name,\n            }\n          )\n        )\n      );\n\n      return result;\n    }).pipe(Effect.provide(layer));\n\n    return await Effect.runPromise(withInterfereLogger(\"next\", program));\n  }\n\n  // Preserve the original function name for diagnostics and tests\n  try {\n    Object.defineProperty(wrapped, \"name\", {\n      value: component.name,\n      configurable: true,\n    });\n  } catch {\n    // Non-critical if we cannot redefine the name\n  }\n\n  return wrapped as unknown as T;\n}\n\n// App directory error handling with Effect\nexport function createInterfereErrorHandler() {\n  const layer = Layer.mergeAll(ConfigServiceLive, ErrorTrackingServiceLive);\n\n  return async (error: Error, errorInfo: { digest?: string }) => {\n    const program = Effect.gen(function* () {\n      const errorTracking = yield* ErrorTrackingService;\n\n      yield* errorTracking.captureError(error, undefined, {\n        digest: errorInfo.digest,\n        type: \"app_directory_error\",\n      });\n    }).pipe(\n      Effect.provide(layer),\n      Effect.catchAll(() => Effect.void) // Best-effort\n    );\n\n    await Effect.runPromise(withInterfereLogger(\"next\", program));\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"middleware.mjs","names":[],"sources":["../../src/server/middleware.ts"],"sourcesContent":["import { withInterfereLogger } from \"@interfere/effect-utils/observability\";\n\nimport { Data, Effect, Layer } from \"effect\";\nimport type { NextRequest, NextResponse } from \"next/server\";\n\nclass MiddlewareError extends Data.TaggedError(\"MiddlewareError\")<{\n  cause: unknown;\n}> {}\n\nimport { NextConfigLive } from \"./services/config.service\";\nimport {\n  ErrorTrackingService,\n  ErrorTrackingServiceLive,\n} from \"./services/error-tracking.service\";\n\n// Middleware wrapper to capture errors with proper Effect handling\nexport function withInterfereMiddleware(\n  middleware: (request: NextRequest) => Promise<NextResponse> | NextResponse\n) {\n  const layer = Layer.mergeAll(NextConfigLive, ErrorTrackingServiceLive);\n\n  return async (request: NextRequest) => {\n    // Skip capturing for Interfere's own endpoint to avoid recursion\n    if (request.nextUrl.pathname.startsWith(\"/api/interfere\")) {\n      return middleware(request);\n    }\n\n    const startTime = Date.now();\n\n    const program = Effect.gen(function* () {\n      const errorTracking = yield* ErrorTrackingService;\n\n      const response = yield* Effect.tryPromise({\n        try: () => Promise.resolve(middleware(request)),\n        catch: (cause) => new MiddlewareError({ cause }),\n      }).pipe(\n        Effect.annotateLogs({ path: request.nextUrl.pathname }),\n        Effect.withSpan(\"middleware.request\", {\n          attributes: { path: request.nextUrl.pathname },\n        }),\n        Effect.tapError((error) =>\n          errorTracking.captureError(\n            error.cause instanceof Error\n              ? error.cause\n              : new Error(String(error.cause)),\n            request,\n            {\n              pathname: request.nextUrl.pathname,\n              middleware: true,\n              duration: Date.now() - startTime,\n            }\n          )\n        )\n      );\n\n      return response;\n    }).pipe(Effect.provide(layer));\n\n    return await Effect.runPromise(withInterfereLogger(\"next\", program));\n  };\n}\n\n// Helper for API route error handling with Effect\nexport function withInterfereApiRoute(\n  handler: (req: NextRequest) => Promise<Response>\n) {\n  const layer = Layer.mergeAll(NextConfigLive, ErrorTrackingServiceLive);\n\n  return async (req: NextRequest) => {\n    // Skip capturing for Interfere's own endpoint to avoid recursion\n    if (req.nextUrl.pathname.startsWith(\"/api/interfere\")) {\n      return handler(req);\n    }\n\n    const startTime = Date.now();\n\n    const program = Effect.gen(function* () {\n      const errorTracking = yield* ErrorTrackingService;\n\n      const response = yield* Effect.tryPromise({\n        try: () => handler(req),\n        catch: (cause) => new MiddlewareError({ cause }),\n      }).pipe(\n        Effect.annotateLogs({ path: req.nextUrl.pathname }),\n        Effect.withSpan(\"api.request\", {\n          attributes: { path: req.nextUrl.pathname },\n        }),\n        Effect.tapError((error) =>\n          errorTracking.captureError(\n            error.cause instanceof Error\n              ? error.cause\n              : new Error(String(error.cause)),\n            req,\n            {\n              pathname: req.nextUrl.pathname,\n              type: \"api_route\",\n              duration: Date.now() - startTime,\n            }\n          )\n        )\n      );\n\n      return response;\n    }).pipe(Effect.provide(layer));\n\n    return await Effect.runPromise(withInterfereLogger(\"next\", program));\n  };\n}\n\n// Helper for server component error handling with Effect\nexport function withInterfereServerComponent<\n  T extends (...args: unknown[]) => Promise<unknown>,\n>(component: T, componentName?: string): T {\n  const layer = Layer.mergeAll(NextConfigLive, ErrorTrackingServiceLive);\n\n  async function wrapped(this: unknown, ...args: Parameters<T>) {\n    const self = this;\n\n    // Track the original error so we can re-throw it cleanly\n    let originalError: unknown = null;\n\n    const program = Effect.gen(function* () {\n      const errorTracking = yield* ErrorTrackingService;\n\n      const result = yield* Effect.tryPromise({\n        try: () => component.apply(self as never, args as never),\n        catch: (cause) => {\n          // Store the original error before wrapping\n          originalError = cause;\n          return new MiddlewareError({ cause });\n        },\n      }).pipe(\n        Effect.tapError((error) =>\n          errorTracking.captureError(\n            error.cause instanceof Error\n              ? error.cause\n              : new Error(String(error.cause)),\n            undefined,\n            {\n              type: \"server_component\",\n              componentName: componentName || component.name,\n            }\n          )\n        )\n      );\n\n      return result;\n    }).pipe(Effect.provide(layer));\n\n    try {\n      return await Effect.runPromise(withInterfereLogger(\"next\", program));\n    } catch (error) {\n      // Re-throw the original error so Next.js sees it cleanly\n      // instead of the FiberFailure/MiddlewareError wrapper.\n      // If originalError is null, it means the error occurred before the component\n      // execution (e.g., during service initialization), so re-throw the actual error.\n      throw originalError ?? error;\n    }\n  }\n\n  // Preserve the original function name for diagnostics and tests\n  try {\n    Object.defineProperty(wrapped, \"name\", {\n      value: component.name,\n      configurable: true,\n    });\n  } catch {\n    // Non-critical if we cannot redefine the name\n  }\n\n  return wrapped as unknown as T;\n}\n\n// App directory error handling with Effect\nexport function createInterfereErrorHandler() {\n  const layer = Layer.mergeAll(NextConfigLive, ErrorTrackingServiceLive);\n\n  return async (error: Error, errorInfo: { digest?: string }) => {\n    const program = Effect.gen(function* () {\n      const errorTracking = yield* ErrorTrackingService;\n\n      yield* errorTracking.captureError(error, undefined, {\n        digest: errorInfo.digest,\n        type: \"app_directory_error\",\n      });\n    }).pipe(Effect.provide(layer));\n\n    await Effect.runPromise(withInterfereLogger(\"next\", program));\n  };\n}\n"],"mappings":"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"}

package/dist/server/on-request-error.d.mts

@@ -0,0 +1,27 @@
+//#region src/server/on-request-error.d.ts
+interface NextRequestErrorContext {
+  renderSource?: "react-server-components" | "react-server-components-payload" | "server-rendering";
+  renderType?: "dynamic" | "dynamic-resume";
+  revalidateReason?: "on-demand" | "stale";
+  routePath: string;
+  routerKind: "Pages Router" | "App Router";
+  routeType: "render" | "route" | "action" | "middleware" | "proxy";
+}
+interface NextRequestErrorRequest {
+  headers: Record<string, string | string[] | undefined>;
+  method: string;
+  path: string;
+}
+type NextRequestError = Error & {
+  digest?: string;
+};
+interface CaptureRequestErrorParams {
+  context: NextRequestErrorContext;
+  error: NextRequestError;
+  request: NextRequestErrorRequest;
+}
+declare function captureRequestError(params: CaptureRequestErrorParams): Promise<void>;
+declare function isErrorAlreadyCaptured(error: unknown): boolean;
+declare function markErrorAsCaptured(error: unknown): void;
+//#endregion
+export { CaptureRequestErrorParams, NextRequestError, NextRequestErrorContext, NextRequestErrorRequest, captureRequestError, isErrorAlreadyCaptured, markErrorAsCaptured };

package/dist/server/on-request-error.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"on-request-error.d.mts","names":[],"sources":["../../src/server/on-request-error.ts"],"mappings":";UAgBiB,uBAAA;EACf,YAAA;EAIA,UAAA;EACA,gBAAA;EACA,SAAA;EACA,UAAA;EACA,SAAA;AAAA;AAAA,UAGe,uBAAA;EACf,OAAA,EAAS,MAAA;EACT,MAAA;EACA,IAAA;AAAA;AAAA,KAGU,gBAAA,GAAmB,KAAA;EAAU,MAAA;AAAA;AAAA,UAExB,yBAAA;EACf,OAAA,EAAS,uBAAA;EACT,KAAA,EAAO,gBAAA;EACP,OAAA,EAAS,uBAAA;AAAA;AAAA,iBAgDW,mBAAA,CACpB,MAAA,EAAQ,yBAAA,GACP,OAAA;AAAA,iBAmDa,sBAAA,CAAuB,KAAA;AAAA,iBAIvB,mBAAA,CAAoB,KAAA"}

package/dist/server/on-request-error.mjs

@@ -0,0 +1,74 @@
+import { NextConfigLive } from "./services/config.service.mjs";
+import { createSessionContextFromRequest, runWithSessionContext } from "./session-context.mjs";
+import { ErrorTrackingService, ErrorTrackingServiceLive } from "./services/error-tracking.service.mjs";
+import { withInterfereLogger } from "@interfere/effect-utils/observability";
+import { Effect, Layer } from "effect";
+
+//#region src/server/on-request-error.ts
+const CAPTURED_SYMBOL = Symbol.for("interfere.captured");
+const errorTrackingLayer = Layer.mergeAll(NextConfigLive, ErrorTrackingServiceLive);
+const CAPTURE_TIMEOUT_MS = 5e3;
+function normalizeHeaders(headers) {
+	const normalized = {};
+	for (const [key, value] of Object.entries(headers)) {
+		if (value === void 0) continue;
+		normalized[key] = Array.isArray(value) ? value.join(", ") : value;
+	}
+	return normalized;
+}
+function isErrorCaptured(error) {
+	if (typeof error !== "object" || error === null) return false;
+	return CAPTURED_SYMBOL in error;
+}
+function markErrorCaptured(error) {
+	if (typeof error !== "object" || error === null) return;
+	try {
+		Object.defineProperty(error, CAPTURED_SYMBOL, {
+			value: true,
+			enumerable: false,
+			writable: false,
+			configurable: false
+		});
+	} catch {}
+}
+async function captureRequestError(params) {
+	const { error, request, context } = params;
+	if (isErrorCaptured(error)) return;
+	markErrorCaptured(error);
+	const pseudoRequest = new Request(new URL(request.path, "http://localhost"), {
+		method: request.method,
+		headers: normalizeHeaders(request.headers)
+	});
+	const sessionContext = createSessionContextFromRequest(pseudoRequest);
+	const program = Effect.gen(function* () {
+		const errorTracking = yield* ErrorTrackingService;
+		const enrichedContext = {
+			routerKind: context.routerKind,
+			routePath: context.routePath,
+			routeType: context.routeType,
+			...context.renderSource && { renderSource: context.renderSource },
+			...context.revalidateReason && { revalidateReason: context.revalidateReason },
+			...context.renderType && { renderType: context.renderType },
+			requestPath: request.path,
+			requestMethod: request.method,
+			...error.digest && { errorDigest: error.digest },
+			mechanism: {
+				type: "onRequestError",
+				handled: false,
+				synthetic: false
+			},
+			captureSource: "on_request_error"
+		};
+		yield* errorTracking.captureError(error, pseudoRequest, enrichedContext);
+	}).pipe(Effect.provide(errorTrackingLayer), Effect.timeout(CAPTURE_TIMEOUT_MS), Effect.catchAll(() => Effect.void));
+	await runWithSessionContext(sessionContext, () => Effect.runPromise(withInterfereLogger("next-server", program)).catch(() => {}));
+}
+function isErrorAlreadyCaptured(error) {
+	return isErrorCaptured(error);
+}
+function markErrorAsCaptured(error) {
+	markErrorCaptured(error);
+}
+
+//#endregion
+export { captureRequestError, isErrorAlreadyCaptured, markErrorAsCaptured };

package/dist/server/on-request-error.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"on-request-error.mjs","names":[],"sources":["../../src/server/on-request-error.ts"],"sourcesContent":["import { withInterfereLogger } from \"@interfere/effect-utils/observability\";\n\nimport { Effect, Layer } from \"effect\";\n\nimport { NextConfigLive } from \"./services/config.service.js\";\nimport {\n  ErrorTrackingService,\n  ErrorTrackingServiceLive,\n} from \"./services/error-tracking.service.js\";\nimport {\n  createSessionContextFromRequest,\n  runWithSessionContext,\n} from \"./session-context.js\";\n\nconst CAPTURED_SYMBOL = Symbol.for(\"interfere.captured\");\n\nexport interface NextRequestErrorContext {\n  renderSource?:\n    | \"react-server-components\"\n    | \"react-server-components-payload\"\n    | \"server-rendering\";\n  renderType?: \"dynamic\" | \"dynamic-resume\";\n  revalidateReason?: \"on-demand\" | \"stale\";\n  routePath: string;\n  routerKind: \"Pages Router\" | \"App Router\";\n  routeType: \"render\" | \"route\" | \"action\" | \"middleware\" | \"proxy\";\n}\n\nexport interface NextRequestErrorRequest {\n  headers: Record<string, string | string[] | undefined>;\n  method: string;\n  path: string;\n}\n\nexport type NextRequestError = Error & { digest?: string };\n\nexport interface CaptureRequestErrorParams {\n  context: NextRequestErrorContext;\n  error: NextRequestError;\n  request: NextRequestErrorRequest;\n}\n\nconst errorTrackingLayer = Layer.mergeAll(\n  NextConfigLive,\n  ErrorTrackingServiceLive\n);\n\nconst CAPTURE_TIMEOUT_MS = 5000;\n\nfunction normalizeHeaders(\n  headers: Record<string, string | string[] | undefined>\n): Record<string, string> {\n  const normalized: Record<string, string> = {};\n\n  for (const [key, value] of Object.entries(headers)) {\n    if (value === undefined) {\n      continue;\n    }\n    normalized[key] = Array.isArray(value) ? value.join(\", \") : value;\n  }\n\n  return normalized;\n}\n\nfunction isErrorCaptured(error: unknown): boolean {\n  if (typeof error !== \"object\" || error === null) {\n    return false;\n  }\n  return CAPTURED_SYMBOL in error;\n}\n\nfunction markErrorCaptured(error: unknown): void {\n  if (typeof error !== \"object\" || error === null) {\n    return;\n  }\n  try {\n    Object.defineProperty(error, CAPTURED_SYMBOL, {\n      value: true,\n      enumerable: false,\n      writable: false,\n      configurable: false,\n    });\n  } catch {\n    /* frozen objects */\n  }\n}\n\nexport async function captureRequestError(\n  params: CaptureRequestErrorParams\n): Promise<void> {\n  const { error, request, context } = params;\n\n  if (isErrorCaptured(error)) {\n    return;\n  }\n  markErrorCaptured(error);\n\n  // Create pseudo Request object for session context parsing\n  const pseudoRequest = new Request(new URL(request.path, \"http://localhost\"), {\n    method: request.method,\n    headers: normalizeHeaders(request.headers),\n  });\n\n  // Extract session context from request headers\n  const sessionContext = createSessionContextFromRequest(pseudoRequest);\n\n  const program = Effect.gen(function* () {\n    const errorTracking = yield* ErrorTrackingService;\n\n    const enrichedContext: Record<string, unknown> = {\n      routerKind: context.routerKind,\n      routePath: context.routePath,\n      routeType: context.routeType,\n      ...(context.renderSource && { renderSource: context.renderSource }),\n      ...(context.revalidateReason && {\n        revalidateReason: context.revalidateReason,\n      }),\n      ...(context.renderType && { renderType: context.renderType }),\n      requestPath: request.path,\n      requestMethod: request.method,\n      ...(error.digest && { errorDigest: error.digest }),\n      mechanism: { type: \"onRequestError\", handled: false, synthetic: false },\n      captureSource: \"on_request_error\",\n    };\n\n    yield* errorTracking.captureError(error, pseudoRequest, enrichedContext);\n  }).pipe(\n    Effect.provide(errorTrackingLayer),\n    Effect.timeout(CAPTURE_TIMEOUT_MS),\n    Effect.catchAll(() => Effect.void)\n  );\n\n  // Run the program within session context for AsyncLocalStorage propagation\n  await runWithSessionContext(sessionContext, () =>\n    Effect.runPromise(withInterfereLogger(\"next-server\", program)).catch(() => {\n      /* best-effort */\n    })\n  );\n}\n\nexport function isErrorAlreadyCaptured(error: unknown): boolean {\n  return isErrorCaptured(error);\n}\n\nexport function markErrorAsCaptured(error: unknown): void {\n  markErrorCaptured(error);\n}\n"],"mappings":";;;;;;;AAcA,MAAM,kBAAkB,OAAO,IAAI,qBAAqB;AA4BxD,MAAM,qBAAqB,MAAM,SAC/B,gBACA,yBACD;AAED,MAAM,qBAAqB;AAE3B,SAAS,iBACP,SACwB;CACxB,MAAM,aAAqC,EAAE;AAE7C,MAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,QAAQ,EAAE;AAClD,MAAI,UAAU,OACZ;AAEF,aAAW,OAAO,MAAM,QAAQ,MAAM,GAAG,MAAM,KAAK,KAAK,GAAG;;AAG9D,QAAO;;AAGT,SAAS,gBAAgB,OAAyB;AAChD,KAAI,OAAO,UAAU,YAAY,UAAU,KACzC,QAAO;AAET,QAAO,mBAAmB;;AAG5B,SAAS,kBAAkB,OAAsB;AAC/C,KAAI,OAAO,UAAU,YAAY,UAAU,KACzC;AAEF,KAAI;AACF,SAAO,eAAe,OAAO,iBAAiB;GAC5C,OAAO;GACP,YAAY;GACZ,UAAU;GACV,cAAc;GACf,CAAC;SACI;;AAKV,eAAsB,oBACpB,QACe;CACf,MAAM,EAAE,OAAO,SAAS,YAAY;AAEpC,KAAI,gBAAgB,MAAM,CACxB;AAEF,mBAAkB,MAAM;CAGxB,MAAM,gBAAgB,IAAI,QAAQ,IAAI,IAAI,QAAQ,MAAM,mBAAmB,EAAE;EAC3E,QAAQ,QAAQ;EAChB,SAAS,iBAAiB,QAAQ,QAAQ;EAC3C,CAAC;CAGF,MAAM,iBAAiB,gCAAgC,cAAc;CAErE,MAAM,UAAU,OAAO,IAAI,aAAa;EACtC,MAAM,gBAAgB,OAAO;EAE7B,MAAM,kBAA2C;GAC/C,YAAY,QAAQ;GACpB,WAAW,QAAQ;GACnB,WAAW,QAAQ;GACnB,GAAI,QAAQ,gBAAgB,EAAE,cAAc,QAAQ,cAAc;GAClE,GAAI,QAAQ,oBAAoB,EAC9B,kBAAkB,QAAQ,kBAC3B;GACD,GAAI,QAAQ,cAAc,EAAE,YAAY,QAAQ,YAAY;GAC5D,aAAa,QAAQ;GACrB,eAAe,QAAQ;GACvB,GAAI,MAAM,UAAU,EAAE,aAAa,MAAM,QAAQ;GACjD,WAAW;IAAE,MAAM;IAAkB,SAAS;IAAO,WAAW;IAAO;GACvE,eAAe;GAChB;AAED,SAAO,cAAc,aAAa,OAAO,eAAe,gBAAgB;GACxE,CAAC,KACD,OAAO,QAAQ,mBAAmB,EAClC,OAAO,QAAQ,mBAAmB,EAClC,OAAO,eAAe,OAAO,KAAK,CACnC;AAGD,OAAM,sBAAsB,sBAC1B,OAAO,WAAW,oBAAoB,eAAe,QAAQ,CAAC,CAAC,YAAY,GAEzE,CACH;;AAGH,SAAgB,uBAAuB,OAAyB;AAC9D,QAAO,gBAAgB,MAAM;;AAG/B,SAAgB,oBAAoB,OAAsB;AACxD,mBAAkB,MAAM"}

package/dist/server/proxy.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.mts","names":[],"sources":["../../src/server/proxy.ts"],"sourcesContent":[],"mappings":";;;iBAiBgB,kBAAA,gBAEP,oBACE,mBACJ,QAAQ,YAAY,iBAIN,oBAAoB,mBAAc,QAAA"}
+{"version":3,"file":"proxy.d.mts","names":[],"sources":["../../src/server/proxy.ts"],"mappings":";;;iBAgBgB,kBAAA,CACd,OAAA,GACE,GAAA,EAAK,WAAA,EACL,KAAA,EAAO,cAAA,KACJ,OAAA,CAAQ,QAAA,IAAY,QAAA,IAIX,GAAA,EAAK,WAAA,EAAa,KAAA,EAAO,cAAA,KAAc,OAAA,CAAA,QAAA"}

package/dist/server/proxy.mjs

@@ -1,22 +1,21 @@
-import { ConfigServiceLive } from "./services/config.service.mjs";
+import { NextConfigLive } from "./services/config.service.mjs";
 import { ErrorTrackingService, ErrorTrackingServiceLive } from "./services/error-tracking.service.mjs";
 import { withInterfereLogger } from "@interfere/effect-utils/observability";
 import { Data, Effect, Layer } from "effect";
-import { withSpan } from "@interfere/react/effect/layers/tracer.layer";
 
 //#region src/server/proxy.ts
 var ProxyError = class extends Data.TaggedError("ProxyError") {};
 function withInterfereProxy(handler) {
-	const layer = Layer.mergeAll(ConfigServiceLive, ErrorTrackingServiceLive);
+	const layer = Layer.mergeAll(NextConfigLive, ErrorTrackingServiceLive);
 	return async (req, event) => {
 		if (req.nextUrl.pathname.startsWith("/api/interfere")) return handler(req, event);
 		const started = Date.now();
 		const program = Effect.gen(function* () {
 			const errorTracking = yield* ErrorTrackingService;
-			return yield* withSpan("proxy.request", Effect.tryPromise({
+			return yield* Effect.tryPromise({
 				try: () => Promise.resolve(handler(req, event)),
 				catch: (cause) => new ProxyError({ cause })
-			}), { attributes: { path: req.nextUrl.pathname } }).pipe(Effect.tapError((error) => errorTracking.captureError(error.cause instanceof Error ? error.cause : new Error(String(error.cause)), req, {
+			}).pipe(Effect.annotateLogs({ path: req.nextUrl.pathname }), Effect.withSpan("proxy.request", { attributes: { path: req.nextUrl.pathname } }), Effect.tapError((error) => errorTracking.captureError(error.cause instanceof Error ? error.cause : new Error(String(error.cause)), req, {
 				pathname: req.nextUrl.pathname,
 				proxy: true,
 				duration: Date.now() - started

package/dist/server/proxy.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.mjs","names":[],"sources":["../../src/server/proxy.ts"],"sourcesContent":["import { withInterfereLogger } from \"@interfere/effect-utils/observability\";\nimport { withSpan } from \"@interfere/react/effect/layers/tracer.layer\";\n\nimport { Data, Effect, Layer } from \"effect\";\nimport type { NextFetchEvent, NextRequest } from \"next/server\";\n\nclass ProxyError extends Data.TaggedError(\"ProxyError\")<{\n  cause: unknown;\n}> {}\n\nimport { ConfigServiceLive } from \"./services/config.service\";\nimport {\n  ErrorTrackingService,\n  ErrorTrackingServiceLive,\n} from \"./services/error-tracking.service\";\n\n// Proxy wrapper compatible with Next 16 `proxy.ts` with Effect\nexport function withInterfereProxy(\n  handler: (\n    req: NextRequest,\n    event: NextFetchEvent\n  ) => Promise<Response> | Response\n) {\n  const layer = Layer.mergeAll(ConfigServiceLive, ErrorTrackingServiceLive);\n\n  return async (req: NextRequest, event: NextFetchEvent) => {\n    if (req.nextUrl.pathname.startsWith(\"/api/interfere\")) {\n      return handler(req, event);\n    }\n\n    const started = Date.now();\n\n    const program = Effect.gen(function* () {\n      const errorTracking = yield* ErrorTrackingService;\n\n      const response = yield* withSpan(\n        \"proxy.request\",\n        Effect.tryPromise({\n          try: () => Promise.resolve(handler(req, event)),\n          catch: (cause) => new ProxyError({ cause }),\n        }),\n        { attributes: { path: req.nextUrl.pathname } }\n      ).pipe(\n        Effect.tapError((error) =>\n          errorTracking.captureError(\n            error.cause instanceof Error\n              ? error.cause\n              : new Error(String(error.cause)),\n            req,\n            {\n              pathname: req.nextUrl.pathname,\n              proxy: true,\n              duration: Date.now() - started,\n            }\n          )\n        )\n      );\n\n      return response;\n    }).pipe(Effect.provide(layer));\n\n    return await Effect.runPromise(withInterfereLogger(\"next\", program));\n  };\n}\n"],"mappings":";;;;;;;AAMA,IAAM,aAAN,cAAyB,KAAK,YAAY,aAAa,CAEpD;AASH,SAAgB,mBACd,SAIA;CACA,MAAM,QAAQ,MAAM,SAAS,mBAAmB,yBAAyB;AAEzE,QAAO,OAAO,KAAkB,UAA0B;AACxD,MAAI,IAAI,QAAQ,SAAS,WAAW,iBAAiB,CACnD,QAAO,QAAQ,KAAK,MAAM;EAG5B,MAAM,UAAU,KAAK,KAAK;EAE1B,MAAM,UAAU,OAAO,IAAI,aAAa;GACtC,MAAM,gBAAgB,OAAO;AAyB7B,UAvBiB,OAAO,SACtB,iBACA,OAAO,WAAW;IAChB,WAAW,QAAQ,QAAQ,QAAQ,KAAK,MAAM,CAAC;IAC/C,QAAQ,UAAU,IAAI,WAAW,EAAE,OAAO,CAAC;IAC5C,CAAC,EACF,EAAE,YAAY,EAAE,MAAM,IAAI,QAAQ,UAAU,EAAE,CAC/C,CAAC,KACA,OAAO,UAAU,UACf,cAAc,aACZ,MAAM,iBAAiB,QACnB,MAAM,QACN,IAAI,MAAM,OAAO,MAAM,MAAM,CAAC,EAClC,KACA;IACE,UAAU,IAAI,QAAQ;IACtB,OAAO;IACP,UAAU,KAAK,KAAK,GAAG;IACxB,CACF,CACF,CACF;IAGD,CAAC,KAAK,OAAO,QAAQ,MAAM,CAAC;AAE9B,SAAO,MAAM,OAAO,WAAW,oBAAoB,QAAQ,QAAQ,CAAC"}
+{"version":3,"file":"proxy.mjs","names":[],"sources":["../../src/server/proxy.ts"],"sourcesContent":["import { withInterfereLogger } from \"@interfere/effect-utils/observability\";\n\nimport { Data, Effect, Layer } from \"effect\";\nimport type { NextFetchEvent, NextRequest } from \"next/server\";\n\nclass ProxyError extends Data.TaggedError(\"ProxyError\")<{\n  cause: unknown;\n}> {}\n\nimport { NextConfigLive } from \"./services/config.service\";\nimport {\n  ErrorTrackingService,\n  ErrorTrackingServiceLive,\n} from \"./services/error-tracking.service\";\n\n// Proxy wrapper compatible with Next 16 `proxy.ts` with Effect\nexport function withInterfereProxy(\n  handler: (\n    req: NextRequest,\n    event: NextFetchEvent\n  ) => Promise<Response> | Response\n) {\n  const layer = Layer.mergeAll(NextConfigLive, ErrorTrackingServiceLive);\n\n  return async (req: NextRequest, event: NextFetchEvent) => {\n    if (req.nextUrl.pathname.startsWith(\"/api/interfere\")) {\n      return handler(req, event);\n    }\n\n    const started = Date.now();\n\n    const program = Effect.gen(function* () {\n      const errorTracking = yield* ErrorTrackingService;\n\n      const response = yield* Effect.tryPromise({\n        try: () => Promise.resolve(handler(req, event)),\n        catch: (cause) => new ProxyError({ cause }),\n      }).pipe(\n        Effect.annotateLogs({ path: req.nextUrl.pathname }),\n        Effect.withSpan(\"proxy.request\", {\n          attributes: { path: req.nextUrl.pathname },\n        }),\n        Effect.tapError((error) =>\n          errorTracking.captureError(\n            error.cause instanceof Error\n              ? error.cause\n              : new Error(String(error.cause)),\n            req,\n            {\n              pathname: req.nextUrl.pathname,\n              proxy: true,\n              duration: Date.now() - started,\n            }\n          )\n        )\n      );\n\n      return response;\n    }).pipe(Effect.provide(layer));\n\n    return await Effect.runPromise(withInterfereLogger(\"next\", program));\n  };\n}\n"],"mappings":";;;;;;AAKA,IAAM,aAAN,cAAyB,KAAK,YAAY,aAAa,CAEpD;AASH,SAAgB,mBACd,SAIA;CACA,MAAM,QAAQ,MAAM,SAAS,gBAAgB,yBAAyB;AAEtE,QAAO,OAAO,KAAkB,UAA0B;AACxD,MAAI,IAAI,QAAQ,SAAS,WAAW,iBAAiB,CACnD,QAAO,QAAQ,KAAK,MAAM;EAG5B,MAAM,UAAU,KAAK,KAAK;EAE1B,MAAM,UAAU,OAAO,IAAI,aAAa;GACtC,MAAM,gBAAgB,OAAO;AAyB7B,UAvBiB,OAAO,OAAO,WAAW;IACxC,WAAW,QAAQ,QAAQ,QAAQ,KAAK,MAAM,CAAC;IAC/C,QAAQ,UAAU,IAAI,WAAW,EAAE,OAAO,CAAC;IAC5C,CAAC,CAAC,KACD,OAAO,aAAa,EAAE,MAAM,IAAI,QAAQ,UAAU,CAAC,EACnD,OAAO,SAAS,iBAAiB,EAC/B,YAAY,EAAE,MAAM,IAAI,QAAQ,UAAU,EAC3C,CAAC,EACF,OAAO,UAAU,UACf,cAAc,aACZ,MAAM,iBAAiB,QACnB,MAAM,QACN,IAAI,MAAM,OAAO,MAAM,MAAM,CAAC,EAClC,KACA;IACE,UAAU,IAAI,QAAQ;IACtB,OAAO;IACP,UAAU,KAAK,KAAK,GAAG;IACxB,CACF,CACF,CACF;IAGD,CAAC,KAAK,OAAO,QAAQ,MAAM,CAAC;AAE9B,SAAO,MAAM,OAAO,WAAW,oBAAoB,QAAQ,QAAQ,CAAC"}

package/dist/server/route-handler.d.mts

@@ -1,9 +1,39 @@
+import { ConfigService } from "./services/config.service.mjs";
+import { ErrorTrackingService } from "./services/error-tracking.service.mjs";
+import { Context, Effect, Layer } from "effect";
 import { NextRequest } from "next/server";
+import * as effect_Types0 from "effect/Types";
+import * as effect_Cause0 from "effect/Cause";
+import * as effect_ParseResult0 from "effect/ParseResult";
 
 //#region src/server/route-handler.d.ts
 type RouteHandler = (request: NextRequest) => Promise<Response>;
+declare const ProxyError_base: new <A extends Record<string, any> = {}>(args: effect_Types0.Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P] }) => effect_Cause0.YieldableError & {
+  readonly _tag: "ProxyError";
+} & Readonly<A>;
+declare class ProxyError extends ProxyError_base<{
+  readonly status: number;
+  readonly message: string;
+  readonly body?: string;
+}> {}
+interface ProxyUpstreamClient {
+  readonly postIngest: (args: {
+    readonly apiUrl: string;
+    readonly publicToken: string;
+    readonly traceparent: string;
+    readonly body: string;
+  }) => Effect.Effect<Response, ProxyError>;
+}
+declare const ProxyUpstreamClient: Context.Tag<ProxyUpstreamClient, ProxyUpstreamClient>;
+declare const ProxyUpstreamClientLive: Layer.Layer<ProxyUpstreamClient, never, never>;
 declare const GET: RouteHandler;
+declare const getStatusEffect: Effect.Effect<Response, never, ConfigService>;
+declare const proxyIngestRequest: (request: Request, params: {
+  apiUrl: string;
+  publicToken: string;
+}) => Effect.Effect<Response, string | effect_ParseResult0.ParseError | ProxyError, ProxyUpstreamClient>;
 declare const POST: RouteHandler;
+declare const postProxyEffect: (request: NextRequest) => Effect.Effect<Response, never, ConfigService | ErrorTrackingService | ProxyUpstreamClient>;
 declare const OPTIONS: RouteHandler;
 //#endregion
-export { GET, OPTIONS, POST };
+export { GET, OPTIONS, POST, ProxyUpstreamClient, ProxyUpstreamClientLive, getStatusEffect, postProxyEffect, proxyIngestRequest };

package/dist/server/route-handler.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"route-handler.d.mts","names":[],"sources":["../../src/server/route-handler.ts"],"sourcesContent":[],"mappings":";;;KAwBK,YAAA,aAAyB,gBAAgB,QAAQ;cAmBzC,KAAK;AAnBb,cA2JQ,IA3JI,EA2JE,YA3JF;AAAa,cAsQjB,OAtQiB,EAsQR,YAtQQ"}
+{"version":3,"file":"route-handler.d.mts","names":[],"sources":["../../src/server/route-handler.ts"],"mappings":";;;;;;;;;KAuBK,YAAA,IAAgB,OAAA,EAAS,WAAA,KAAgB,OAAA,CAAQ,QAAA;AAAA,cAAQ,eAAA;;;cAGxD,UAAA,SAAmB,eAAA;EAAA,SACd,MAAA;EAAA,SACA,OAAA;EAAA,SACA,IAAA;AAAA;AAAA,UAGM,mBAAA;EAAA,SACN,UAAA,GAAa,IAAA;IAAA,SACX,MAAA;IAAA,SACA,WAAA;IAAA,SACA,WAAA;IAAA,SACA,IAAA;EAAA,MACL,MAAA,CAAO,MAAA,CAAO,QAAA,EAAU,UAAA;AAAA;AAAA,cAGnB,mBAAA,EAAmB,OAAA,CAAA,GAAA,CAAA,mBAAA,EAAA,mBAAA;AAAA,cAInB,uBAAA,EAAuB,KAAA,CAAA,KAAA,CAAA,mBAAA;AAAA,cAuCvB,GAAA,EAAK,YAAA;AAAA,cAKL,eAAA,EAAe,MAAA,CAAA,MAAA,CAAA,QAAA,SAAA,aAAA;AAAA,cAUf,kBAAA,GAAkB,OAAA,EAAA,OAAA,EAAA,MAAA;;;;cAkHlB,IAAA,EAAM,YAAA;AAAA,cAKN,eAAA,GAAmB,OAAA,EAAS,WAAA,KAAW,MAAA,CAAA,MAAA,CAAA,QAAA,SAAA,aAAA,GAAA,oBAAA,GAAA,mBAAA;AAAA,cA0FvC,OAAA,EAAS,YAAA"}

package/dist/server/route-handler.mjs

@@ -1,57 +1,66 @@
-"use server";
-
-import { ConfigService, ConfigServiceLive } from "./services/config.service.mjs";
+import { ConfigService, NextConfigLive } from "./services/config.service.mjs";
 import { ErrorTrackingService, ErrorTrackingServiceLive } from "./services/error-tracking.service.mjs";
 import { API_PATHS } from "@interfere/constants/api";
 import { withInterfereLogger } from "@interfere/effect-utils/observability";
-import { Data, Effect, Layer, Schedule } from "effect";
-import { withSpan } from "@interfere/react/effect/layers/tracer.layer";
+import { Context, Data, Effect, Layer, Schedule, Schema } from "effect";
 import { createBackoffSchedule, shouldRetryHttp, withTimeoutFail } from "@interfere/effect-utils/retry";
+import { Status } from "@interfere/constants/http";
 import { envelopeSchema } from "@interfere/types/sdk/envelope";
 import { v7 } from "uuid";
 import { z } from "zod";
 
 //#region src/server/route-handler.ts
 /** biome-ignore-all lint/suspicious/useAwait: route handlers must be async */
-const layer = Layer.mergeAll(ConfigServiceLive, ErrorTrackingServiceLive);
 var ProxyError = class extends Data.TaggedError("ProxyError") {};
+const ProxyUpstreamClient = Context.GenericTag("@interfere/next/ProxyUpstreamClient");
+const ProxyUpstreamClientLive = Layer.succeed(ProxyUpstreamClient, ProxyUpstreamClient.of({ postIngest: ({ apiUrl, publicToken, traceparent, body }) => Effect.tryPromise({
+	try: () => fetch(`${apiUrl}${API_PATHS.INGEST_V1}`, {
+		method: "POST",
+		headers: {
+			"Content-Type": "application/json",
+			"x-interfere-pub-token": publicToken,
+			traceparent
+		},
+		body
+	}),
+	catch: (error) => new ProxyError({
+		status: 0,
+		message: error instanceof Error ? error.message : String(error)
+	})
+}) }));
+const configLayer = NextConfigLive;
+const layer = Layer.mergeAll(configLayer, ErrorTrackingServiceLive, ProxyUpstreamClientLive);
 const TIMEOUT_MS = 1e4;
 const RETRY_COUNT = 2;
-const HTTP_BAD_GATEWAY = 502;
 const RETRY_INITIAL_MS = 100;
 const RETRY_MAX_MS = 2e3;
 const envelopesArraySchema = z.array(envelopeSchema);
 const GET = async () => {
-	const program = Effect.gen(function* () {
-		const configured = yield* (yield* ConfigService).getSecretKey.pipe(Effect.map(() => true), Effect.catchAll(() => Effect.succeed(false)));
-		return Response.json({
-			status: "ok",
-			configured,
-			timestamp: Date.now()
-		});
-	}).pipe(Effect.provide(layer));
+	const program = getStatusEffect.pipe(Effect.provide(layer));
 	return await Effect.runPromise(withInterfereLogger("next", program));
 };
-const proxyIngestRequest = (request, params) => Effect.gen(function* () {
+const getStatusEffect = Effect.gen(function* () {
+	const configured = yield* (yield* ConfigService).getApiKey.pipe(Effect.map(() => true), Effect.catchAll(() => Effect.succeed(false)));
+	return Response.json({
+		status: "ok",
+		configured,
+		timestamp: Date.now()
+	});
+});
+const proxyIngestRequest = Effect.fn("proxyIngestRequest")(function* (request, params) {
 	const traceparent = (request.headers.get("traceparent") || void 0) ?? generateTraceparent();
 	const body = yield* Effect.tryPromise({
 		try: () => request.clone().text(),
 		catch: () => new ProxyError({
-			status: 400,
+			status: Status.BAD_REQUEST,
 			message: "Invalid request body"
 		})
 	});
-	let parsed;
-	try {
-		parsed = JSON.parse(body);
-	} catch (error) {
-		yield* Effect.logWarning("Invalid JSON in request body").pipe(Effect.annotateLogs({ error: String(error) }));
-		return yield* Effect.fail(new ProxyError({
-			status: 400,
-			message: "Invalid JSON in request body",
-			body: String(error)
-		}));
-	}
+	const parsed = yield* Schema.decode(Schema.parseJson())(body).pipe(Effect.mapError((error) => new ProxyError({
+		status: Status.BAD_REQUEST,
+		message: "Invalid JSON in request body",
+		body: String(error)
+	})), Effect.tapError(() => Effect.logWarning("Invalid JSON in request body").pipe(Effect.annotateLogs({ body }))));
 	const validation = envelopesArraySchema.safeParse(parsed);
 	if (!validation.success) {
 		const issues = validation.error.issues.map((issue) => ({
@@ -60,13 +69,13 @@ const proxyIngestRequest = (request, params) => Effect.gen(function* () {
 			code: issue.code
 		}));
 		yield* Effect.logWarning("Invalid envelope schema").pipe(Effect.annotateLogs({ validationErrors: issues }));
-		const b = JSON.stringify({
+		const b = yield* Schema.encode(Schema.parseJson())({
 			ok: false,
 			code: "INVALID_ENVELOPE_SCHEMA",
 			errors: issues
 		});
 		return new Response(b, {
-			status: 422,
+			status: Status.UNPROCESSABLE_ENTITY,
 			headers: { "content-type": "application/json" }
 		});
 	}
@@ -82,20 +91,13 @@ const proxyIngestRequest = (request, params) => Effect.gen(function* () {
 		dedupedCount: deduped.length,
 		droppedDuplicates: dropped
 	}));
-	const upstream = yield* withTimeoutFail(Effect.tryPromise({
-		try: () => fetch(`${params.apiUrl}${API_PATHS.INGEST_V0}`, {
-			method: "POST",
-			headers: {
-				"Content-Type": "application/json",
-				"x-interfere-surface": params.surfaceToken,
-				traceparent
-			},
-			body: JSON.stringify(deduped)
-		}),
-		catch: (error) => new ProxyError({
-			status: 0,
-			message: error instanceof Error ? error.message : String(error)
-		})
+	const upstreamClient = yield* ProxyUpstreamClient;
+	const upstreamRequestBody = yield* Schema.encode(Schema.parseJson())(deduped);
+	const upstream = yield* withTimeoutFail(upstreamClient.postIngest({
+		apiUrl: params.apiUrl,
+		publicToken: params.publicToken,
+		traceparent,
+		body: upstreamRequestBody
 	}), TIMEOUT_MS, () => new ProxyError({
 		status: 0,
 		message: "Network timeout"
@@ -110,43 +112,40 @@ const proxyIngestRequest = (request, params) => Effect.gen(function* () {
 	});
 });
 const POST = async (request) => {
-	const program = Effect.gen(function* () {
-		yield* Effect.logDebug("Handling ingest proxy request").pipe(Effect.annotateLogs({ path: request.nextUrl.pathname }));
-		const config = yield* ConfigService;
-		const errorTracking = yield* ErrorTrackingService;
-		yield* config.getSecretKey.pipe(Effect.tapError(() => Effect.logError("Service not configured - missing INTERFERE_SECRET_KEY")), Effect.catchTag("ConfigError", () => Effect.fail(new ProxyError({
-			status: 503,
-			message: "Service not configured. INTERFERE_SECRET_KEY environment variable is required."
-		}))));
-		const surfaceToken = yield* config.getPublicToken.pipe(Effect.tapError((error) => Effect.logError("Failed to get public token").pipe(Effect.annotateLogs({ reason: error.message }))), Effect.catchTag("ConfigError", (error) => Effect.fail(new ProxyError({
-			status: 503,
-			message: `Auth not available: ${error.message}`
-		}))));
-		const apiUrl = yield* config.getApiUrl;
-		const schedule = createBackoffSchedule(RETRY_INITIAL_MS, RETRY_MAX_MS, RETRY_COUNT).pipe(Schedule.whileInput((e) => e instanceof ProxyError ? shouldRetryHttp(e.status) : false));
-		const response = yield* withSpan("proxy.forward", proxyIngestRequest(request, {
-			apiUrl,
-			surfaceToken
-		}), { attributes: {} }).pipe(Effect.retry(schedule), Effect.tapError((error) => Effect.gen(function* () {
-			yield* errorTracking.captureError(error, request, {
-				pathname: request.nextUrl.pathname,
-				type: "api_route"
-			});
-			yield* Effect.logError("Proxy request failed").pipe(Effect.annotateLogs({
-				error: String(error),
-				status: error instanceof ProxyError ? error.status : 0
-			}));
-		})));
-		yield* Effect.logDebug("Proxy request completed").pipe(Effect.annotateLogs({ status: response.status }));
-		return response;
-	}).pipe(Effect.provide(layer), Effect.catchTag("ProxyError", (error) => Effect.succeed(Response.json({ error: error.message }, { status: error.status || HTTP_BAD_GATEWAY }))), Effect.catchAll((error) => {
-		Effect.runFork(Effect.logError("Unexpected error in route handler").pipe(Effect.annotateLogs({ error: String(error) })));
-		return Effect.succeed(Response.json({ error: "Internal server error" }, { status: 500 }));
-	}));
+	const program = postProxyEffect(request).pipe(Effect.provide(layer));
 	return await Effect.runPromise(withInterfereLogger("next", program));
 };
+const postProxyEffect = (request) => Effect.gen(function* () {
+	yield* Effect.logDebug("Handling ingest proxy request").pipe(Effect.annotateLogs({ path: request.nextUrl.pathname }));
+	const config = yield* ConfigService;
+	const errorTracking = yield* ErrorTrackingService;
+	const publicToken = yield* config.getPublicToken.pipe(Effect.tapError(() => Effect.logError("Service not configured - missing public token configuration")), Effect.catchTag("ConfigError", () => Effect.fail(new ProxyError({
+		status: Status.SERVICE_UNAVAILABLE,
+		message: "Service not configured. Public token configuration is required."
+	}))));
+	const apiUrl = yield* config.getApiUrl;
+	const schedule = createBackoffSchedule(RETRY_INITIAL_MS, RETRY_MAX_MS, RETRY_COUNT).pipe(Schedule.whileInput((e) => e instanceof ProxyError ? shouldRetryHttp(e.status) : false));
+	const response = yield* proxyIngestRequest(request, {
+		apiUrl,
+		publicToken
+	}).pipe(Effect.withSpan("proxy.forward"), Effect.retry(schedule), Effect.tapError(Effect.fn("handleProxyError")(function* (error) {
+		yield* errorTracking.captureError(error, request, {
+			pathname: request.nextUrl.pathname,
+			type: "api_route"
+		});
+		yield* Effect.logError("Proxy request failed").pipe(Effect.annotateLogs({
+			error: String(error),
+			status: error instanceof ProxyError ? error.status : 0
+		}));
+	})));
+	yield* Effect.logDebug("Proxy request completed").pipe(Effect.annotateLogs({ status: response.status }));
+	return response;
+}).pipe(Effect.catchTag("ProxyError", (error) => Effect.succeed(Response.json({ error: error.message }, { status: error.status || Status.BAD_GATEWAY }))), Effect.catchAll((error) => {
+	Effect.runFork(Effect.logError("Unexpected error in route handler").pipe(Effect.annotateLogs({ error: String(error) })));
+	return Effect.succeed(Response.json({ error: "Internal server error" }, { status: Status.INTERNAL_SERVER_ERROR }));
+}));
 const OPTIONS = async () => Effect.runPromise(withInterfereLogger("next", Effect.succeed(new Response(null, {
-	status: 200,
+	status: Status.OK,
 	headers: {
 		"Access-Control-Allow-Origin": "*",
 		"Access-Control-Allow-Methods": "GET, POST, OPTIONS",
@@ -169,4 +168,4 @@ function randomHex(bytes) {
 }
 
 //#endregion
-export { GET, OPTIONS, POST };
+export { GET, OPTIONS, POST, ProxyUpstreamClient, ProxyUpstreamClientLive, getStatusEffect, postProxyEffect, proxyIngestRequest };