moost 0.6.46 → 0.6.48

package/dist/index.cjs

@@ -48,7 +48,7 @@ let stamped = false;
 	if (stamped) return;
 	stamped = true;
 	stampModuleIdentity({
-		version: "0.6.46",
+		version: "0.6.48",
 		path: typeof __filename === "string" ? __filename : require("url").pathToFileURL(__filename).href
 	});
 }
@@ -124,7 +124,7 @@ function getDefaultLogger(topic) {
 
 //#endregion
 //#region packages/moost/src/event-scope.ts
-function _define_property$2(obj, key, value) {
+function _define_property$1(obj, key, value) {
 	if (key in obj) Object.defineProperty(obj, key, {
 		value,
 		enumerable: true,
@@ -143,13 +143,64 @@ function nextScopeId() {
 	}
 	return `__moost_${_scopeChar}_${++_scopeNum}`;
 }
-const scopeIdSlot = (0, _wooksjs_event_core.cached)(() => nextScopeId());
+const eventScopeSlot = (0, _wooksjs_event_core.cached)(() => ({
+	id: nextScopeId(),
+	held: false,
+	registered: false
+}));
+/**
+* The DI scope of an event (see {@link useScopeId}) — cached on the event context itself.
+* @internal
+*/ const getEventScope = (ctx) => (ctx ?? (0, _wooksjs_event_core.current)()).getOwn(eventScopeSlot);
 /**
 * Composable returning the moost DI scope ID of the current event. Generated on first call
 * and cached on the event context itself — never inherited from a parent context, so a child
 * event (a workflow run started with `eventContext`, a WebSocket message) owns its scope
 * instead of sharing, and later releasing, its parent's.
-*/ const useScopeId = (ctx) => (ctx ?? (0, _wooksjs_event_core.current)()).getOwn(scopeIdSlot);
+*/ const useScopeId = (ctx) => getEventScope(ctx).id;
+/**
+* Holds the event scope for a handler lifecycle — registering it, deferred to the first
+* `FOR_EVENT` resolution (see {@link resolveEventScopeId}). Returns the release, which drops
+* the scope like the release of an eager registration.
+* @internal
+*/ function holdEventScopeLazily(scope) {
+	scope.held = true;
+	return () => {
+		scope.held = false;
+		if (scope.registered) {
+			scope.registered = false;
+			getMoostInfact().unregisterScope(scope.id);
+		}
+	};
+}
+/**
+* The scope id a `FOR_EVENT` resolution in the current event uses: a held scope is registered
+* in the DI container now, on first use.
+* @internal
+*/ function resolveEventScopeId() {
+	const scope = getEventScope();
+	if (scope.held && !scope.registered) {
+		scope.registered = true;
+		getMoostInfact().registerScope(scope.id);
+	}
+	return scope.id;
+}
+/**
+* Keeps the current event's scope state in step with a direct `registerScope` /
+* `unregisterScope` of its id on the moost DI container — `registerEventScope(useScopeId())`,
+* or an adapter's `cleanup: () => getMoostInfact().unregisterScope(useScopeId())`. As with an
+* eager registration: a registered scope is dropped with the handler lifecycle, and an
+* unregistered one stays gone for the rest of the lifecycle (a later `FOR_EVENT` resolution
+* fails instead of registering it again — and leaking it, when nothing releases it after).
+* @internal
+*/ function syncEventScope(scopeId, registered) {
+	const ctx = (0, _wooksjs_event_core.tryGetCurrent)();
+	const scope = ctx?.hasOwn(eventScopeSlot) ? ctx.getOwn(eventScopeSlot) : void 0;
+	if (scope?.id === scopeId) {
+		scope.registered = registered;
+		if (!registered) scope.held = false;
+	}
+}
 /** Registers a DI scope for the given ID and returns an unscope function. */ function registerEventScope(scopeId) {
 	const infact = getMoostInfact();
 	infact.registerScope(scopeId);
@@ -169,7 +220,7 @@ const NO_ISOLATION = /* @__PURE__ */ new Set();
 		super({
 			logger: parent.logger,
 			parent
-		}), _define_property$2(this, "isolated", void 0), this.isolated = isolated;
+		}), _define_property$1(this, "isolated", void 0), this.isolated = isolated;
 	}
 };
 /**
@@ -222,7 +273,7 @@ const NO_ISOLATION = /* @__PURE__ */ new Set();
 		ctx: child
 	});
 	if (opts?.shareScope !== false) {
-		child.setOwn(scopeIdSlot, useScopeId(parent));
+		child.setOwn(eventScopeSlot, getEventScope(parent));
 		return (0, _wooksjs_event_core.run)(child, fn);
 	}
 	const release = registerEventScope(useScopeId(child));
@@ -347,6 +398,22 @@ const moostMate = new _prostojs_mate.Mate(METADATA_WORKSPACE, {
 	return moostMate;
 }
 
+//#endregion
+//#region packages/moost/src/metadata/moost-infact.ts
+/**
+* The moost DI container. A direct scope (un)registration of the current event's own scope
+* keeps its on-demand registration state in step (see `syncEventScope`).
+*/ var MoostInfact = class extends _prostojs_infact.Infact {
+	registerScope(scopeId) {
+		super.registerScope(scopeId);
+		syncEventScope(scopeId, true);
+	}
+	unregisterScope(scopeId) {
+		super.unregisterScope(scopeId);
+		syncEventScope(scopeId, false);
+	}
+};
+
 //#endregion
 //#region packages/moost/src/metadata/infact.ts
 const sharedMoostInfact = getNewMoostInfact();
@@ -458,7 +525,7 @@ function formatNewInstanceArg(a) {
 /**
 * Get Infact instance (used for Dependency Injections)
 */ function getNewMoostInfact() {
-	return new _prostojs_infact.Infact({
+	return new MoostInfact({
 		describeClass(classConstructor) {
 			const meta = getMoostMate().read(classConstructor);
 			return {
@@ -467,7 +534,7 @@ function formatNewInstanceArg(a) {
 				constructorParams: meta?.params || [],
 				provide: meta?.provide,
 				properties: meta?.properties || [],
-				scopeId: meta?.injectable === "FOR_EVENT" ? useScopeId() : void 0
+				scopeId: meta?.injectable === "FOR_EVENT" ? resolveEventScopeId() : void 0
 			};
 		},
 		resolveParam({ paramMeta, customData, classConstructor, index, scopeId, instantiate }) {
@@ -519,19 +586,27 @@ const registry = (_g = globalThis).__moost_keys ?? (_g.__moost_keys = /* @__PURE
 
 //#endregion
 //#region packages/moost/src/composables/controller.composable.ts
-const controllerInstanceKey = globalKey("controller.instance");
-const controllerMethodKey = globalKey("controller.method");
-const controllerRouteKey = globalKey("controller.route");
-const controllerPrefixKey = globalKey("controller.prefix");
+const controllerContextKey = globalKey("controller.context");
 /**
 * Sets the controller context for the current event scope.
 * Called internally by adapters when dispatching events to handlers.
 */ function setControllerContext(controller, method, route, opts) {
 	const _ctx = opts?.ctx || (0, _wooksjs_event_core.current)();
-	_ctx.set(controllerInstanceKey, controller);
-	_ctx.set(controllerMethodKey, method);
-	_ctx.set(controllerRouteKey, route);
-	if (opts?.prefix !== void 0) _ctx.set(controllerPrefixKey, opts.prefix);
+	let prefix = opts?.prefix;
+	if (prefix === void 0 && _ctx.has(controllerContextKey)) prefix = _ctx.get(controllerContextKey).prefix;
+	_ctx.set(controllerContextKey, {
+		instance: controller,
+		method,
+		route,
+		prefix
+	});
+}
+/** Reads the controller context; throws the per-field "not set" error when there is none. */ function readControllerContext(ctx, field) {
+	try {
+		return ctx.get(controllerContextKey);
+	} catch {
+		throw new Error(`Key "controller.${field}" is not set`);
+	}
 }
 /** Brands already warned about by {@link brandedAdapterFor} (one warning per process). */ const reportedAdapterCopies = /* @__PURE__ */ new Set();
 /**
@@ -555,10 +630,14 @@ const controllerPrefixKey = globalKey("controller.prefix");
 * Returns utilities for accessing the controller instance, method metadata, and DI.
 */ function useControllerContext(ctx) {
 	const _ctx = ctx || (0, _wooksjs_event_core.current)();
-	const getController = () => _ctx.get(controllerInstanceKey);
-	const getMethod = () => _ctx.get(controllerMethodKey);
-	const getRoute = () => _ctx.get(controllerRouteKey);
-	const getPrefix = () => _ctx.get(controllerPrefixKey);
+	const getController = () => readControllerContext(_ctx, "instance").instance;
+	const getMethod = () => readControllerContext(_ctx, "method").method;
+	const getRoute = () => readControllerContext(_ctx, "route").route;
+	const getPrefix = () => {
+		const { prefix } = readControllerContext(_ctx, "prefix");
+		if (prefix === void 0) throw new Error("Key \"controller.prefix\" is not set");
+		return prefix;
+	};
 	const getControllerMeta = () => getMoostMate().read(getController());
 	const getMethodMeta = (name) => getMoostMate().read(getController(), name || getMethod());
 	function instantiate(c) {
@@ -602,13 +681,30 @@ const interceptResultKey = globalKey("interceptor.result");
 //#region packages/moost/src/adapter-utils.ts
 const noop = () => {};
 /**
-* Registers an event's DI scope, held by its handler lifecycle and, with `adapterHolds`, by
-* the adapter too. Each release is idempotent; the scope is dropped once every holder let go,
-* so an adapter signal that fires early (a client disconnect mid-handler) cannot pull the
-* scope from under a running handler. Built outside the handler closure so a long-lived
-* adapter listener (the response 'close' of a streamed body) retains only the scope.
-*/ function holdEventScope(scopeId, adapterHolds) {
-	const drop = registerEventScope(scopeId);
+* The hook options of one event. `logger` is a prototype getter: the topic logger is only
+* derived when a hook reads it (an own accessor property would deopt the object instead).
+*/ let EventHookOptions = class EventHookOptions {
+	get logger() {
+		return this._getLogger();
+	}
+	constructor(scopeId, unscope, method, getResponse, reply, getLogger) {
+		this.scopeId = scopeId;
+		this.unscope = unscope;
+		this.method = method;
+		this.getResponse = getResponse;
+		this.reply = reply;
+		this._getLogger = getLogger;
+	}
+};
+/**
+* Holds an event's DI scope (registered on demand, see `holdEventScopeLazily`) by its handler
+* lifecycle and, with `adapterHolds`, by the adapter too. Each release is idempotent; the
+* scope is dropped once every holder let go, so an adapter signal that fires early (a client
+* disconnect mid-handler) cannot pull the scope from under a running handler. Built outside
+* the handler closure so a long-lived adapter listener (the response 'close' of a streamed
+* body) retains only the scope.
+*/ function holdEventScope(scope, adapterHolds) {
+	const drop = holdEventScopeLazily(scope);
 	let holders = adapterHolds ? 2 : 1;
 	const hold = () => {
 		let held = true;
@@ -634,7 +730,6 @@ const noop = () => {};
 * Handles scope registration, controller resolution, interceptors, argument resolution,
 * handler invocation, and cleanup — optimised for sync-first execution.
 */ function defineMoostEventHandler(options) {
-	const ci = (0, _wooksjs_event_core.getContextInjector)();
 	const manualUnscope = !!options.manualUnscope;
 	const handlerSpanName = `Handler:${options.targetPath}`;
 	const handlerAttrs = {
@@ -642,21 +737,17 @@ const noop = () => {};
 		"moost.controller": options.controllerName || ""
 	};
 	return () => {
+		const ci = (0, _wooksjs_event_core.getContextInjector)();
 		const ctx = (0, _wooksjs_event_core.current)();
-		const scopeId = useScopeId(ctx);
-		const logger = (0, _wooksjs_event_core.useLogger)(options.loggerTitle, ctx);
-		const { unscope, releaseLifecycle, failLifecycle } = holdEventScope(scopeId, manualUnscope);
+		const scope = getEventScope(ctx);
+		const scopeId = scope.id;
+		const { unscope, releaseLifecycle, failLifecycle } = holdEventScope(scope, manualUnscope);
 		let response;
+		let logger;
+		const getLogger = () => logger ?? (logger = (0, _wooksjs_event_core.useLogger)(options.loggerTitle, ctx));
 		let hookOptions;
 		function getHookOptions() {
-			return hookOptions ?? (hookOptions = {
-				scopeId,
-				logger,
-				unscope,
-				method: options.controllerMethod,
-				getResponse: () => response,
-				reply: (r) => response = r
-			});
+			return hookOptions ?? (hookOptions = new EventHookOptions(scopeId, unscope, options.controllerMethod, () => response, (r) => response = r, getLogger));
 		}
 		let interceptorHandler;
 		let raise = false;
@@ -694,7 +785,7 @@ const noop = () => {};
 				response = initResult;
 				if (response !== void 0) return cleanup();
 			} catch (error) {
-				if (options.logErrors) logger.error(String(error));
+				if (options.logErrors) getLogger().error(String(error));
 				response = error;
 				raise = true;
 				return cleanup();
@@ -711,7 +802,7 @@ const noop = () => {};
 				}, handleError);
 				args = argsResult;
 			} catch (error) {
-				if (options.logErrors) logger.error(String(error));
+				if (options.logErrors) getLogger().error(String(error));
 				response = error;
 				raise = true;
 				return cleanup();
@@ -726,21 +817,21 @@ const noop = () => {};
 					response = r;
 					return cleanup();
 				}, (error) => {
-					if (options.logErrors) logger.error(error);
+					if (options.logErrors) getLogger().error(error);
 					response = error;
 					raise = true;
 					return cleanup();
 				});
 				response = handlerResult;
 			} catch (error) {
-				if (options.logErrors) logger.error(error);
+				if (options.logErrors) getLogger().error(error);
 				response = error;
 				raise = true;
 			}
 			return cleanup();
 		}
 		function handleError(error) {
-			if (options.logErrors) logger.error(String(error));
+			if (options.logErrors) getLogger().error(String(error));
 			response = error;
 			raise = true;
 			return cleanup();
@@ -754,7 +845,7 @@ const noop = () => {};
 					if (raise && response !== raisedResponse) raise = false;
 					return finalize();
 				}, (error) => {
-					if (options.logErrors) logger.error(String(error));
+					if (options.logErrors) getLogger().error(String(error));
 					throw error;
 				});
 				response = afterResult;
@@ -1134,10 +1225,14 @@ function ImportController(prefix, controller, provide) {
 */ function Resolve(resolver, label) {
 	return (target, key, index) => {
 		const i = typeof index === "number" ? index : void 0;
+		let labelFilled = false;
 		getMoostMate().decorate("resolver", (metas, level) => {
-			let newLabel = label;
-			if (!newLabel && level === "PROP" && typeof metas.key === "string") newLabel = metas.key;
-			fillLabel(target, key || "", i, newLabel);
+			if (!labelFilled) {
+				labelFilled = true;
+				let newLabel = label;
+				if (!newLabel && level === "PROP" && typeof metas.key === "string") newLabel = metas.key;
+				fillLabel(target, key || "", i, newLabel);
+			}
 			return resolver(metas, level);
 		})(target, key, i);
 	};
@@ -1608,6 +1703,7 @@ const sharedPipes = [{
 
 //#endregion
 //#region packages/moost/src/resolve-arguments.ts
+/** `metas.instantiate` of a handler argument: resolves through the current controller's DI. */ const instantiateFromController = (t) => useControllerContext().instantiate(t);
 /**
 * Builds an argument-resolver function from pre-computed per-parameter pipe lists.
 *
@@ -1616,21 +1712,25 @@ const sharedPipes = [{
 * `unknown[]` synchronously when possible, or `Promise<unknown[]>` otherwise.
 */ function resolveArguments(argsPipes, context) {
 	if (argsPipes.length === 0) return;
+	const params = argsPipes.map(({ meta: paramMeta, pipes }, index) => ({
+		pipes,
+		metas: {
+			classMeta: context.classMeta,
+			methodMeta: context.methodMeta,
+			paramMeta,
+			type: context.type,
+			key: context.key,
+			index,
+			targetMeta: paramMeta,
+			instantiate: instantiateFromController
+		}
+	}));
 	return () => {
 		const args = [];
 		let hasAsync = false;
-		for (let i = 0; i < argsPipes.length; i++) {
-			const { pipes, meta: paramMeta } = argsPipes[i];
-			const result = runPipes(pipes, void 0, {
-				classMeta: context.classMeta,
-				methodMeta: context.methodMeta,
-				paramMeta,
-				type: context.type,
-				key: context.key,
-				index: i,
-				targetMeta: paramMeta,
-				instantiate: (t) => useControllerContext().instantiate(t)
-			}, "PARAM");
+		for (let i = 0; i < params.length; i++) {
+			const { pipes, metas } = params[i];
+			const result = runPipes(pipes, void 0, metas, "PARAM");
 			if (!hasAsync && isThenable(result)) hasAsync = true;
 			args[i] = result;
 		}
@@ -1640,16 +1740,9 @@ const sharedPipes = [{
 
 //#endregion
 //#region packages/moost/src/interceptor-handler.ts
-function _define_property$1(obj, key, value) {
-	if (key in obj) Object.defineProperty(obj, key, {
-		value,
-		enumerable: true,
-		configurable: true,
-		writable: true
-	});
-	else obj[key] = value;
-	return obj;
-}
+/** Span attributes of the interceptor stages — shared, never mutated. */ const BEFORE_STAGE = { "moost.interceptor.stage": "before" };
+const AFTER_STAGE = { "moost.interceptor.stage": "after" };
+const ON_ERROR_STAGE = { "moost.interceptor.stage": "onError" };
 /**
 * Manages the before/after/error interceptor lifecycle for a single event.
 * Optimised for the common sync path — only allocates promises when an interceptor goes async.
@@ -1674,16 +1767,15 @@ function _define_property$1(obj, key, value) {
 	* Returns a pending PromiseLike if `before` went async, or undefined.
 	*/ registerDef(def, entry, ci) {
 		if (def.after) (this.after ?? (this.after = [])).unshift({
-			name: entry.name,
+			spanName: entry.spanName,
 			fn: def.after
 		});
 		if (def.error) (this.onError ?? (this.onError = [])).unshift({
-			name: entry.name,
+			spanName: entry.spanName,
 			fn: def.error
 		});
 		if (def.before) {
-			const spanName = entry.spanName;
-			const result = ci ? ci.with(spanName, { "moost.interceptor.stage": "before" }, () => def.before?.(this.getReplyFn())) : def.before(this.getReplyFn());
+			const result = ci ? ci.with(entry.spanName, BEFORE_STAGE, () => def.before?.(this.getReplyFn())) : def.before(this.getReplyFn());
 			if (isThenable(result)) return result;
 		}
 	}
@@ -1736,10 +1828,10 @@ function _define_property$1(obj, key, value) {
 		const handlers = isError ? this.onError : this.after;
 		if (!handlers) return this.response;
 		const ci = (0, _wooksjs_event_core.getContextInjector)();
-		const stage = isError ? "onError" : "after";
+		const stage = isError ? ON_ERROR_STAGE : AFTER_STAGE;
 		for (let i = 0; i < handlers.length; i++) {
-			const { name, fn } = handlers[i];
-			const result = ci ? ci.with(`Interceptor:${name}`, { "moost.interceptor.stage": stage }, () => fn(response, this.getReplyFn())) : fn(response, this.getReplyFn());
+			const { spanName, fn } = handlers[i];
+			const result = ci ? ci.with(spanName, stage, () => fn(response, this.getReplyFn())) : fn(response, this.getReplyFn());
 			if (isThenable(result)) return this._fireAfterAsync({
 				ci,
 				handlers,
@@ -1752,21 +1844,19 @@ function _define_property$1(obj, key, value) {
 	async _fireAfterAsync(ctx, pending, startIndex) {
 		await pending;
 		for (let i = startIndex + 1; i < ctx.handlers.length; i++) {
-			const { name, fn } = ctx.handlers[i];
-			if (ctx.ci) await ctx.ci.with(`Interceptor:${name}`, { "moost.interceptor.stage": ctx.stage }, () => fn(ctx.response, this.getReplyFn()));
+			const { spanName, fn } = ctx.handlers[i];
+			if (ctx.ci) await ctx.ci.with(spanName, ctx.stage, () => fn(ctx.response, this.getReplyFn()));
 			else await fn(ctx.response, this.getReplyFn());
 		}
 		return this.response;
 	}
 	constructor(handlers) {
-		_define_property$1(this, "handlers", void 0);
-		_define_property$1(this, "after", void 0);
-		_define_property$1(this, "onError", void 0);
-		_define_property$1(this, "response", void 0);
-		_define_property$1(this, "responseOverwritten", void 0);
-		_define_property$1(this, "_boundReplyFn", void 0);
 		this.handlers = handlers;
+		this.after = void 0;
+		this.onError = void 0;
+		this.response = void 0;
 		this.responseOverwritten = false;
+		this._boundReplyFn = void 0;
 	}
 };
 
@@ -1774,6 +1864,7 @@ function _define_property$1(obj, key, value) {
 //#region packages/moost/src/utils.ts
 const mate = getMoostMate();
 const noInterceptors = () => void 0;
+const isForEvent = (instance) => mate.read(instance)?.injectable === "FOR_EVENT";
 function findInterceptorMethods(handler) {
 	const fakeInstance = Object.create(handler.prototype);
 	const methods = getInstanceOwnMethods(fakeInstance);
@@ -1812,6 +1903,8 @@ function callMethod(instance, methodName, resolveArgs) {
 }
 function createClassInterceptorFactory(opts) {
 	const infact = getMoostInfact();
+	const customData = { pipes: opts.pipes };
+	const defs = opts.cacheable ? /* @__PURE__ */ new WeakMap() : void 0;
 	function buildDef(instance) {
 		const def = {};
 		if (opts.methods.before) {
@@ -1844,9 +1937,21 @@ function createClassInterceptorFactory(opts) {
 		return def;
 	}
 	function fromTarget(targetInstance) {
-		const result = infact.getForInstance(targetInstance, opts.handler, { customData: { pipes: opts.pipes } });
-		if (isThenable(result)) return result.then(buildDef);
-		return buildDef(result);
+		const cached = defs?.get(targetInstance);
+		if (cached) return cached;
+		const registries = infact.getInstanceRegistries(targetInstance);
+		const result = infact.get(opts.handler, {
+			provide: registries.provide || {},
+			replace: registries.replace,
+			customData
+		});
+		const remember = (instance) => {
+			const def = buildDef(instance);
+			if (defs && !isForEvent(instance) && !isForEvent(targetInstance)) defs.set(targetInstance, def);
+			return def;
+		};
+		if (isThenable(result)) return result.then(remember);
+		return remember(result);
 	}
 	return () => {
 		const result = opts.getTargetInstance();
@@ -1888,7 +1993,8 @@ function getIterceptorHandlerFactory(interceptors, getTargetInstance, pipes) {
 				methods,
 				resolvers,
 				getTargetInstance,
-				pipes: mergedPipes
+				pipes: mergedPipes,
+				cacheable: classMeta.injectable !== "FOR_EVENT"
 			}),
 			name,
 			spanName
@@ -2387,12 +2493,17 @@ function _define_property(obj, key, value) {
 	* - before the hook pass starts (including from a controller constructor
 	*   during binding) — queued;
 	* - while the pass runs (from another hook) — runs later in the same pass;
-	* - after the pass finished — runs immediately (asynchronously, in its own
-	*   init context); a failure is logged, since there is no `init()` left to
+	* - after the pass finished — runs once, immediately (asynchronously, in its
+	*   own init context) and is NOT stored, so it does not run again on
+	*   re-init and per-request callers (`FOR_EVENT` constructors) do not grow
+	*   the hook list. A failure is logged, since there is no `init()` left to
 	*   reject.
 	*
-	* No de-duplication: registering the same function twice runs it twice.
-	* Hooks re-run on re-init exactly like `@MoostInit` hooks.
+	* No de-duplication: registering the same function twice runs it twice
+	* (per-request callers should guard non-idempotent work themselves). Hooks
+	* registered before or during a pass re-run on re-init exactly like
+	* `@MoostInit` hooks; to get a hook on every future init, register it
+	* before `init()`.
 	* @since 0.6.46
 	*/ addInitHook(fn, opts) {
 		const hook = {
@@ -2400,10 +2511,13 @@ function _define_property(obj, key, value) {
 			priority: opts?.priority ?? 0,
 			fn
 		};
+		if (this.initHookPhase === "done") {
+			this.runInitHook(hook).catch((error) => {
+				this.logger.error(`Late init hook failed: ${errorMessage(error)}`);
+			});
+			return;
+		}
 		this.initHooks.push(hook);
-		if (this.initHookPhase === "done") this.runInitHook(hook).catch((error) => {
-			this.logger.error(`Late init hook failed: ${errorMessage(error)}`);
-		});
 	}
 	/**
 	* ### dispose
@@ -2536,7 +2650,7 @@ function _define_property(obj, key, value) {
 			infact.setInstanceRegistries(instance, provide, replace, { pipes });
 		}
 		if (instance) this.singletonInstances.add(instance);
-		const getInstance = instance ? () => instance : async () => await infact.get(controller, { ...infactOpts });
+		const getInstance = instance ? () => instance : () => infact.get(controller, infactOpts);
 		const classConstructor = (0, _prostojs_mate.isConstructor)(controller) ? controller : (0, _prostojs_mate.getConstructor)(controller);
 		const controllerOverview = await bindControllerMethods({
 			getInstance,

package/dist/index.d.ts

@@ -216,6 +216,28 @@ declare function MoostDispose(opts?: {
     priority?: number;
 }): MethodDecorator;
 
+/** Summary of a registered controller, its metadata, prefix, and handlers. */
+interface TControllerOverview {
+    meta: TMoostMetadata;
+    computedPrefix: string;
+    type: TFunction;
+    handlers: THandlerOverview[];
+}
+/** Summary of a registered handler method within a controller. */
+interface THandlerOverview {
+    meta: TMoostMetadata;
+    path?: string;
+    type: string;
+    method: string;
+    handler: TMoostHandler<TEmpty>;
+    registeredAs: {
+        path: string;
+        args: string[];
+    }[];
+}
+/** Hook points in the event handler lifecycle where context injectors are invoked. */
+type TContextInjectorHook = 'Event:start' | 'Interceptors:init' | 'Arguments:resolve' | 'Interceptors:before' | 'Handler' | 'Interceptors:after';
+
 type TDecoratorLevel = 'CLASS' | 'METHOD' | 'PROP' | 'PARAM';
 
 /** Metadata context passed to pipe functions during argument/property resolution. */
@@ -257,28 +279,6 @@ interface TPipeData {
 
 declare const resolvePipe: TPipeFn<TEmpty>;
 
-/** Summary of a registered controller, its metadata, prefix, and handlers. */
-interface TControllerOverview {
-    meta: TMoostMetadata;
-    computedPrefix: string;
-    type: TFunction;
-    handlers: THandlerOverview[];
-}
-/** Summary of a registered handler method within a controller. */
-interface THandlerOverview {
-    meta: TMoostMetadata;
-    path?: string;
-    type: string;
-    method: string;
-    handler: TMoostHandler<TEmpty>;
-    registeredAs: {
-        path: string;
-        args: string[];
-    }[];
-}
-/** Hook points in the event handler lifecycle where context injectors are invoked. */
-type TContextInjectorHook = 'Event:start' | 'Interceptors:init' | 'Arguments:resolve' | 'Interceptors:before' | 'Handler' | 'Interceptors:after';
-
 type TInterceptorBeforeFn = (reply: (response: TAny) => void) => void | Promise<void>;
 type TInterceptorAfterFn = (response: TAny, reply: (response: TAny) => void) => void | Promise<void>;
 type TInterceptorErrorFn = (error: Error, reply: (response: TAny) => void) => void | Promise<void>;
@@ -412,6 +412,19 @@ interface TCommonMoostMeta {
     type?: TFunction;
 }
 
+/** Infact `customData` of a moost resolution: the pipes its params and props resolve through. */
+interface TMoostInfactCustom {
+    pipes?: TPipeData[];
+}
+/**
+ * The moost DI container. A direct scope (un)registration of the current event's own scope
+ * keeps its on-demand registration state in step (see `syncEventScope`).
+ */
+declare class MoostInfact extends Infact<TMoostMetadata, TMoostMetadata, TMoostParamsMetadata, TMoostInfactCustom> {
+    registerScope(scopeId: string | symbol): void;
+    unregisterScope(scopeId: string | symbol): void;
+}
+
 interface TInfactLoggingOptions {
     newInstance?: true | false | 'FOR_EVENT' | 'SINGLETON';
     warn?: true | false;
@@ -420,7 +433,7 @@ interface TInfactLoggingOptions {
 /** Configures which Infact DI events are logged (instance creation, warnings, errors). */
 declare function setInfactLoggingOptions(options: TInfactLoggingOptions): void;
 /** Returns the shared Infact DI container used by Moost for dependency injection. */
-declare function getMoostInfact(): Infact<TMoostMetadata<TEmpty>, TMoostMetadata<TEmpty>, TMoostParamsMetadata, TCustom>;
+declare function getMoostInfact(): MoostInfact;
 /**
  * Every SINGLETON instance currently held by an Infact container's **global**
  * registry (per-event `scopes` registries are excluded — those instances are
@@ -431,9 +444,6 @@ declare function getMoostInfact(): Infact<TMoostMetadata<TEmpty>, TMoostMetadata
  * (`Moost.dispose()`, the `@moostjs/vite` dev plugin) do not each re-derive it.
  */
 declare function getInfactSingletonInstances(infact?: ReturnType<typeof getMoostInfact>): object[];
-interface TCustom {
-    pipes?: TPipeData[];
-}
 /**
  * Define global scope name to be used with `@InjectFromScope` and `@InjectScopeVars` decorators
  *
@@ -451,7 +461,7 @@ declare function getInfactScopeVars<T extends object>(name: string | symbol): T
 /**
  * Get Infact instance (used for Dependency Injections)
  */
-declare function getNewMoostInfact(): Infact<TMoostMetadata<TEmpty>, TMoostMetadata<TEmpty>, TMoostParamsMetadata, TCustom>;
+declare function getNewMoostInfact(): MoostInfact;
 
 /**
  * `fatal-capable` findings may reject `init()` (only non-optional constructor
@@ -777,12 +787,17 @@ declare class Moost extends Hookable {
      * - before the hook pass starts (including from a controller constructor
      *   during binding) — queued;
      * - while the pass runs (from another hook) — runs later in the same pass;
-     * - after the pass finished — runs immediately (asynchronously, in its own
-     *   init context); a failure is logged, since there is no `init()` left to
+     * - after the pass finished — runs once, immediately (asynchronously, in its
+     *   own init context) and is NOT stored, so it does not run again on
+     *   re-init and per-request callers (`FOR_EVENT` constructors) do not grow
+     *   the hook list. A failure is logged, since there is no `init()` left to
      *   reject.
      *
-     * No de-duplication: registering the same function twice runs it twice.
-     * Hooks re-run on re-init exactly like `@MoostInit` hooks.
+     * No de-duplication: registering the same function twice runs it twice
+     * (per-request callers should guard non-idempotent work themselves). Hooks
+     * registered before or during a pass re-run on re-init exactly like
+     * `@MoostInit` hooks; to get a hook on every future init, register it
+     * before `init()`.
      * @since 0.6.46
      */
     addInitHook(fn: (app: this) => unknown, opts?: {
@@ -1301,24 +1316,24 @@ interface TInterceptorEntry {
     /** Pre-computed span name for ci.with(). */
     spanName: string;
 }
+/** A registered after/onError hook of one event. */
+interface TRegisteredHook<F> {
+    /** Pre-computed span name for ci.with(). */
+    spanName: string;
+    fn: F;
+}
 /**
  * Manages the before/after/error interceptor lifecycle for a single event.
  * Optimised for the common sync path — only allocates promises when an interceptor goes async.
  */
 declare class InterceptorHandler {
-    protected handlers: TInterceptorEntry[];
-    constructor(handlers: TInterceptorEntry[]);
-    protected after: {
-        name: string;
-        fn: TInterceptorAfterFn;
-    }[] | undefined;
-    protected onError: {
-        name: string;
-        fn: TInterceptorErrorFn;
-    }[] | undefined;
+    protected after: TRegisteredHook<TInterceptorAfterFn>[] | undefined;
+    protected onError: TRegisteredHook<TInterceptorErrorFn>[] | undefined;
     response?: unknown;
     responseOverwritten: boolean;
     protected _boundReplyFn?: (reply: unknown) => void;
+    protected handlers: TInterceptorEntry[];
+    constructor(handlers: TInterceptorEntry[]);
     protected getReplyFn(): (reply: unknown) => void;
     get count(): number;
     get countAfter(): number;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { ContextInjector, EventContext, cached, cached as cached$1, createEventContext, createEventContext as createEventContext$1, current, current as current$1, eventTypeKey, getContextInjector, getContextInjector as getContextInjector$1, key, key as key$1, replaceContextInjector, resetContextInjector, run, run as run$1, useLogger, useLogger as useLogger$1, useRouteParams } from "@wooksjs/event-core";
+import { ContextInjector, EventContext, cached, cached as cached$1, createEventContext, createEventContext as createEventContext$1, current, current as current$1, eventTypeKey, getContextInjector, getContextInjector as getContextInjector$1, key, key as key$1, replaceContextInjector, resetContextInjector, run, run as run$1, tryGetCurrent, useLogger, useLogger as useLogger$1, useRouteParams } from "@wooksjs/event-core";
 import { Mate, getConstructor, getConstructor as getConstructor$1, isConstructor, isConstructor as isConstructor$1 } from "@prostojs/mate";
 import { ProstoLogger, ProstoLogger as ProstoLogger$1, coloredConsole, createConsoleTransort } from "@prostojs/logger";
 import { Infact, createProvideRegistry, createProvideRegistry as createProvideRegistry$1, createReplaceRegistry, createReplaceRegistry as createReplaceRegistry$1, getClassKey, getClassKey as getClassKey$1 } from "@prostojs/infact";
@@ -47,7 +47,7 @@ let stamped = false;
 	if (stamped) return;
 	stamped = true;
 	stampModuleIdentity({
-		version: "0.6.46",
+		version: "0.6.48",
 		path: typeof __filename === "string" ? __filename : import.meta.url
 	});
 }
@@ -123,7 +123,7 @@ function getDefaultLogger(topic) {
 
 //#endregion
 //#region packages/moost/src/event-scope.ts
-function _define_property$2(obj, key, value) {
+function _define_property$1(obj, key, value) {
 	if (key in obj) Object.defineProperty(obj, key, {
 		value,
 		enumerable: true,
@@ -142,13 +142,64 @@ function nextScopeId() {
 	}
 	return `__moost_${_scopeChar}_${++_scopeNum}`;
 }
-const scopeIdSlot = cached$1(() => nextScopeId());
+const eventScopeSlot = cached$1(() => ({
+	id: nextScopeId(),
+	held: false,
+	registered: false
+}));
+/**
+* The DI scope of an event (see {@link useScopeId}) — cached on the event context itself.
+* @internal
+*/ const getEventScope = (ctx) => (ctx ?? current$1()).getOwn(eventScopeSlot);
 /**
 * Composable returning the moost DI scope ID of the current event. Generated on first call
 * and cached on the event context itself — never inherited from a parent context, so a child
 * event (a workflow run started with `eventContext`, a WebSocket message) owns its scope
 * instead of sharing, and later releasing, its parent's.
-*/ const useScopeId = (ctx) => (ctx ?? current$1()).getOwn(scopeIdSlot);
+*/ const useScopeId = (ctx) => getEventScope(ctx).id;
+/**
+* Holds the event scope for a handler lifecycle — registering it, deferred to the first
+* `FOR_EVENT` resolution (see {@link resolveEventScopeId}). Returns the release, which drops
+* the scope like the release of an eager registration.
+* @internal
+*/ function holdEventScopeLazily(scope) {
+	scope.held = true;
+	return () => {
+		scope.held = false;
+		if (scope.registered) {
+			scope.registered = false;
+			getMoostInfact().unregisterScope(scope.id);
+		}
+	};
+}
+/**
+* The scope id a `FOR_EVENT` resolution in the current event uses: a held scope is registered
+* in the DI container now, on first use.
+* @internal
+*/ function resolveEventScopeId() {
+	const scope = getEventScope();
+	if (scope.held && !scope.registered) {
+		scope.registered = true;
+		getMoostInfact().registerScope(scope.id);
+	}
+	return scope.id;
+}
+/**
+* Keeps the current event's scope state in step with a direct `registerScope` /
+* `unregisterScope` of its id on the moost DI container — `registerEventScope(useScopeId())`,
+* or an adapter's `cleanup: () => getMoostInfact().unregisterScope(useScopeId())`. As with an
+* eager registration: a registered scope is dropped with the handler lifecycle, and an
+* unregistered one stays gone for the rest of the lifecycle (a later `FOR_EVENT` resolution
+* fails instead of registering it again — and leaking it, when nothing releases it after).
+* @internal
+*/ function syncEventScope(scopeId, registered) {
+	const ctx = tryGetCurrent();
+	const scope = ctx?.hasOwn(eventScopeSlot) ? ctx.getOwn(eventScopeSlot) : void 0;
+	if (scope?.id === scopeId) {
+		scope.registered = registered;
+		if (!registered) scope.held = false;
+	}
+}
 /** Registers a DI scope for the given ID and returns an unscope function. */ function registerEventScope(scopeId) {
 	const infact = getMoostInfact();
 	infact.registerScope(scopeId);
@@ -168,7 +219,7 @@ const NO_ISOLATION = /* @__PURE__ */ new Set();
 		super({
 			logger: parent.logger,
 			parent
-		}), _define_property$2(this, "isolated", void 0), this.isolated = isolated;
+		}), _define_property$1(this, "isolated", void 0), this.isolated = isolated;
 	}
 };
 /**
@@ -221,7 +272,7 @@ const NO_ISOLATION = /* @__PURE__ */ new Set();
 		ctx: child
 	});
 	if (opts?.shareScope !== false) {
-		child.setOwn(scopeIdSlot, useScopeId(parent));
+		child.setOwn(eventScopeSlot, getEventScope(parent));
 		return run$1(child, fn);
 	}
 	const release = registerEventScope(useScopeId(child));
@@ -346,6 +397,22 @@ const moostMate = new Mate(METADATA_WORKSPACE, {
 	return moostMate;
 }
 
+//#endregion
+//#region packages/moost/src/metadata/moost-infact.ts
+/**
+* The moost DI container. A direct scope (un)registration of the current event's own scope
+* keeps its on-demand registration state in step (see `syncEventScope`).
+*/ var MoostInfact = class extends Infact {
+	registerScope(scopeId) {
+		super.registerScope(scopeId);
+		syncEventScope(scopeId, true);
+	}
+	unregisterScope(scopeId) {
+		super.unregisterScope(scopeId);
+		syncEventScope(scopeId, false);
+	}
+};
+
 //#endregion
 //#region packages/moost/src/metadata/infact.ts
 const sharedMoostInfact = getNewMoostInfact();
@@ -457,7 +524,7 @@ function formatNewInstanceArg(a) {
 /**
 * Get Infact instance (used for Dependency Injections)
 */ function getNewMoostInfact() {
-	return new Infact({
+	return new MoostInfact({
 		describeClass(classConstructor) {
 			const meta = getMoostMate().read(classConstructor);
 			return {
@@ -466,7 +533,7 @@ function formatNewInstanceArg(a) {
 				constructorParams: meta?.params || [],
 				provide: meta?.provide,
 				properties: meta?.properties || [],
-				scopeId: meta?.injectable === "FOR_EVENT" ? useScopeId() : void 0
+				scopeId: meta?.injectable === "FOR_EVENT" ? resolveEventScopeId() : void 0
 			};
 		},
 		resolveParam({ paramMeta, customData, classConstructor, index, scopeId, instantiate }) {
@@ -518,19 +585,27 @@ const registry = (_g = globalThis).__moost_keys ?? (_g.__moost_keys = /* @__PURE
 
 //#endregion
 //#region packages/moost/src/composables/controller.composable.ts
-const controllerInstanceKey = globalKey("controller.instance");
-const controllerMethodKey = globalKey("controller.method");
-const controllerRouteKey = globalKey("controller.route");
-const controllerPrefixKey = globalKey("controller.prefix");
+const controllerContextKey = globalKey("controller.context");
 /**
 * Sets the controller context for the current event scope.
 * Called internally by adapters when dispatching events to handlers.
 */ function setControllerContext(controller, method, route, opts) {
 	const _ctx = opts?.ctx || current$1();
-	_ctx.set(controllerInstanceKey, controller);
-	_ctx.set(controllerMethodKey, method);
-	_ctx.set(controllerRouteKey, route);
-	if (opts?.prefix !== void 0) _ctx.set(controllerPrefixKey, opts.prefix);
+	let prefix = opts?.prefix;
+	if (prefix === void 0 && _ctx.has(controllerContextKey)) prefix = _ctx.get(controllerContextKey).prefix;
+	_ctx.set(controllerContextKey, {
+		instance: controller,
+		method,
+		route,
+		prefix
+	});
+}
+/** Reads the controller context; throws the per-field "not set" error when there is none. */ function readControllerContext(ctx, field) {
+	try {
+		return ctx.get(controllerContextKey);
+	} catch {
+		throw new Error(`Key "controller.${field}" is not set`);
+	}
 }
 /** Brands already warned about by {@link brandedAdapterFor} (one warning per process). */ const reportedAdapterCopies = /* @__PURE__ */ new Set();
 /**
@@ -554,10 +629,14 @@ const controllerPrefixKey = globalKey("controller.prefix");
 * Returns utilities for accessing the controller instance, method metadata, and DI.
 */ function useControllerContext(ctx) {
 	const _ctx = ctx || current$1();
-	const getController = () => _ctx.get(controllerInstanceKey);
-	const getMethod = () => _ctx.get(controllerMethodKey);
-	const getRoute = () => _ctx.get(controllerRouteKey);
-	const getPrefix = () => _ctx.get(controllerPrefixKey);
+	const getController = () => readControllerContext(_ctx, "instance").instance;
+	const getMethod = () => readControllerContext(_ctx, "method").method;
+	const getRoute = () => readControllerContext(_ctx, "route").route;
+	const getPrefix = () => {
+		const { prefix } = readControllerContext(_ctx, "prefix");
+		if (prefix === void 0) throw new Error("Key \"controller.prefix\" is not set");
+		return prefix;
+	};
 	const getControllerMeta = () => getMoostMate().read(getController());
 	const getMethodMeta = (name) => getMoostMate().read(getController(), name || getMethod());
 	function instantiate(c) {
@@ -601,13 +680,30 @@ const interceptResultKey = globalKey("interceptor.result");
 //#region packages/moost/src/adapter-utils.ts
 const noop = () => {};
 /**
-* Registers an event's DI scope, held by its handler lifecycle and, with `adapterHolds`, by
-* the adapter too. Each release is idempotent; the scope is dropped once every holder let go,
-* so an adapter signal that fires early (a client disconnect mid-handler) cannot pull the
-* scope from under a running handler. Built outside the handler closure so a long-lived
-* adapter listener (the response 'close' of a streamed body) retains only the scope.
-*/ function holdEventScope(scopeId, adapterHolds) {
-	const drop = registerEventScope(scopeId);
+* The hook options of one event. `logger` is a prototype getter: the topic logger is only
+* derived when a hook reads it (an own accessor property would deopt the object instead).
+*/ let EventHookOptions = class EventHookOptions {
+	get logger() {
+		return this._getLogger();
+	}
+	constructor(scopeId, unscope, method, getResponse, reply, getLogger) {
+		this.scopeId = scopeId;
+		this.unscope = unscope;
+		this.method = method;
+		this.getResponse = getResponse;
+		this.reply = reply;
+		this._getLogger = getLogger;
+	}
+};
+/**
+* Holds an event's DI scope (registered on demand, see `holdEventScopeLazily`) by its handler
+* lifecycle and, with `adapterHolds`, by the adapter too. Each release is idempotent; the
+* scope is dropped once every holder let go, so an adapter signal that fires early (a client
+* disconnect mid-handler) cannot pull the scope from under a running handler. Built outside
+* the handler closure so a long-lived adapter listener (the response 'close' of a streamed
+* body) retains only the scope.
+*/ function holdEventScope(scope, adapterHolds) {
+	const drop = holdEventScopeLazily(scope);
 	let holders = adapterHolds ? 2 : 1;
 	const hold = () => {
 		let held = true;
@@ -633,7 +729,6 @@ const noop = () => {};
 * Handles scope registration, controller resolution, interceptors, argument resolution,
 * handler invocation, and cleanup — optimised for sync-first execution.
 */ function defineMoostEventHandler(options) {
-	const ci = getContextInjector$1();
 	const manualUnscope = !!options.manualUnscope;
 	const handlerSpanName = `Handler:${options.targetPath}`;
 	const handlerAttrs = {
@@ -641,21 +736,17 @@ const noop = () => {};
 		"moost.controller": options.controllerName || ""
 	};
 	return () => {
+		const ci = getContextInjector$1();
 		const ctx = current$1();
-		const scopeId = useScopeId(ctx);
-		const logger = useLogger$1(options.loggerTitle, ctx);
-		const { unscope, releaseLifecycle, failLifecycle } = holdEventScope(scopeId, manualUnscope);
+		const scope = getEventScope(ctx);
+		const scopeId = scope.id;
+		const { unscope, releaseLifecycle, failLifecycle } = holdEventScope(scope, manualUnscope);
 		let response;
+		let logger;
+		const getLogger = () => logger ?? (logger = useLogger$1(options.loggerTitle, ctx));
 		let hookOptions;
 		function getHookOptions() {
-			return hookOptions ?? (hookOptions = {
-				scopeId,
-				logger,
-				unscope,
-				method: options.controllerMethod,
-				getResponse: () => response,
-				reply: (r) => response = r
-			});
+			return hookOptions ?? (hookOptions = new EventHookOptions(scopeId, unscope, options.controllerMethod, () => response, (r) => response = r, getLogger));
 		}
 		let interceptorHandler;
 		let raise = false;
@@ -693,7 +784,7 @@ const noop = () => {};
 				response = initResult;
 				if (response !== void 0) return cleanup();
 			} catch (error) {
-				if (options.logErrors) logger.error(String(error));
+				if (options.logErrors) getLogger().error(String(error));
 				response = error;
 				raise = true;
 				return cleanup();
@@ -710,7 +801,7 @@ const noop = () => {};
 				}, handleError);
 				args = argsResult;
 			} catch (error) {
-				if (options.logErrors) logger.error(String(error));
+				if (options.logErrors) getLogger().error(String(error));
 				response = error;
 				raise = true;
 				return cleanup();
@@ -725,21 +816,21 @@ const noop = () => {};
 					response = r;
 					return cleanup();
 				}, (error) => {
-					if (options.logErrors) logger.error(error);
+					if (options.logErrors) getLogger().error(error);
 					response = error;
 					raise = true;
 					return cleanup();
 				});
 				response = handlerResult;
 			} catch (error) {
-				if (options.logErrors) logger.error(error);
+				if (options.logErrors) getLogger().error(error);
 				response = error;
 				raise = true;
 			}
 			return cleanup();
 		}
 		function handleError(error) {
-			if (options.logErrors) logger.error(String(error));
+			if (options.logErrors) getLogger().error(String(error));
 			response = error;
 			raise = true;
 			return cleanup();
@@ -753,7 +844,7 @@ const noop = () => {};
 					if (raise && response !== raisedResponse) raise = false;
 					return finalize();
 				}, (error) => {
-					if (options.logErrors) logger.error(String(error));
+					if (options.logErrors) getLogger().error(String(error));
 					throw error;
 				});
 				response = afterResult;
@@ -1133,10 +1224,14 @@ function ImportController(prefix, controller, provide) {
 */ function Resolve(resolver, label) {
 	return (target, key, index) => {
 		const i = typeof index === "number" ? index : void 0;
+		let labelFilled = false;
 		getMoostMate().decorate("resolver", (metas, level) => {
-			let newLabel = label;
-			if (!newLabel && level === "PROP" && typeof metas.key === "string") newLabel = metas.key;
-			fillLabel(target, key || "", i, newLabel);
+			if (!labelFilled) {
+				labelFilled = true;
+				let newLabel = label;
+				if (!newLabel && level === "PROP" && typeof metas.key === "string") newLabel = metas.key;
+				fillLabel(target, key || "", i, newLabel);
+			}
 			return resolver(metas, level);
 		})(target, key, i);
 	};
@@ -1607,6 +1702,7 @@ const sharedPipes = [{
 
 //#endregion
 //#region packages/moost/src/resolve-arguments.ts
+/** `metas.instantiate` of a handler argument: resolves through the current controller's DI. */ const instantiateFromController = (t) => useControllerContext().instantiate(t);
 /**
 * Builds an argument-resolver function from pre-computed per-parameter pipe lists.
 *
@@ -1615,21 +1711,25 @@ const sharedPipes = [{
 * `unknown[]` synchronously when possible, or `Promise<unknown[]>` otherwise.
 */ function resolveArguments(argsPipes, context) {
 	if (argsPipes.length === 0) return;
+	const params = argsPipes.map(({ meta: paramMeta, pipes }, index) => ({
+		pipes,
+		metas: {
+			classMeta: context.classMeta,
+			methodMeta: context.methodMeta,
+			paramMeta,
+			type: context.type,
+			key: context.key,
+			index,
+			targetMeta: paramMeta,
+			instantiate: instantiateFromController
+		}
+	}));
 	return () => {
 		const args = [];
 		let hasAsync = false;
-		for (let i = 0; i < argsPipes.length; i++) {
-			const { pipes, meta: paramMeta } = argsPipes[i];
-			const result = runPipes(pipes, void 0, {
-				classMeta: context.classMeta,
-				methodMeta: context.methodMeta,
-				paramMeta,
-				type: context.type,
-				key: context.key,
-				index: i,
-				targetMeta: paramMeta,
-				instantiate: (t) => useControllerContext().instantiate(t)
-			}, "PARAM");
+		for (let i = 0; i < params.length; i++) {
+			const { pipes, metas } = params[i];
+			const result = runPipes(pipes, void 0, metas, "PARAM");
 			if (!hasAsync && isThenable(result)) hasAsync = true;
 			args[i] = result;
 		}
@@ -1639,16 +1739,9 @@ const sharedPipes = [{
 
 //#endregion
 //#region packages/moost/src/interceptor-handler.ts
-function _define_property$1(obj, key, value) {
-	if (key in obj) Object.defineProperty(obj, key, {
-		value,
-		enumerable: true,
-		configurable: true,
-		writable: true
-	});
-	else obj[key] = value;
-	return obj;
-}
+/** Span attributes of the interceptor stages — shared, never mutated. */ const BEFORE_STAGE = { "moost.interceptor.stage": "before" };
+const AFTER_STAGE = { "moost.interceptor.stage": "after" };
+const ON_ERROR_STAGE = { "moost.interceptor.stage": "onError" };
 /**
 * Manages the before/after/error interceptor lifecycle for a single event.
 * Optimised for the common sync path — only allocates promises when an interceptor goes async.
@@ -1673,16 +1766,15 @@ function _define_property$1(obj, key, value) {
 	* Returns a pending PromiseLike if `before` went async, or undefined.
 	*/ registerDef(def, entry, ci) {
 		if (def.after) (this.after ?? (this.after = [])).unshift({
-			name: entry.name,
+			spanName: entry.spanName,
 			fn: def.after
 		});
 		if (def.error) (this.onError ?? (this.onError = [])).unshift({
-			name: entry.name,
+			spanName: entry.spanName,
 			fn: def.error
 		});
 		if (def.before) {
-			const spanName = entry.spanName;
-			const result = ci ? ci.with(spanName, { "moost.interceptor.stage": "before" }, () => def.before?.(this.getReplyFn())) : def.before(this.getReplyFn());
+			const result = ci ? ci.with(entry.spanName, BEFORE_STAGE, () => def.before?.(this.getReplyFn())) : def.before(this.getReplyFn());
 			if (isThenable(result)) return result;
 		}
 	}
@@ -1735,10 +1827,10 @@ function _define_property$1(obj, key, value) {
 		const handlers = isError ? this.onError : this.after;
 		if (!handlers) return this.response;
 		const ci = getContextInjector$1();
-		const stage = isError ? "onError" : "after";
+		const stage = isError ? ON_ERROR_STAGE : AFTER_STAGE;
 		for (let i = 0; i < handlers.length; i++) {
-			const { name, fn } = handlers[i];
-			const result = ci ? ci.with(`Interceptor:${name}`, { "moost.interceptor.stage": stage }, () => fn(response, this.getReplyFn())) : fn(response, this.getReplyFn());
+			const { spanName, fn } = handlers[i];
+			const result = ci ? ci.with(spanName, stage, () => fn(response, this.getReplyFn())) : fn(response, this.getReplyFn());
 			if (isThenable(result)) return this._fireAfterAsync({
 				ci,
 				handlers,
@@ -1751,21 +1843,19 @@ function _define_property$1(obj, key, value) {
 	async _fireAfterAsync(ctx, pending, startIndex) {
 		await pending;
 		for (let i = startIndex + 1; i < ctx.handlers.length; i++) {
-			const { name, fn } = ctx.handlers[i];
-			if (ctx.ci) await ctx.ci.with(`Interceptor:${name}`, { "moost.interceptor.stage": ctx.stage }, () => fn(ctx.response, this.getReplyFn()));
+			const { spanName, fn } = ctx.handlers[i];
+			if (ctx.ci) await ctx.ci.with(spanName, ctx.stage, () => fn(ctx.response, this.getReplyFn()));
 			else await fn(ctx.response, this.getReplyFn());
 		}
 		return this.response;
 	}
 	constructor(handlers) {
-		_define_property$1(this, "handlers", void 0);
-		_define_property$1(this, "after", void 0);
-		_define_property$1(this, "onError", void 0);
-		_define_property$1(this, "response", void 0);
-		_define_property$1(this, "responseOverwritten", void 0);
-		_define_property$1(this, "_boundReplyFn", void 0);
 		this.handlers = handlers;
+		this.after = void 0;
+		this.onError = void 0;
+		this.response = void 0;
 		this.responseOverwritten = false;
+		this._boundReplyFn = void 0;
 	}
 };
 
@@ -1773,6 +1863,7 @@ function _define_property$1(obj, key, value) {
 //#region packages/moost/src/utils.ts
 const mate = getMoostMate();
 const noInterceptors = () => void 0;
+const isForEvent = (instance) => mate.read(instance)?.injectable === "FOR_EVENT";
 function findInterceptorMethods(handler) {
 	const fakeInstance = Object.create(handler.prototype);
 	const methods = getInstanceOwnMethods(fakeInstance);
@@ -1811,6 +1902,8 @@ function callMethod(instance, methodName, resolveArgs) {
 }
 function createClassInterceptorFactory(opts) {
 	const infact = getMoostInfact();
+	const customData = { pipes: opts.pipes };
+	const defs = opts.cacheable ? /* @__PURE__ */ new WeakMap() : void 0;
 	function buildDef(instance) {
 		const def = {};
 		if (opts.methods.before) {
@@ -1843,9 +1936,21 @@ function createClassInterceptorFactory(opts) {
 		return def;
 	}
 	function fromTarget(targetInstance) {
-		const result = infact.getForInstance(targetInstance, opts.handler, { customData: { pipes: opts.pipes } });
-		if (isThenable(result)) return result.then(buildDef);
-		return buildDef(result);
+		const cached = defs?.get(targetInstance);
+		if (cached) return cached;
+		const registries = infact.getInstanceRegistries(targetInstance);
+		const result = infact.get(opts.handler, {
+			provide: registries.provide || {},
+			replace: registries.replace,
+			customData
+		});
+		const remember = (instance) => {
+			const def = buildDef(instance);
+			if (defs && !isForEvent(instance) && !isForEvent(targetInstance)) defs.set(targetInstance, def);
+			return def;
+		};
+		if (isThenable(result)) return result.then(remember);
+		return remember(result);
 	}
 	return () => {
 		const result = opts.getTargetInstance();
@@ -1887,7 +1992,8 @@ function getIterceptorHandlerFactory(interceptors, getTargetInstance, pipes) {
 				methods,
 				resolvers,
 				getTargetInstance,
-				pipes: mergedPipes
+				pipes: mergedPipes,
+				cacheable: classMeta.injectable !== "FOR_EVENT"
 			}),
 			name,
 			spanName
@@ -2386,12 +2492,17 @@ function _define_property(obj, key, value) {
 	* - before the hook pass starts (including from a controller constructor
 	*   during binding) — queued;
 	* - while the pass runs (from another hook) — runs later in the same pass;
-	* - after the pass finished — runs immediately (asynchronously, in its own
-	*   init context); a failure is logged, since there is no `init()` left to
+	* - after the pass finished — runs once, immediately (asynchronously, in its
+	*   own init context) and is NOT stored, so it does not run again on
+	*   re-init and per-request callers (`FOR_EVENT` constructors) do not grow
+	*   the hook list. A failure is logged, since there is no `init()` left to
 	*   reject.
 	*
-	* No de-duplication: registering the same function twice runs it twice.
-	* Hooks re-run on re-init exactly like `@MoostInit` hooks.
+	* No de-duplication: registering the same function twice runs it twice
+	* (per-request callers should guard non-idempotent work themselves). Hooks
+	* registered before or during a pass re-run on re-init exactly like
+	* `@MoostInit` hooks; to get a hook on every future init, register it
+	* before `init()`.
 	* @since 0.6.46
 	*/ addInitHook(fn, opts) {
 		const hook = {
@@ -2399,10 +2510,13 @@ function _define_property(obj, key, value) {
 			priority: opts?.priority ?? 0,
 			fn
 		};
+		if (this.initHookPhase === "done") {
+			this.runInitHook(hook).catch((error) => {
+				this.logger.error(`Late init hook failed: ${errorMessage(error)}`);
+			});
+			return;
+		}
 		this.initHooks.push(hook);
-		if (this.initHookPhase === "done") this.runInitHook(hook).catch((error) => {
-			this.logger.error(`Late init hook failed: ${errorMessage(error)}`);
-		});
 	}
 	/**
 	* ### dispose
@@ -2535,7 +2649,7 @@ function _define_property(obj, key, value) {
 			infact.setInstanceRegistries(instance, provide, replace, { pipes });
 		}
 		if (instance) this.singletonInstances.add(instance);
-		const getInstance = instance ? () => instance : async () => await infact.get(controller, { ...infactOpts });
+		const getInstance = instance ? () => instance : () => infact.get(controller, infactOpts);
 		const classConstructor = isConstructor$1(controller) ? controller : getConstructor$1(controller);
 		const controllerOverview = await bindControllerMethods({
 			getInstance,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moost",
-  "version": "0.6.46",
+  "version": "0.6.48",
   "description": "moost",
   "keywords": [
     "composables",
@@ -38,18 +38,18 @@
     }
   },
   "dependencies": {
-    "@prostojs/infact": "^0.6.0",
+    "@prostojs/infact": "^0.6.1",
     "@prostojs/logger": "^0.4.3",
-    "@prostojs/mate": "^0.5.0",
-    "@wooksjs/event-core": "^0.7.26",
+    "@prostojs/mate": "^0.5.1",
+    "@wooksjs/event-core": "^0.7.27",
     "hookable": "^5.5.3",
-    "wooks": "^0.7.26"
+    "wooks": "^0.7.27"
   },
   "devDependencies": {
-    "@wooksjs/event-http": "^0.7.26",
-    "@wooksjs/http-body": "^0.7.26",
+    "@wooksjs/event-http": "^0.7.27",
+    "@wooksjs/http-body": "^0.7.27",
     "vitest": "3.2.7",
-    "@moostjs/event-http": "^0.6.46"
+    "@moostjs/event-http": "^0.6.48"
   },
   "scripts": {
     "pub": "pnpm publish --access public",