@btravstack/amqp-worker 0.16.0 → 0.18.0

package/dist/index.cjs

@@ -61,46 +61,11 @@ const brokerLog = (observers) => {
 //#endregion
 //#region src/unit.ts
 /**
-* Where `messageUnits` leaves the forked context for the piece wrappers to read.
-* A symbol rather than a name: the dispatcher merges it into the context every
-* handler sees, and a string key would appear on the record a handler written
-* against the `{ inject, sync }` arm destructures.
-*/
-const UNIT_SCOPE = Symbol("@btravstack/amqp-worker/unit-scope");
-/**
-* The declared record, as a getter per name resolved on read out of the fork.
-* Neither writable nor configurable — a handler reads what the fork holds, and
-* cannot reshape the record under the next delivery. With no `unit.message`
-* bound there is nothing to resolve from, so the record is empty whatever was
-* declared.
-*/
-const unitRecordOf = (forked, record) => {
-	const unit = {};
-	if (forked === void 0) return unit;
-	for (const [name, port] of Object.entries(record)) Object.defineProperty(unit, name, {
-		enumerable: true,
-		get: () => forked.get(port)
-	});
-	return unit;
-};
-/**
 * One handler entry — a function, or `[handler, options]` — with its piece's
 * declared record put on `context.unit`. Applied once per piece as di
 * constructs it, so a delivery costs one record and one context object.
 */
-const withUnit = (record, entry) => {
-	const wrap = (handler) => (helpers, message) => {
-		const { [UNIT_SCOPE]: forked, ...rest } = helpers.context ?? {};
-		return handler({
-			...helpers,
-			context: {
-				...rest,
-				unit: unitRecordOf(forked, record)
-			}
-		}, message);
-	};
-	return Array.isArray(entry) ? [wrap(entry[0]), entry[1]] : wrap(entry);
-};
+const withUnit = (record, entry) => Array.isArray(entry) ? [(0, _btravstack_core.withUnitRecord)(record, entry[0]), entry[1]] : (0, _btravstack_core.withUnitRecord)(record, entry);
 //#endregion
 //#region src/handler.ts
 /** One id, declared once, so no contract instantiating it warns about a duplicate. */
@@ -144,13 +109,8 @@ const HANDLER_PREFIX = "AmqpHandler:";
 */
 const AmqpHandler = (contract, key) => {
 	const port = class extends (0, _btravstack_di.Port)(`${HANDLER_PREFIX}${key}`) {};
-	return (options) => {
-		const record = options.unit ?? {};
-		return Object.assign((0, _btravstack_di.Provider)(port)({
-			inject: options.inject,
-			sync: (services) => withUnit(record, options.sync(services))
-		}), { unit: record });
-	};
+	const mint = (0, _btravstack_core.mintPiece)(port, withUnit);
+	return (options) => mint(options);
 };
 //#endregion
 //#region src/message-units.ts
@@ -163,9 +123,8 @@ const AmqpHandler = (contract, key) => {
 * runs unchanged, so the ambient `currentUnit()` record is what the unit leaves
 * for the adapters that read it.
 *
-* The forked context rides the dispatcher's context under {@link UNIT_SCOPE},
-* where each piece's own wrapper turns it into the typed `context.unit` record
-* that piece declared — the records live with the pieces, so a hand-composed
+* The forked context rides the dispatcher's context, where each piece's own
+* wrapper turns it into the typed `context.unit` record that piece declared — the records live with the pieces, so a hand-composed
 * `amqp()` gets them without threading a second option through the starter.
 *
 * **The kernel's per-unit `AbortSignal` rides that record too**, and it is the
@@ -173,17 +132,19 @@ const AmqpHandler = (contract, key) => {
 * handler that must stop when the kernel stops waiting reads
 * `currentUnit()?.signal`.
 */
-const messageUnits = (host, observers, unit) => (args, next) => {
-	const settle = (0, _btravstack_core.observe)(observers, {
+const messageUnits = (host, observers, unit) => (args, next) => (0, _btravstack_core.dispatchUnit)({
+	host,
+	observers,
+	operation: {
 		component: "amqp",
 		name: "delivery",
 		attributes: { handler: args.handlerName }
-	});
-	return host.run(metaFor(args.rawMessage), (scope) => unit === void 0 ? next() : scope.fork(unit, [[AmqpMessagePort, args.message]]).flatMap((forked) => next({ context: { [UNIT_SCOPE]: forked } }))).tap(() => settle({ outcome: "ok" })).tapFailure((failure) => settle({
-		outcome: "error",
-		cause: failure.tag === "Err" ? failure.error : failure.cause
-	}));
-};
+	},
+	meta: metaFor(args.rawMessage),
+	unit,
+	seed: [AmqpMessagePort, args.message],
+	next
+});
 /**
 * `UnitMeta.id` must be unique per unit, and a **delivery tag is not one**: tags
 * are per-channel and restart at `1` after a reconnect, which
@@ -255,10 +216,7 @@ const amqp = (options) => {
 		needs: [_btravstack_config.Env, AmqpHandlersPort],
 		provides: [
 			config,
-			_btravstack_di.Provider.member(_btravstack_core.Observers)({
-				inject: {},
-				value: _btravstack_core.noObserver
-			}),
+			_btravstack_core.noObserverMember,
 			(0, _btravstack_di.Provider)(AmqpRuntime)({
 				inject: {
 					config: AmqpConfig,
@@ -291,19 +249,7 @@ const amqp = (options) => {
 * slices claiming one key are di's duplicate-provider defect at build.
 */
 const AmqpHandlers = (contract) => {
-	const build = (0, _btravstack_di.Provider)(AmqpHandlersPort);
-	const compose = (pieces) => build({
-		inject: Object.fromEntries(pieces.map((piece) => [piece.port.portId.slice(12), piece.port])),
-		sync: (services) => services
-	});
-	const whole = (options) => {
-		const record = options.unit ?? {};
-		return build({
-			inject: options.inject,
-			sync: (services) => Object.fromEntries(Object.entries(options.sync(services)).map(([key, entry]) => [key, withUnit(record, entry)]))
-		});
-	};
-	return ((first) => Array.isArray(first) ? compose(first) : whole(first));
+	return (0, _btravstack_core.composeByPrefix)(AmqpHandlersPort, HANDLER_PREFIX, withUnit);
 };
 const startFailed = (cause) => new _btravstack_core.RuntimeStartFailed({
 	runtime: "amqp",

package/dist/index.d.cts

@@ -1,21 +1,7 @@
 import { ConfigInvalid, Env } from "@btravstack/config";
-import { AnyModule, AnyPort, AnyProvider, Exportable, Module, NeedsGate, PortClassOf, PortInstance, Provider, Scope, ServiceOf } from "@btravstack/di";
+import { AnyUnitModule, Refuse, Runtime, RuntimePort, UnitGate, UnitNeedsOf, UnitRecordOf } from "@btravstack/core";
+import { AnyModule, AnyPort, AnyProvider, Exportable, Module, NeedsGate, PortClassOf, PortInstance, Provider, ServiceOf } from "@btravstack/di";
 import { ConsumerOptions, TypedAmqpWorker, WorkerInferHandlers } from "@amqp-contract/worker";
-import { Runtime, RuntimePort } from "@btravstack/core";
-//#region src/unit.d.ts
-/** What a bound unit module exports — the port instances a handler of that kind may read. */
-type UnitExportsOf<M> = M extends Module<infer X, never, unknown> ? X : never;
-/** The declared `unit:` record, as the services a handler reads off `context.unit`. */
-type UnitRecordOf<U extends Readonly<Record<string, AnyPort>>> = { readonly [N in keyof U]: ServiceOf<InstanceType<U[N]>>; };
-/**
- * A piece injecting a port the bound `unit.message` module does not export.
- * `unknown` when every declared port is covered — including the empty case, so
- * a worker whose pieces declare no `unit:` is gated on nothing.
- */
-type UnitGate<Unit, Declared> = [Exclude<NonNullable<Declared>, UnitExportsOf<Unit>>] extends [never] ? unknown : {
-  readonly "UNIT DOES NOT PROVIDE — a piece injects a port the bound unit module does not export": Exclude<NonNullable<Declared>, UnitExportsOf<Unit>>;
-};
-//#endregion
 //#region src/handler.d.ts
 /** The consumer and rpc names `C` declares — the keys of its handlers record. */
 type HandlerKeyOf<C extends AnyAmqpContract> = keyof WorkerInferHandlers<C> & string;
@@ -65,8 +51,6 @@ declare const HANDLER_PREFIX = "AmqpHandler:";
 /** What a minted piece returns. */
 type MintedHandler<C extends AnyAmqpContract, K extends HandlerKeyOf<C>, N, U extends Readonly<Record<string, AnyPort>>> = Provider<InstanceType<HandlerPortOf<C, K>>, never, N> & {
   readonly port: HandlerPortOf<C, K>;
-  /** The declared `unit:` record, which `AmqpHandlers`'s array arm reads back off the piece. */
-  readonly unit: U;
   /** Phantom: the ports this piece injects, which the root's `unit.message` must export. */
   readonly _declared?: InstanceType<U[keyof U]>;
 };
@@ -114,22 +98,8 @@ export declare class AmqpConfig extends AmqpConfig_base<{
 }> {}
 /** The runtime's port: what `amqp()` provides, and what the module `start` boots must export. */
 export declare class AmqpRuntime extends RuntimePort<Runtime<never, AmqpInfo>> {}
-/**
- * A module `unit.message` may bind, as the upper bound `amqp()` constrains its
- * own `Unit` type parameter to. `Module`'s `_exports` channel is contravariant,
- * so `Exports = never` — never `unknown` — is what makes a REAL module's own
- * (necessarily narrower) export type assignable to this bound: `(x: Concrete)
- * => void` is assignable to `(x: never) => void`, not to `(x: unknown) =>
- * void`.
- */
-type AnyUnitModule = Module<never, never, unknown>;
-/**
- * The needs a bound `unit.message` module still owes, or `never` when none is
- * bound. `Scope` is excluded, since nothing can ever provide it — the same
- * exemption `NeedsGate` itself carries — and so is the delivery, which the
- * fork's own seed discharges.
- */
-type UnitNeedsOf<Unit> = Unit extends Module<never, never, infer N> ? Exclude<N, Scope | AmqpMessageInstance> : never;
+/** The needs a bound `unit.message` module still owes, less the delivery the fork's seed discharges. */
+type UnitNeedsOf$1<Unit> = UnitNeedsOf<Unit, AmqpMessageInstance>;
 /**
  * The contract type `TypedAmqpWorker.create` accepts, extracted rather than
  * imported by name so `@amqp-contract/contract` stays out of the peer range.
@@ -192,7 +162,7 @@ type AmqpTuning<Unit extends AnyUnitModule | undefined = undefined> = {
  *
  * With `url` pinned the module reads nothing from the environment.
  */
-export declare const amqp: <TContract extends AnyAmqpContract, Unit extends AnyUnitModule | undefined = undefined>(options: AmqpOptions<TContract, Unit>) => Module<AmqpRuntime | AmqpConfig, ConfigInvalid, Env | HandlersInstanceOf<TContract> | UnitNeedsOf<Unit>>;
+export declare const amqp: <TContract extends AnyAmqpContract, Unit extends AnyUnitModule | undefined = undefined>(options: AmqpOptions<TContract, Unit>) => Module<AmqpRuntime | AmqpConfig, ConfigInvalid, Env | HandlersInstanceOf<TContract> | UnitNeedsOf$1<Unit>>;
 /** One piece of the handlers record — what `AmqpHandler(contract, key)(…)` returns, as the composing form consumes it. */
 type PieceOf<C extends AnyAmqpContract> = { readonly [K in HandlerKeyOf<C>]: {
   readonly port: HandlerPortOf<C, K>;
@@ -211,19 +181,6 @@ type KeyOfPiece<P> = P extends {
 } ? K : never;
 /** The consumers and rpcs no piece in `T` covers. */
 type Uncovered<C extends AnyAmqpContract, T extends readonly PieceOf<C>[]> = Exclude<HandlerKeyOf<C>, KeyOfPiece<T[number]>>;
-/**
- * A refused array: as long as the array the caller wrote, its head the caller's
- * own elements — which match — and its LAST element the marker paired with what
- * is wrong.
- *
- * TypeScript compares two equal-length tuples element by element, so the extra
- * diagnostic it reports lands on the trailing element and carries both the
- * sentence and the missing key. A fixed two-element tuple named the key only
- * when the array happened to be two elements long; every other arity was a
- * length mismatch, and the developer diffed the contract against the array by
- * hand.
- */
-type Refuse<T extends readonly unknown[], Marker extends string, Detail> = T extends readonly [...infer Head, unknown] ? readonly [...Head, readonly [Marker, Detail]] : readonly [readonly [Marker, Detail]];
 /**
  * The record arm: the whole handlers record from one `sync`, with one `unit:`
  * record shared by every entry in it.
@@ -280,7 +237,7 @@ export declare const AmqpHandlers: <C extends AnyAmqpContract>(contract: C) => W
 //#endregion
 //#region src/amqp-module.d.ts
 /** The starter's own module, as the sugar adds it to the application's imports. */
-type AmqpStarter<TContract extends AnyAmqpContract, Unit extends AnyUnitModule | undefined> = Module<AmqpRuntime | AmqpConfig, ConfigInvalid, Env | HandlersInstanceOf<TContract> | UnitNeedsOf<Unit>>;
+type AmqpStarter<TContract extends AnyAmqpContract, Unit extends AnyUnitModule | undefined> = Module<AmqpRuntime | AmqpConfig, ConfigInvalid, Env | HandlersInstanceOf<TContract> | UnitNeedsOf$1<Unit>>;
 /** The application's imports plus the starter — the tuple `Module(name)` is handed. */
 type Imports<I extends readonly AnyModule[], TContract extends AnyAmqpContract, Unit extends AnyUnitModule | undefined> = readonly [...I, AmqpStarter<TContract, Unit>];
 /** The handlers provider plus the application's own — the tuple `Module(name)` is handed. */

package/dist/index.d.mts

@@ -1,21 +1,7 @@
-import { AnyModule, AnyPort, AnyProvider, Exportable, Module, NeedsGate, PortClassOf, PortInstance, Provider, Scope, ServiceOf } from "@btravstack/di";
+import { AnyModule, AnyPort, AnyProvider, Exportable, Module, NeedsGate, PortClassOf, PortInstance, Provider, ServiceOf } from "@btravstack/di";
 import { ConsumerOptions, TypedAmqpWorker, WorkerInferHandlers } from "@amqp-contract/worker";
 import { ConfigInvalid, Env } from "@btravstack/config";
-import { Runtime, RuntimePort } from "@btravstack/core";
-//#region src/unit.d.ts
-/** What a bound unit module exports — the port instances a handler of that kind may read. */
-type UnitExportsOf<M> = M extends Module<infer X, never, unknown> ? X : never;
-/** The declared `unit:` record, as the services a handler reads off `context.unit`. */
-type UnitRecordOf<U extends Readonly<Record<string, AnyPort>>> = { readonly [N in keyof U]: ServiceOf<InstanceType<U[N]>>; };
-/**
- * A piece injecting a port the bound `unit.message` module does not export.
- * `unknown` when every declared port is covered — including the empty case, so
- * a worker whose pieces declare no `unit:` is gated on nothing.
- */
-type UnitGate<Unit, Declared> = [Exclude<NonNullable<Declared>, UnitExportsOf<Unit>>] extends [never] ? unknown : {
-  readonly "UNIT DOES NOT PROVIDE — a piece injects a port the bound unit module does not export": Exclude<NonNullable<Declared>, UnitExportsOf<Unit>>;
-};
-//#endregion
+import { AnyUnitModule, Refuse, Runtime, RuntimePort, UnitGate, UnitNeedsOf, UnitRecordOf } from "@btravstack/core";
 //#region src/handler.d.ts
 /** The consumer and rpc names `C` declares — the keys of its handlers record. */
 type HandlerKeyOf<C extends AnyAmqpContract> = keyof WorkerInferHandlers<C> & string;
@@ -65,8 +51,6 @@ declare const HANDLER_PREFIX = "AmqpHandler:";
 /** What a minted piece returns. */
 type MintedHandler<C extends AnyAmqpContract, K extends HandlerKeyOf<C>, N, U extends Readonly<Record<string, AnyPort>>> = Provider<InstanceType<HandlerPortOf<C, K>>, never, N> & {
   readonly port: HandlerPortOf<C, K>;
-  /** The declared `unit:` record, which `AmqpHandlers`'s array arm reads back off the piece. */
-  readonly unit: U;
   /** Phantom: the ports this piece injects, which the root's `unit.message` must export. */
   readonly _declared?: InstanceType<U[keyof U]>;
 };
@@ -114,22 +98,8 @@ export declare class AmqpConfig extends AmqpConfig_base<{
 }> {}
 /** The runtime's port: what `amqp()` provides, and what the module `start` boots must export. */
 export declare class AmqpRuntime extends RuntimePort<Runtime<never, AmqpInfo>> {}
-/**
- * A module `unit.message` may bind, as the upper bound `amqp()` constrains its
- * own `Unit` type parameter to. `Module`'s `_exports` channel is contravariant,
- * so `Exports = never` — never `unknown` — is what makes a REAL module's own
- * (necessarily narrower) export type assignable to this bound: `(x: Concrete)
- * => void` is assignable to `(x: never) => void`, not to `(x: unknown) =>
- * void`.
- */
-type AnyUnitModule = Module<never, never, unknown>;
-/**
- * The needs a bound `unit.message` module still owes, or `never` when none is
- * bound. `Scope` is excluded, since nothing can ever provide it — the same
- * exemption `NeedsGate` itself carries — and so is the delivery, which the
- * fork's own seed discharges.
- */
-type UnitNeedsOf<Unit> = Unit extends Module<never, never, infer N> ? Exclude<N, Scope | AmqpMessageInstance> : never;
+/** The needs a bound `unit.message` module still owes, less the delivery the fork's seed discharges. */
+type UnitNeedsOf$1<Unit> = UnitNeedsOf<Unit, AmqpMessageInstance>;
 /**
  * The contract type `TypedAmqpWorker.create` accepts, extracted rather than
  * imported by name so `@amqp-contract/contract` stays out of the peer range.
@@ -192,7 +162,7 @@ type AmqpTuning<Unit extends AnyUnitModule | undefined = undefined> = {
  *
  * With `url` pinned the module reads nothing from the environment.
  */
-export declare const amqp: <TContract extends AnyAmqpContract, Unit extends AnyUnitModule | undefined = undefined>(options: AmqpOptions<TContract, Unit>) => Module<AmqpRuntime | AmqpConfig, ConfigInvalid, Env | HandlersInstanceOf<TContract> | UnitNeedsOf<Unit>>;
+export declare const amqp: <TContract extends AnyAmqpContract, Unit extends AnyUnitModule | undefined = undefined>(options: AmqpOptions<TContract, Unit>) => Module<AmqpRuntime | AmqpConfig, ConfigInvalid, Env | HandlersInstanceOf<TContract> | UnitNeedsOf$1<Unit>>;
 /** One piece of the handlers record — what `AmqpHandler(contract, key)(…)` returns, as the composing form consumes it. */
 type PieceOf<C extends AnyAmqpContract> = { readonly [K in HandlerKeyOf<C>]: {
   readonly port: HandlerPortOf<C, K>;
@@ -211,19 +181,6 @@ type KeyOfPiece<P> = P extends {
 } ? K : never;
 /** The consumers and rpcs no piece in `T` covers. */
 type Uncovered<C extends AnyAmqpContract, T extends readonly PieceOf<C>[]> = Exclude<HandlerKeyOf<C>, KeyOfPiece<T[number]>>;
-/**
- * A refused array: as long as the array the caller wrote, its head the caller's
- * own elements — which match — and its LAST element the marker paired with what
- * is wrong.
- *
- * TypeScript compares two equal-length tuples element by element, so the extra
- * diagnostic it reports lands on the trailing element and carries both the
- * sentence and the missing key. A fixed two-element tuple named the key only
- * when the array happened to be two elements long; every other arity was a
- * length mismatch, and the developer diffed the contract against the array by
- * hand.
- */
-type Refuse<T extends readonly unknown[], Marker extends string, Detail> = T extends readonly [...infer Head, unknown] ? readonly [...Head, readonly [Marker, Detail]] : readonly [readonly [Marker, Detail]];
 /**
  * The record arm: the whole handlers record from one `sync`, with one `unit:`
  * record shared by every entry in it.
@@ -280,7 +237,7 @@ export declare const AmqpHandlers: <C extends AnyAmqpContract>(contract: C) => W
 //#endregion
 //#region src/amqp-module.d.ts
 /** The starter's own module, as the sugar adds it to the application's imports. */
-type AmqpStarter<TContract extends AnyAmqpContract, Unit extends AnyUnitModule | undefined> = Module<AmqpRuntime | AmqpConfig, ConfigInvalid, Env | HandlersInstanceOf<TContract> | UnitNeedsOf<Unit>>;
+type AmqpStarter<TContract extends AnyAmqpContract, Unit extends AnyUnitModule | undefined> = Module<AmqpRuntime | AmqpConfig, ConfigInvalid, Env | HandlersInstanceOf<TContract> | UnitNeedsOf$1<Unit>>;
 /** The application's imports plus the starter — the tuple `Module(name)` is handed. */
 type Imports<I extends readonly AnyModule[], TContract extends AnyAmqpContract, Unit extends AnyUnitModule | undefined> = readonly [...I, AmqpStarter<TContract, Unit>];
 /** The handlers provider plus the application's own — the tuple `Module(name)` is handed. */

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { Module, Port, Provider } from "@btravstack/di";
 import { TypedAmqpWorker } from "@amqp-contract/worker";
 import { Config, Env } from "@btravstack/config";
-import { Observers, RuntimePort, RuntimeStartFailed, noObserver, observe, releasedBy, traceIdOfTraceparent } from "@btravstack/core";
+import { Observers, RuntimePort, RuntimeStartFailed, composeByPrefix, dispatchUnit, mintPiece, noObserverMember, observe, releasedBy, traceIdOfTraceparent, withUnitRecord } from "@btravstack/core";
 import { P } from "unthrown";
 import { randomUUID } from "node:crypto";
 //#region src/broker-log.ts
@@ -60,46 +60,11 @@ const brokerLog = (observers) => {
 //#endregion
 //#region src/unit.ts
 /**
-* Where `messageUnits` leaves the forked context for the piece wrappers to read.
-* A symbol rather than a name: the dispatcher merges it into the context every
-* handler sees, and a string key would appear on the record a handler written
-* against the `{ inject, sync }` arm destructures.
-*/
-const UNIT_SCOPE = Symbol("@btravstack/amqp-worker/unit-scope");
-/**
-* The declared record, as a getter per name resolved on read out of the fork.
-* Neither writable nor configurable — a handler reads what the fork holds, and
-* cannot reshape the record under the next delivery. With no `unit.message`
-* bound there is nothing to resolve from, so the record is empty whatever was
-* declared.
-*/
-const unitRecordOf = (forked, record) => {
-	const unit = {};
-	if (forked === void 0) return unit;
-	for (const [name, port] of Object.entries(record)) Object.defineProperty(unit, name, {
-		enumerable: true,
-		get: () => forked.get(port)
-	});
-	return unit;
-};
-/**
 * One handler entry — a function, or `[handler, options]` — with its piece's
 * declared record put on `context.unit`. Applied once per piece as di
 * constructs it, so a delivery costs one record and one context object.
 */
-const withUnit = (record, entry) => {
-	const wrap = (handler) => (helpers, message) => {
-		const { [UNIT_SCOPE]: forked, ...rest } = helpers.context ?? {};
-		return handler({
-			...helpers,
-			context: {
-				...rest,
-				unit: unitRecordOf(forked, record)
-			}
-		}, message);
-	};
-	return Array.isArray(entry) ? [wrap(entry[0]), entry[1]] : wrap(entry);
-};
+const withUnit = (record, entry) => Array.isArray(entry) ? [withUnitRecord(record, entry[0]), entry[1]] : withUnitRecord(record, entry);
 //#endregion
 //#region src/handler.ts
 /** One id, declared once, so no contract instantiating it warns about a duplicate. */
@@ -143,13 +108,8 @@ const HANDLER_PREFIX = "AmqpHandler:";
 */
 const AmqpHandler = (contract, key) => {
 	const port = class extends Port(`${HANDLER_PREFIX}${key}`) {};
-	return (options) => {
-		const record = options.unit ?? {};
-		return Object.assign(Provider(port)({
-			inject: options.inject,
-			sync: (services) => withUnit(record, options.sync(services))
-		}), { unit: record });
-	};
+	const mint = mintPiece(port, withUnit);
+	return (options) => mint(options);
 };
 //#endregion
 //#region src/message-units.ts
@@ -162,9 +122,8 @@ const AmqpHandler = (contract, key) => {
 * runs unchanged, so the ambient `currentUnit()` record is what the unit leaves
 * for the adapters that read it.
 *
-* The forked context rides the dispatcher's context under {@link UNIT_SCOPE},
-* where each piece's own wrapper turns it into the typed `context.unit` record
-* that piece declared — the records live with the pieces, so a hand-composed
+* The forked context rides the dispatcher's context, where each piece's own
+* wrapper turns it into the typed `context.unit` record that piece declared — the records live with the pieces, so a hand-composed
 * `amqp()` gets them without threading a second option through the starter.
 *
 * **The kernel's per-unit `AbortSignal` rides that record too**, and it is the
@@ -172,17 +131,19 @@ const AmqpHandler = (contract, key) => {
 * handler that must stop when the kernel stops waiting reads
 * `currentUnit()?.signal`.
 */
-const messageUnits = (host, observers, unit) => (args, next) => {
-	const settle = observe(observers, {
+const messageUnits = (host, observers, unit) => (args, next) => dispatchUnit({
+	host,
+	observers,
+	operation: {
 		component: "amqp",
 		name: "delivery",
 		attributes: { handler: args.handlerName }
-	});
-	return host.run(metaFor(args.rawMessage), (scope) => unit === void 0 ? next() : scope.fork(unit, [[AmqpMessagePort, args.message]]).flatMap((forked) => next({ context: { [UNIT_SCOPE]: forked } }))).tap(() => settle({ outcome: "ok" })).tapFailure((failure) => settle({
-		outcome: "error",
-		cause: failure.tag === "Err" ? failure.error : failure.cause
-	}));
-};
+	},
+	meta: metaFor(args.rawMessage),
+	unit,
+	seed: [AmqpMessagePort, args.message],
+	next
+});
 /**
 * `UnitMeta.id` must be unique per unit, and a **delivery tag is not one**: tags
 * are per-channel and restart at `1` after a reconnect, which
@@ -254,10 +215,7 @@ const amqp = (options) => {
 		needs: [Env, AmqpHandlersPort],
 		provides: [
 			config,
-			Provider.member(Observers)({
-				inject: {},
-				value: noObserver
-			}),
+			noObserverMember,
 			Provider(AmqpRuntime)({
 				inject: {
 					config: AmqpConfig,
@@ -290,19 +248,7 @@ const amqp = (options) => {
 * slices claiming one key are di's duplicate-provider defect at build.
 */
 const AmqpHandlers = (contract) => {
-	const build = Provider(AmqpHandlersPort);
-	const compose = (pieces) => build({
-		inject: Object.fromEntries(pieces.map((piece) => [piece.port.portId.slice(12), piece.port])),
-		sync: (services) => services
-	});
-	const whole = (options) => {
-		const record = options.unit ?? {};
-		return build({
-			inject: options.inject,
-			sync: (services) => Object.fromEntries(Object.entries(options.sync(services)).map(([key, entry]) => [key, withUnit(record, entry)]))
-		});
-	};
-	return ((first) => Array.isArray(first) ? compose(first) : whole(first));
+	return composeByPrefix(AmqpHandlersPort, HANDLER_PREFIX, withUnit);
 };
 const startFailed = (cause) => new RuntimeStartFailed({
 	runtime: "amqp",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btravstack/amqp-worker",
-  "version": "0.16.0",
+  "version": "0.18.0",
   "description": "The AMQP starter for @btravstack/core: the handlers as a port, one unit per delivery, and a drain the kernel's deadline releases",
   "keywords": [
     "amqp",
@@ -44,30 +44,31 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@amqp-contract/contract": "3.0.0-beta.7",
-    "@amqp-contract/testing": "3.0.0-beta.7",
-    "@amqp-contract/worker": "3.0.0-beta.7",
-    "@btravstack/config": "0.16.0",
-    "@btravstack/core": "0.16.0",
-    "@btravstack/di": "0.16.0",
+    "@amqp-contract/contract": "3.0.0-beta.11",
+    "@amqp-contract/testing": "3.0.0-beta.11",
+    "@amqp-contract/worker": "3.0.0-beta.11",
+    "@btravstack/config": "0.18.0",
+    "@btravstack/core": "0.18.0",
+    "@btravstack/di": "0.18.0",
     "@btravstack/internal-test-infra": "0.0.0",
-    "@btravstack/testing": "0.16.0",
+    "@btravstack/testing": "0.18.0",
     "@btravstack/tsconfig": "0.4.0",
     "@opentelemetry/api": "1.9.1",
-    "@types/node": "26.4.1",
-    "@unthrown/vitest": "5.8.0",
-    "@vitest/coverage-v8": "4.1.11",
+    "@types/node": "26.6.4",
+    "@unthrown/vitest": "5.12.0",
+    "@vitest/coverage-v8": "5.0.3",
     "tsdown": "0.23.0",
     "typescript": "7.0.2",
-    "unthrown": "5.8.0",
-    "vitest": "4.1.11",
-    "zod": "4.5.4"
+    "typescript-consumer": "npm:typescript@5.9.3",
+    "unthrown": "5.12.0",
+    "vitest": "5.0.3",
+    "zod": "4.6.5"
   },
   "peerDependencies": {
     "@amqp-contract/worker": "^3.0.0-beta.7",
-    "@btravstack/config": "^0.16.0",
-    "@btravstack/core": "^0.16.0",
-    "@btravstack/di": "^0.16.0",
+    "@btravstack/config": "^0.18.0",
+    "@btravstack/core": "^0.18.0",
+    "@btravstack/di": "^0.18.0",
     "@opentelemetry/api": "^1",
     "unthrown": "^5.0.0"
   },
@@ -78,6 +79,6 @@
     "build": "tsdown src/index.ts --format cjs,esm --dts --clean",
     "dev": "tsdown src/index.ts --format cjs,esm --dts --watch",
     "test": "vitest run --coverage",
-    "typecheck": "tsc --noEmit && tsc --noEmit -p tsconfig.test-d.json"
+    "typecheck": "tsc --noEmit && tsc --noEmit -p tsconfig.test-d.json && node ./node_modules/typescript-consumer/bin/tsc --noEmit -p tsconfig.test-d.json"
   }
 }