@amqp-contract/worker 0.9.0 → 0.11.0

package/docs/index.md

@@ -8,7 +8,7 @@
 
 ### MessageValidationError
 
-Defined in: [packages/worker/src/errors.ts:35](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/errors.ts#L35)
+Defined in: [packages/worker/src/errors.ts:35](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/errors.ts#L35)
 
 Error thrown when message validation fails
 
@@ -24,7 +24,7 @@ Error thrown when message validation fails
 new MessageValidationError(consumerName, issues): MessageValidationError;
 ```
 
-Defined in: [packages/worker/src/errors.ts:36](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/errors.ts#L36)
+Defined in: [packages/worker/src/errors.ts:36](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/errors.ts#L36)
 
 ###### Parameters
 
@@ -48,12 +48,12 @@ WorkerError.constructor
 | Property | Modifier | Type | Description | Inherited from | Defined in |
 | ------ | ------ | ------ | ------ | ------ | ------ |
 | <a id="cause"></a> `cause?` | `public` | `unknown` | - | `WorkerError.cause` | node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es2022.error.d.ts:26 |
-| <a id="consumername"></a> `consumerName` | `readonly` | `string` | - | - | [packages/worker/src/errors.ts:37](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/errors.ts#L37) |
-| <a id="issues"></a> `issues` | `readonly` | `unknown` | - | - | [packages/worker/src/errors.ts:38](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/errors.ts#L38) |
+| <a id="consumername"></a> `consumerName` | `readonly` | `string` | - | - | [packages/worker/src/errors.ts:37](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/errors.ts#L37) |
+| <a id="issues"></a> `issues` | `readonly` | `unknown` | - | - | [packages/worker/src/errors.ts:38](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/errors.ts#L38) |
 | <a id="message"></a> `message` | `public` | `string` | - | `WorkerError.message` | node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1077 |
 | <a id="name"></a> `name` | `public` | `string` | - | `WorkerError.name` | node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1076 |
 | <a id="stack"></a> `stack?` | `public` | `string` | - | `WorkerError.stack` | node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1078 |
-| <a id="stacktracelimit"></a> `stackTraceLimit` | `static` | `number` | The `Error.stackTraceLimit` property specifies the number of stack frames collected by a stack trace (whether generated by `new Error().stack` or `Error.captureStackTrace(obj)`). The default value is `10` but may be set to any valid JavaScript number. Changes will affect any stack trace captured _after_ the value has been changed. If set to a non-number value, or set to a negative number, stack traces will not capture any frames. | `WorkerError.stackTraceLimit` | node\_modules/.pnpm/@types+node@25.0.5/node\_modules/@types/node/globals.d.ts:67 |
+| <a id="stacktracelimit"></a> `stackTraceLimit` | `static` | `number` | The `Error.stackTraceLimit` property specifies the number of stack frames collected by a stack trace (whether generated by `new Error().stack` or `Error.captureStackTrace(obj)`). The default value is `10` but may be set to any valid JavaScript number. Changes will affect any stack trace captured _after_ the value has been changed. If set to a non-number value, or set to a negative number, stack traces will not capture any frames. | `WorkerError.stackTraceLimit` | node\_modules/.pnpm/@types+node@25.0.9/node\_modules/@types/node/globals.d.ts:67 |
 
 #### Methods
 
@@ -63,7 +63,7 @@ WorkerError.constructor
 static captureStackTrace(targetObject, constructorOpt?): void;
 ```
 
-Defined in: node\_modules/.pnpm/@types+node@25.0.5/node\_modules/@types/node/globals.d.ts:51
+Defined in: node\_modules/.pnpm/@types+node@25.0.9/node\_modules/@types/node/globals.d.ts:51
 
 Creates a `.stack` property on `targetObject`, which when accessed returns
 a string representing the location in the code at which
@@ -132,7 +132,7 @@ WorkerError.captureStackTrace
 static prepareStackTrace(err, stackTraces): any;
 ```
 
-Defined in: node\_modules/.pnpm/@types+node@25.0.5/node\_modules/@types/node/globals.d.ts:55
+Defined in: node\_modules/.pnpm/@types+node@25.0.9/node\_modules/@types/node/globals.d.ts:55
 
 ###### Parameters
 
@@ -159,7 +159,7 @@ WorkerError.prepareStackTrace
 
 ### NonRetryableError
 
-Defined in: [packages/worker/src/errors.ts:69](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/errors.ts#L69)
+Defined in: [packages/worker/src/errors.ts:69](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/errors.ts#L69)
 
 Non-retryable errors - permanent failures that should not be retried
 Examples: invalid data, business rule violations, permanent external failures
@@ -179,7 +179,7 @@ immediately sent to the dead letter queue (DLQ) if configured.
 new NonRetryableError(message, cause?): NonRetryableError;
 ```
 
-Defined in: [packages/worker/src/errors.ts:70](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/errors.ts#L70)
+Defined in: [packages/worker/src/errors.ts:70](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/errors.ts#L70)
 
 ###### Parameters
 
@@ -202,11 +202,11 @@ WorkerError.constructor
 
 | Property | Modifier | Type | Description | Inherited from | Defined in |
 | ------ | ------ | ------ | ------ | ------ | ------ |
-| <a id="cause-1"></a> `cause?` | `readonly` | `unknown` | - | `WorkerError.cause` | [packages/worker/src/errors.ts:72](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/errors.ts#L72) |
+| <a id="cause-1"></a> `cause?` | `readonly` | `unknown` | - | `WorkerError.cause` | [packages/worker/src/errors.ts:72](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/errors.ts#L72) |
 | <a id="message-1"></a> `message` | `public` | `string` | - | `WorkerError.message` | node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1077 |
 | <a id="name-1"></a> `name` | `public` | `string` | - | `WorkerError.name` | node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1076 |
 | <a id="stack-1"></a> `stack?` | `public` | `string` | - | `WorkerError.stack` | node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1078 |
-| <a id="stacktracelimit-1"></a> `stackTraceLimit` | `static` | `number` | The `Error.stackTraceLimit` property specifies the number of stack frames collected by a stack trace (whether generated by `new Error().stack` or `Error.captureStackTrace(obj)`). The default value is `10` but may be set to any valid JavaScript number. Changes will affect any stack trace captured _after_ the value has been changed. If set to a non-number value, or set to a negative number, stack traces will not capture any frames. | `WorkerError.stackTraceLimit` | node\_modules/.pnpm/@types+node@25.0.5/node\_modules/@types/node/globals.d.ts:67 |
+| <a id="stacktracelimit-1"></a> `stackTraceLimit` | `static` | `number` | The `Error.stackTraceLimit` property specifies the number of stack frames collected by a stack trace (whether generated by `new Error().stack` or `Error.captureStackTrace(obj)`). The default value is `10` but may be set to any valid JavaScript number. Changes will affect any stack trace captured _after_ the value has been changed. If set to a non-number value, or set to a negative number, stack traces will not capture any frames. | `WorkerError.stackTraceLimit` | node\_modules/.pnpm/@types+node@25.0.9/node\_modules/@types/node/globals.d.ts:67 |
 
 #### Methods
 
@@ -216,7 +216,7 @@ WorkerError.constructor
 static captureStackTrace(targetObject, constructorOpt?): void;
 ```
 
-Defined in: node\_modules/.pnpm/@types+node@25.0.5/node\_modules/@types/node/globals.d.ts:51
+Defined in: node\_modules/.pnpm/@types+node@25.0.9/node\_modules/@types/node/globals.d.ts:51
 
 Creates a `.stack` property on `targetObject`, which when accessed returns
 a string representing the location in the code at which
@@ -285,7 +285,7 @@ WorkerError.captureStackTrace
 static prepareStackTrace(err, stackTraces): any;
 ```
 
-Defined in: node\_modules/.pnpm/@types+node@25.0.5/node\_modules/@types/node/globals.d.ts:55
+Defined in: node\_modules/.pnpm/@types+node@25.0.9/node\_modules/@types/node/globals.d.ts:55
 
 ###### Parameters
 
@@ -312,7 +312,7 @@ WorkerError.prepareStackTrace
 
 ### RetryableError
 
-Defined in: [packages/worker/src/errors.ts:52](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/errors.ts#L52)
+Defined in: [packages/worker/src/errors.ts:52](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/errors.ts#L52)
 
 Retryable errors - transient failures that may succeed on retry
 Examples: network timeouts, rate limiting, temporary service unavailability
@@ -332,7 +332,7 @@ The worker will apply exponential backoff and retry the message.
 new RetryableError(message, cause?): RetryableError;
 ```
 
-Defined in: [packages/worker/src/errors.ts:53](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/errors.ts#L53)
+Defined in: [packages/worker/src/errors.ts:53](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/errors.ts#L53)
 
 ###### Parameters
 
@@ -355,11 +355,11 @@ WorkerError.constructor
 
 | Property | Modifier | Type | Description | Inherited from | Defined in |
 | ------ | ------ | ------ | ------ | ------ | ------ |
-| <a id="cause-2"></a> `cause?` | `readonly` | `unknown` | - | `WorkerError.cause` | [packages/worker/src/errors.ts:55](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/errors.ts#L55) |
+| <a id="cause-2"></a> `cause?` | `readonly` | `unknown` | - | `WorkerError.cause` | [packages/worker/src/errors.ts:55](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/errors.ts#L55) |
 | <a id="message-2"></a> `message` | `public` | `string` | - | `WorkerError.message` | node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1077 |
 | <a id="name-2"></a> `name` | `public` | `string` | - | `WorkerError.name` | node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1076 |
 | <a id="stack-2"></a> `stack?` | `public` | `string` | - | `WorkerError.stack` | node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1078 |
-| <a id="stacktracelimit-2"></a> `stackTraceLimit` | `static` | `number` | The `Error.stackTraceLimit` property specifies the number of stack frames collected by a stack trace (whether generated by `new Error().stack` or `Error.captureStackTrace(obj)`). The default value is `10` but may be set to any valid JavaScript number. Changes will affect any stack trace captured _after_ the value has been changed. If set to a non-number value, or set to a negative number, stack traces will not capture any frames. | `WorkerError.stackTraceLimit` | node\_modules/.pnpm/@types+node@25.0.5/node\_modules/@types/node/globals.d.ts:67 |
+| <a id="stacktracelimit-2"></a> `stackTraceLimit` | `static` | `number` | The `Error.stackTraceLimit` property specifies the number of stack frames collected by a stack trace (whether generated by `new Error().stack` or `Error.captureStackTrace(obj)`). The default value is `10` but may be set to any valid JavaScript number. Changes will affect any stack trace captured _after_ the value has been changed. If set to a non-number value, or set to a negative number, stack traces will not capture any frames. | `WorkerError.stackTraceLimit` | node\_modules/.pnpm/@types+node@25.0.9/node\_modules/@types/node/globals.d.ts:67 |
 
 #### Methods
 
@@ -369,7 +369,7 @@ WorkerError.constructor
 static captureStackTrace(targetObject, constructorOpt?): void;
 ```
 
-Defined in: node\_modules/.pnpm/@types+node@25.0.5/node\_modules/@types/node/globals.d.ts:51
+Defined in: node\_modules/.pnpm/@types+node@25.0.9/node\_modules/@types/node/globals.d.ts:51
 
 Creates a `.stack` property on `targetObject`, which when accessed returns
 a string representing the location in the code at which
@@ -438,7 +438,7 @@ WorkerError.captureStackTrace
 static prepareStackTrace(err, stackTraces): any;
 ```
 
-Defined in: node\_modules/.pnpm/@types+node@25.0.5/node\_modules/@types/node/globals.d.ts:55
+Defined in: node\_modules/.pnpm/@types+node@25.0.9/node\_modules/@types/node/globals.d.ts:55
 
 ###### Parameters
 
@@ -465,7 +465,7 @@ WorkerError.prepareStackTrace
 
 ### TechnicalError
 
-Defined in: [packages/worker/src/errors.ts:22](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/errors.ts#L22)
+Defined in: [packages/worker/src/errors.ts:22](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/errors.ts#L22)
 
 Error for technical/runtime failures in worker operations
 This includes validation failures, parsing failures, and processing failures
@@ -482,7 +482,7 @@ This includes validation failures, parsing failures, and processing failures
 new TechnicalError(message, cause?): TechnicalError;
 ```
 
-Defined in: [packages/worker/src/errors.ts:23](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/errors.ts#L23)
+Defined in: [packages/worker/src/errors.ts:23](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/errors.ts#L23)
 
 ###### Parameters
 
@@ -505,11 +505,11 @@ WorkerError.constructor
 
 | Property | Modifier | Type | Description | Inherited from | Defined in |
 | ------ | ------ | ------ | ------ | ------ | ------ |
-| <a id="cause-3"></a> `cause?` | `readonly` | `unknown` | - | `WorkerError.cause` | [packages/worker/src/errors.ts:25](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/errors.ts#L25) |
+| <a id="cause-3"></a> `cause?` | `readonly` | `unknown` | - | `WorkerError.cause` | [packages/worker/src/errors.ts:25](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/errors.ts#L25) |
 | <a id="message-3"></a> `message` | `public` | `string` | - | `WorkerError.message` | node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1077 |
 | <a id="name-3"></a> `name` | `public` | `string` | - | `WorkerError.name` | node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1076 |
 | <a id="stack-3"></a> `stack?` | `public` | `string` | - | `WorkerError.stack` | node\_modules/.pnpm/typescript@5.9.3/node\_modules/typescript/lib/lib.es5.d.ts:1078 |
-| <a id="stacktracelimit-3"></a> `stackTraceLimit` | `static` | `number` | The `Error.stackTraceLimit` property specifies the number of stack frames collected by a stack trace (whether generated by `new Error().stack` or `Error.captureStackTrace(obj)`). The default value is `10` but may be set to any valid JavaScript number. Changes will affect any stack trace captured _after_ the value has been changed. If set to a non-number value, or set to a negative number, stack traces will not capture any frames. | `WorkerError.stackTraceLimit` | node\_modules/.pnpm/@types+node@25.0.5/node\_modules/@types/node/globals.d.ts:67 |
+| <a id="stacktracelimit-3"></a> `stackTraceLimit` | `static` | `number` | The `Error.stackTraceLimit` property specifies the number of stack frames collected by a stack trace (whether generated by `new Error().stack` or `Error.captureStackTrace(obj)`). The default value is `10` but may be set to any valid JavaScript number. Changes will affect any stack trace captured _after_ the value has been changed. If set to a non-number value, or set to a negative number, stack traces will not capture any frames. | `WorkerError.stackTraceLimit` | node\_modules/.pnpm/@types+node@25.0.9/node\_modules/@types/node/globals.d.ts:67 |
 
 #### Methods
 
@@ -519,7 +519,7 @@ WorkerError.constructor
 static captureStackTrace(targetObject, constructorOpt?): void;
 ```
 
-Defined in: node\_modules/.pnpm/@types+node@25.0.5/node\_modules/@types/node/globals.d.ts:51
+Defined in: node\_modules/.pnpm/@types+node@25.0.9/node\_modules/@types/node/globals.d.ts:51
 
 Creates a `.stack` property on `targetObject`, which when accessed returns
 a string representing the location in the code at which
@@ -588,7 +588,7 @@ WorkerError.captureStackTrace
 static prepareStackTrace(err, stackTraces): any;
 ```
 
-Defined in: node\_modules/.pnpm/@types+node@25.0.5/node\_modules/@types/node/globals.d.ts:55
+Defined in: node\_modules/.pnpm/@types+node@25.0.9/node\_modules/@types/node/globals.d.ts:55
 
 ###### Parameters
 
@@ -615,7 +615,7 @@ WorkerError.prepareStackTrace
 
 ### TypedAmqpWorker
 
-Defined in: [packages/worker/src/worker.ts:190](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/worker.ts#L190)
+Defined in: [packages/worker/src/worker.ts:178](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/worker.ts#L178)
 
 Type-safe AMQP worker for consuming messages from RabbitMQ.
 
@@ -669,7 +669,7 @@ await worker.close().resultToPromise();
 close(): Future<Result<void, TechnicalError>>;
 ```
 
-Defined in: [packages/worker/src/worker.ts:327](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/worker.ts#L327)
+Defined in: [packages/worker/src/worker.ts:299](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/worker.ts#L299)
 
 Close the AMQP channel and connection.
 
@@ -697,7 +697,7 @@ if (closeResult.isOk()) {
 static create<TContract>(options): Future<Result<TypedAmqpWorker<TContract>, TechnicalError>>;
 ```
 
-Defined in: [packages/worker/src/worker.ts:283](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/worker.ts#L283)
+Defined in: [packages/worker/src/worker.ts:255](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/worker.ts#L255)
 
 Create a type-safe AMQP worker from a contract.
 
@@ -733,7 +733,7 @@ A Future that resolves to a Result containing the worker or an error
 const worker = await TypedAmqpWorker.create({
   contract: myContract,
   handlers: {
-    processOrder: async (msg) => console.log('Order:', msg.orderId)
+    processOrder: async ({ payload }) => console.log('Order:', payload.orderId)
   },
   urls: ['amqp://localhost']
 }).resultToPromise();
@@ -747,7 +747,7 @@ const worker = await TypedAmqpWorker.create({
 type CreateWorkerOptions<TContract> = object;
 ```
 
-Defined in: [packages/worker/src/worker.ts:124](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/worker.ts#L124)
+Defined in: [packages/worker/src/worker.ts:115](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/worker.ts#L115)
 
 Options for creating a type-safe AMQP worker.
 
@@ -758,39 +758,30 @@ const options: CreateWorkerOptions<typeof contract> = {
   contract: myContract,
   handlers: {
     // Simple handler
-    processOrder: async (message) => {
-      console.log('Processing order:', message.orderId);
+    processOrder: ({ payload }) => {
+      console.log('Processing order:', payload.orderId);
+      return Future.value(Result.Ok(undefined));
     },
-    // Handler with options (prefetch)
+    // Handler with prefetch configuration
     processPayment: [
-      async (message) => {
-        console.log('Processing payment:', message.paymentId);
+      ({ payload }) => {
+        console.log('Processing payment:', payload.paymentId);
+        return Future.value(Result.Ok(undefined));
       },
       { prefetch: 10 }
-    ],
-    // Handler with batch processing
-    processNotifications: [
-      async (messages) => {
-        console.log('Processing batch:', messages.length);
-      },
-      { batchSize: 5, batchTimeout: 1000 }
     ]
   },
   urls: ['amqp://localhost'],
   connectionOptions: {
     heartbeatIntervalInSeconds: 30
   },
-  logger: myLogger,
-  retry: {
-    maxRetries: 3,
-    initialDelayMs: 1000,
-    maxDelayMs: 30000,
-    backoffMultiplier: 2,
-    jitter: true
-  }
+  logger: myLogger
 };
 ```
 
+Note: Retry configuration is defined at the queue level in the contract,
+not at the handler level. See `QueueDefinition.retry` for configuration options.
+
 #### Type Parameters
 
 | Type Parameter | Description |
@@ -801,13 +792,12 @@ const options: CreateWorkerOptions<typeof contract> = {
 
 | Property | Type | Description | Defined in |
 | ------ | ------ | ------ | ------ |
-| <a id="connectionoptions"></a> `connectionOptions?` | `AmqpConnectionManagerOptions` | Optional connection configuration (heartbeat, reconnect settings, etc.) | [packages/worker/src/worker.ts:137](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/worker.ts#L137) |
-| <a id="contract"></a> `contract` | `TContract` | The AMQP contract definition specifying consumers and their message schemas | [packages/worker/src/worker.ts:126](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/worker.ts#L126) |
-| <a id="handlers"></a> `handlers` | [`WorkerInferSafeConsumerHandlers`](#workerinfersafeconsumerhandlers)\<`TContract`\> | Handlers for each consumer defined in the contract. Handlers must return `Future<Result<void, HandlerError>>` for explicit error handling. Use defineHandler() to create safe handlers, or defineUnsafeHandler() which wraps Promise-based handlers into safe handlers internally. | [packages/worker/src/worker.ts:133](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/worker.ts#L133) |
-| <a id="logger"></a> `logger?` | `Logger` | Optional logger for logging message consumption and errors | [packages/worker/src/worker.ts:139](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/worker.ts#L139) |
-| <a id="retry"></a> `retry?` | [`RetryOptions`](#retryoptions) | Retry configuration - when undefined, uses legacy behavior (immediate requeue) | [packages/worker/src/worker.ts:141](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/worker.ts#L141) |
-| <a id="telemetry"></a> `telemetry?` | `TelemetryProvider` | Optional telemetry provider for tracing and metrics. If not provided, uses the default provider which attempts to load OpenTelemetry. OpenTelemetry instrumentation is automatically enabled if @opentelemetry/api is installed. | [packages/worker/src/worker.ts:147](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/worker.ts#L147) |
-| <a id="urls"></a> `urls` | `ConnectionUrl`[] | AMQP broker URL(s). Multiple URLs provide failover support | [packages/worker/src/worker.ts:135](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/worker.ts#L135) |
+| <a id="connectionoptions"></a> `connectionOptions?` | `AmqpConnectionManagerOptions` | Optional connection configuration (heartbeat, reconnect settings, etc.) | [packages/worker/src/worker.ts:127](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/worker.ts#L127) |
+| <a id="contract"></a> `contract` | `TContract` | The AMQP contract definition specifying consumers and their message schemas | [packages/worker/src/worker.ts:117](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/worker.ts#L117) |
+| <a id="handlers"></a> `handlers` | [`WorkerInferSafeConsumerHandlers`](#workerinfersafeconsumerhandlers)\<`TContract`\> | Handlers for each consumer defined in the contract. Handlers must return `Future<Result<void, HandlerError>>` for explicit error handling. Use defineHandler() to create handlers. | [packages/worker/src/worker.ts:123](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/worker.ts#L123) |
+| <a id="logger"></a> `logger?` | `Logger` | Optional logger for logging message consumption and errors | [packages/worker/src/worker.ts:129](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/worker.ts#L129) |
+| <a id="telemetry"></a> `telemetry?` | `TelemetryProvider` | Optional telemetry provider for tracing and metrics. If not provided, uses the default provider which attempts to load OpenTelemetry. OpenTelemetry instrumentation is automatically enabled if @opentelemetry/api is installed. | [packages/worker/src/worker.ts:135](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/worker.ts#L135) |
+| <a id="urls"></a> `urls` | `ConnectionUrl`[] | AMQP broker URL(s). Multiple URLs provide failover support | [packages/worker/src/worker.ts:125](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/worker.ts#L125) |
 
 ***
 
@@ -819,130 +809,64 @@ type HandlerError =
   | NonRetryableError;
 ```
 
-Defined in: [packages/worker/src/errors.ts:83](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/errors.ts#L83)
+Defined in: [packages/worker/src/errors.ts:83](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/errors.ts#L83)
 
 Union type representing all handler errors.
 Use this type when defining handlers that explicitly signal error outcomes.
 
 ***
 
-### RetryOptions
+### WorkerConsumedMessage
 
 ```ts
-type RetryOptions = object;
+type WorkerConsumedMessage<TPayload, THeaders> = object;
 ```
 
-Defined in: [packages/worker/src/worker.ts:56](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/worker.ts#L56)
-
-Retry configuration options for handling failed message processing.
-
-When enabled, the worker will automatically retry failed messages using
-RabbitMQ's native TTL + Dead Letter Exchange (DLX) pattern.
-
-#### Properties
-
-| Property | Type | Description | Defined in |
-| ------ | ------ | ------ | ------ |
-| <a id="backoffmultiplier"></a> `backoffMultiplier?` | `number` | Exponential backoff multiplier (default: 2) | [packages/worker/src/worker.ts:64](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/worker.ts#L64) |
-| <a id="initialdelayms"></a> `initialDelayMs?` | `number` | Initial delay in ms before first retry (default: 1000) | [packages/worker/src/worker.ts:60](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/worker.ts#L60) |
-| <a id="jitter"></a> `jitter?` | `boolean` | Add jitter to prevent thundering herd (default: true) | [packages/worker/src/worker.ts:66](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/worker.ts#L66) |
-| <a id="maxdelayms"></a> `maxDelayMs?` | `number` | Maximum delay in ms between retries (default: 30000) | [packages/worker/src/worker.ts:62](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/worker.ts#L62) |
-| <a id="maxretries"></a> `maxRetries?` | `number` | Maximum retry attempts before sending to DLQ (default: 3) | [packages/worker/src/worker.ts:58](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/worker.ts#L58) |
-
-***
-
-### ~~WorkerInferConsumerBatchHandler~~
-
-```ts
-type WorkerInferConsumerBatchHandler<TContract, TName> = WorkerInferUnsafeConsumerBatchHandler<TContract, TName>;
-```
-
-Defined in: [packages/worker/src/types.ts:195](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/types.ts#L195)
-
-#### Type Parameters
-
-| Type Parameter |
-| ------ |
-| `TContract` *extends* `ContractDefinition` |
-| `TName` *extends* `InferConsumerNames`\<`TContract`\> |
-
-#### Deprecated
-
-Use WorkerInferUnsafeConsumerBatchHandler instead
-
-***
-
-### ~~WorkerInferConsumerHandler~~
-
-```ts
-type WorkerInferConsumerHandler<TContract, TName> = WorkerInferUnsafeConsumerHandler<TContract, TName>;
-```
-
-Defined in: [packages/worker/src/types.ts:187](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/types.ts#L187)
-
-#### Type Parameters
-
-| Type Parameter |
-| ------ |
-| `TContract` *extends* `ContractDefinition` |
-| `TName` *extends* `InferConsumerNames`\<`TContract`\> |
-
-#### Deprecated
-
-Use WorkerInferUnsafeConsumerHandler instead
-
-***
-
-### ~~WorkerInferConsumerHandlerEntry~~
-
-```ts
-type WorkerInferConsumerHandlerEntry<TContract, TName> = WorkerInferUnsafeConsumerHandlerEntry<TContract, TName>;
-```
-
-Defined in: [packages/worker/src/types.ts:203](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/types.ts#L203)
-
-#### Type Parameters
-
-| Type Parameter |
-| ------ |
-| `TContract` *extends* `ContractDefinition` |
-| `TName` *extends* `InferConsumerNames`\<`TContract`\> |
+Defined in: [packages/worker/src/types.ts:86](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/types.ts#L86)
 
-#### Deprecated
+A consumed message containing parsed payload and headers.
 
-Use WorkerInferUnsafeConsumerHandlerEntry instead
+This type represents the first argument passed to consumer handlers.
+It contains the validated payload and (if defined in the message schema) the validated headers.
 
-***
-
-### ~~WorkerInferConsumerHandlers~~
+#### Example
 
-```ts
-type WorkerInferConsumerHandlers<TContract> = WorkerInferUnsafeConsumerHandlers<TContract>;
+```typescript
+// Handler receives the consumed message with typed payload and headers
+const handler = defineHandler(contract, 'processOrder', (message, rawMessage) => {
+  console.log(message.payload.orderId);  // Typed payload
+  console.log(message.headers?.priority); // Typed headers (if defined)
+  console.log(rawMessage.fields.deliveryTag); // Raw AMQP message
+  return Future.value(Result.Ok(undefined));
+});
 ```
 
-Defined in: [packages/worker/src/types.ts:211](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/types.ts#L211)
-
 #### Type Parameters
 
-| Type Parameter |
-| ------ |
-| `TContract` *extends* `ContractDefinition` |
+| Type Parameter | Default type | Description |
+| ------ | ------ | ------ |
+| `TPayload` | - | The inferred payload type from the message schema |
+| `THeaders` | `undefined` | The inferred headers type from the message schema (undefined if not defined) |
 
-#### Deprecated
+#### Properties
 
-Use WorkerInferUnsafeConsumerHandlers instead
+| Property | Type | Description | Defined in |
+| ------ | ------ | ------ | ------ |
+| <a id="headers"></a> `headers` | `THeaders` *extends* `undefined` ? `undefined` : `THeaders` | The validated message headers (present only when headers schema is defined) | [packages/worker/src/types.ts:90](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/types.ts#L90) |
+| <a id="payload"></a> `payload` | `TPayload` | The validated message payload | [packages/worker/src/types.ts:88](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/types.ts#L88) |
 
 ***
 
-### WorkerInferConsumerInput
+### WorkerInferConsumedMessage
 
 ```ts
-type WorkerInferConsumerInput<TContract, TName> = ConsumerInferInput<InferConsumer<TContract, TName>>;
+type WorkerInferConsumedMessage<TContract, TName> = WorkerConsumedMessage<WorkerInferConsumerPayload<TContract, TName>, WorkerInferConsumerHeaders<TContract, TName>>;
 ```
 
-Defined in: [packages/worker/src/types.ts:39](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/types.ts#L39)
+Defined in: [packages/worker/src/types.ts:97](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/types.ts#L97)
 
-Worker perspective types - for consuming messages
+Infer the full consumed message type for a specific consumer.
+Includes both payload and headers (if defined).
 
 #### Type Parameters
 
@@ -953,16 +877,16 @@ Worker perspective types - for consuming messages
 
 ***
 
-### WorkerInferSafeConsumerBatchHandler()
+### WorkerInferConsumerHeaders
 
 ```ts
-type WorkerInferSafeConsumerBatchHandler<TContract, TName> = (messages) => Future<Result<void, HandlerError>>;
+type WorkerInferConsumerHeaders<TContract, TName> = ConsumerInferHeadersInput<InferConsumer<TContract, TName>>;
 ```
 
-Defined in: [packages/worker/src/types.ts:80](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/types.ts#L80)
+Defined in: [packages/worker/src/types.ts:61](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/types.ts#L61)
 
-Safe consumer handler type for batch processing.
-Returns a `Future<Result<void, HandlerError>>` for explicit error handling.
+Infer the headers type for a specific consumer
+Returns undefined if no headers schema is defined
 
 #### Type Parameters
 
@@ -971,32 +895,15 @@ Returns a `Future<Result<void, HandlerError>>` for explicit error handling.
 | `TContract` *extends* `ContractDefinition` |
 | `TName` *extends* `InferConsumerNames`\<`TContract`\> |
 
-#### Parameters
-
-| Parameter | Type |
-| ------ | ------ |
-| `messages` | [`WorkerInferConsumerInput`](#workerinferconsumerinput)\<`TContract`, `TName`\>[] |
-
-#### Returns
-
-`Future`\<`Result`\<`void`, [`HandlerError`](#handlererror)\>\>
-
-#### Example
-
-```typescript
-const handler: WorkerInferSafeConsumerBatchHandler<typeof contract, 'processOrders'> =
-  (messages) => Future.value(Result.Ok(undefined));
-```
-
 ***
 
 ### WorkerInferSafeConsumerHandler()
 
 ```ts
-type WorkerInferSafeConsumerHandler<TContract, TName> = (message) => Future<Result<void, HandlerError>>;
+type WorkerInferSafeConsumerHandler<TContract, TName> = (message, rawMessage) => Future<Result<void, HandlerError>>;
 ```
 
-Defined in: [packages/worker/src/types.ts:65](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/types.ts#L65)
+Defined in: [packages/worker/src/types.ts:133](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/types.ts#L133)
 
 Safe consumer handler type for a specific consumer.
 Returns a `Future<Result<void, HandlerError>>` for explicit error handling.
@@ -1014,9 +921,10 @@ Returns a `Future<Result<void, HandlerError>>` for explicit error handling.
 
 #### Parameters
 
-| Parameter | Type |
-| ------ | ------ |
-| `message` | [`WorkerInferConsumerInput`](#workerinferconsumerinput)\<`TContract`, `TName`\> |
+| Parameter | Type | Description |
+| ------ | ------ | ------ |
+| `message` | [`WorkerInferConsumedMessage`](#workerinferconsumedmessage)\<`TContract`, `TName`\> | The parsed message containing validated payload and headers |
+| `rawMessage` | `ConsumeMessage` | The raw AMQP message with all metadata (fields, properties, content) |
 
 #### Returns
 
@@ -1026,7 +934,11 @@ Returns a `Future<Result<void, HandlerError>>` for explicit error handling.
 
 ```typescript
 const handler: WorkerInferSafeConsumerHandler<typeof contract, 'processOrder'> =
-  (message) => Future.value(Result.Ok(undefined));
+  ({ payload }, rawMessage) => {
+    console.log(payload.orderId);  // Typed payload
+    console.log(rawMessage.fields.deliveryTag); // Raw AMQP message
+    return Future.value(Result.Ok(undefined));
+  };
 ```
 
 ***
@@ -1037,25 +949,20 @@ const handler: WorkerInferSafeConsumerHandler<typeof contract, 'processOrder'> =
 type WorkerInferSafeConsumerHandlerEntry<TContract, TName> = 
   | WorkerInferSafeConsumerHandler<TContract, TName>
   | readonly [WorkerInferSafeConsumerHandler<TContract, TName>, {
-  batchSize?: never;
-  batchTimeout?: never;
-  prefetch?: number;
-}]
-  | readonly [WorkerInferSafeConsumerBatchHandler<TContract, TName>, {
-  batchSize: number;
-  batchTimeout?: number;
   prefetch?: number;
 }];
 ```
 
-Defined in: [packages/worker/src/types.ts:95](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/types.ts#L95)
+Defined in: [packages/worker/src/types.ts:151](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/types.ts#L151)
 
 Safe handler entry for a consumer - either a function or a tuple of [handler, options].
 
-Three patterns are supported:
-1. Simple handler: `(message) => Future.value(Result.Ok(undefined))`
-2. Handler with prefetch: `[(message) => ..., { prefetch: 10 }]`
-3. Batch handler: `[(messages) => ..., { batchSize: 5, batchTimeout: 1000 }]`
+Two patterns are supported:
+1. Simple handler: `({ payload }, rawMessage) => Future.value(Result.Ok(undefined))`
+2. Handler with prefetch: `[({ payload }, rawMessage) => ..., { prefetch: 10 }]`
+
+Note: Retry configuration is now defined at the queue level in the contract,
+not at the handler level. See `QueueDefinition.retry` for configuration options.
 
 #### Type Parameters
 
@@ -1072,7 +979,7 @@ Three patterns are supported:
 type WorkerInferSafeConsumerHandlers<TContract> = { [K in InferConsumerNames<TContract>]: WorkerInferSafeConsumerHandlerEntry<TContract, K> };
 ```
 
-Defined in: [packages/worker/src/types.ts:113](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/types.ts#L113)
+Defined in: [packages/worker/src/types.ts:162](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/types.ts#L162)
 
 Safe consumer handlers for a contract.
 All handlers return `Future<Result<void, HandlerError>>` for explicit error control.
@@ -1083,136 +990,6 @@ All handlers return `Future<Result<void, HandlerError>>` for explicit error cont
 | ------ |
 | `TContract` *extends* `ContractDefinition` |
 
-***
-
-### ~~WorkerInferUnsafeConsumerBatchHandler()~~
-
-```ts
-type WorkerInferUnsafeConsumerBatchHandler<TContract, TName> = (messages) => Promise<void>;
-```
-
-Defined in: [packages/worker/src/types.ts:147](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/types.ts#L147)
-
-Unsafe consumer handler type for batch processing.
-Returns a `Promise<void>` - throws exceptions on error.
-
-#### Type Parameters
-
-| Type Parameter |
-| ------ |
-| `TContract` *extends* `ContractDefinition` |
-| `TName` *extends* `InferConsumerNames`\<`TContract`\> |
-
-#### Parameters
-
-| Parameter | Type |
-| ------ | ------ |
-| `messages` | [`WorkerInferConsumerInput`](#workerinferconsumerinput)\<`TContract`, `TName`\>[] |
-
-#### Returns
-
-`Promise`\<`void`\>
-
-#### Deprecated
-
-Prefer using safe handlers (WorkerInferSafeConsumerBatchHandler) that return
-`Future<Result<void, HandlerError>>` for better error handling.
-
-***
-
-### ~~WorkerInferUnsafeConsumerHandler()~~
-
-```ts
-type WorkerInferUnsafeConsumerHandler<TContract, TName> = (message) => Promise<void>;
-```
-
-Defined in: [packages/worker/src/types.ts:135](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/types.ts#L135)
-
-Unsafe consumer handler type for a specific consumer.
-Returns a `Promise<void>` - throws exceptions on error.
-
-#### Type Parameters
-
-| Type Parameter |
-| ------ |
-| `TContract` *extends* `ContractDefinition` |
-| `TName` *extends* `InferConsumerNames`\<`TContract`\> |
-
-#### Parameters
-
-| Parameter | Type |
-| ------ | ------ |
-| `message` | [`WorkerInferConsumerInput`](#workerinferconsumerinput)\<`TContract`, `TName`\> |
-
-#### Returns
-
-`Promise`\<`void`\>
-
-#### Deprecated
-
-Prefer using safe handlers (WorkerInferSafeConsumerHandler) that return
-`Future<Result<void, HandlerError>>` for better error handling.
-
-**Note:** When using unsafe handlers:
-- All thrown errors are treated as retryable by default (when retry is configured)
-- Use RetryableError or NonRetryableError to control retry behavior explicitly
-
-***
-
-### ~~WorkerInferUnsafeConsumerHandlerEntry~~
-
-```ts
-type WorkerInferUnsafeConsumerHandlerEntry<TContract, TName> = 
-  | WorkerInferUnsafeConsumerHandler<TContract, TName>
-  | readonly [WorkerInferUnsafeConsumerHandler<TContract, TName>, {
-  batchSize?: never;
-  batchTimeout?: never;
-  prefetch?: number;
-}]
-  | readonly [WorkerInferUnsafeConsumerBatchHandler<TContract, TName>, {
-  batchSize: number;
-  batchTimeout?: number;
-  prefetch?: number;
-}];
-```
-
-Defined in: [packages/worker/src/types.ts:157](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/types.ts#L157)
-
-Unsafe handler entry for a consumer - either a function or a tuple of [handler, options].
-
-#### Type Parameters
-
-| Type Parameter |
-| ------ |
-| `TContract` *extends* `ContractDefinition` |
-| `TName` *extends* `InferConsumerNames`\<`TContract`\> |
-
-#### Deprecated
-
-Prefer using safe handler entries (WorkerInferSafeConsumerHandlerEntry).
-
-***
-
-### ~~WorkerInferUnsafeConsumerHandlers~~
-
-```ts
-type WorkerInferUnsafeConsumerHandlers<TContract> = { [K in InferConsumerNames<TContract>]: WorkerInferUnsafeConsumerHandlerEntry<TContract, K> };
-```
-
-Defined in: [packages/worker/src/types.ts:176](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/types.ts#L176)
-
-Unsafe consumer handlers for a contract.
-
-#### Type Parameters
-
-| Type Parameter |
-| ------ |
-| `TContract` *extends* `ContractDefinition` |
-
-#### Deprecated
-
-Prefer using safe handlers (WorkerInferSafeConsumerHandlers).
-
 ## Functions
 
 ### defineHandler()
@@ -1226,17 +1003,16 @@ function defineHandler<TContract, TName>(
 handler): WorkerInferSafeConsumerHandlerEntry<TContract, TName>;
 ```
 
-Defined in: [packages/worker/src/handlers.ts:134](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/handlers.ts#L134)
+Defined in: [packages/worker/src/handlers.ts:103](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/handlers.ts#L103)
 
 Define a type-safe handler for a specific consumer in a contract.
 
 **Recommended:** This function creates handlers that return `Future<Result<void, HandlerError>>`,
 providing explicit error handling and better control over retry behavior.
 
-Supports three patterns:
-1. Simple handler: just the function (single message handler)
-2. Handler with prefetch: [handler, { prefetch: 10 }] (single message handler with config)
-3. Batch handler: [batchHandler, { batchSize: 5, batchTimeout: 1000 }] (REQUIRES batchSize config)
+Supports two patterns:
+1. Simple handler: just the function
+2. Handler with options: [handler, { prefetch: 10 }]
 
 ##### Type Parameters
 
@@ -1270,8 +1046,8 @@ import { orderContract } from './contract';
 const processOrderHandler = defineHandler(
   orderContract,
   'processOrder',
-  (message) =>
-    Future.fromPromise(processPayment(message))
+  ({ payload }) =>
+    Future.fromPromise(processPayment(payload))
       .mapOk(() => undefined)
       .mapError((error) => new RetryableError('Payment failed', error))
 );
@@ -1280,8 +1056,8 @@ const processOrderHandler = defineHandler(
 const validateOrderHandler = defineHandler(
   orderContract,
   'validateOrder',
-  (message) => {
-    if (message.amount < 1) {
+  ({ payload }) => {
+    if (payload.amount < 1) {
       // Won't be retried - goes directly to DLQ
       return Future.value(Result.Error(new NonRetryableError('Invalid order amount')));
     }
@@ -1300,17 +1076,16 @@ function defineHandler<TContract, TName>(
 options): WorkerInferSafeConsumerHandlerEntry<TContract, TName>;
 ```
 
-Defined in: [packages/worker/src/handlers.ts:142](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/handlers.ts#L142)
+Defined in: [packages/worker/src/handlers.ts:111](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/handlers.ts#L111)
 
 Define a type-safe handler for a specific consumer in a contract.
 
 **Recommended:** This function creates handlers that return `Future<Result<void, HandlerError>>`,
 providing explicit error handling and better control over retry behavior.
 
-Supports three patterns:
-1. Simple handler: just the function (single message handler)
-2. Handler with prefetch: [handler, { prefetch: 10 }] (single message handler with config)
-3. Batch handler: [batchHandler, { batchSize: 5, batchTimeout: 1000 }] (REQUIRES batchSize config)
+Supports two patterns:
+1. Simple handler: just the function
+2. Handler with options: [handler, { prefetch: 10 }]
 
 ##### Type Parameters
 
@@ -1326,9 +1101,7 @@ Supports three patterns:
 | `contract` | `TContract` | The contract definition containing the consumer |
 | `consumerName` | `TName` | The name of the consumer from the contract |
 | `handler` | [`WorkerInferSafeConsumerHandler`](#workerinfersafeconsumerhandler)\<`TContract`, `TName`\> | The handler function that returns `Future<Result<void, HandlerError>>` |
-| `options` | \{ `batchSize?`: `undefined`; `batchTimeout?`: `undefined`; `prefetch?`: `number`; \} | Optional consumer options (prefetch, batchSize, batchTimeout) |
-| `options.batchSize?` | `undefined` | - |
-| `options.batchTimeout?` | `undefined` | - |
+| `options` | \{ `prefetch?`: `number`; \} | Optional consumer options (prefetch) |
 | `options.prefetch?` | `number` | - |
 
 ##### Returns
@@ -1348,8 +1121,8 @@ import { orderContract } from './contract';
 const processOrderHandler = defineHandler(
   orderContract,
   'processOrder',
-  (message) =>
-    Future.fromPromise(processPayment(message))
+  ({ payload }) =>
+    Future.fromPromise(processPayment(payload))
       .mapOk(() => undefined)
       .mapError((error) => new RetryableError('Payment failed', error))
 );
@@ -1358,86 +1131,8 @@ const processOrderHandler = defineHandler(
 const validateOrderHandler = defineHandler(
   orderContract,
   'validateOrder',
-  (message) => {
-    if (message.amount < 1) {
-      // Won't be retried - goes directly to DLQ
-      return Future.value(Result.Error(new NonRetryableError('Invalid order amount')));
-    }
-    return Future.value(Result.Ok(undefined));
-  }
-);
-```
-
-#### Call Signature
-
-```ts
-function defineHandler<TContract, TName>(
-   contract, 
-   consumerName, 
-   handler, 
-options): WorkerInferSafeConsumerHandlerEntry<TContract, TName>;
-```
-
-Defined in: [packages/worker/src/handlers.ts:151](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/handlers.ts#L151)
-
-Define a type-safe handler for a specific consumer in a contract.
-
-**Recommended:** This function creates handlers that return `Future<Result<void, HandlerError>>`,
-providing explicit error handling and better control over retry behavior.
-
-Supports three patterns:
-1. Simple handler: just the function (single message handler)
-2. Handler with prefetch: [handler, { prefetch: 10 }] (single message handler with config)
-3. Batch handler: [batchHandler, { batchSize: 5, batchTimeout: 1000 }] (REQUIRES batchSize config)
-
-##### Type Parameters
-
-| Type Parameter | Description |
-| ------ | ------ |
-| `TContract` *extends* `ContractDefinition` | The contract definition type |
-| `TName` *extends* `string` \| `number` \| `symbol` | The consumer name from the contract |
-
-##### Parameters
-
-| Parameter | Type | Description |
-| ------ | ------ | ------ |
-| `contract` | `TContract` | The contract definition containing the consumer |
-| `consumerName` | `TName` | The name of the consumer from the contract |
-| `handler` | [`WorkerInferSafeConsumerBatchHandler`](#workerinfersafeconsumerbatchhandler)\<`TContract`, `TName`\> | The handler function that returns `Future<Result<void, HandlerError>>` |
-| `options` | \{ `batchSize`: `number`; `batchTimeout?`: `number`; `prefetch?`: `number`; \} | Optional consumer options (prefetch, batchSize, batchTimeout) |
-| `options.batchSize` | `number` | - |
-| `options.batchTimeout?` | `number` | - |
-| `options.prefetch?` | `number` | - |
-
-##### Returns
-
-[`WorkerInferSafeConsumerHandlerEntry`](#workerinfersafeconsumerhandlerentry)\<`TContract`, `TName`\>
-
-A type-safe handler that can be used with TypedAmqpWorker
-
-##### Example
-
-```typescript
-import { defineHandler, RetryableError, NonRetryableError } from '@amqp-contract/worker';
-import { Future, Result } from '@swan-io/boxed';
-import { orderContract } from './contract';
-
-// Simple handler with explicit error handling using mapError
-const processOrderHandler = defineHandler(
-  orderContract,
-  'processOrder',
-  (message) =>
-    Future.fromPromise(processPayment(message))
-      .mapOk(() => undefined)
-      .mapError((error) => new RetryableError('Payment failed', error))
-);
-
-// Handler with validation (non-retryable error)
-const validateOrderHandler = defineHandler(
-  orderContract,
-  'validateOrder',
-  (message) => {
-    if (message.amount < 1) {
+  ({ payload }) => {
+    if (payload.amount < 1) {
       // Won't be retried - goes directly to DLQ
       return Future.value(Result.Error(new NonRetryableError('Invalid order amount')));
     }
@@ -1454,7 +1149,7 @@ const validateOrderHandler = defineHandler(
 function defineHandlers<TContract>(contract, handlers): WorkerInferSafeConsumerHandlers<TContract>;
 ```
 
-Defined in: [packages/worker/src/handlers.ts:208](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/handlers.ts#L208)
+Defined in: [packages/worker/src/handlers.ts:166](https://github.com/btravers/amqp-contract/blob/ed05e43c04fa526b751d45622ccc1ac53b2e96f9/packages/worker/src/handlers.ts#L166)
 
 Define multiple type-safe handlers for consumers in a contract.
 
@@ -1488,270 +1183,13 @@ import { Future } from '@swan-io/boxed';
 import { orderContract } from './contract';
 
 const handlers = defineHandlers(orderContract, {
-  processOrder: (message) =>
-    Future.fromPromise(processPayment(message))
+  processOrder: ({ payload }) =>
+    Future.fromPromise(processPayment(payload))
       .mapOk(() => undefined)
       .mapError((error) => new RetryableError('Payment failed', error)),
-  notifyOrder: (message) =>
-    Future.fromPromise(sendNotification(message))
+  notifyOrder: ({ payload }) =>
+    Future.fromPromise(sendNotification(payload))
       .mapOk(() => undefined)
       .mapError((error) => new RetryableError('Notification failed', error)),
 });
 ```
-
-***
-
-### ~~defineUnsafeHandler()~~
-
-#### Call Signature
-
-```ts
-function defineUnsafeHandler<TContract, TName>(
-   contract, 
-   consumerName, 
-handler): WorkerInferSafeConsumerHandlerEntry<TContract, TName>;
-```
-
-Defined in: [packages/worker/src/handlers.ts:272](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/handlers.ts#L272)
-
-Define an unsafe handler for a specific consumer in a contract.
-
-##### Type Parameters
-
-| Type Parameter | Description |
-| ------ | ------ |
-| `TContract` *extends* `ContractDefinition` | The contract definition type |
-| `TName` *extends* `string` \| `number` \| `symbol` | The consumer name from the contract |
-
-##### Parameters
-
-| Parameter | Type | Description |
-| ------ | ------ | ------ |
-| `contract` | `TContract` | The contract definition containing the consumer |
-| `consumerName` | `TName` | The name of the consumer from the contract |
-| `handler` | `UnsafeHandler`\<`TContract`, `TName`\> | The async handler function that processes messages |
-
-##### Returns
-
-[`WorkerInferSafeConsumerHandlerEntry`](#workerinfersafeconsumerhandlerentry)\<`TContract`, `TName`\>
-
-A type-safe handler that can be used with TypedAmqpWorker
-
-##### Deprecated
-
-Use `defineHandler` instead for explicit error handling with `Future<Result>`.
-
-**Warning:** Unsafe handlers use exception-based error handling:
-- All thrown errors are treated as retryable by default
-- Harder to reason about which errors should be retried
-- May lead to unexpected retry behavior
-
-**Note:** Internally, this function wraps the Promise-based handler into a Future-based
-safe handler for consistent processing in the worker.
-
-##### Example
-
-```typescript
-import { defineUnsafeHandler } from '@amqp-contract/worker';
-
-// ⚠️ Consider using defineHandler for better error handling
-const processOrderHandler = defineUnsafeHandler(
-  orderContract,
-  'processOrder',
-  async (message) => {
-    // Throws on error - will be retried
-    await processPayment(message);
-  }
-);
-```
-
-#### Call Signature
-
-```ts
-function defineUnsafeHandler<TContract, TName>(
-   contract, 
-   consumerName, 
-   handler, 
-options): WorkerInferSafeConsumerHandlerEntry<TContract, TName>;
-```
-
-Defined in: [packages/worker/src/handlers.ts:280](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/handlers.ts#L280)
-
-Define an unsafe handler for a specific consumer in a contract.
-
-##### Type Parameters
-
-| Type Parameter | Description |
-| ------ | ------ |
-| `TContract` *extends* `ContractDefinition` | The contract definition type |
-| `TName` *extends* `string` \| `number` \| `symbol` | The consumer name from the contract |
-
-##### Parameters
-
-| Parameter | Type | Description |
-| ------ | ------ | ------ |
-| `contract` | `TContract` | The contract definition containing the consumer |
-| `consumerName` | `TName` | The name of the consumer from the contract |
-| `handler` | `UnsafeHandler`\<`TContract`, `TName`\> | The async handler function that processes messages |
-| `options` | \{ `batchSize?`: `undefined`; `batchTimeout?`: `undefined`; `prefetch?`: `number`; \} | Optional consumer options (prefetch, batchSize, batchTimeout) |
-| `options.batchSize?` | `undefined` | - |
-| `options.batchTimeout?` | `undefined` | - |
-| `options.prefetch?` | `number` | - |
-
-##### Returns
-
-[`WorkerInferSafeConsumerHandlerEntry`](#workerinfersafeconsumerhandlerentry)\<`TContract`, `TName`\>
-
-A type-safe handler that can be used with TypedAmqpWorker
-
-##### Deprecated
-
-Use `defineHandler` instead for explicit error handling with `Future<Result>`.
-
-**Warning:** Unsafe handlers use exception-based error handling:
-- All thrown errors are treated as retryable by default
-- Harder to reason about which errors should be retried
-- May lead to unexpected retry behavior
-
-**Note:** Internally, this function wraps the Promise-based handler into a Future-based
-safe handler for consistent processing in the worker.
-
-##### Example
-
-```typescript
-import { defineUnsafeHandler } from '@amqp-contract/worker';
-
-// ⚠️ Consider using defineHandler for better error handling
-const processOrderHandler = defineUnsafeHandler(
-  orderContract,
-  'processOrder',
-  async (message) => {
-    // Throws on error - will be retried
-    await processPayment(message);
-  }
-);
-```
-
-#### Call Signature
-
-```ts
-function defineUnsafeHandler<TContract, TName>(
-   contract, 
-   consumerName, 
-   handler, 
-options): WorkerInferSafeConsumerHandlerEntry<TContract, TName>;
-```
-
-Defined in: [packages/worker/src/handlers.ts:289](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/handlers.ts#L289)
-
-Define an unsafe handler for a specific consumer in a contract.
-
-##### Type Parameters
-
-| Type Parameter | Description |
-| ------ | ------ |
-| `TContract` *extends* `ContractDefinition` | The contract definition type |
-| `TName` *extends* `string` \| `number` \| `symbol` | The consumer name from the contract |
-
-##### Parameters
-
-| Parameter | Type | Description |
-| ------ | ------ | ------ |
-| `contract` | `TContract` | The contract definition containing the consumer |
-| `consumerName` | `TName` | The name of the consumer from the contract |
-| `handler` | `UnsafeBatchHandler`\<`TContract`, `TName`\> | The async handler function that processes messages |
-| `options` | \{ `batchSize`: `number`; `batchTimeout?`: `number`; `prefetch?`: `number`; \} | Optional consumer options (prefetch, batchSize, batchTimeout) |
-| `options.batchSize` | `number` | - |
-| `options.batchTimeout?` | `number` | - |
-| `options.prefetch?` | `number` | - |
-
-##### Returns
-
-[`WorkerInferSafeConsumerHandlerEntry`](#workerinfersafeconsumerhandlerentry)\<`TContract`, `TName`\>
-
-A type-safe handler that can be used with TypedAmqpWorker
-
-##### Deprecated
-
-Use `defineHandler` instead for explicit error handling with `Future<Result>`.
-
-**Warning:** Unsafe handlers use exception-based error handling:
-- All thrown errors are treated as retryable by default
-- Harder to reason about which errors should be retried
-- May lead to unexpected retry behavior
-
-**Note:** Internally, this function wraps the Promise-based handler into a Future-based
-safe handler for consistent processing in the worker.
-
-##### Example
-
-```typescript
-import { defineUnsafeHandler } from '@amqp-contract/worker';
-
-// ⚠️ Consider using defineHandler for better error handling
-const processOrderHandler = defineUnsafeHandler(
-  orderContract,
-  'processOrder',
-  async (message) => {
-    // Throws on error - will be retried
-    await processPayment(message);
-  }
-);
-```
-
-***
-
-### ~~defineUnsafeHandlers()~~
-
-```ts
-function defineUnsafeHandlers<TContract>(contract, handlers): WorkerInferSafeConsumerHandlers<TContract>;
-```
-
-Defined in: [packages/worker/src/handlers.ts:373](https://github.com/btravers/amqp-contract/blob/f058a24938d9644a82812e57d7995cb683cfd6b5/packages/worker/src/handlers.ts#L373)
-
-Define multiple unsafe handlers for consumers in a contract.
-
-#### Type Parameters
-
-| Type Parameter | Description |
-| ------ | ------ |
-| `TContract` *extends* `ContractDefinition` | The contract definition type |
-
-#### Parameters
-
-| Parameter | Type | Description |
-| ------ | ------ | ------ |
-| `contract` | `TContract` | The contract definition containing the consumers |
-| `handlers` | `UnsafeHandlers`\<`TContract`\> | An object with async handler functions for each consumer |
-
-#### Returns
-
-[`WorkerInferSafeConsumerHandlers`](#workerinfersafeconsumerhandlers)\<`TContract`\>
-
-A type-safe handlers object that can be used with TypedAmqpWorker
-
-#### Deprecated
-
-Use `defineHandlers` instead for explicit error handling with `Future<Result>`.
-
-**Warning:** Unsafe handlers use exception-based error handling.
-Consider migrating to safe handlers for better error control.
-
-**Note:** Internally, this function wraps all Promise-based handlers into Future-based
-safe handlers for consistent processing in the worker.
-
-#### Example
-
-```typescript
-import { defineUnsafeHandlers } from '@amqp-contract/worker';
-
-// ⚠️ Consider using defineHandlers for better error handling
-const handlers = defineUnsafeHandlers(orderContract, {
-  processOrder: async (message) => {
-    await processPayment(message);
-  },
-  notifyOrder: async (message) => {
-    await sendNotification(message);
-  },
-});
-```