@blokjs/trigger-pubsub 0.2.3 → 0.6.2

package/dist/adapters/factory.js

@@ -0,0 +1,80 @@
+/**
+ * v0.7 PR 6 — pub/sub adapter factory.
+ *
+ * Resolves a `provider` string to a concrete `PubSubAdapter` instance.
+ * Used by `PubSubTrigger` (per-workflow provider dispatch) and by the
+ * `@blokjs/pubsub-publish` helper.
+ *
+ * Provider resolution order:
+ *   1. Explicit `provider` field on the workflow.
+ *   2. `BLOK_PUBSUB_ADAPTER` env var.
+ *   3. `"nats"` fallback (cheapest infra; matches the v0.7 plan's
+ *      "default for pub/sub" recommendation).
+ *
+ * Each adapter lazy-imports its broker SDK on first use; workflows
+ * that don't use a given provider don't pay the install cost.
+ */
+import { AWSSNSAdapter } from "./AWSSNSAdapter";
+import { AzureServiceBusAdapter } from "./AzureServiceBusAdapter";
+import { GCPPubSubAdapter } from "./GCPPubSubAdapter";
+import { KafkaPubSubAdapter } from "./KafkaPubSubAdapter";
+import { NATSPubSubAdapter } from "./NATSPubSubAdapter";
+import { RedisStreamsPubSubAdapter } from "./RedisStreamsPubSubAdapter";
+export function resolveProvider(provider) {
+    if (provider)
+        return provider;
+    const envValue = process.env.BLOK_PUBSUB_ADAPTER;
+    if (envValue && isPubSubProvider(envValue))
+        return envValue;
+    return "nats";
+}
+function isPubSubProvider(value) {
+    return (value === "nats" ||
+        value === "redis-streams" ||
+        value === "kafka" ||
+        value === "gcp" ||
+        value === "aws" ||
+        value === "azure");
+}
+export function createPubSubAdapter(provider) {
+    switch (provider) {
+        case "nats":
+            return new NATSPubSubAdapter();
+        case "redis-streams":
+            return new RedisStreamsPubSubAdapter();
+        case "kafka":
+            return new KafkaPubSubAdapter();
+        case "gcp":
+            return new GCPPubSubAdapter();
+        case "aws":
+            return new AWSSNSAdapter();
+        case "azure":
+            return new AzureServiceBusAdapter();
+        default: {
+            const exhaustive = provider;
+            throw new Error(`[blok][pubsub] unknown provider "${exhaustive}". Check PubSubProviderSchema.`);
+        }
+    }
+}
+/**
+ * Process-singleton adapter pool — one instance per provider. The
+ * trigger calls `getOrCreateAdapter("nats")` once per workflow, and
+ * subsequent workflows on the same provider share the broker
+ * connection.
+ */
+const pool = new Map();
+export function getOrCreateAdapter(provider) {
+    let adapter = pool.get(provider);
+    if (!adapter) {
+        adapter = createPubSubAdapter(provider);
+        pool.set(provider, adapter);
+    }
+    return adapter;
+}
+export function _resetAdapterPoolForTests() {
+    for (const adapter of pool.values()) {
+        void adapter.disconnect?.().catch(() => { });
+    }
+    pool.clear();
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hZGFwdGVycy9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7Ozs7Ozs7R0FlRztBQUlILE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNoRCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUMxRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN4RCxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUV4RSxNQUFNLFVBQVUsZUFBZSxDQUFDLFFBQXlCO0lBQ3hELElBQUksUUFBUTtRQUFFLE9BQU8sUUFBUSxDQUFDO0lBQzlCLE1BQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsbUJBQW1CLENBQUM7SUFDakQsSUFBSSxRQUFRLElBQUksZ0JBQWdCLENBQUMsUUFBUSxDQUFDO1FBQUUsT0FBTyxRQUFRLENBQUM7SUFDNUQsT0FBTyxNQUFNLENBQUM7QUFDZixDQUFDO0FBRUQsU0FBUyxnQkFBZ0IsQ0FBQyxLQUFhO0lBQ3RDLE9BQU8sQ0FDTixLQUFLLEtBQUssTUFBTTtRQUNoQixLQUFLLEtBQUssZUFBZTtRQUN6QixLQUFLLEtBQUssT0FBTztRQUNqQixLQUFLLEtBQUssS0FBSztRQUNmLEtBQUssS0FBSyxLQUFLO1FBQ2YsS0FBSyxLQUFLLE9BQU8sQ0FDakIsQ0FBQztBQUNILENBQUM7QUFFRCxNQUFNLFVBQVUsbUJBQW1CLENBQUMsUUFBd0I7SUFDM0QsUUFBUSxRQUFRLEVBQUUsQ0FBQztRQUNsQixLQUFLLE1BQU07WUFDVixPQUFPLElBQUksaUJBQWlCLEVBQUUsQ0FBQztRQUNoQyxLQUFLLGVBQWU7WUFDbkIsT0FBTyxJQUFJLHlCQUF5QixFQUFFLENBQUM7UUFDeEMsS0FBSyxPQUFPO1lBQ1gsT0FBTyxJQUFJLGtCQUFrQixFQUFFLENBQUM7UUFDakMsS0FBSyxLQUFLO1lBQ1QsT0FBTyxJQUFJLGdCQUFnQixFQUFFLENBQUM7UUFDL0IsS0FBSyxLQUFLO1lBQ1QsT0FBTyxJQUFJLGFBQWEsRUFBRSxDQUFDO1FBQzVCLEtBQUssT0FBTztZQUNYLE9BQU8sSUFBSSxzQkFBc0IsRUFBRSxDQUFDO1FBQ3JDLE9BQU8sQ0FBQyxDQUFDLENBQUM7WUFDVCxNQUFNLFVBQVUsR0FBVSxRQUFRLENBQUM7WUFDbkMsTUFBTSxJQUFJLEtBQUssQ0FBQyxvQ0FBb0MsVUFBb0IsZ0NBQWdDLENBQUMsQ0FBQztRQUMzRyxDQUFDO0lBQ0YsQ0FBQztBQUNGLENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sSUFBSSxHQUF1QyxJQUFJLEdBQUcsRUFBRSxDQUFDO0FBRTNELE1BQU0sVUFBVSxrQkFBa0IsQ0FBQyxRQUF3QjtJQUMxRCxJQUFJLE9BQU8sR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2pDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNkLE9BQU8sR0FBRyxtQkFBbUIsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUN4QyxJQUFJLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUM3QixDQUFDO0lBQ0QsT0FBTyxPQUFPLENBQUM7QUFDaEIsQ0FBQztBQUVELE1BQU0sVUFBVSx5QkFBeUI7SUFDeEMsS0FBSyxNQUFNLE9BQU8sSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQztRQUNyQyxLQUFLLE9BQU8sQ0FBQyxVQUFVLEVBQUUsRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsR0FBRSxDQUFDLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBQ0QsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO0FBQ2QsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogdjAuNyBQUiA2IOKAlCBwdWIvc3ViIGFkYXB0ZXIgZmFjdG9yeS5cbiAqXG4gKiBSZXNvbHZlcyBhIGBwcm92aWRlcmAgc3RyaW5nIHRvIGEgY29uY3JldGUgYFB1YlN1YkFkYXB0ZXJgIGluc3RhbmNlLlxuICogVXNlZCBieSBgUHViU3ViVHJpZ2dlcmAgKHBlci13b3JrZmxvdyBwcm92aWRlciBkaXNwYXRjaCkgYW5kIGJ5IHRoZVxuICogYEBibG9ranMvcHVic3ViLXB1Ymxpc2hgIGhlbHBlci5cbiAqXG4gKiBQcm92aWRlciByZXNvbHV0aW9uIG9yZGVyOlxuICogICAxLiBFeHBsaWNpdCBgcHJvdmlkZXJgIGZpZWxkIG9uIHRoZSB3b3JrZmxvdy5cbiAqICAgMi4gYEJMT0tfUFVCU1VCX0FEQVBURVJgIGVudiB2YXIuXG4gKiAgIDMuIGBcIm5hdHNcImAgZmFsbGJhY2sgKGNoZWFwZXN0IGluZnJhOyBtYXRjaGVzIHRoZSB2MC43IHBsYW4nc1xuICogICAgICBcImRlZmF1bHQgZm9yIHB1Yi9zdWJcIiByZWNvbW1lbmRhdGlvbikuXG4gKlxuICogRWFjaCBhZGFwdGVyIGxhenktaW1wb3J0cyBpdHMgYnJva2VyIFNESyBvbiBmaXJzdCB1c2U7IHdvcmtmbG93c1xuICogdGhhdCBkb24ndCB1c2UgYSBnaXZlbiBwcm92aWRlciBkb24ndCBwYXkgdGhlIGluc3RhbGwgY29zdC5cbiAqL1xuXG5pbXBvcnQgdHlwZSB7IFB1YlN1YlByb3ZpZGVyIH0gZnJvbSBcIkBibG9ranMvaGVscGVyXCI7XG5pbXBvcnQgdHlwZSB7IFB1YlN1YkFkYXB0ZXIgfSBmcm9tIFwiLi4vUHViU3ViVHJpZ2dlclwiO1xuaW1wb3J0IHsgQVdTU05TQWRhcHRlciB9IGZyb20gXCIuL0FXU1NOU0FkYXB0ZXJcIjtcbmltcG9ydCB7IEF6dXJlU2VydmljZUJ1c0FkYXB0ZXIgfSBmcm9tIFwiLi9BenVyZVNlcnZpY2VCdXNBZGFwdGVyXCI7XG5pbXBvcnQgeyBHQ1BQdWJTdWJBZGFwdGVyIH0gZnJvbSBcIi4vR0NQUHViU3ViQWRhcHRlclwiO1xuaW1wb3J0IHsgS2Fma2FQdWJTdWJBZGFwdGVyIH0gZnJvbSBcIi4vS2Fma2FQdWJTdWJBZGFwdGVyXCI7XG5pbXBvcnQgeyBOQVRTUHViU3ViQWRhcHRlciB9IGZyb20gXCIuL05BVFNQdWJTdWJBZGFwdGVyXCI7XG5pbXBvcnQgeyBSZWRpc1N0cmVhbXNQdWJTdWJBZGFwdGVyIH0gZnJvbSBcIi4vUmVkaXNTdHJlYW1zUHViU3ViQWRhcHRlclwiO1xuXG5leHBvcnQgZnVuY3Rpb24gcmVzb2x2ZVByb3ZpZGVyKHByb3ZpZGVyPzogUHViU3ViUHJvdmlkZXIpOiBQdWJTdWJQcm92aWRlciB7XG5cdGlmIChwcm92aWRlcikgcmV0dXJuIHByb3ZpZGVyO1xuXHRjb25zdCBlbnZWYWx1ZSA9IHByb2Nlc3MuZW52LkJMT0tfUFVCU1VCX0FEQVBURVI7XG5cdGlmIChlbnZWYWx1ZSAmJiBpc1B1YlN1YlByb3ZpZGVyKGVudlZhbHVlKSkgcmV0dXJuIGVudlZhbHVlO1xuXHRyZXR1cm4gXCJuYXRzXCI7XG59XG5cbmZ1bmN0aW9uIGlzUHViU3ViUHJvdmlkZXIodmFsdWU6IHN0cmluZyk6IHZhbHVlIGlzIFB1YlN1YlByb3ZpZGVyIHtcblx0cmV0dXJuIChcblx0XHR2YWx1ZSA9PT0gXCJuYXRzXCIgfHxcblx0XHR2YWx1ZSA9PT0gXCJyZWRpcy1zdHJlYW1zXCIgfHxcblx0XHR2YWx1ZSA9PT0gXCJrYWZrYVwiIHx8XG5cdFx0dmFsdWUgPT09IFwiZ2NwXCIgfHxcblx0XHR2YWx1ZSA9PT0gXCJhd3NcIiB8fFxuXHRcdHZhbHVlID09PSBcImF6dXJlXCJcblx0KTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNyZWF0ZVB1YlN1YkFkYXB0ZXIocHJvdmlkZXI6IFB1YlN1YlByb3ZpZGVyKTogUHViU3ViQWRhcHRlciB7XG5cdHN3aXRjaCAocHJvdmlkZXIpIHtcblx0XHRjYXNlIFwibmF0c1wiOlxuXHRcdFx0cmV0dXJuIG5ldyBOQVRTUHViU3ViQWRhcHRlcigpO1xuXHRcdGNhc2UgXCJyZWRpcy1zdHJlYW1zXCI6XG5cdFx0XHRyZXR1cm4gbmV3IFJlZGlzU3RyZWFtc1B1YlN1YkFkYXB0ZXIoKTtcblx0XHRjYXNlIFwia2Fma2FcIjpcblx0XHRcdHJldHVybiBuZXcgS2Fma2FQdWJTdWJBZGFwdGVyKCk7XG5cdFx0Y2FzZSBcImdjcFwiOlxuXHRcdFx0cmV0dXJuIG5ldyBHQ1BQdWJTdWJBZGFwdGVyKCk7XG5cdFx0Y2FzZSBcImF3c1wiOlxuXHRcdFx0cmV0dXJuIG5ldyBBV1NTTlNBZGFwdGVyKCk7XG5cdFx0Y2FzZSBcImF6dXJlXCI6XG5cdFx0XHRyZXR1cm4gbmV3IEF6dXJlU2VydmljZUJ1c0FkYXB0ZXIoKTtcblx0XHRkZWZhdWx0OiB7XG5cdFx0XHRjb25zdCBleGhhdXN0aXZlOiBuZXZlciA9IHByb3ZpZGVyO1xuXHRcdFx0dGhyb3cgbmV3IEVycm9yKGBbYmxva11bcHVic3ViXSB1bmtub3duIHByb3ZpZGVyIFwiJHtleGhhdXN0aXZlIGFzIHN0cmluZ31cIi4gQ2hlY2sgUHViU3ViUHJvdmlkZXJTY2hlbWEuYCk7XG5cdFx0fVxuXHR9XG59XG5cbi8qKlxuICogUHJvY2Vzcy1zaW5nbGV0b24gYWRhcHRlciBwb29sIOKAlCBvbmUgaW5zdGFuY2UgcGVyIHByb3ZpZGVyLiBUaGVcbiAqIHRyaWdnZXIgY2FsbHMgYGdldE9yQ3JlYXRlQWRhcHRlcihcIm5hdHNcIilgIG9uY2UgcGVyIHdvcmtmbG93LCBhbmRcbiAqIHN1YnNlcXVlbnQgd29ya2Zsb3dzIG9uIHRoZSBzYW1lIHByb3ZpZGVyIHNoYXJlIHRoZSBicm9rZXJcbiAqIGNvbm5lY3Rpb24uXG4gKi9cbmNvbnN0IHBvb2w6IE1hcDxQdWJTdWJQcm92aWRlciwgUHViU3ViQWRhcHRlcj4gPSBuZXcgTWFwKCk7XG5cbmV4cG9ydCBmdW5jdGlvbiBnZXRPckNyZWF0ZUFkYXB0ZXIocHJvdmlkZXI6IFB1YlN1YlByb3ZpZGVyKTogUHViU3ViQWRhcHRlciB7XG5cdGxldCBhZGFwdGVyID0gcG9vbC5nZXQocHJvdmlkZXIpO1xuXHRpZiAoIWFkYXB0ZXIpIHtcblx0XHRhZGFwdGVyID0gY3JlYXRlUHViU3ViQWRhcHRlcihwcm92aWRlcik7XG5cdFx0cG9vbC5zZXQocHJvdmlkZXIsIGFkYXB0ZXIpO1xuXHR9XG5cdHJldHVybiBhZGFwdGVyO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gX3Jlc2V0QWRhcHRlclBvb2xGb3JUZXN0cygpOiB2b2lkIHtcblx0Zm9yIChjb25zdCBhZGFwdGVyIG9mIHBvb2wudmFsdWVzKCkpIHtcblx0XHR2b2lkIGFkYXB0ZXIuZGlzY29ubmVjdD8uKCkuY2F0Y2goKCkgPT4ge30pO1xuXHR9XG5cdHBvb2wuY2xlYXIoKTtcbn1cbiJdfQ==

package/dist/index.d.ts

@@ -1,55 +1,46 @@
 /**
  * @blokjs/trigger-pubsub
  *
- * Pub/Sub-based trigger for Blok workflows.
- * Supports multiple pub/sub providers:
- * - Google Cloud Pub/Sub
- * - AWS SNS/SQS
- * - Azure Service Bus
- *
- * @example GCP Pub/Sub
- * ```typescript
- * import { PubSubTrigger, GCPPubSubAdapter } from "@blokjs/trigger-pubsub";
- *
- * class MyPubSubTrigger extends PubSubTrigger {
- *   protected adapter = new GCPPubSubAdapter({
- *     projectId: "my-project",
- *   });
- *
- *   protected nodes = myNodes;
- *   protected workflows = myWorkflows;
- * }
- *
- * const trigger = new MyPubSubTrigger();
- * await trigger.listen();
- * ```
- *
- * @example AWS SNS/SQS
- * ```typescript
- * import { PubSubTrigger, AWSSNSAdapter } from "@blokjs/trigger-pubsub";
- *
- * class MyPubSubTrigger extends PubSubTrigger {
- *   protected adapter = new AWSSNSAdapter({
- *     region: "us-east-1",
- *   });
- *   // ...
- * }
- * ```
- *
- * @example Azure Service Bus
- * ```typescript
- * import { PubSubTrigger, AzureServiceBusAdapter } from "@blokjs/trigger-pubsub";
- *
- * class MyPubSubTrigger extends PubSubTrigger {
- *   protected adapter = new AzureServiceBusAdapter({
- *     connectionString: process.env.AZURE_SERVICE_BUS_CONNECTION_STRING,
- *   });
- *   // ...
+ * Pub/Sub-based trigger for Blok workflows. Supports 6 providers:
+ *
+ *   - **NATS** (Core + JetStream) — cheapest infra; subject wildcards.
+ *   - **Redis Streams**           — when Redis is already in stack.
+ *   - **Kafka**                   — high-throughput streaming.
+ *   - **GCP Pub/Sub**             — Google Cloud-locked.
+ *   - **AWS SNS+SQS**             — SNS fan-out → SQS queueing.
+ *   - **Azure Service Bus**       — Azure Service Bus.
+ *
+ * v0.7+ — pick the adapter per workflow via `trigger.pubsub.provider`.
+ * `BLOK_PUBSUB_ADAPTER` env var sets the default (falls back to NATS).
+ * Subclasses can still set `protected adapter` directly for back-
+ * compat with the pre-v0.7 single-adapter pattern.
+ *
+ * **Fan-out vs competing-consumer**: omit `consumerGroup` for fan-out
+ * (every subscriber sees every message); set it for competing-consumer
+ * (1 of N within group). One field disambiguates the two semantics.
+ *
+ * @example v0.7 — NATS subject hierarchy with JSON workflow
+ * ```json
+ * {
+ *   "name": "audit-all-order-events",
+ *   "trigger": {
+ *     "pubsub": {
+ *       "provider": "nats",
+ *       "topic": "orders.>",
+ *       "durable": true,
+ *       "startFrom": "earliest"
+ *     }
+ *   },
+ *   "steps": [...]
  * }
  * ```
  */
 export { PubSubTrigger, type PubSubAdapter, type PubSubMessage, } from "./PubSubTrigger";
-export { GCPPubSubAdapter, type GCPPubSubConfig } from "./adapters/GCPPubSubAdapter";
 export { AWSSNSAdapter, type AWSSNSConfig } from "./adapters/AWSSNSAdapter";
 export { AzureServiceBusAdapter, type AzureServiceBusConfig } from "./adapters/AzureServiceBusAdapter";
+export { GCPPubSubAdapter, type GCPPubSubConfig } from "./adapters/GCPPubSubAdapter";
+export { KafkaPubSubAdapter, type KafkaPubSubConfig } from "./adapters/KafkaPubSubAdapter";
+export { NATSPubSubAdapter, type NATSPubSubConfig } from "./adapters/NATSPubSubAdapter";
+export { RedisStreamsPubSubAdapter, type RedisStreamsPubSubConfig } from "./adapters/RedisStreamsPubSubAdapter";
+export { _resetAdapterPoolForTests, createPubSubAdapter, getOrCreateAdapter, resolveProvider, } from "./adapters/factory";
 export type { PubSubProvider, PubSubTriggerOpts, } from "@blokjs/helper";

package/dist/index.js

@@ -1,57 +1,50 @@
 /**
  * @blokjs/trigger-pubsub
  *
- * Pub/Sub-based trigger for Blok workflows.
- * Supports multiple pub/sub providers:
- * - Google Cloud Pub/Sub
- * - AWS SNS/SQS
- * - Azure Service Bus
- *
- * @example GCP Pub/Sub
- * ```typescript
- * import { PubSubTrigger, GCPPubSubAdapter } from "@blokjs/trigger-pubsub";
- *
- * class MyPubSubTrigger extends PubSubTrigger {
- *   protected adapter = new GCPPubSubAdapter({
- *     projectId: "my-project",
- *   });
- *
- *   protected nodes = myNodes;
- *   protected workflows = myWorkflows;
- * }
- *
- * const trigger = new MyPubSubTrigger();
- * await trigger.listen();
- * ```
- *
- * @example AWS SNS/SQS
- * ```typescript
- * import { PubSubTrigger, AWSSNSAdapter } from "@blokjs/trigger-pubsub";
- *
- * class MyPubSubTrigger extends PubSubTrigger {
- *   protected adapter = new AWSSNSAdapter({
- *     region: "us-east-1",
- *   });
- *   // ...
- * }
- * ```
- *
- * @example Azure Service Bus
- * ```typescript
- * import { PubSubTrigger, AzureServiceBusAdapter } from "@blokjs/trigger-pubsub";
- *
- * class MyPubSubTrigger extends PubSubTrigger {
- *   protected adapter = new AzureServiceBusAdapter({
- *     connectionString: process.env.AZURE_SERVICE_BUS_CONNECTION_STRING,
- *   });
- *   // ...
+ * Pub/Sub-based trigger for Blok workflows. Supports 6 providers:
+ *
+ *   - **NATS** (Core + JetStream) — cheapest infra; subject wildcards.
+ *   - **Redis Streams**           — when Redis is already in stack.
+ *   - **Kafka**                   — high-throughput streaming.
+ *   - **GCP Pub/Sub**             — Google Cloud-locked.
+ *   - **AWS SNS+SQS**             — SNS fan-out → SQS queueing.
+ *   - **Azure Service Bus**       — Azure Service Bus.
+ *
+ * v0.7+ — pick the adapter per workflow via `trigger.pubsub.provider`.
+ * `BLOK_PUBSUB_ADAPTER` env var sets the default (falls back to NATS).
+ * Subclasses can still set `protected adapter` directly for back-
+ * compat with the pre-v0.7 single-adapter pattern.
+ *
+ * **Fan-out vs competing-consumer**: omit `consumerGroup` for fan-out
+ * (every subscriber sees every message); set it for competing-consumer
+ * (1 of N within group). One field disambiguates the two semantics.
+ *
+ * @example v0.7 — NATS subject hierarchy with JSON workflow
+ * ```json
+ * {
+ *   "name": "audit-all-order-events",
+ *   "trigger": {
+ *     "pubsub": {
+ *       "provider": "nats",
+ *       "topic": "orders.>",
+ *       "durable": true,
+ *       "startFrom": "earliest"
+ *     }
+ *   },
+ *   "steps": [...]
  * }
  * ```
  */
 // Core exports
 export { PubSubTrigger, } from "./PubSubTrigger";
 // Adapters
-export { GCPPubSubAdapter } from "./adapters/GCPPubSubAdapter";
 export { AWSSNSAdapter } from "./adapters/AWSSNSAdapter";
 export { AzureServiceBusAdapter } from "./adapters/AzureServiceBusAdapter";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FpREc7QUFFSCxlQUFlO0FBQ2YsT0FBTyxFQUNOLGFBQWEsR0FHYixNQUFNLGlCQUFpQixDQUFDO0FBRXpCLFdBQVc7QUFDWCxPQUFPLEVBQUUsZ0JBQWdCLEVBQXdCLE1BQU0sNkJBQTZCLENBQUM7QUFDckYsT0FBTyxFQUFFLGFBQWEsRUFBcUIsTUFBTSwwQkFBMEIsQ0FBQztBQUM1RSxPQUFPLEVBQUUsc0JBQXNCLEVBQThCLE1BQU0sbUNBQW1DLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBibG9ranMvdHJpZ2dlci1wdWJzdWJcbiAqXG4gKiBQdWIvU3ViLWJhc2VkIHRyaWdnZXIgZm9yIEJsb2sgd29ya2Zsb3dzLlxuICogU3VwcG9ydHMgbXVsdGlwbGUgcHViL3N1YiBwcm92aWRlcnM6XG4gKiAtIEdvb2dsZSBDbG91ZCBQdWIvU3ViXG4gKiAtIEFXUyBTTlMvU1FTXG4gKiAtIEF6dXJlIFNlcnZpY2UgQnVzXG4gKlxuICogQGV4YW1wbGUgR0NQIFB1Yi9TdWJcbiAqIGBgYHR5cGVzY3JpcHRcbiAqIGltcG9ydCB7IFB1YlN1YlRyaWdnZXIsIEdDUFB1YlN1YkFkYXB0ZXIgfSBmcm9tIFwiQGJsb2tqcy90cmlnZ2VyLXB1YnN1YlwiO1xuICpcbiAqIGNsYXNzIE15UHViU3ViVHJpZ2dlciBleHRlbmRzIFB1YlN1YlRyaWdnZXIge1xuICogICBwcm90ZWN0ZWQgYWRhcHRlciA9IG5ldyBHQ1BQdWJTdWJBZGFwdGVyKHtcbiAqICAgICBwcm9qZWN0SWQ6IFwibXktcHJvamVjdFwiLFxuICogICB9KTtcbiAqXG4gKiAgIHByb3RlY3RlZCBub2RlcyA9IG15Tm9kZXM7XG4gKiAgIHByb3RlY3RlZCB3b3JrZmxvd3MgPSBteVdvcmtmbG93cztcbiAqIH1cbiAqXG4gKiBjb25zdCB0cmlnZ2VyID0gbmV3IE15UHViU3ViVHJpZ2dlcigpO1xuICogYXdhaXQgdHJpZ2dlci5saXN0ZW4oKTtcbiAqIGBgYFxuICpcbiAqIEBleGFtcGxlIEFXUyBTTlMvU1FTXG4gKiBgYGB0eXBlc2NyaXB0XG4gKiBpbXBvcnQgeyBQdWJTdWJUcmlnZ2VyLCBBV1NTTlNBZGFwdGVyIH0gZnJvbSBcIkBibG9ranMvdHJpZ2dlci1wdWJzdWJcIjtcbiAqXG4gKiBjbGFzcyBNeVB1YlN1YlRyaWdnZXIgZXh0ZW5kcyBQdWJTdWJUcmlnZ2VyIHtcbiAqICAgcHJvdGVjdGVkIGFkYXB0ZXIgPSBuZXcgQVdTU05TQWRhcHRlcih7XG4gKiAgICAgcmVnaW9uOiBcInVzLWVhc3QtMVwiLFxuICogICB9KTtcbiAqICAgLy8gLi4uXG4gKiB9XG4gKiBgYGBcbiAqXG4gKiBAZXhhbXBsZSBBenVyZSBTZXJ2aWNlIEJ1c1xuICogYGBgdHlwZXNjcmlwdFxuICogaW1wb3J0IHsgUHViU3ViVHJpZ2dlciwgQXp1cmVTZXJ2aWNlQnVzQWRhcHRlciB9IGZyb20gXCJAYmxva2pzL3RyaWdnZXItcHVic3ViXCI7XG4gKlxuICogY2xhc3MgTXlQdWJTdWJUcmlnZ2VyIGV4dGVuZHMgUHViU3ViVHJpZ2dlciB7XG4gKiAgIHByb3RlY3RlZCBhZGFwdGVyID0gbmV3IEF6dXJlU2VydmljZUJ1c0FkYXB0ZXIoe1xuICogICAgIGNvbm5lY3Rpb25TdHJpbmc6IHByb2Nlc3MuZW52LkFaVVJFX1NFUlZJQ0VfQlVTX0NPTk5FQ1RJT05fU1RSSU5HLFxuICogICB9KTtcbiAqICAgLy8gLi4uXG4gKiB9XG4gKiBgYGBcbiAqL1xuXG4vLyBDb3JlIGV4cG9ydHNcbmV4cG9ydCB7XG5cdFB1YlN1YlRyaWdnZXIsXG5cdHR5cGUgUHViU3ViQWRhcHRlcixcblx0dHlwZSBQdWJTdWJNZXNzYWdlLFxufSBmcm9tIFwiLi9QdWJTdWJUcmlnZ2VyXCI7XG5cbi8vIEFkYXB0ZXJzXG5leHBvcnQgeyBHQ1BQdWJTdWJBZGFwdGVyLCB0eXBlIEdDUFB1YlN1YkNvbmZpZyB9IGZyb20gXCIuL2FkYXB0ZXJzL0dDUFB1YlN1YkFkYXB0ZXJcIjtcbmV4cG9ydCB7IEFXU1NOU0FkYXB0ZXIsIHR5cGUgQVdTU05TQ29uZmlnIH0gZnJvbSBcIi4vYWRhcHRlcnMvQVdTU05TQWRhcHRlclwiO1xuZXhwb3J0IHsgQXp1cmVTZXJ2aWNlQnVzQWRhcHRlciwgdHlwZSBBenVyZVNlcnZpY2VCdXNDb25maWcgfSBmcm9tIFwiLi9hZGFwdGVycy9BenVyZVNlcnZpY2VCdXNBZGFwdGVyXCI7XG5cbi8vIFJlLWV4cG9ydCB0eXBlcyBmcm9tIGhlbHBlciBmb3IgY29udmVuaWVuY2VcbmV4cG9ydCB0eXBlIHtcblx0UHViU3ViUHJvdmlkZXIsXG5cdFB1YlN1YlRyaWdnZXJPcHRzLFxufSBmcm9tIFwiQGJsb2tqcy9oZWxwZXJcIjtcbiJdfQ==
+export { GCPPubSubAdapter } from "./adapters/GCPPubSubAdapter";
+export { KafkaPubSubAdapter } from "./adapters/KafkaPubSubAdapter";
+export { NATSPubSubAdapter } from "./adapters/NATSPubSubAdapter";
+export { RedisStreamsPubSubAdapter } from "./adapters/RedisStreamsPubSubAdapter";
+// v0.7 PR 6 — factory + pool used by PubSubTrigger and exposed for
+// helper nodes (`@blokjs/pubsub-publish`).
+export { _resetAdapterPoolForTests, createPubSubAdapter, getOrCreateAdapter, resolveProvider, } from "./adapters/factory";
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQW9DRztBQUVILGVBQWU7QUFDZixPQUFPLEVBQ04sYUFBYSxHQUdiLE1BQU0saUJBQWlCLENBQUM7QUFFekIsV0FBVztBQUNYLE9BQU8sRUFBRSxhQUFhLEVBQXFCLE1BQU0sMEJBQTBCLENBQUM7QUFDNUUsT0FBTyxFQUFFLHNCQUFzQixFQUE4QixNQUFNLG1DQUFtQyxDQUFDO0FBQ3ZHLE9BQU8sRUFBRSxnQkFBZ0IsRUFBd0IsTUFBTSw2QkFBNkIsQ0FBQztBQUNyRixPQUFPLEVBQUUsa0JBQWtCLEVBQTBCLE1BQU0sK0JBQStCLENBQUM7QUFDM0YsT0FBTyxFQUFFLGlCQUFpQixFQUF5QixNQUFNLDhCQUE4QixDQUFDO0FBQ3hGLE9BQU8sRUFBRSx5QkFBeUIsRUFBaUMsTUFBTSxzQ0FBc0MsQ0FBQztBQUVoSCxtRUFBbUU7QUFDbkUsMkNBQTJDO0FBQzNDLE9BQU8sRUFDTix5QkFBeUIsRUFDekIsbUJBQW1CLEVBQ25CLGtCQUFrQixFQUNsQixlQUFlLEdBQ2YsTUFBTSxvQkFBb0IsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGJsb2tqcy90cmlnZ2VyLXB1YnN1YlxuICpcbiAqIFB1Yi9TdWItYmFzZWQgdHJpZ2dlciBmb3IgQmxvayB3b3JrZmxvd3MuIFN1cHBvcnRzIDYgcHJvdmlkZXJzOlxuICpcbiAqICAgLSAqKk5BVFMqKiAoQ29yZSArIEpldFN0cmVhbSkg4oCUIGNoZWFwZXN0IGluZnJhOyBzdWJqZWN0IHdpbGRjYXJkcy5cbiAqICAgLSAqKlJlZGlzIFN0cmVhbXMqKiAgICAgICAgICAg4oCUIHdoZW4gUmVkaXMgaXMgYWxyZWFkeSBpbiBzdGFjay5cbiAqICAgLSAqKkthZmthKiogICAgICAgICAgICAgICAgICAg4oCUIGhpZ2gtdGhyb3VnaHB1dCBzdHJlYW1pbmcuXG4gKiAgIC0gKipHQ1AgUHViL1N1YioqICAgICAgICAgICAgIOKAlCBHb29nbGUgQ2xvdWQtbG9ja2VkLlxuICogICAtICoqQVdTIFNOUytTUVMqKiAgICAgICAgICAgICDigJQgU05TIGZhbi1vdXQg4oaSIFNRUyBxdWV1ZWluZy5cbiAqICAgLSAqKkF6dXJlIFNlcnZpY2UgQnVzKiogICAgICAg4oCUIEF6dXJlIFNlcnZpY2UgQnVzLlxuICpcbiAqIHYwLjcrIOKAlCBwaWNrIHRoZSBhZGFwdGVyIHBlciB3b3JrZmxvdyB2aWEgYHRyaWdnZXIucHVic3ViLnByb3ZpZGVyYC5cbiAqIGBCTE9LX1BVQlNVQl9BREFQVEVSYCBlbnYgdmFyIHNldHMgdGhlIGRlZmF1bHQgKGZhbGxzIGJhY2sgdG8gTkFUUykuXG4gKiBTdWJjbGFzc2VzIGNhbiBzdGlsbCBzZXQgYHByb3RlY3RlZCBhZGFwdGVyYCBkaXJlY3RseSBmb3IgYmFjay1cbiAqIGNvbXBhdCB3aXRoIHRoZSBwcmUtdjAuNyBzaW5nbGUtYWRhcHRlciBwYXR0ZXJuLlxuICpcbiAqICoqRmFuLW91dCB2cyBjb21wZXRpbmctY29uc3VtZXIqKjogb21pdCBgY29uc3VtZXJHcm91cGAgZm9yIGZhbi1vdXRcbiAqIChldmVyeSBzdWJzY3JpYmVyIHNlZXMgZXZlcnkgbWVzc2FnZSk7IHNldCBpdCBmb3IgY29tcGV0aW5nLWNvbnN1bWVyXG4gKiAoMSBvZiBOIHdpdGhpbiBncm91cCkuIE9uZSBmaWVsZCBkaXNhbWJpZ3VhdGVzIHRoZSB0d28gc2VtYW50aWNzLlxuICpcbiAqIEBleGFtcGxlIHYwLjcg4oCUIE5BVFMgc3ViamVjdCBoaWVyYXJjaHkgd2l0aCBKU09OIHdvcmtmbG93XG4gKiBgYGBqc29uXG4gKiB7XG4gKiAgIFwibmFtZVwiOiBcImF1ZGl0LWFsbC1vcmRlci1ldmVudHNcIixcbiAqICAgXCJ0cmlnZ2VyXCI6IHtcbiAqICAgICBcInB1YnN1YlwiOiB7XG4gKiAgICAgICBcInByb3ZpZGVyXCI6IFwibmF0c1wiLFxuICogICAgICAgXCJ0b3BpY1wiOiBcIm9yZGVycy4+XCIsXG4gKiAgICAgICBcImR1cmFibGVcIjogdHJ1ZSxcbiAqICAgICAgIFwic3RhcnRGcm9tXCI6IFwiZWFybGllc3RcIlxuICogICAgIH1cbiAqICAgfSxcbiAqICAgXCJzdGVwc1wiOiBbLi4uXVxuICogfVxuICogYGBgXG4gKi9cblxuLy8gQ29yZSBleHBvcnRzXG5leHBvcnQge1xuXHRQdWJTdWJUcmlnZ2VyLFxuXHR0eXBlIFB1YlN1YkFkYXB0ZXIsXG5cdHR5cGUgUHViU3ViTWVzc2FnZSxcbn0gZnJvbSBcIi4vUHViU3ViVHJpZ2dlclwiO1xuXG4vLyBBZGFwdGVyc1xuZXhwb3J0IHsgQVdTU05TQWRhcHRlciwgdHlwZSBBV1NTTlNDb25maWcgfSBmcm9tIFwiLi9hZGFwdGVycy9BV1NTTlNBZGFwdGVyXCI7XG5leHBvcnQgeyBBenVyZVNlcnZpY2VCdXNBZGFwdGVyLCB0eXBlIEF6dXJlU2VydmljZUJ1c0NvbmZpZyB9IGZyb20gXCIuL2FkYXB0ZXJzL0F6dXJlU2VydmljZUJ1c0FkYXB0ZXJcIjtcbmV4cG9ydCB7IEdDUFB1YlN1YkFkYXB0ZXIsIHR5cGUgR0NQUHViU3ViQ29uZmlnIH0gZnJvbSBcIi4vYWRhcHRlcnMvR0NQUHViU3ViQWRhcHRlclwiO1xuZXhwb3J0IHsgS2Fma2FQdWJTdWJBZGFwdGVyLCB0eXBlIEthZmthUHViU3ViQ29uZmlnIH0gZnJvbSBcIi4vYWRhcHRlcnMvS2Fma2FQdWJTdWJBZGFwdGVyXCI7XG5leHBvcnQgeyBOQVRTUHViU3ViQWRhcHRlciwgdHlwZSBOQVRTUHViU3ViQ29uZmlnIH0gZnJvbSBcIi4vYWRhcHRlcnMvTkFUU1B1YlN1YkFkYXB0ZXJcIjtcbmV4cG9ydCB7IFJlZGlzU3RyZWFtc1B1YlN1YkFkYXB0ZXIsIHR5cGUgUmVkaXNTdHJlYW1zUHViU3ViQ29uZmlnIH0gZnJvbSBcIi4vYWRhcHRlcnMvUmVkaXNTdHJlYW1zUHViU3ViQWRhcHRlclwiO1xuXG4vLyB2MC43IFBSIDYg4oCUIGZhY3RvcnkgKyBwb29sIHVzZWQgYnkgUHViU3ViVHJpZ2dlciBhbmQgZXhwb3NlZCBmb3Jcbi8vIGhlbHBlciBub2RlcyAoYEBibG9ranMvcHVic3ViLXB1Ymxpc2hgKS5cbmV4cG9ydCB7XG5cdF9yZXNldEFkYXB0ZXJQb29sRm9yVGVzdHMsXG5cdGNyZWF0ZVB1YlN1YkFkYXB0ZXIsXG5cdGdldE9yQ3JlYXRlQWRhcHRlcixcblx0cmVzb2x2ZVByb3ZpZGVyLFxufSBmcm9tIFwiLi9hZGFwdGVycy9mYWN0b3J5XCI7XG5cbi8vIFJlLWV4cG9ydCB0eXBlcyBmcm9tIGhlbHBlciBmb3IgY29udmVuaWVuY2VcbmV4cG9ydCB0eXBlIHtcblx0UHViU3ViUHJvdmlkZXIsXG5cdFB1YlN1YlRyaWdnZXJPcHRzLFxufSBmcm9tIFwiQGJsb2tqcy9oZWxwZXJcIjtcbiJdfQ==

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@blokjs/trigger-pubsub",
-	"version": "0.2.3",
-	"description": "Pub/Sub-based trigger for Blok workflows - supports GCP Pub/Sub, AWS SNS/SQS, and Azure Service Bus",
+	"version": "0.6.2",
+	"description": "Pub/Sub trigger for Blok workflows — supports NATS (Core + JetStream), Redis Streams, Kafka, GCP Pub/Sub, AWS SNS+SQS, and Azure Service Bus.",
 	"type": "module",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -14,9 +14,9 @@
 	"author": "Deskree Technologies Inc.",
 	"license": "Apache-2.0",
 	"dependencies": {
-		"@blokjs/helper": "^0.2.0",
-		"@blokjs/runner": "^0.2.0",
-		"@blokjs/shared": "^0.2.0",
+		"@blokjs/helper": "^0.6.2",
+		"@blokjs/runner": "^0.6.2",
+		"@blokjs/shared": "^0.6.2",
 		"@opentelemetry/api": "^1.9.0",
 		"uuid": "^11.1.0"
 	},
@@ -27,15 +27,15 @@
 		"vitest": "^4.0.18"
 	},
 	"peerDependencies": {
-		"@google-cloud/pubsub": "^5.0.0",
 		"@aws-sdk/client-sns": "^3.980.0",
 		"@aws-sdk/client-sqs": "^3.980.0",
-		"@azure/service-bus": "^7.9.5"
+		"@azure/service-bus": "^7.9.5",
+		"@google-cloud/pubsub": "^5.0.0",
+		"ioredis": "^5.9.2",
+		"kafkajs": "^2.2.0",
+		"nats": "^2.29.0"
 	},
 	"peerDependenciesMeta": {
-		"@google-cloud/pubsub": {
-			"optional": true
-		},
 		"@aws-sdk/client-sns": {
 			"optional": true
 		},
@@ -44,6 +44,18 @@
 		},
 		"@azure/service-bus": {
 			"optional": true
+		},
+		"@google-cloud/pubsub": {
+			"optional": true
+		},
+		"ioredis": {
+			"optional": true
+		},
+		"kafkajs": {
+			"optional": true
+		},
+		"nats": {
+			"optional": true
 		}
 	},
 	"private": false,

package/src/PubSubTrigger.ts

@@ -20,9 +20,9 @@
 
 import type { HelperResponse, PubSubProvider, PubSubTriggerOpts } from "@blokjs/helper";
 import {
+	type BlokService,
 	DefaultLogger,
 	type GlobalOptions,
-	type BlokService,
 	NodeMap,
 	TriggerBase,
 	type TriggerResponse,
@@ -74,6 +74,18 @@ export interface PubSubAdapter {
 	/** Unsubscribe from a topic */
 	unsubscribe(subscription: string): Promise<void>;
 
+	/**
+	 * v0.7 PR 6 — publish a single message to a topic. Used by the
+	 * `@blokjs/pubsub-publish` helper and any workflow that fan-outs
+	 * events to subscribers. Provider-portable: each adapter wraps its
+	 * native producer client.
+	 *
+	 * Optional `partitionKey` / `orderingKey` is honored by providers
+	 * that support per-key ordering (Kafka, GCP Pub/Sub ordered
+	 * delivery). Ignored otherwise.
+	 */
+	publish(topic: string, payload: unknown, opts?: { partitionKey?: string; orderingKey?: string }): Promise<void>;
+
 	/** Check if connected */
 	isConnected(): boolean;
 
@@ -107,7 +119,22 @@ export abstract class PubSubTrigger extends TriggerBase {
 		process.env.PROJECT_VERSION || "0.0.1",
 	);
 	protected readonly logger = new DefaultLogger();
-	protected abstract adapter: PubSubAdapter;
+
+	/**
+	 * v0.7 PR 6 — back-compat default adapter. When subclasses set
+	 * `protected adapter = new GCPPubSubAdapter()` (pre-v0.7 pattern),
+	 * ALL workflows route through it regardless of their `provider`
+	 * field. When unset, each workflow's `provider` is resolved via
+	 * the factory.
+	 */
+	protected adapter?: PubSubAdapter;
+
+	/**
+	 * v0.7 PR 6 — adapter pool, keyed by provider. Populated lazily in
+	 * `listen()` as workflows are matched to providers. Drained in
+	 * `stop()`. One adapter (one broker connection) per provider.
+	 */
+	protected adapterPool: Map<string, PubSubAdapter> = new Map();
 
 	// Subclasses provide these
 	protected abstract nodes: Record<string, BlokService<unknown>>;
@@ -143,10 +170,6 @@ export abstract class PubSubTrigger extends TriggerBase {
 		this.loadWorkflows();
 
 		try {
-			// Connect to pub/sub system
-			await this.adapter.connect();
-			this.logger.log(`Connected to ${this.adapter.provider} pub/sub system`);
-
 			// Find all workflows with pub/sub triggers
 			const pubsubWorkflows = this.getPubSubWorkflows();
 
@@ -155,14 +178,17 @@ export abstract class PubSubTrigger extends TriggerBase {
 				return this.endCounter(startTime);
 			}
 
-			// Subscribe to each topic/subscription
+			// Subscribe to each topic via the adapter that owns its
+			// provider. Per-workflow `provider` field with subclass-
+			// adapter back-compat (handled in resolveAdapterForWorkflow).
 			for (const workflow of pubsubWorkflows) {
 				const config = workflow.config.trigger?.pubsub as PubSubTriggerOpts;
+				const adapter = await this.resolveAdapterForWorkflow(config);
 				this.logger.log(
-					`Subscribing to topic: ${config.topic}, subscription: ${config.subscription} for workflow: ${workflow.path}`,
+					`Subscribing to topic: ${config.topic} via ${adapter.provider} (subscription: ${config.subscription ?? "<auto>"}, group: ${config.consumerGroup ?? "<fan-out>"})`,
 				);
 
-				await this.adapter.subscribe(config, async (message) => {
+				await adapter.subscribe(config, async (message) => {
 					await this.handleMessage(message, workflow, config);
 				});
 			}
@@ -182,13 +208,53 @@ export abstract class PubSubTrigger extends TriggerBase {
 	}
 
 	/**
-	 * Stop the pub/sub subscriber
+	 * Stop the pub/sub subscriber — drains every adapter in the pool
+	 * plus the subclass-set adapter (if any).
 	 */
 	async stop(): Promise<void> {
-		await this.adapter.disconnect();
+		for (const adapter of this.adapterPool.values()) {
+			try {
+				await adapter.disconnect();
+			} catch (err) {
+				this.logger.error(`[blok][pubsub] disconnect failed: ${(err as Error).message}`);
+			}
+		}
+		this.adapterPool.clear();
 		this.logger.log("Pub/Sub trigger stopped");
 	}
 
+	/**
+	 * v0.7 PR 6 — pick the adapter for a workflow's `provider` field.
+	 *
+	 * Resolution order:
+	 *   1. Subclass-set `this.adapter` (back-compat).
+	 *   2. Per-workflow `provider` field via the factory.
+	 *   3. `BLOK_PUBSUB_ADAPTER` env var.
+	 *   4. `"nats"` fallback.
+	 *
+	 * Adapters are connected on first use and pooled per provider.
+	 */
+	protected async resolveAdapterForWorkflow(config: PubSubTriggerOpts): Promise<PubSubAdapter> {
+		if (this.adapter) {
+			if (!this.adapter.isConnected()) {
+				await this.adapter.connect();
+				this.logger.log(`Connected to ${this.adapter.provider} pub/sub system (subclass adapter)`);
+			}
+			this.adapterPool.set(this.adapter.provider, this.adapter);
+			return this.adapter;
+		}
+		const { resolveProvider, createPubSubAdapter } = await import("./adapters/factory");
+		const provider = resolveProvider(config.provider);
+		let adapter = this.adapterPool.get(provider);
+		if (!adapter) {
+			adapter = createPubSubAdapter(provider);
+			await adapter.connect();
+			this.logger.log(`Connected to ${adapter.provider} pub/sub system`);
+			this.adapterPool.set(provider, adapter);
+		}
+		return adapter;
+	}
+
 	protected override async onHmrWorkflowChange(): Promise<void> {
 		this.logger.log("[HMR] Pub/Sub workflow changed, reloading...");
 		await this.waitForInFlightRequests();
@@ -263,7 +329,7 @@ export abstract class PubSubTrigger extends TriggerBase {
 
 				// Store message metadata in context
 				if (!ctx.vars) ctx.vars = {};
-				ctx.vars["_pubsub_message"] = {
+				ctx.vars._pubsub_message = {
 					topic: message.topic,
 					subscription: message.subscription || "",
 					publishTime: message.publishTime?.toISOString() ?? "",
@@ -280,8 +346,8 @@ export abstract class PubSubTrigger extends TriggerBase {
 				span.setAttribute("success", true);
 				span.setAttribute("message_id", id);
 				span.setAttribute("topic", config.topic);
-				span.setAttribute("subscription", config.subscription);
-				span.setAttribute("provider", config.provider);
+				span.setAttribute("subscription", config.subscription ?? "<auto>");
+				span.setAttribute("provider", config.provider ?? "<default>");
 				span.setAttribute("elapsed_ms", end - start);
 				span.setStatus({ code: SpanStatusCode.OK });
 
@@ -289,8 +355,8 @@ export abstract class PubSubTrigger extends TriggerBase {
 				pubsubMessages.add(1, {
 					env: process.env.NODE_ENV,
 					topic: config.topic,
-					subscription: config.subscription,
-					provider: config.provider,
+					subscription: config.subscription ?? "<auto>",
+					provider: config.provider ?? "<default>",
 					workflow_name: this.configuration.name,
 					success: "true",
 				});
@@ -314,8 +380,8 @@ export abstract class PubSubTrigger extends TriggerBase {
 				pubsubErrors.add(1, {
 					env: process.env.NODE_ENV,
 					topic: config.topic,
-					subscription: config.subscription,
-					provider: config.provider,
+					subscription: config.subscription ?? "<auto>",
+					provider: config.provider ?? "<default>",
 					workflow_name: this.configuration?.name || "unknown",
 				});