@horizon-republic/nestjs-jetstream 2.10.0 → 2.11.1

package/dist/index.cjs

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from2, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __decorateClass = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
@@ -85,7 +95,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/jetstream.module.ts
-var import_common18 = require("@nestjs/common");
+var import_common21 = require("@nestjs/common");
 
 // src/client/jetstream.client.ts
 var import_common5 = require("@nestjs/common");
@@ -110,6 +120,10 @@ var TransportEvent = /* @__PURE__ */ ((TransportEvent2) => {
   TransportEvent2["ShutdownStart"] = "shutdownStart";
   TransportEvent2["ShutdownComplete"] = "shutdownComplete";
   TransportEvent2["DeadLetter"] = "deadLetter";
+  TransportEvent2["ConsumerRecovered"] = "consumerRecovered";
+  TransportEvent2["HandlerCompleted"] = "handlerCompleted";
+  TransportEvent2["Published"] = "published";
+  TransportEvent2["RpcCompleted"] = "rpcCompleted";
   return TransportEvent2;
 })(TransportEvent || {});
 
@@ -498,6 +512,8 @@ var resolveCaptureBody = (option) => {
   };
 };
 var resolveOtelOptions = (options = {}) => {
+  if (options === true) options = {};
+  if (options === false) options = { enabled: false };
   return {
     enabled: options.enabled ?? true,
     traces: expandTracesOption(options.traces),
@@ -577,7 +593,7 @@ var extractContext = (ctx, carrier, getter) => import_api.propagation.extract(ct
 
 // src/otel/tracer.ts
 var import_api2 = require("@opentelemetry/api");
-var PACKAGE_VERSION = true ? "2.10.0" : "0.0.0";
+var PACKAGE_VERSION = true ? "2.11.1" : "0.0.0";
 var getTracer = () => import_api2.trace.getTracer(TRACER_NAME, PACKAGE_VERSION);
 
 // src/otel/carrier.ts
@@ -1368,6 +1384,17 @@ var detectEventKind = (pattern) => {
   if (pattern.startsWith("ordered:" /* Ordered */)) return "ordered" /* Ordered */;
   return "event" /* Event */;
 };
+var declaredEventPattern = (pattern) => {
+  if (pattern.startsWith("broadcast:" /* Broadcast */))
+    return pattern.slice("broadcast:" /* Broadcast */.length);
+  if (pattern.startsWith("ordered:" /* Ordered */)) return pattern.slice("ordered:" /* Ordered */.length);
+  return pattern;
+};
+var eventStreamKind = (kind) => {
+  if (kind === "broadcast" /* Broadcast */) return "broadcast" /* Broadcast */;
+  if (kind === "ordered" /* Ordered */) return "ordered" /* Ordered */;
+  return "ev" /* Event */;
+};
 var JetstreamClient = class extends import_microservices.ClientProxy {
   constructor(rootOptions, targetServiceName, connection, codec, eventBus) {
     super();
@@ -1483,50 +1510,60 @@ var JetstreamClient = class extends import_microservices.ClientProxy {
     const encoded = this.codec.encode(data);
     const effectiveMsgId = messageId ?? import_nuid.nuid.next();
     const record = packet.data instanceof JetstreamRecord ? packet.data : new JetstreamRecord(data, /* @__PURE__ */ new Map());
-    await withPublishSpan(
-      {
-        subject: publishSubject,
-        pattern: packet.pattern,
-        record,
-        kind: detectEventKind(packet.pattern),
-        payloadBytes: encoded.length,
-        payload: encoded,
-        messageId: effectiveMsgId,
-        headers: msgHeaders,
-        serviceName: this.callerName,
-        endpoint: this.serverEndpoint,
-        scheduleTarget: schedule ? eventSubject : void 0
-      },
-      this.otel,
-      async () => {
-        const warnIfDuplicate = (kindLabel, ack2) => {
-          if (ack2.duplicate) {
-            this.logger.warn(
-              `Duplicate ${kindLabel} publish detected: ${publishSubject} (seq: ${ack2.seq})`
-            );
+    const publishKind = detectEventKind(packet.pattern);
+    const declaredPattern = declaredEventPattern(packet.pattern);
+    const streamKind = eventStreamKind(publishKind);
+    const startedAt = performance.now();
+    try {
+      await withPublishSpan(
+        {
+          subject: publishSubject,
+          pattern: packet.pattern,
+          record,
+          kind: publishKind,
+          payloadBytes: encoded.length,
+          payload: encoded,
+          messageId: effectiveMsgId,
+          headers: msgHeaders,
+          serviceName: this.callerName,
+          endpoint: this.serverEndpoint,
+          scheduleTarget: schedule ? eventSubject : void 0
+        },
+        this.otel,
+        async () => {
+          const warnIfDuplicate = (kindLabel, ack2) => {
+            if (ack2.duplicate) {
+              this.logger.warn(
+                `Duplicate ${kindLabel} publish detected: ${publishSubject} (seq: ${ack2.seq})`
+              );
+            }
+          };
+          if (schedule) {
+            const ack2 = await this.connection.getJetStreamClient().publish(publishSubject, encoded, {
+              headers: msgHeaders,
+              msgID: effectiveMsgId,
+              ttl,
+              schedule: {
+                specification: schedule.at,
+                target: eventSubject
+              }
+            });
+            warnIfDuplicate("scheduled", ack2);
+            return;
           }
-        };
-        if (schedule) {
-          const ack2 = await this.connection.getJetStreamClient().publish(publishSubject, encoded, {
+          const ack = await this.connection.getJetStreamClient().publish(publishSubject, encoded, {
             headers: msgHeaders,
             msgID: effectiveMsgId,
-            ttl,
-            schedule: {
-              specification: schedule.at,
-              target: eventSubject
-            }
+            ttl
           });
-          warnIfDuplicate("scheduled", ack2);
-          return;
+          warnIfDuplicate("event", ack);
         }
-        const ack = await this.connection.getJetStreamClient().publish(publishSubject, encoded, {
-          headers: msgHeaders,
-          msgID: effectiveMsgId,
-          ttl
-        });
-        warnIfDuplicate("event", ack);
-      }
-    );
+      );
+      this.reportPublished(declaredPattern, streamKind, startedAt, "success");
+    } catch (err) {
+      this.reportPublished(declaredPattern, streamKind, startedAt, "error");
+      throw err;
+    }
     return void 0;
   }
   /**
@@ -1554,14 +1591,17 @@ var JetstreamClient = class extends import_microservices.ClientProxy {
     };
     let jetStreamCorrelationId = null;
     if (this.isCoreMode) {
-      this.publishCoreRpc(subject, data, hdrs, timeout, callback).catch(onUnhandled);
+      this.publishCoreRpc(subject, data, hdrs, timeout, callback, packet.pattern).catch(
+        onUnhandled
+      );
     } else {
       jetStreamCorrelationId = import_nuid.nuid.next();
       this.publishJetStreamRpc(subject, data, callback, {
         headers: hdrs,
         timeout,
         correlationId: jetStreamCorrelationId,
-        messageId
+        messageId,
+        declaredPattern: packet.pattern
       }).catch(onUnhandled);
     }
     return () => {
@@ -1576,7 +1616,7 @@ var JetstreamClient = class extends import_microservices.ClientProxy {
     };
   }
   /** Core mode: nc.request() with timeout. */
-  async publishCoreRpc(subject, data, customHeaders, timeout, callback) {
+  async publishCoreRpc(subject, data, customHeaders, timeout, callback, declaredPattern) {
     const effectiveTimeout = timeout ?? this.defaultRpcTimeout;
     const hdrs = this.buildHeaders(customHeaders, { subject });
     const encoded = this.codec.encode(data);
@@ -1591,6 +1631,7 @@ var JetstreamClient = class extends import_microservices.ClientProxy {
       },
       this.otel
     );
+    const startedAt = performance.now();
     try {
       const nc = this.readyForPublish ? this.connection.unwrap : await this.connect();
       const response = await import_api8.context.with(
@@ -1603,9 +1644,13 @@ var JetstreamClient = class extends import_microservices.ClientProxy {
       const decoded = this.codec.decode(response.data);
       if (response.headers?.get("x-error" /* Error */)) {
         spanHandle.finish({ kind: "reply-error" /* ReplyError */, replyPayload: decoded });
+        this.reportPublished(declaredPattern, "cmd" /* Command */, startedAt, "success");
+        this.reportRpcCompleted(declaredPattern, startedAt, "error");
         callback({ err: decoded, response: null, isDisposed: true });
       } else {
         spanHandle.finish({ kind: "ok" /* Ok */, reply: decoded });
+        this.reportPublished(declaredPattern, "cmd" /* Command */, startedAt, "success");
+        this.reportRpcCompleted(declaredPattern, startedAt, "success");
         callback({ err: null, response: decoded, isDisposed: true });
       }
     } catch (err) {
@@ -1613,16 +1658,20 @@ var JetstreamClient = class extends import_microservices.ClientProxy {
       if (error instanceof import_transport_node.TimeoutError) {
         spanHandle.finish({ kind: "timeout" /* Timeout */ });
         this.eventBus.emit("rpcTimeout" /* RpcTimeout */, subject, "");
+        this.reportPublished(declaredPattern, "cmd" /* Command */, startedAt, "success");
+        this.reportRpcCompleted(declaredPattern, startedAt, "timeout");
       } else {
         spanHandle.finish({ kind: "error" /* Error */, error });
         this.eventBus.emit("error" /* Error */, error, "client-rpc");
+        this.reportPublished(declaredPattern, "cmd" /* Command */, startedAt, "error");
+        this.reportRpcCompleted(declaredPattern, startedAt, "error");
       }
       callback({ err: error, response: null, isDisposed: true });
     }
   }
   /** JetStream mode: publish to stream + wait for inbox response. */
   async publishJetStreamRpc(subject, data, callback, options) {
-    const { headers: customHeaders, correlationId, messageId } = options;
+    const { headers: customHeaders, correlationId, messageId, declaredPattern } = options;
     const effectiveTimeout = options.timeout ?? this.defaultRpcTimeout;
     const hdrs = this.buildHeaders(customHeaders, {
       subject,
@@ -1643,6 +1692,7 @@ var JetstreamClient = class extends import_microservices.ClientProxy {
       },
       this.otel
     );
+    const startedAt = performance.now();
     this.pendingMessages.set(correlationId, (packet) => {
       if (packet.err) {
         if (packet.err instanceof Error) {
@@ -1650,8 +1700,10 @@ var JetstreamClient = class extends import_microservices.ClientProxy {
         } else {
           spanHandle.finish({ kind: "reply-error" /* ReplyError */, replyPayload: packet.err });
         }
+        this.reportRpcCompleted(declaredPattern, startedAt, "error");
       } else {
         spanHandle.finish({ kind: "ok" /* Ok */, reply: packet.response });
+        this.reportRpcCompleted(declaredPattern, startedAt, "success");
       }
       callback(packet);
     });
@@ -1661,6 +1713,7 @@ var JetstreamClient = class extends import_microservices.ClientProxy {
       this.pendingMessages.delete(correlationId);
       spanHandle.finish({ kind: "timeout" /* Timeout */ });
       this.eventBus.emit("rpcTimeout" /* RpcTimeout */, subject, correlationId);
+      this.reportRpcCompleted(declaredPattern, startedAt, "timeout");
       callback({ err: new Error(RPC_TIMEOUT_MESSAGE), response: null, isDisposed: true });
     }, effectiveTimeout);
     this.pendingTimeouts.set(correlationId, timeoutId);
@@ -1673,6 +1726,8 @@ var JetstreamClient = class extends import_microservices.ClientProxy {
         this.pendingMessages.delete(correlationId);
         const inboxError = new Error("Inbox not initialized");
         spanHandle.finish({ kind: "error" /* Error */, error: inboxError });
+        this.reportPublished(declaredPattern, "cmd" /* Command */, startedAt, "error");
+        this.reportRpcCompleted(declaredPattern, startedAt, "error");
         callback({
           err: new Error("Inbox not initialized \u2014 JetStream RPC mode requires a connected inbox"),
           response: null,
@@ -1687,6 +1742,7 @@ var JetstreamClient = class extends import_microservices.ClientProxy {
           msgID: messageId ?? import_nuid.nuid.next()
         })
       );
+      this.reportPublished(declaredPattern, "cmd" /* Command */, startedAt, "success");
     } catch (err) {
       const existingTimeout = this.pendingTimeouts.get(correlationId);
       if (existingTimeout) {
@@ -1698,9 +1754,32 @@ var JetstreamClient = class extends import_microservices.ClientProxy {
       const error = err instanceof Error ? err : new Error("Unknown error");
       spanHandle.finish({ kind: "error" /* Error */, error });
       this.eventBus.emit("error" /* Error */, error, `jetstream-rpc-publish:${subject}`);
+      this.reportPublished(declaredPattern, "cmd" /* Command */, startedAt, "error");
+      this.reportRpcCompleted(declaredPattern, startedAt, "error");
       callback({ err: error, response: null, isDisposed: true });
     }
   }
+  // hasHook is per-emit so late subscribers (JetstreamMetricsService during
+  // OnApplicationBootstrap) still receive events.
+  reportPublished(declaredPattern, kind, startedAt, status) {
+    if (!this.eventBus.hasHook("published" /* Published */)) return;
+    this.eventBus.emit(
+      "published" /* Published */,
+      declaredPattern,
+      kind,
+      performance.now() - startedAt,
+      status
+    );
+  }
+  reportRpcCompleted(declaredPattern, startedAt, status) {
+    if (!this.eventBus.hasHook("rpcCompleted" /* RpcCompleted */)) return;
+    this.eventBus.emit(
+      "rpcCompleted" /* RpcCompleted */,
+      declaredPattern,
+      performance.now() - startedAt,
+      status
+    );
+  }
   /** Fail-fast all pending JetStream RPC callbacks on connection loss. */
   handleDisconnect() {
     this.rejectPendingRpcs(new Error("Connection lost"));
@@ -2106,43 +2185,53 @@ var ConnectionProvider = class {
 var EventBus = class {
   hooks;
   logger;
+  subscribers = /* @__PURE__ */ new Map();
   constructor(logger5, hooks) {
     this.logger = logger5;
     this.hooks = hooks ?? {};
   }
   /**
-   * Emit a lifecycle event. Dispatches to custom hook if registered, otherwise no-op.
-   *
-   * @param event - The {@link TransportEvent} to emit.
-   * @param args - Arguments matching the hook signature for this event.
+   * Subscribe to a transport event. Used by built-in observers (e.g. metrics).
+   * Multiple subscribers per event are supported; each is called independently.
+   */
+  subscribe(event, handler) {
+    const list = this.subscribers.get(event) ?? [];
+    list.push(handler);
+    this.subscribers.set(event, list);
+  }
+  /**
+   * Emit a lifecycle event. Dispatches to all internal subscribers and the
+   * registered user hook (if any).
    */
   emit(event, ...args) {
-    const hook = this.hooks[event];
-    if (!hook) return;
-    this.callHook(event, hook, ...args);
+    this.dispatch(event, args);
   }
   /**
    * Hot-path optimized emit for MessageRouted events.
    * Avoids rest/spread overhead of the generic `emit()`.
    */
   emitMessageRouted(subject, kind) {
-    const hook = this.hooks["messageRouted" /* MessageRouted */];
-    if (!hook) return;
-    this.callHook(
-      "messageRouted" /* MessageRouted */,
-      hook,
-      subject,
-      kind
-    );
+    this.dispatch("messageRouted" /* MessageRouted */, [subject, kind]);
   }
   /**
-   * Check whether a hook is registered for the given event.
-   *
-   * Used by the routing hot path to elide the emit call entirely when the
-   * transport owner did not register a listener.
+   * Check whether any listener (user hook or internal subscriber) is registered
+   * for the given event. Used by routing hot path to elide the emit call when
+   * no one is listening.
    */
   hasHook(event) {
-    return this.hooks[event] !== void 0;
+    return this.hooks[event] !== void 0 || (this.subscribers.get(event)?.length ?? 0) > 0;
+  }
+  dispatch(event, args) {
+    const subs = this.subscribers.get(event);
+    if (subs?.length) {
+      for (const sub of [...subs]) {
+        this.callHook(event, sub, ...args);
+      }
+    }
+    const hook = this.hooks[event];
+    if (hook) {
+      this.callHook(event, hook, ...args);
+    }
   }
   callHook(event, hook, ...args) {
     try {
@@ -2221,12 +2310,692 @@ var JetstreamHealthIndicator = class {
         isHealthCheckError: true
       });
     }
-    return { [key]: details };
+    return { [key]: details };
+  }
+};
+JetstreamHealthIndicator = __decorateClass([
+  (0, import_common7.Injectable)()
+], JetstreamHealthIndicator);
+
+// src/metrics/metrics.module.ts
+var import_common11 = require("@nestjs/common");
+
+// src/server/routing/pattern-registry.ts
+var import_common8 = require("@nestjs/common");
+var HANDLER_LABELS = {
+  ["broadcast" /* Broadcast */]: "broadcast" /* Broadcast */,
+  ["ordered" /* Ordered */]: "ordered" /* Ordered */,
+  ["ev" /* Event */]: "event" /* Event */,
+  ["cmd" /* Command */]: "rpc" /* Rpc */
+};
+var PatternRegistry = class {
+  constructor(options) {
+    this.options = options;
+  }
+  logger = new import_common8.Logger("Jetstream:PatternRegistry");
+  registry = /* @__PURE__ */ new Map();
+  // Cached after registerHandlers() — the registry is immutable from that point
+  cachedPatterns = null;
+  _hasEvents = false;
+  _hasCommands = false;
+  _hasBroadcasts = false;
+  _hasOrdered = false;
+  _hasMetadata = false;
+  /**
+   * Register all handlers from the NestJS strategy.
+   *
+   * @param handlers Map of pattern -> MessageHandler from `Server.getHandlers()`.
+   */
+  registerHandlers(handlers) {
+    const serviceName = this.options.name;
+    for (const [pattern, handler] of handlers) {
+      const extras = handler.extras;
+      const isEvent = handler.isEventHandler ?? false;
+      const isBroadcast = !!extras?.broadcast;
+      const isOrdered = !!extras?.ordered;
+      const meta = extras?.meta;
+      if (isBroadcast && isOrdered) {
+        throw new Error(
+          `Handler "${pattern}" cannot be both broadcast and ordered. Use one or the other.`
+        );
+      }
+      let kind;
+      if (isBroadcast) kind = "broadcast" /* Broadcast */;
+      else if (isOrdered) kind = "ordered" /* Ordered */;
+      else if (isEvent) kind = "ev" /* Event */;
+      else kind = "cmd" /* Command */;
+      const fullSubject = kind === "broadcast" /* Broadcast */ ? buildBroadcastSubject(pattern) : buildSubject(serviceName, kind, pattern);
+      this.registry.set(fullSubject, {
+        handler,
+        pattern,
+        isEvent: isEvent && !isOrdered,
+        isBroadcast,
+        isOrdered,
+        meta
+      });
+      this.logger.debug(`Registered ${HANDLER_LABELS[kind]}: ${pattern} -> ${fullSubject}`);
+    }
+    this.cachedPatterns = this.buildPatternsByKind();
+    this._hasEvents = this.cachedPatterns.events.length > 0;
+    this._hasCommands = this.cachedPatterns.commands.length > 0;
+    this._hasBroadcasts = this.cachedPatterns.broadcasts.length > 0;
+    this._hasOrdered = this.cachedPatterns.ordered.length > 0;
+    this._hasMetadata = [...this.registry.values()].some((entry) => entry.meta !== void 0);
+    this.logSummary();
+  }
+  /** Find handler for a full NATS subject. */
+  getHandler(subject) {
+    return this.registry.get(subject)?.handler ?? null;
+  }
+  /**
+   * Resolve the declared pattern and {@link StreamKind} for a full NATS subject.
+   *
+   * Returns `null` when the subject is not registered. The declared pattern is
+   * the value the user passed to `@EventPattern`/`@MessagePattern` — stable and
+   * bounded, suitable for use as a Prometheus label without cardinality risk.
+   */
+  resolveDeclared(subject) {
+    const entry = this.registry.get(subject);
+    if (!entry) return null;
+    return { pattern: entry.pattern, kind: this.resolveStreamKind(entry) };
+  }
+  /** Get all registered broadcast patterns (for consumer filter_subject setup). */
+  getBroadcastPatterns() {
+    return this.getPatternsByKind().broadcasts.map((p) => buildBroadcastSubject(p));
+  }
+  hasBroadcastHandlers() {
+    return this._hasBroadcasts;
+  }
+  hasRpcHandlers() {
+    return this._hasCommands;
+  }
+  hasEventHandlers() {
+    return this._hasEvents;
+  }
+  hasOrderedHandlers() {
+    return this._hasOrdered;
+  }
+  /** Get fully-qualified NATS subjects for ordered handlers. */
+  getOrderedSubjects() {
+    return this.getPatternsByKind().ordered.map(
+      (p) => buildSubject(this.options.name, "ordered" /* Ordered */, p)
+    );
+  }
+  /** Check if any registered handler has metadata. */
+  hasMetadata() {
+    return this._hasMetadata;
+  }
+  /**
+   * Get handler metadata entries for KV publishing.
+   *
+   * Returns a map of KV key -> metadata object for all handlers that have `meta`.
+   * Key format: `{serviceName}.{kind}.{pattern}`.
+   */
+  getMetadataEntries() {
+    const entries = /* @__PURE__ */ new Map();
+    for (const entry of this.registry.values()) {
+      if (!entry.meta) continue;
+      const kind = this.resolveStreamKind(entry);
+      const key = metadataKey(this.options.name, kind, entry.pattern);
+      entries.set(key, entry.meta);
+    }
+    return entries;
+  }
+  /** Get patterns grouped by kind (cached after registration). */
+  getPatternsByKind() {
+    const patterns = this.cachedPatterns ?? this.buildPatternsByKind();
+    return {
+      events: [...patterns.events],
+      commands: [...patterns.commands],
+      broadcasts: [...patterns.broadcasts],
+      ordered: [...patterns.ordered]
+    };
+  }
+  /** Normalize a full NATS subject back to the user-facing pattern. */
+  normalizeSubject(subject) {
+    const name = internalName(this.options.name);
+    const prefixes = [
+      `${name}.${"cmd" /* Command */}.`,
+      `${name}.${"ev" /* Event */}.`,
+      `${name}.${"ordered" /* Ordered */}.`,
+      `${"broadcast" /* Broadcast */}.`
+    ];
+    for (const prefix of prefixes) {
+      if (subject.startsWith(prefix)) {
+        return subject.slice(prefix.length);
+      }
+    }
+    return subject;
+  }
+  buildPatternsByKind() {
+    const events = [];
+    const commands = [];
+    const broadcasts = [];
+    const ordered = [];
+    for (const entry of this.registry.values()) {
+      if (entry.isBroadcast) broadcasts.push(entry.pattern);
+      else if (entry.isOrdered) ordered.push(entry.pattern);
+      else if (entry.isEvent) events.push(entry.pattern);
+      else commands.push(entry.pattern);
+    }
+    return { events, commands, broadcasts, ordered };
+  }
+  resolveStreamKind(entry) {
+    if (entry.isBroadcast) return "broadcast" /* Broadcast */;
+    if (entry.isOrdered) return "ordered" /* Ordered */;
+    if (entry.isEvent) return "ev" /* Event */;
+    return "cmd" /* Command */;
+  }
+  logSummary() {
+    const { events, commands, broadcasts, ordered } = this.getPatternsByKind();
+    const parts = [
+      `${commands.length} RPC`,
+      `${events.length} events`,
+      `${broadcasts.length} broadcasts`
+    ];
+    if (ordered.length > 0) {
+      parts.push(`${ordered.length} ordered`);
+    }
+    this.logger.log(`Registered handlers: ${parts.join(", ")}`);
+  }
+};
+
+// src/metrics/metrics.constants.ts
+var JETSTREAM_METRICS_CONFIG = /* @__PURE__ */ Symbol("JETSTREAM_METRICS_CONFIG");
+var JETSTREAM_METRICS_REGISTRY = /* @__PURE__ */ Symbol("JETSTREAM_METRICS_REGISTRY");
+var JETSTREAM_METRICS_PROM_CLIENT = /* @__PURE__ */ Symbol("JETSTREAM_METRICS_PROM_CLIENT");
+var DEFAULT_METRICS_PREFIX = "jetstream_";
+var DEFAULT_POLL_INTERVAL_MS = 15e3;
+var DEFAULT_HISTOGRAM_BUCKETS = {
+  handlerDuration: [1e-3, 5e-3, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10],
+  publishDuration: [1e-3, 5e-3, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5],
+  rpcDuration: [1e-3, 5e-3, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10]
+};
+var ERROR_CONTEXT_PREFIXES = [
+  ["connection", "connection"],
+  ["codec", "codec"],
+  ["client-rpc", "publish"],
+  ["jetstream-rpc-publish", "publish"],
+  ["publish", "publish"],
+  ["message-provider", "consume"],
+  ["consume", "consume"],
+  ["core-rpc-handler", "handler"],
+  ["rpc-handler", "handler"],
+  // EventRouter formats contexts as `${StreamKind.*}-handler:...` — the enum
+  // uses short forms (`ev`, `ordered`, `broadcast`) so both surface in the wild.
+  ["ev-handler", "handler"],
+  ["event-handler", "handler"],
+  ["broadcast-handler", "handler"],
+  ["ordered-handler", "handler"],
+  ["handler", "handler"],
+  ["shutdown", "shutdown"]
+];
+var UNMATCHED_SUBJECT_LABEL = "<unmatched>";
+var STREAM_KIND_LABEL = {
+  ["ev" /* Event */]: "event",
+  ["cmd" /* Command */]: "command",
+  ["broadcast" /* Broadcast */]: "broadcast",
+  ["ordered" /* Ordered */]: "ordered"
+};
+
+// src/metrics/metrics.service.ts
+var import_common10 = require("@nestjs/common");
+
+// src/metrics/error-context-mapper.ts
+var mapErrorContext = (context7) => {
+  if (!context7) return "other";
+  for (const [prefix, mapped] of ERROR_CONTEXT_PREFIXES) {
+    if (context7 === prefix || context7.startsWith(`${prefix}:`)) {
+      return mapped;
+    }
+  }
+  return "other";
+};
+
+// src/metrics/metrics.factory.ts
+var createMetrics = (opts) => {
+  const { register, promClient } = opts;
+  const prefix = opts.prefix ?? DEFAULT_METRICS_PREFIX;
+  const buckets = {
+    handlerDuration: opts.buckets?.handlerDuration ?? DEFAULT_HISTOGRAM_BUCKETS.handlerDuration,
+    publishDuration: opts.buckets?.publishDuration ?? DEFAULT_HISTOGRAM_BUCKETS.publishDuration,
+    rpcDuration: opts.buckets?.rpcDuration ?? DEFAULT_HISTOGRAM_BUCKETS.rpcDuration
+  };
+  if (opts.defaultLabels && Object.keys(opts.defaultLabels).length > 0) {
+    register.setDefaultLabels(opts.defaultLabels);
+  }
+  const counter = (name, help, labelNames) => new promClient.Counter({ name: `${prefix}${name}`, help, labelNames, registers: [register] });
+  const histogram = (name, help, labelNames, bucketArr) => new promClient.Histogram({
+    name: `${prefix}${name}`,
+    help,
+    labelNames,
+    buckets: bucketArr,
+    registers: [register]
+  });
+  const gauge = (name, help, labelNames) => new promClient.Gauge({ name: `${prefix}${name}`, help, labelNames, registers: [register] });
+  return {
+    messagesReceivedTotal: counter(
+      "messages_received_total",
+      "Total messages routed to a handler.",
+      ["stream", "subject", "kind"]
+    ),
+    messagesProcessedTotal: counter(
+      "messages_processed_total",
+      "Total messages whose handler completed.",
+      ["stream", "subject", "kind", "status"]
+    ),
+    messagesUnhandledTotal: counter(
+      "messages_unhandled_total",
+      "Messages received but not matching any registered handler.",
+      ["subject"]
+    ),
+    messagesDeadLetterTotal: counter(
+      "messages_dead_letter_total",
+      "Messages routed to dead-letter after exhausting redelivery attempts.",
+      ["stream", "subject"]
+    ),
+    publishTotal: counter(
+      "publish_total",
+      "Total publish/send operations performed by the client.",
+      ["subject", "kind", "status"]
+    ),
+    rpcTimeoutTotal: counter("rpc_timeout_total", "RPC calls that exceeded the timeout deadline.", [
+      "subject"
+    ]),
+    consumerRecoveredTotal: counter(
+      "consumer_recovered_total",
+      "Self-healing recoveries after consume-loop failures.",
+      ["kind"]
+    ),
+    errorsTotal: counter("errors_total", "Transport-level errors emitted on the EventBus.", [
+      "context"
+    ]),
+    handlerDurationSeconds: histogram(
+      "handler_duration_seconds",
+      "Wall-clock duration of handler execution.",
+      ["stream", "subject", "kind", "status"],
+      buckets.handlerDuration
+    ),
+    publishDurationSeconds: histogram(
+      "publish_duration_seconds",
+      "Wall-clock duration of client publish/send operations.",
+      ["subject", "kind", "status"],
+      buckets.publishDuration
+    ),
+    rpcDurationSeconds: histogram(
+      "rpc_duration_seconds",
+      "Wall-clock duration of RPC round-trips from client perspective.",
+      ["subject", "status"],
+      buckets.rpcDuration
+    ),
+    consumerNumPending: gauge(
+      "consumer_num_pending",
+      "Messages not yet delivered to this consumer.",
+      ["stream", "consumer", "kind"]
+    ),
+    consumerNumAckPending: gauge(
+      "consumer_num_ack_pending",
+      "Messages delivered but not yet acked.",
+      ["stream", "consumer", "kind"]
+    ),
+    consumerNumRedelivered: gauge(
+      "consumer_num_redelivered",
+      "Messages currently in redelivery state.",
+      ["stream", "consumer", "kind"]
+    ),
+    consumerNumWaiting: gauge(
+      "consumer_num_waiting",
+      "Pull-request waiting count for this consumer.",
+      ["stream", "consumer", "kind"]
+    ),
+    streamMessages: gauge("stream_messages", "Total messages stored in this stream.", ["stream"]),
+    streamBytes: gauge("stream_bytes", "Total bytes stored in this stream.", ["stream"]),
+    connectionUp: gauge("connection_up", "NATS connection state (1 connected, 0 disconnected).", [
+      "server"
+    ]),
+    metricsPollErrorsTotal: counter(
+      "metrics_poll_errors_total",
+      "Errors encountered while polling JetStreamManager for gauge data.",
+      ["target"]
+    )
+  };
+};
+
+// src/metrics/poll-runner.ts
+var import_common9 = require("@nestjs/common");
+var PollRunner = class {
+  constructor(opts) {
+    this.opts = opts;
+  }
+  logger = new import_common9.Logger("Jetstream:Metrics:Poll");
+  timer = null;
+  inFlight = null;
+  start() {
+    if (this.timer !== null) return;
+    if (this.opts.intervalMs <= 0) return;
+    if (this.opts.targets.length === 0) return;
+    this.timer = setInterval(() => {
+      if (this.inFlight !== null) {
+        this.logger.warn("Skipping poll tick \u2014 previous cycle still in flight");
+        return;
+      }
+      this.inFlight = this.tick().finally(() => {
+        this.inFlight = null;
+      });
+    }, this.opts.intervalMs);
+  }
+  async stop() {
+    if (this.timer !== null) {
+      clearInterval(this.timer);
+      this.timer = null;
+    }
+    if (this.inFlight !== null) await this.inFlight;
+  }
+  /** @internal Visible for tests. Runs one poll cycle. */
+  async tick() {
+    let jsm;
+    try {
+      jsm = await this.opts.jsmFactory();
+    } catch {
+      this.recordPollError("jsm.connect");
+      return;
+    }
+    await Promise.all([this.pollConsumers(jsm), this.pollStreams(jsm)]);
+  }
+  async pollConsumers(jsm) {
+    for (const target of this.opts.targets) {
+      try {
+        const info = await jsm.consumers.info(target.stream, target.consumer);
+        const labels = {
+          stream: target.stream,
+          consumer: target.consumer,
+          kind: STREAM_KIND_LABEL[target.kind]
+        };
+        this.opts.metrics.consumerNumPending.labels(labels).set(info.num_pending);
+        this.opts.metrics.consumerNumAckPending.labels(labels).set(info.num_ack_pending);
+        this.opts.metrics.consumerNumRedelivered.labels(labels).set(info.num_redelivered);
+        this.opts.metrics.consumerNumWaiting.labels(labels).set(info.num_waiting);
+      } catch {
+        this.recordPollError("consumer.info");
+      }
+    }
+  }
+  async pollStreams(jsm) {
+    const uniqueStreams = new Set(this.opts.targets.map((t) => t.stream));
+    for (const stream of uniqueStreams) {
+      try {
+        const info = await jsm.streams.info(stream);
+        this.opts.metrics.streamMessages.labels({ stream }).set(info.state.messages);
+        this.opts.metrics.streamBytes.labels({ stream }).set(info.state.bytes);
+      } catch {
+        this.recordPollError("stream.info");
+      }
+    }
+  }
+  recordPollError(target) {
+    this.opts.metrics.metricsPollErrorsTotal.labels({ target }).inc();
+  }
+};
+
+// src/metrics/metrics.service.ts
+var JetstreamMetricsService = class {
+  constructor(eventBus, config, promClient, options, patternRegistry, connection = null) {
+    this.eventBus = eventBus;
+    this.config = config;
+    this.promClient = promClient;
+    this.options = options;
+    this.patternRegistry = patternRegistry;
+    this.connection = connection;
+  }
+  logger = new import_common10.Logger("Jetstream:Metrics");
+  metrics = null;
+  pollRunner = null;
+  activeServers = /* @__PURE__ */ new Set();
+  async onApplicationBootstrap() {
+    if (this.metrics !== null) return;
+    if (!this.options.metrics || !this.config || !this.promClient) return;
+    if (!this.config.register) {
+      throw new Error(
+        "JetstreamMetricsService requires a prom-client Registry \u2014 none was resolved by JetstreamMetricsModule."
+      );
+    }
+    this.metrics = createMetrics({
+      register: this.config.register,
+      promClient: this.promClient,
+      prefix: this.config.prefix,
+      defaultLabels: this.config.defaultLabels,
+      buckets: this.config.buckets
+    });
+    this.subscribeToEvents();
+    this.syncInitialConnectionState();
+    this.startPolling();
+    this.logger.log(
+      `Metrics enabled (prefix=${this.config.prefix ?? DEFAULT_METRICS_PREFIX}, poll=${this.getEffectivePollInterval()}ms)`
+    );
+  }
+  async onModuleDestroy() {
+    await this.pollRunner?.stop();
+    this.pollRunner = null;
+  }
+  /** @internal Visible for tests. `0` disables polling. */
+  getEffectivePollInterval() {
+    return this.config?.pollInterval ?? DEFAULT_POLL_INTERVAL_MS;
+  }
+  /**
+   * NATS connects during early bootstrap, before this service subscribes to
+   * the EventBus — the initial `Connect` emission misses us. Mirror the
+   * current state here so `connection_up` reflects reality the moment metrics
+   * come online; later disconnects/reconnects update it normally.
+   */
+  syncInitialConnectionState() {
+    const nc = this.connection?.unwrap;
+    if (!nc) return;
+    const server = nc.getServer();
+    this.activeServers.add(server);
+    this.metrics?.connectionUp.labels({ server }).set(1);
+  }
+  /** Skips polling for publisher-only deployments and when no kinds are active. */
+  startPolling() {
+    const interval = this.getEffectivePollInterval();
+    const connection = this.connection;
+    if (interval <= 0 || !this.patternRegistry || !connection || !this.metrics) return;
+    const targets = this.buildPollTargets();
+    if (targets.length === 0) return;
+    this.pollRunner = new PollRunner({
+      intervalMs: interval,
+      jsmFactory: async () => connection.getJetStreamManager(),
+      metrics: this.metrics,
+      targets
+    });
+    this.pollRunner.start();
+  }
+  buildPollTargets() {
+    const registry = this.patternRegistry;
+    if (!registry) return [];
+    const targets = [];
+    if (registry.hasEventHandlers()) {
+      targets.push({
+        kind: "ev" /* Event */,
+        stream: streamName(this.options.name, "ev" /* Event */),
+        consumer: consumerName(this.options.name, "ev" /* Event */)
+      });
+    }
+    if (registry.hasRpcHandlers() && isJetStreamRpcMode(this.options.rpc)) {
+      targets.push({
+        kind: "cmd" /* Command */,
+        stream: streamName(this.options.name, "cmd" /* Command */),
+        consumer: consumerName(this.options.name, "cmd" /* Command */)
+      });
+    }
+    if (registry.hasBroadcastHandlers()) {
+      targets.push({
+        kind: "broadcast" /* Broadcast */,
+        stream: streamName(this.options.name, "broadcast" /* Broadcast */),
+        consumer: consumerName(this.options.name, "broadcast" /* Broadcast */)
+      });
+    }
+    return targets;
+  }
+  subscribeToEvents() {
+    this.eventBus.subscribe("connect" /* Connect */, this.onConnect);
+    this.eventBus.subscribe("disconnect" /* Disconnect */, this.onDisconnect);
+    this.eventBus.subscribe("reconnect" /* Reconnect */, this.onReconnect);
+    this.eventBus.subscribe("error" /* Error */, this.onError);
+    this.eventBus.subscribe("rpcTimeout" /* RpcTimeout */, this.onRpcTimeout);
+    this.eventBus.subscribe("messageRouted" /* MessageRouted */, this.onMessageRouted);
+    this.eventBus.subscribe("deadLetter" /* DeadLetter */, this.onDeadLetter);
+    this.eventBus.subscribe("consumerRecovered" /* ConsumerRecovered */, this.onConsumerRecovered);
+    this.eventBus.subscribe("handlerCompleted" /* HandlerCompleted */, this.onHandlerCompleted);
+    this.eventBus.subscribe("published" /* Published */, this.onPublished);
+    this.eventBus.subscribe("rpcCompleted" /* RpcCompleted */, this.onRpcCompleted);
+  }
+  onConnect = (server) => {
+    this.activeServers.add(server);
+    this.metrics?.connectionUp.labels({ server }).set(1);
+  };
+  onReconnect = (server) => {
+    this.activeServers.add(server);
+    this.metrics?.connectionUp.labels({ server }).set(1);
+  };
+  onDisconnect = () => {
+    for (const server of this.activeServers) {
+      this.metrics?.connectionUp.labels({ server }).set(0);
+    }
+  };
+  onError = (_err, context7) => {
+    this.metrics?.errorsTotal.labels({ context: mapErrorContext(context7) }).inc();
+  };
+  onRpcTimeout = (subject, _correlationId) => {
+    const declared = this.resolveDeclared(subject);
+    const subjectLabel = declared?.pattern ?? UNMATCHED_SUBJECT_LABEL;
+    this.metrics?.rpcTimeoutTotal.labels({ subject: subjectLabel }).inc();
+  };
+  // `_kind` collapses broadcast/ordered into MessageKind.Event — we use
+  // declared.kind from PatternRegistry for the precise label instead.
+  onMessageRouted = (subject, _kind) => {
+    if (!this.metrics) return;
+    const declared = this.resolveDeclared(subject);
+    if (!declared) {
+      this.metrics.messagesUnhandledTotal.labels({ subject: UNMATCHED_SUBJECT_LABEL }).inc();
+      return;
+    }
+    this.metrics.messagesReceivedTotal.labels({
+      stream: streamName(this.options.name, declared.kind),
+      subject: declared.pattern,
+      kind: STREAM_KIND_LABEL[declared.kind]
+    }).inc();
+  };
+  onDeadLetter = (info) => {
+    const declared = this.resolveDeclared(info.subject);
+    const subjectLabel = declared?.pattern ?? UNMATCHED_SUBJECT_LABEL;
+    this.metrics?.messagesDeadLetterTotal.labels({ stream: info.stream, subject: subjectLabel }).inc();
+  };
+  onConsumerRecovered = (label, _attempts) => {
+    const kindLabel = STREAM_KIND_LABEL[label] ?? String(label);
+    this.metrics?.consumerRecoveredTotal.labels({ kind: kindLabel }).inc();
+  };
+  onHandlerCompleted = (pattern, kind, durationMs, status) => {
+    if (!this.metrics) return;
+    const stream = streamName(this.options.name, kind);
+    const kindLabel = STREAM_KIND_LABEL[kind];
+    const labels = { stream, subject: pattern, kind: kindLabel, status };
+    this.metrics.messagesProcessedTotal.labels(labels).inc();
+    this.metrics.handlerDurationSeconds.labels(labels).observe(durationMs / 1e3);
+  };
+  onPublished = (pattern, kind, durationMs, status) => {
+    if (!this.metrics) return;
+    const labels = { subject: pattern, kind: STREAM_KIND_LABEL[kind], status };
+    this.metrics.publishTotal.labels(labels).inc();
+    this.metrics.publishDurationSeconds.labels(labels).observe(durationMs / 1e3);
+  };
+  onRpcCompleted = (pattern, durationMs, status) => {
+    this.metrics?.rpcDurationSeconds.labels({ subject: pattern, status }).observe(durationMs / 1e3);
+  };
+  resolveDeclared(subject) {
+    return this.patternRegistry?.resolveDeclared(subject) ?? null;
   }
 };
-JetstreamHealthIndicator = __decorateClass([
-  (0, import_common7.Injectable)()
-], JetstreamHealthIndicator);
+JetstreamMetricsService = __decorateClass([
+  (0, import_common10.Injectable)(),
+  __decorateParam(1, (0, import_common10.Inject)(JETSTREAM_METRICS_CONFIG)),
+  __decorateParam(2, (0, import_common10.Inject)(JETSTREAM_METRICS_PROM_CLIENT)),
+  __decorateParam(3, (0, import_common10.Inject)(JETSTREAM_OPTIONS)),
+  __decorateParam(4, (0, import_common10.Optional)()),
+  __decorateParam(5, (0, import_common10.Optional)()),
+  __decorateParam(5, (0, import_common10.Inject)(JETSTREAM_CONNECTION))
+], JetstreamMetricsService);
+
+// src/metrics/metrics.module.ts
+var PROM_CLIENT_INSTALL_MESSAGE = "prom-client is required when JetstreamModule.forRoot({ metrics: ... }) is enabled. Install it with: pnpm add prom-client";
+var resolvePromClient = async () => {
+  try {
+    return await import("prom-client");
+  } catch {
+    throw new Error(PROM_CLIENT_INSTALL_MESSAGE);
+  }
+};
+var normalizeMetricsConfig = (option, promClient) => {
+  const user = option && option !== true ? option : {};
+  return {
+    register: user.register ?? promClient.register,
+    prefix: user.prefix ?? DEFAULT_METRICS_PREFIX,
+    defaultLabels: user.defaultLabels,
+    pollInterval: user.pollInterval ?? DEFAULT_POLL_INTERVAL_MS,
+    buckets: user.buckets
+  };
+};
+var JetstreamMetricsModule = class {
+  static forFeature() {
+    const promClientProvider = {
+      provide: JETSTREAM_METRICS_PROM_CLIENT,
+      inject: [JETSTREAM_OPTIONS],
+      useFactory: async (opts) => {
+        if (!opts.metrics) return null;
+        const mod = await resolvePromClient();
+        return { Counter: mod.Counter, Histogram: mod.Histogram, Gauge: mod.Gauge };
+      }
+    };
+    const configProvider = {
+      provide: JETSTREAM_METRICS_CONFIG,
+      inject: [JETSTREAM_OPTIONS],
+      useFactory: async (opts) => {
+        if (!opts.metrics) return null;
+        const mod = await resolvePromClient();
+        return normalizeMetricsConfig(opts.metrics, mod);
+      }
+    };
+    const registryProvider = {
+      provide: JETSTREAM_METRICS_REGISTRY,
+      inject: [JETSTREAM_METRICS_CONFIG],
+      useFactory: (cfg) => cfg?.register ?? null
+    };
+    const serviceProvider = {
+      provide: JetstreamMetricsService,
+      inject: [
+        JETSTREAM_EVENT_BUS,
+        JETSTREAM_METRICS_CONFIG,
+        JETSTREAM_METRICS_PROM_CLIENT,
+        JETSTREAM_OPTIONS,
+        { token: PatternRegistry, optional: true },
+        { token: JETSTREAM_CONNECTION, optional: true }
+      ],
+      useFactory: (eventBus, cfg, runtime, opts, patternRegistry, connection) => new JetstreamMetricsService(eventBus, cfg, runtime, opts, patternRegistry, connection)
+    };
+    return {
+      module: JetstreamMetricsModule,
+      providers: [promClientProvider, configProvider, registryProvider, serviceProvider],
+      exports: [
+        JetstreamMetricsService,
+        JETSTREAM_METRICS_CONFIG,
+        JETSTREAM_METRICS_REGISTRY,
+        JETSTREAM_METRICS_PROM_CLIENT
+      ]
+    };
+  }
+};
+JetstreamMetricsModule = __decorateClass([
+  (0, import_common11.Module)({})
+], JetstreamMetricsModule);
 
 // src/server/strategy.ts
 var import_microservices2 = require("@nestjs/microservices");
@@ -2302,6 +3071,26 @@ var JetstreamStrategy = class extends import_microservices2.Server {
     this.messageProvider.destroy();
     this.started = false;
   }
+  /**
+   * Override NestJS `Server.addHandler` to fail-fast on duplicate pattern registration.
+   *
+   * The base class silently overwrites duplicate RPC handlers (last wins) and appends
+   * duplicate event handlers to a linked list. Both behaviors are hazardous in a
+   * JetStream context: silent overwrite drops a handler the user wrote, and double
+   * event dispatch double-acks/double-processes the same JetStream message.
+   *
+   * We treat any pattern collision as a fatal misconfiguration so it surfaces at
+   * bootstrap instead of in production traffic.
+   */
+  addHandler(pattern, callback, isEventHandler = false, extras = {}) {
+    const normalizedPattern = this.normalizePattern(pattern);
+    if (this.messageHandlers.has(normalizedPattern)) {
+      throw new Error(
+        `Duplicate handler registered for pattern "${normalizedPattern}". Each @EventPattern() / @MessagePattern() value must be unique within a microservice \u2014 find and remove the second declaration.`
+      );
+    }
+    super.addHandler(pattern, callback, isEventHandler, extras);
+  }
   /**
    * Register event listener (required by Server base class).
    *
@@ -2374,7 +3163,7 @@ var JetstreamStrategy = class extends import_microservices2.Server {
 };
 
 // src/server/core-rpc.server.ts
-var import_common8 = require("@nestjs/common");
+var import_common12 = require("@nestjs/common");
 var import_transport_node3 = require("@nats-io/transport-node");
 
 // src/context/rpc.context.ts
@@ -2643,7 +3432,7 @@ var CoreRpcServer = class {
     this.serviceName = derived.serviceName;
     this.serverEndpoint = derived.serverEndpoint;
   }
-  logger = new import_common8.Logger("Jetstream:CoreRpc");
+  logger = new import_common12.Logger("Jetstream:CoreRpc");
   subscription = null;
   otel;
   serviceName;
@@ -2696,6 +3485,7 @@ var CoreRpcServer = class {
       return;
     }
     const ctx = new RpcContext([msg]);
+    const startedAt = performance.now();
     try {
       const raw = await withConsumeSpan(
         {
@@ -2714,6 +3504,7 @@ var CoreRpcServer = class {
         }
       );
       msg.respond(this.codec.encode(raw));
+      this.reportHandlerCompleted(msg, startedAt, "success");
     } catch (err) {
       this.eventBus.emit(
         "error" /* Error */,
@@ -2721,7 +3512,23 @@ var CoreRpcServer = class {
         `core-rpc-handler:${msg.subject}`
       );
       this.respondWithError(msg, err);
-    }
+      this.reportHandlerCompleted(msg, startedAt, "error");
+    }
+  }
+  // See EventRouter.reportHandlerCompleted for the rationale on declared
+  // pattern + per-emit hasHook check.
+  reportHandlerCompleted(msg, startedAt, status) {
+    if (!this.eventBus.hasHook("handlerCompleted" /* HandlerCompleted */)) return;
+    const declared = this.patternRegistry.resolveDeclared(msg.subject);
+    const pattern = declared?.pattern ?? msg.subject;
+    const kind = declared?.kind ?? "cmd" /* Command */;
+    this.eventBus.emit(
+      "handlerCompleted" /* HandlerCompleted */,
+      pattern,
+      kind,
+      performance.now() - startedAt,
+      status
+    );
   }
   /** Send an error response back to the caller with x-error header. */
   respondWithError(msg, error) {
@@ -2736,8 +3543,8 @@ var CoreRpcServer = class {
 };
 
 // src/server/infrastructure/stream.provider.ts
-var import_common10 = require("@nestjs/common");
-var import_jetstream14 = require("@nats-io/jetstream");
+var import_common14 = require("@nestjs/common");
+var import_jetstream17 = require("@nats-io/jetstream");
 
 // src/server/infrastructure/nats-error-codes.ts
 var NatsErrorCode = /* @__PURE__ */ ((NatsErrorCode2) => {
@@ -2803,8 +3610,8 @@ var isEqual = (a, b) => {
 };
 
 // src/server/infrastructure/stream-migration.ts
-var import_common9 = require("@nestjs/common");
-var import_jetstream13 = require("@nats-io/jetstream");
+var import_common13 = require("@nestjs/common");
+var import_jetstream16 = require("@nats-io/jetstream");
 var MIGRATION_BACKUP_SUFFIX = "__migration_backup";
 var DEFAULT_SOURCING_TIMEOUT_MS = 3e4;
 var SOURCING_POLL_INTERVAL_MS = 100;
@@ -2812,7 +3619,7 @@ var StreamMigration = class {
   constructor(sourcingTimeoutMs = DEFAULT_SOURCING_TIMEOUT_MS) {
     this.sourcingTimeoutMs = sourcingTimeoutMs;
   }
-  logger = new import_common9.Logger("Jetstream:Stream");
+  logger = new import_common13.Logger("Jetstream:Stream");
   async migrate(jsm, streamName2, newConfig) {
     const backupName = `${streamName2}${MIGRATION_BACKUP_SUFFIX}`;
     const startTime = Date.now();
@@ -2881,7 +3688,7 @@ var StreamMigration = class {
       this.logger.warn(`Found orphaned migration backup stream: ${backupName}, cleaning up`);
       await jsm.streams.delete(backupName);
     } catch (err) {
-      if (err instanceof import_jetstream13.JetStreamApiError && err.apiError().err_code === 10059 /* StreamNotFound */) {
+      if (err instanceof import_jetstream16.JetStreamApiError && err.apiError().err_code === 10059 /* StreamNotFound */) {
         return;
       }
       throw err;
@@ -2899,7 +3706,7 @@ var StreamProvider = class {
     this.otelServiceName = derived.serviceName;
     this.otelEndpoint = derived.serverEndpoint;
   }
-  logger = new import_common10.Logger("Jetstream:Stream");
+  logger = new import_common14.Logger("Jetstream:Stream");
   migration = new StreamMigration();
   otel;
   otelServiceName;
@@ -2964,7 +3771,7 @@ var StreamProvider = class {
           const currentInfo = await jsm.streams.info(config.name);
           return await this.handleExistingStream(jsm, currentInfo, config);
         } catch (err) {
-          if (err instanceof import_jetstream14.JetStreamApiError && err.apiError().err_code === 10059 /* StreamNotFound */) {
+          if (err instanceof import_jetstream17.JetStreamApiError && err.apiError().err_code === 10059 /* StreamNotFound */) {
             this.logger.log(`Creating stream: ${config.name}`);
             return await jsm.streams.add(config);
           }
@@ -2991,7 +3798,7 @@ var StreamProvider = class {
           const currentInfo = await jsm.streams.info(config.name);
           return await this.handleExistingStream(jsm, currentInfo, config);
         } catch (err) {
-          if (err instanceof import_jetstream14.JetStreamApiError && err.apiError().err_code === 10059 /* StreamNotFound */) {
+          if (err instanceof import_jetstream17.JetStreamApiError && err.apiError().err_code === 10059 /* StreamNotFound */) {
             this.logger.log(`Creating DLQ stream: ${config.name}`);
             return await jsm.streams.add(config);
           }
@@ -3154,8 +3961,8 @@ var StreamProvider = class {
 };
 
 // src/server/infrastructure/consumer.provider.ts
-var import_common11 = require("@nestjs/common");
-var import_jetstream16 = require("@nats-io/jetstream");
+var import_common15 = require("@nestjs/common");
+var import_jetstream19 = require("@nats-io/jetstream");
 var ConsumerProvider = class {
   constructor(options, connection, streamProvider, patternRegistry) {
     this.options = options;
@@ -3167,7 +3974,7 @@ var ConsumerProvider = class {
     this.otelServiceName = derived.serviceName;
     this.otelEndpoint = derived.serverEndpoint;
   }
-  logger = new import_common11.Logger("Jetstream:Consumer");
+  logger = new import_common15.Logger("Jetstream:Consumer");
   otel;
   otelServiceName;
   otelEndpoint;
@@ -3216,7 +4023,7 @@ var ConsumerProvider = class {
           this.logger.debug(`Consumer exists, updating: ${name}`);
           return await jsm.consumers.update(stream, name, config);
         } catch (err) {
-          if (!(err instanceof import_jetstream16.JetStreamApiError) || err.apiError().err_code !== 10014 /* ConsumerNotFound */) {
+          if (!(err instanceof import_jetstream19.JetStreamApiError) || err.apiError().err_code !== 10014 /* ConsumerNotFound */) {
             throw err;
           }
           return await this.createConsumer(jsm, stream, name, config);
@@ -3256,7 +4063,7 @@ var ConsumerProvider = class {
         try {
           return await jsm.consumers.info(stream, name);
         } catch (err) {
-          if (!(err instanceof import_jetstream16.JetStreamApiError) || err.apiError().err_code !== 10014 /* ConsumerNotFound */) {
+          if (!(err instanceof import_jetstream19.JetStreamApiError) || err.apiError().err_code !== 10014 /* ConsumerNotFound */) {
             throw err;
           }
           return await this.createConsumer(jsm, stream, name, config);
@@ -3277,7 +4084,7 @@ var ConsumerProvider = class {
         `Stream ${stream} is being migrated (backup ${backupName} exists). Waiting for migration to complete before recovering consumer.`
       );
     } catch (err) {
-      if (err instanceof import_jetstream16.JetStreamApiError && err.apiError().err_code === 10059 /* StreamNotFound */) {
+      if (err instanceof import_jetstream19.JetStreamApiError && err.apiError().err_code === 10059 /* StreamNotFound */) {
         return;
       }
       throw err;
@@ -3291,7 +4098,7 @@ var ConsumerProvider = class {
     try {
       return await jsm.consumers.add(stream, config);
     } catch (addErr) {
-      if (addErr instanceof import_jetstream16.JetStreamApiError && addErr.apiError().err_code === 10148 /* ConsumerAlreadyExists */) {
+      if (addErr instanceof import_jetstream19.JetStreamApiError && addErr.apiError().err_code === 10148 /* ConsumerAlreadyExists */) {
         this.logger.debug(`Consumer ${name} created by another pod, using existing`);
         return await jsm.consumers.info(stream, name);
       }
@@ -3378,8 +4185,8 @@ var ConsumerProvider = class {
 };
 
 // src/server/infrastructure/message.provider.ts
-var import_common12 = require("@nestjs/common");
-var import_jetstream18 = require("@nats-io/jetstream");
+var import_common16 = require("@nestjs/common");
+var import_jetstream21 = require("@nats-io/jetstream");
 var import_rxjs3 = require("rxjs");
 var MessageProvider = class {
   constructor(connection, eventBus, consumeOptionsMap = /* @__PURE__ */ new Map(), consumerRecoveryFn) {
@@ -3388,7 +4195,7 @@ var MessageProvider = class {
     this.consumeOptionsMap = consumeOptionsMap;
     this.consumerRecoveryFn = consumerRecoveryFn;
   }
-  logger = new import_common12.Logger("Jetstream:Message");
+  logger = new import_common16.Logger("Jetstream:Message");
   activeIterators = /* @__PURE__ */ new Set();
   orderedReadyResolve = null;
   orderedReadyReject = null;
@@ -3440,7 +4247,7 @@ var MessageProvider = class {
    */
   async startOrdered(streamName2, filterSubjects, orderedConfig) {
     const consumerOpts = { filter_subjects: filterSubjects };
-    if (orderedConfig?.deliverPolicy !== void 0 && orderedConfig.deliverPolicy !== import_jetstream18.DeliverPolicy.All) {
+    if (orderedConfig?.deliverPolicy !== void 0 && orderedConfig.deliverPolicy !== import_jetstream21.DeliverPolicy.All) {
       consumerOpts.deliver_policy = orderedConfig.deliverPolicy;
     }
     if (orderedConfig?.optStartSeq !== void 0) {
@@ -3486,10 +4293,13 @@ var MessageProvider = class {
   /** Create a self-healing consumer flow for a specific kind. */
   createFlow(kind, info) {
     const target$ = this.getTargetSubject(kind);
-    return this.createSelfHealingFlow(() => this.consumeOnce(kind, info, target$), info.name);
+    return this.createSelfHealingFlow(
+      (onConnected) => this.consumeOnce(kind, info, target$, onConnected),
+      info.name
+    );
   }
   /** Single iteration: get consumer -> pull messages -> emit to subject. */
-  async consumeOnce(kind, info, target$) {
+  async consumeOnce(kind, info, target$, onConnected) {
     const js = this.connection.getJetStreamClient();
     let consumer;
     let consumerName2 = info.name;
@@ -3517,6 +4327,7 @@ var MessageProvider = class {
     });
     this.activeIterators.add(messages);
     this.monitorConsumerHealth(messages, consumerName2);
+    onConnected();
     try {
       await messages.closed();
     } finally {
@@ -3571,7 +4382,7 @@ var MessageProvider = class {
   /** Create a self-healing ordered consumer flow. */
   createOrderedFlow(streamName2, consumerOpts) {
     return this.createSelfHealingFlow(
-      () => this.consumeOrderedOnce(streamName2, consumerOpts),
+      (onConnected) => this.consumeOrderedOnce(streamName2, consumerOpts, onConnected),
       "ordered" /* Ordered */,
       (err) => {
         if (this.orderedReadyReject) {
@@ -3585,10 +4396,15 @@ var MessageProvider = class {
   /** Shared self-healing flow: defer -> retry with exponential backoff on error/completion. */
   createSelfHealingFlow(source, label, onFirstError) {
     let consecutiveFailures = 0;
-    return (0, import_rxjs3.defer)(source).pipe(
-      (0, import_rxjs3.tap)(() => {
-        consecutiveFailures = 0;
-      }),
+    const onConnected = () => {
+      if (consecutiveFailures > 0) {
+        const attempts = consecutiveFailures;
+        this.logger.log(`Consumer ${label} recovered after ${attempts} failed attempt(s)`);
+        this.eventBus.emit("consumerRecovered" /* ConsumerRecovered */, label, attempts);
+      }
+      consecutiveFailures = 0;
+    };
+    return (0, import_rxjs3.defer)(() => source(onConnected)).pipe(
       (0, import_rxjs3.catchError)((err) => {
         consecutiveFailures++;
         this.logger.error(`Consumer ${label} error, will restart:`, err);
@@ -3611,7 +4427,7 @@ var MessageProvider = class {
     );
   }
   /** Single iteration: create ordered consumer -> push messages into the subject. */
-  async consumeOrderedOnce(streamName2, consumerOpts) {
+  async consumeOrderedOnce(streamName2, consumerOpts, onConnected) {
     const js = this.connection.getJetStreamClient();
     const consumer = await js.consumers.get(streamName2, consumerOpts);
     const orderedMessages$ = this.orderedMessages$;
@@ -3626,6 +4442,7 @@ var MessageProvider = class {
       this.orderedReadyReject = null;
     }
     this.activeIterators.add(messages);
+    onConnected();
     try {
       await messages.closed();
     } finally {
@@ -3635,7 +4452,7 @@ var MessageProvider = class {
 };
 
 // src/server/infrastructure/metadata.provider.ts
-var import_common13 = require("@nestjs/common");
+var import_common17 = require("@nestjs/common");
 var import_kv = require("@nats-io/kv");
 var MetadataProvider = class {
   constructor(options, connection) {
@@ -3644,7 +4461,7 @@ var MetadataProvider = class {
     this.replicas = options.metadata?.replicas ?? DEFAULT_METADATA_REPLICAS;
     this.ttl = Math.max(options.metadata?.ttl ?? DEFAULT_METADATA_TTL, MIN_METADATA_TTL);
   }
-  logger = new import_common13.Logger("Jetstream:Metadata");
+  logger = new import_common17.Logger("Jetstream:Metadata");
   bucketName;
   replicas;
   ttl;
@@ -3736,176 +4553,8 @@ var MetadataProvider = class {
   }
 };
 
-// src/server/routing/pattern-registry.ts
-var import_common14 = require("@nestjs/common");
-var HANDLER_LABELS = {
-  ["broadcast" /* Broadcast */]: "broadcast" /* Broadcast */,
-  ["ordered" /* Ordered */]: "ordered" /* Ordered */,
-  ["ev" /* Event */]: "event" /* Event */,
-  ["cmd" /* Command */]: "rpc" /* Rpc */
-};
-var PatternRegistry = class {
-  constructor(options) {
-    this.options = options;
-  }
-  logger = new import_common14.Logger("Jetstream:PatternRegistry");
-  registry = /* @__PURE__ */ new Map();
-  // Cached after registerHandlers() — the registry is immutable from that point
-  cachedPatterns = null;
-  _hasEvents = false;
-  _hasCommands = false;
-  _hasBroadcasts = false;
-  _hasOrdered = false;
-  _hasMetadata = false;
-  /**
-   * Register all handlers from the NestJS strategy.
-   *
-   * @param handlers Map of pattern -> MessageHandler from `Server.getHandlers()`.
-   */
-  registerHandlers(handlers) {
-    const serviceName = this.options.name;
-    for (const [pattern, handler] of handlers) {
-      const extras = handler.extras;
-      const isEvent = handler.isEventHandler ?? false;
-      const isBroadcast = !!extras?.broadcast;
-      const isOrdered = !!extras?.ordered;
-      const meta = extras?.meta;
-      if (isBroadcast && isOrdered) {
-        throw new Error(
-          `Handler "${pattern}" cannot be both broadcast and ordered. Use one or the other.`
-        );
-      }
-      let kind;
-      if (isBroadcast) kind = "broadcast" /* Broadcast */;
-      else if (isOrdered) kind = "ordered" /* Ordered */;
-      else if (isEvent) kind = "ev" /* Event */;
-      else kind = "cmd" /* Command */;
-      const fullSubject = kind === "broadcast" /* Broadcast */ ? buildBroadcastSubject(pattern) : buildSubject(serviceName, kind, pattern);
-      this.registry.set(fullSubject, {
-        handler,
-        pattern,
-        isEvent: isEvent && !isOrdered,
-        isBroadcast,
-        isOrdered,
-        meta
-      });
-      this.logger.debug(`Registered ${HANDLER_LABELS[kind]}: ${pattern} -> ${fullSubject}`);
-    }
-    this.cachedPatterns = this.buildPatternsByKind();
-    this._hasEvents = this.cachedPatterns.events.length > 0;
-    this._hasCommands = this.cachedPatterns.commands.length > 0;
-    this._hasBroadcasts = this.cachedPatterns.broadcasts.length > 0;
-    this._hasOrdered = this.cachedPatterns.ordered.length > 0;
-    this._hasMetadata = [...this.registry.values()].some((entry) => entry.meta !== void 0);
-    this.logSummary();
-  }
-  /** Find handler for a full NATS subject. */
-  getHandler(subject) {
-    return this.registry.get(subject)?.handler ?? null;
-  }
-  /** Get all registered broadcast patterns (for consumer filter_subject setup). */
-  getBroadcastPatterns() {
-    return this.getPatternsByKind().broadcasts.map((p) => buildBroadcastSubject(p));
-  }
-  hasBroadcastHandlers() {
-    return this._hasBroadcasts;
-  }
-  hasRpcHandlers() {
-    return this._hasCommands;
-  }
-  hasEventHandlers() {
-    return this._hasEvents;
-  }
-  hasOrderedHandlers() {
-    return this._hasOrdered;
-  }
-  /** Get fully-qualified NATS subjects for ordered handlers. */
-  getOrderedSubjects() {
-    return this.getPatternsByKind().ordered.map(
-      (p) => buildSubject(this.options.name, "ordered" /* Ordered */, p)
-    );
-  }
-  /** Check if any registered handler has metadata. */
-  hasMetadata() {
-    return this._hasMetadata;
-  }
-  /**
-   * Get handler metadata entries for KV publishing.
-   *
-   * Returns a map of KV key -> metadata object for all handlers that have `meta`.
-   * Key format: `{serviceName}.{kind}.{pattern}`.
-   */
-  getMetadataEntries() {
-    const entries = /* @__PURE__ */ new Map();
-    for (const entry of this.registry.values()) {
-      if (!entry.meta) continue;
-      const kind = this.resolveStreamKind(entry);
-      const key = metadataKey(this.options.name, kind, entry.pattern);
-      entries.set(key, entry.meta);
-    }
-    return entries;
-  }
-  /** Get patterns grouped by kind (cached after registration). */
-  getPatternsByKind() {
-    const patterns = this.cachedPatterns ?? this.buildPatternsByKind();
-    return {
-      events: [...patterns.events],
-      commands: [...patterns.commands],
-      broadcasts: [...patterns.broadcasts],
-      ordered: [...patterns.ordered]
-    };
-  }
-  /** Normalize a full NATS subject back to the user-facing pattern. */
-  normalizeSubject(subject) {
-    const name = internalName(this.options.name);
-    const prefixes = [
-      `${name}.${"cmd" /* Command */}.`,
-      `${name}.${"ev" /* Event */}.`,
-      `${name}.${"ordered" /* Ordered */}.`,
-      `${"broadcast" /* Broadcast */}.`
-    ];
-    for (const prefix of prefixes) {
-      if (subject.startsWith(prefix)) {
-        return subject.slice(prefix.length);
-      }
-    }
-    return subject;
-  }
-  buildPatternsByKind() {
-    const events = [];
-    const commands = [];
-    const broadcasts = [];
-    const ordered = [];
-    for (const entry of this.registry.values()) {
-      if (entry.isBroadcast) broadcasts.push(entry.pattern);
-      else if (entry.isOrdered) ordered.push(entry.pattern);
-      else if (entry.isEvent) events.push(entry.pattern);
-      else commands.push(entry.pattern);
-    }
-    return { events, commands, broadcasts, ordered };
-  }
-  resolveStreamKind(entry) {
-    if (entry.isBroadcast) return "broadcast" /* Broadcast */;
-    if (entry.isOrdered) return "ordered" /* Ordered */;
-    if (entry.isEvent) return "ev" /* Event */;
-    return "cmd" /* Command */;
-  }
-  logSummary() {
-    const { events, commands, broadcasts, ordered } = this.getPatternsByKind();
-    const parts = [
-      `${commands.length} RPC`,
-      `${events.length} events`,
-      `${broadcasts.length} broadcasts`
-    ];
-    if (ordered.length > 0) {
-      parts.push(`${ordered.length} ordered`);
-    }
-    this.logger.log(`Registered handlers: ${parts.join(", ")}`);
-  }
-};
-
 // src/server/routing/event.router.ts
-var import_common15 = require("@nestjs/common");
+var import_common18 = require("@nestjs/common");
 var import_transport_node4 = require("@nats-io/transport-node");
 var eventConsumeKindFor = (kind) => {
   if (kind === "broadcast" /* Broadcast */) return "broadcast" /* Broadcast */;
@@ -3934,7 +4583,7 @@ var EventRouter = class {
       this.serverEndpoint = null;
     }
   }
-  logger = new import_common15.Logger("Jetstream:EventRouter");
+  logger = new import_common18.Logger("Jetstream:EventRouter");
   subscriptions = [];
   otel;
   serviceName;
@@ -3978,7 +4627,14 @@ var EventRouter = class {
     const hasAckExtension = ackExtensionInterval !== null && ackExtensionInterval > 0;
     const concurrency = this.getConcurrency(kind);
     const hasDlqCheck = deadLetterConfig !== void 0;
-    const emitRouted = eventBus.hasHook("messageRouted" /* MessageRouted */);
+    const reportHandlerCompleted = (msg, startedAt, status) => {
+      if (!eventBus.hasHook("handlerCompleted" /* HandlerCompleted */)) return;
+      const declared = patternRegistry.resolveDeclared(msg.subject);
+      const pattern = declared?.pattern ?? msg.subject;
+      const declaredKind = declared?.kind ?? kind;
+      const durationMs = performance.now() - startedAt;
+      eventBus.emit("handlerCompleted" /* HandlerCompleted */, pattern, declaredKind, durationMs, status);
+    };
     const isDeadLetter = (msg) => {
       if (!hasDlqCheck) return false;
       const maxDeliver = deadLetterConfig.maxDeliverByStream?.get(msg.info.stream);
@@ -4015,7 +4671,7 @@ var EventRouter = class {
           logger5.error(`Decode error for ${subject}:`, err);
           return null;
         }
-        if (emitRouted) eventBus.emitMessageRouted(subject, "event" /* Event */);
+        eventBus.emitMessageRouted(subject, "event" /* Event */);
         return { handler, data };
       } catch (err) {
         logger5.error(`Unexpected error in ${kind} event router`, err);
@@ -4027,12 +4683,18 @@ var EventRouter = class {
         return null;
       }
     };
+    const statusForContext = (ctx) => {
+      if (ctx.shouldTerminate) return "terminated";
+      if (ctx.shouldRetry) return "retried";
+      return "success";
+    };
     const handleSafe = (msg) => {
       const resolved = resolveEvent(msg);
       if (resolved === null) return void 0;
       const { handler, data } = resolved;
       const ctx = new RpcContext([msg]);
       const stopAckExtension = hasAckExtension ? startAckExtensionTimer(msg, ackExtensionInterval) : null;
+      const startedAt = performance.now();
       let pending;
       try {
         pending = withConsumeSpan(
@@ -4055,18 +4717,21 @@ var EventRouter = class {
           err instanceof Error ? err : new Error(String(err)),
           `${kind}-handler:${msg.subject}`
         );
+        reportHandlerCompleted(msg, startedAt, "error");
         return settleFailure(msg, data, err).finally(() => {
           if (stopAckExtension !== null) stopAckExtension();
         });
       }
       if (!isPromiseLike2(pending)) {
         settleSuccess(msg, ctx);
+        reportHandlerCompleted(msg, startedAt, statusForContext(ctx));
         if (stopAckExtension !== null) stopAckExtension();
         return void 0;
       }
       return pending.then(
         () => {
           settleSuccess(msg, ctx);
+          reportHandlerCompleted(msg, startedAt, statusForContext(ctx));
           if (stopAckExtension !== null) stopAckExtension();
         },
         async (err) => {
@@ -4075,6 +4740,7 @@ var EventRouter = class {
             err instanceof Error ? err : new Error(String(err)),
             `${kind}-handler:${msg.subject}`
           );
+          reportHandlerCompleted(msg, startedAt, "error");
           try {
             await settleFailure(msg, data, err);
           } finally {
@@ -4099,7 +4765,7 @@ var EventRouter = class {
           logger5.error(`Decode error for ${subject}:`, err);
           return void 0;
         }
-        if (emitRouted) eventBus.emitMessageRouted(subject, "event" /* Event */);
+        eventBus.emitMessageRouted(subject, "event" /* Event */);
       } catch (err) {
         logger5.error(`Ordered handler error (${subject}):`, err);
         return void 0;
@@ -4112,6 +4778,7 @@ var EventRouter = class {
           );
         }
       };
+      const startedAt = performance.now();
       let pending;
       try {
         pending = withConsumeSpan(
@@ -4130,15 +4797,24 @@ var EventRouter = class {
         );
       } catch (err) {
         logger5.error(`Ordered handler error (${subject}):`, err);
+        reportHandlerCompleted(msg, startedAt, "error");
         return void 0;
       }
       if (!isPromiseLike2(pending)) {
         warnIfSettlementAttempted();
+        reportHandlerCompleted(msg, startedAt, "success");
         return void 0;
       }
-      return pending.then(warnIfSettlementAttempted, (err) => {
-        logger5.error(`Ordered handler error (${subject}):`, err);
-      });
+      return pending.then(
+        () => {
+          warnIfSettlementAttempted();
+          reportHandlerCompleted(msg, startedAt, "success");
+        },
+        (err) => {
+          logger5.error(`Ordered handler error (${subject}):`, err);
+          reportHandlerCompleted(msg, startedAt, "error");
+        }
+      );
     };
     const route = isOrdered ? handleOrderedSafe : handleSafe;
     const maxActive = isOrdered ? 1 : concurrency ?? Number.POSITIVE_INFINITY;
@@ -4324,7 +5000,7 @@ var EventRouter = class {
 };
 
 // src/server/routing/rpc.router.ts
-var import_common16 = require("@nestjs/common");
+var import_common19 = require("@nestjs/common");
 var import_transport_node5 = require("@nats-io/transport-node");
 var RpcRouter = class {
   constructor(messageProvider, patternRegistry, connection, codec, eventBus, rpcOptions, ackWaitMap, options) {
@@ -4348,7 +5024,7 @@ var RpcRouter = class {
       this.serverEndpoint = null;
     }
   }
-  logger = new import_common16.Logger("Jetstream:RpcRouter");
+  logger = new import_common19.Logger("Jetstream:RpcRouter");
   timeout;
   concurrency;
   resolvedAckExtensionInterval;
@@ -4384,6 +5060,19 @@ var RpcRouter = class {
     const emitRpcTimeout = (subject, correlationId) => {
       eventBus.emit("rpcTimeout" /* RpcTimeout */, subject, correlationId);
     };
+    const reportHandlerCompleted = (msg, startedAt, status) => {
+      if (!eventBus.hasHook("handlerCompleted" /* HandlerCompleted */)) return;
+      const declared = patternRegistry.resolveDeclared(msg.subject);
+      const pattern = declared?.pattern ?? msg.subject;
+      const declaredKind = declared?.kind ?? "cmd" /* Command */;
+      eventBus.emit(
+        "handlerCompleted" /* HandlerCompleted */,
+        pattern,
+        declaredKind,
+        performance.now() - startedAt,
+        status
+      );
+    };
     const publishReply = (replyTo, correlationId, payload) => {
       try {
         const hdrs = (0, import_transport_node5.headers)();
@@ -4447,6 +5136,7 @@ var RpcRouter = class {
       const subject = msg.subject;
       const ctx = new RpcContext([msg]);
       const stopAckExtension = hasAckExtension ? startAckExtensionTimer(msg, ackExtensionInterval) : null;
+      const startedAt = performance.now();
       const reportHandlerError = (err) => {
         eventBus.emit(
           "error" /* Error */,
@@ -4477,12 +5167,14 @@ var RpcRouter = class {
       } catch (err) {
         if (stopAckExtension !== null) stopAckExtension();
         reportHandlerError(err);
+        reportHandlerCompleted(msg, startedAt, "error");
         return void 0;
       }
       if (!isPromiseLike2(pending)) {
         if (stopAckExtension !== null) stopAckExtension();
         msg.ack();
         publishReply(replyTo, correlationId, pending);
+        reportHandlerCompleted(msg, startedAt, "success");
         return void 0;
       }
       let settled = false;
@@ -4493,6 +5185,7 @@ var RpcRouter = class {
         abortController.abort();
         emitRpcTimeout(subject, correlationId);
         msg.term("Handler timeout");
+        reportHandlerCompleted(msg, startedAt, "terminated");
       }, timeout);
       return pending.then(
         (result) => {
@@ -4502,6 +5195,7 @@ var RpcRouter = class {
           if (stopAckExtension !== null) stopAckExtension();
           msg.ack();
           publishReply(replyTo, correlationId, result);
+          reportHandlerCompleted(msg, startedAt, "success");
         },
         (err) => {
           if (settled) return;
@@ -4509,6 +5203,7 @@ var RpcRouter = class {
           clearTimeout(timeoutId);
           if (stopAckExtension !== null) stopAckExtension();
           reportHandlerError(err);
+          reportHandlerCompleted(msg, startedAt, "error");
         }
       );
     };
@@ -4568,14 +5263,14 @@ var RpcRouter = class {
 };
 
 // src/shutdown/shutdown.manager.ts
-var import_common17 = require("@nestjs/common");
+var import_common20 = require("@nestjs/common");
 var ShutdownManager = class {
   constructor(connection, eventBus, timeout) {
     this.connection = connection;
     this.eventBus = eventBus;
     this.timeout = timeout;
   }
-  logger = new import_common17.Logger("Jetstream:Shutdown");
+  logger = new import_common20.Logger("Jetstream:Shutdown");
   shutdownPromise;
   /**
    * Execute the full shutdown sequence.
@@ -4629,12 +5324,14 @@ var JetstreamModule = class {
     return {
       module: JetstreamModule,
       global: true,
+      imports: [JetstreamMetricsModule.forFeature()],
       providers,
       exports: [
         JETSTREAM_CONNECTION,
         JETSTREAM_CODEC,
         JETSTREAM_EVENT_BUS,
         JETSTREAM_OPTIONS,
+        PatternRegistry,
         ShutdownManager,
         JetstreamStrategy,
         JetstreamHealthIndicator
@@ -4656,13 +5353,14 @@ var JetstreamModule = class {
     return {
       module: JetstreamModule,
       global: true,
-      imports: asyncOptions.imports ?? [],
+      imports: [...asyncOptions.imports ?? [], JetstreamMetricsModule.forFeature()],
       providers: [...asyncProviders, ...coreProviders],
       exports: [
         JETSTREAM_CONNECTION,
         JETSTREAM_CODEC,
         JETSTREAM_EVENT_BUS,
         JETSTREAM_OPTIONS,
+        PatternRegistry,
         ShutdownManager,
         JetstreamStrategy,
         JetstreamHealthIndicator
@@ -4711,7 +5409,7 @@ var JetstreamModule = class {
         provide: JETSTREAM_EVENT_BUS,
         inject: [JETSTREAM_OPTIONS],
         useFactory: (options) => {
-          const logger5 = new import_common18.Logger("Jetstream:Module");
+          const logger5 = new import_common21.Logger("Jetstream:Module");
           return new EventBus(logger5, options.hooks);
         }
       },
@@ -5005,12 +5703,12 @@ var JetstreamModule = class {
   }
 };
 JetstreamModule = __decorateClass([
-  (0, import_common18.Global)(),
-  (0, import_common18.Module)({}),
-  __decorateParam(0, (0, import_common18.Optional)()),
-  __decorateParam(0, (0, import_common18.Inject)(ShutdownManager)),
-  __decorateParam(1, (0, import_common18.Optional)()),
-  __decorateParam(1, (0, import_common18.Inject)(JetstreamStrategy))
+  (0, import_common21.Global)(),
+  (0, import_common21.Module)({}),
+  __decorateParam(0, (0, import_common21.Optional)()),
+  __decorateParam(0, (0, import_common21.Inject)(ShutdownManager)),
+  __decorateParam(1, (0, import_common21.Optional)()),
+  __decorateParam(1, (0, import_common21.Inject)(JetstreamStrategy))
 ], JetstreamModule);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {