@pattern-stack/codegen 0.14.1 → 0.15.0

package/dist/src/cli/index.js

@@ -6273,8 +6273,8 @@ async function generateScopeEntityType(opts) {
 }
 
 // src/cli/shared/subsystem-barrel-generator.ts
-import fs5 from "fs";
-import path8 from "path";
+import fs7 from "fs";
+import path10 from "path";
 
 // src/cli/shared/subsystem-detect.ts
 import fs4 from "fs";
@@ -6541,274 +6541,16 @@ function resolveSubsystemsRoot(ctx, overrideTarget) {
   return resolveSubsystemsRootFromConfig(ctx.cwd, ctx.config);
 }
 
-// src/cli/shared/subsystem-barrel-generator.ts
-function quoteOpts(opts) {
-  const entries = Object.entries(opts).filter(([, v]) => v !== void 0);
-  if (entries.length === 0) return "";
-  return "{ " + entries.map(([k, v]) => `${k}: ${typeof v === "string" ? `'${v}'` : String(v)}`).join(", ") + " }";
-}
-function jsonToTs(value) {
-  if (value === null || value === void 0) return "undefined";
-  if (typeof value === "string") return `'${value.replace(/'/g, "\\'")}'`;
-  if (typeof value === "number" || typeof value === "boolean") return String(value);
-  if (Array.isArray(value)) return `[${value.map(jsonToTs).join(", ")}]`;
-  if (typeof value === "object") {
-    const entries = Object.entries(value).filter(
-      ([, v]) => v !== void 0
-    );
-    return `{ ${entries.map(([k, v]) => `${k}: ${jsonToTs(v)}`).join(", ")} }`;
-  }
-  return "undefined";
-}
-function quoteBullmqDomainOpts(input) {
-  const { backend, multiTenant, bullExt } = input;
-  if (backend !== "bullmq" || !bullExt) {
-    return quoteOpts({ backend, multiTenant });
-  }
-  const parts = [`backend: 'bullmq'`];
-  if (multiTenant) parts.push(`multiTenant: true`);
-  parts.push(`extensions: { bullmq: ${jsonToTs(bullExt)} }`);
-  return `{ ${parts.join(", ")} }`;
-}
-var COMPOSERS = {
-  events: ({ moduleImport, cfg }) => {
-    const backend = cfg?.backend ?? "drizzle";
-    const multiTenant = Boolean(cfg?.multi_tenant);
-    return {
-      imports: [
-        `import { EventsModule } from '${moduleImport("events", "events.module")}';`
-      ],
-      calls: [
-        `	EventsModule.forRoot(${quoteOpts({ backend, multiTenant })}),`
-      ]
-    };
-  },
-  jobs: ({ moduleImport, cfg }) => {
-    const backend = cfg?.backend ?? "drizzle";
-    const multiTenant = Boolean(cfg?.multi_tenant);
-    const workerMode = (cfg?.worker_mode ?? "standalone").trim();
-    const imports = [
-      `import { JobsDomainModule } from '${moduleImport("jobs", "jobs-domain.module")}';`
-    ];
-    const bullExt = backend === "bullmq" ? cfg?.extensions?.bullmq : void 0;
-    const domainOpts = quoteBullmqDomainOpts({ backend, multiTenant, bullExt });
-    const calls = [`	JobsDomainModule.forRoot(${domainOpts}),`];
-    if (workerMode === "embedded") {
-      imports.push(
-        `import { JobWorkerModule } from '${moduleImport("jobs", "job-worker.module")}';`
-      );
-      const workerOpts = backend === "bullmq" ? `{ mode: 'embedded', backend: 'bullmq'${bullExt ? `, domainModuleExtensions: { bullmq: ${jsonToTs(bullExt)} }` : ""} }` : `{ mode: 'embedded' }`;
-      calls.push(`	JobWorkerModule.forRoot(${workerOpts}),`);
-    }
-    return { imports, calls };
-  },
-  bridge: ({ moduleImport, cfg }) => {
-    const backend = cfg?.backend ?? "drizzle";
-    const multiTenant = Boolean(cfg?.multi_tenant);
-    return {
-      imports: [
-        `import { BridgeModule } from '${moduleImport("bridge", "bridge.module")}';`
-      ],
-      calls: [
-        `	BridgeModule.forRoot(${quoteOpts({ backend, multiTenant })}),`
-      ]
-    };
-  },
-  integration: ({ moduleImport, cfg }) => {
-    const backend = cfg?.backend ?? "drizzle";
-    const multiTenant = Boolean(cfg?.multi_tenant);
-    return {
-      imports: [
-        `import { IntegrationModule } from '${moduleImport("integration", "integration.module")}';`
-      ],
-      calls: [
-        `	IntegrationModule.forRoot(${quoteOpts({ backend, multiTenant })}),`
-      ]
-    };
-  }
-};
-var PACKAGE2 = "@pattern-stack/codegen";
-function makeModuleImport(mode, subsystemsRel) {
-  if (mode === "vendored") {
-    return (subsystem, moduleBasename) => `${subsystemsRel}/${subsystem}/${moduleBasename}`;
-  }
-  return (subsystem) => subsystem === "events" ? `${PACKAGE2}/subsystems` : `${PACKAGE2}/runtime/subsystems/${subsystem}/index`;
-}
-var COMPOSABLE_ORDER = ["events", "jobs", "bridge", "integration"];
-var HEADER3 = `// AUTO-GENERATED by @pattern-stack/codegen. DO NOT EDIT.
-// Subsystem composition barrel \u2014 reflects \`subsystems.install\` in
-// codegen.config.yaml and the per-subsystem option blocks
-// (\`events:\`, \`jobs:\`, \`bridge:\`, \`integration:\`).
-//
-// Wire into AppModule once:
-//
-//   import { SUBSYSTEM_MODULES } from './generated/subsystems';
-//   @Module({ imports: [DatabaseModule, ...SUBSYSTEM_MODULES, ...GENERATED_MODULES] })
-//
-// Regenerated by every \`codegen entity new\` / \`codegen subsystem install\`.
-
-`;
-function buildSubsystemBarrel(installed, config, subsystemsRel, mode = "vendored") {
-  const moduleImport = makeModuleImport(mode, subsystemsRel);
-  const actable = installed.filter((i) => i.status !== "incomplete");
-  const installedNames = new Set(actable.map((i) => i.name));
-  const emitted = [];
-  const skipped = [];
-  const allImports = [`import type { DynamicModule } from '@nestjs/common';`];
-  const allCalls = [];
-  for (const name of COMPOSABLE_ORDER) {
-    if (!installedNames.has(name)) continue;
-    const composer = COMPOSERS[name];
-    if (!composer) {
-      skipped.push(name);
-      continue;
-    }
-    const cfg = config?.[name] ?? void 0;
-    const out = composer({ moduleImport, cfg });
-    allImports.push(...out.imports);
-    allCalls.push(...out.calls);
-    emitted.push(name);
-  }
-  for (const inst of actable) {
-    if (!COMPOSABLE_ORDER.includes(inst.name) && !COMPOSERS[inst.name]) {
-      skipped.push(inst.name);
-    }
-  }
-  const exportLine = allCalls.length === 0 ? `export const SUBSYSTEM_MODULES: DynamicModule[] = [];
-` : `export const SUBSYSTEM_MODULES: DynamicModule[] = [
-${allCalls.join("\n")}
-];
-`;
-  const body = allImports.join("\n") + "\n\n" + exportLine;
-  return { content: HEADER3 + body, emitted, skipped };
-}
-async function regenerateSubsystemBarrel(opts) {
-  const { ctx, dryRun = false } = opts;
-  const generatedDir = opts.generatedDir ?? resolveGeneratedDir(ctx);
-  const mode = resolveRuntimeMode(ctx.config);
-  const installed = mode === "package" ? configuredInstalledSubsystems(
-    ctx.config
-  ) : await detectInstalledSubsystems(ctx);
-  const subsystemsAbs = resolveSubsystemsRoot(ctx);
-  const barrelAbs = path8.resolve(generatedDir, "subsystems.ts");
-  let subsystemsRel = path8.relative(path8.dirname(barrelAbs), subsystemsAbs).split(path8.sep).join("/");
-  if (!subsystemsRel.startsWith(".")) subsystemsRel = "./" + subsystemsRel;
-  const { content, emitted, skipped } = buildSubsystemBarrel(
-    installed,
-    ctx.config,
-    subsystemsRel,
-    mode
-  );
-  let written = false;
-  if (!dryRun) {
-    fs5.mkdirSync(path8.dirname(barrelAbs), { recursive: true });
-    fs5.writeFileSync(barrelAbs, content);
-    written = true;
-  }
-  return {
-    subsystemBarrel: barrelAbs,
-    emitted,
-    skipped,
-    content,
-    written
-  };
-}
-
-// src/cli/shared/subsystem-schema-generator.ts
-import fs6 from "fs";
-import path9 from "path";
-var PACKAGE3 = "@pattern-stack/codegen";
-var SCHEMA_SYMBOLS = {
-  events: ["domainEvents"],
-  jobs: [
-    "jobs",
-    "jobRuns",
-    "jobSteps",
-    "jobRunStatusEnum",
-    "jobStepKindEnum",
-    "jobStepStatusEnum",
-    "collisionModeEnum",
-    "replayFromEnum",
-    "parentClosePolicyEnum",
-    "waitKindEnum",
-    "triggerSourceEnum"
-  ],
-  bridge: ["bridgeDelivery", "bridgeDeliveryStatusEnum"],
-  integration: [
-    "integrationSubscriptions",
-    "integrationRuns",
-    "integrationRunItems",
-    "integrationRunDirectionEnum",
-    "integrationRunActionEnum",
-    "integrationRunStatusEnum",
-    "integrationRunItemOperationEnum",
-    "integrationRunItemStatusEnum"
-  ]
-};
-var SCHEMA_ORDER = ["events", "jobs", "bridge", "integration"];
-var HEADER4 = `// AUTO-GENERATED by @pattern-stack/codegen. Do not edit.
-// Subsystem Drizzle schema barrel \u2014 re-exports the tables + pgEnums of every
-// installed subsystem so drizzle-kit emits their CREATE TABLE / CREATE TYPE.
-//
-// Fold into your drizzle-kit schema entrypoint once, alongside the entity
-// schema barrel:
-//
-//   // src/schema.ts
-//   export * from './generated/schema';            // entity tables
-//   export * from './generated/subsystems-schema'; // subsystem tables + enums
-//
-// Regenerated by every \`codegen entity new\` / \`codegen subsystem install\`.
-
-`;
-function schemaImportFor(mode, subsystem, subsystemsRel) {
-  return mode === "vendored" ? `${subsystemsRel}/${subsystem}` : `${PACKAGE3}/runtime/subsystems/${subsystem}/index`;
-}
-function buildSubsystemSchemaBarrel(installed, subsystemsRel, mode) {
-  const actable = installed.filter((i) => i.status !== "incomplete");
-  const installedNames = new Set(actable.map((i) => i.name));
-  const emitted = [];
-  const lines = [];
-  for (const name of SCHEMA_ORDER) {
-    if (!installedNames.has(name)) continue;
-    const symbols = SCHEMA_SYMBOLS[name];
-    if (!symbols || symbols.length === 0) continue;
-    const importSpec = schemaImportFor(mode, name, subsystemsRel);
-    lines.push(`export { ${symbols.join(", ")} } from '${importSpec}';`);
-    emitted.push(name);
-  }
-  const body = lines.length === 0 ? "export {};\n" : lines.join("\n") + "\n";
-  return { content: HEADER4 + body, emitted };
-}
-async function regenerateSubsystemSchemaBarrel(opts) {
-  const { ctx, dryRun = false } = opts;
-  const generatedDir = opts.generatedDir ?? resolveGeneratedDir(ctx);
-  const mode = resolveRuntimeMode(ctx.config);
-  const installed = mode === "package" ? configuredInstalledSubsystems(
-    ctx.config
-  ) : await detectInstalledSubsystems(ctx);
-  const subsystemsAbs = resolveSubsystemsRoot(ctx);
-  const barrelAbs = path9.resolve(generatedDir, "subsystems-schema.ts");
-  let subsystemsRel = path9.relative(path9.dirname(barrelAbs), subsystemsAbs).split(path9.sep).join("/");
-  if (!subsystemsRel.startsWith(".")) subsystemsRel = "./" + subsystemsRel;
-  const { content, emitted } = buildSubsystemSchemaBarrel(
-    installed,
-    subsystemsRel,
-    mode
-  );
-  let written = false;
-  if (!dryRun) {
-    fs6.mkdirSync(path9.dirname(barrelAbs), { recursive: true });
-    fs6.writeFileSync(barrelAbs, content);
-    written = true;
-  }
-  return { schemaBarrel: barrelAbs, emitted, content, written };
-}
-
 // src/cli/shared/bridge-registry-generator.ts
-import fs7 from "fs";
-import path10 from "path";
+import fs5 from "fs";
+import path8 from "path";
 import ts2 from "typescript";
-var HEADER5 = `// AUTO-GENERATED by @pattern-stack/codegen. Do not edit.
+var PACKAGE_BRIDGE_TYPE_IMPORT = "@pattern-stack/codegen/runtime/subsystems/bridge/index";
+var OUTPUT_FILE_BY_MODE = {
+  vendored: "registry.ts",
+  package: "bridge-registry.ts"
+};
+var HEADER3 = `// AUTO-GENERATED by @pattern-stack/codegen. Do not edit.
 // Run \`codegen entity new --all\` to refresh.
 `;
 var DuplicateTriggerError = class extends Error {
@@ -6866,12 +6608,12 @@ var UnknownTriggerEventError = class extends Error {
   name = "UnknownTriggerEventError";
 };
 function findHandlerFiles(dir) {
-  if (!fs7.existsSync(dir)) return [];
+  if (!fs5.existsSync(dir)) return [];
   const out = [];
-  for (const entry of fs7.readdirSync(dir, { withFileTypes: true })) {
+  for (const entry of fs5.readdirSync(dir, { withFileTypes: true })) {
     if (entry.name.startsWith(".")) continue;
     if (entry.name === "node_modules" || entry.name === "generated") continue;
-    const full = path10.join(dir, entry.name);
+    const full = path8.join(dir, entry.name);
     if (entry.isDirectory()) {
       out.push(...findHandlerFiles(full));
     } else if (entry.isFile() && entry.name.endsWith(".ts") && !entry.name.endsWith(".d.ts")) {
@@ -6934,7 +6676,7 @@ function scanHandlerFiles(handlersDir) {
   const files = findHandlerFiles(handlersDir);
   const out = [];
   for (const filePath of files) {
-    const text2 = fs7.readFileSync(filePath, "utf8");
+    const text2 = fs5.readFileSync(filePath, "utf8");
     const sourceFile = ts2.createSourceFile(
       filePath,
       text2,
@@ -6949,9 +6691,9 @@ function scanHandlerFiles(handlersDir) {
 }
 function readKnownEventTypes(eventsGeneratedDir) {
   if (!eventsGeneratedDir) return [];
-  const registryPath = path10.join(eventsGeneratedDir, "registry.ts");
-  if (!fs7.existsSync(registryPath)) return [];
-  const text2 = fs7.readFileSync(registryPath, "utf8");
+  const registryPath = path8.join(eventsGeneratedDir, "registry.ts");
+  if (!fs5.existsSync(registryPath)) return [];
+  const text2 = fs5.readFileSync(registryPath, "utf8");
   const out = /* @__PURE__ */ new Set();
   const re = /^\s*'([a-zA-Z0-9_.-]+)':\s*\{/gm;
   let m;
@@ -6963,9 +6705,9 @@ function readKnownEventTypes(eventsGeneratedDir) {
 function readEventTiers(eventsGeneratedDir) {
   const out = /* @__PURE__ */ new Map();
   if (!eventsGeneratedDir) return out;
-  const registryPath = path10.join(eventsGeneratedDir, "registry.ts");
-  if (!fs7.existsSync(registryPath)) return out;
-  const text2 = fs7.readFileSync(registryPath, "utf8");
+  const registryPath = path8.join(eventsGeneratedDir, "registry.ts");
+  if (!fs5.existsSync(registryPath)) return out;
+  const text2 = fs5.readFileSync(registryPath, "utf8");
   const re = /'([a-zA-Z0-9_.-]+)':\s*\{[^}]*?tier:\s*'(domain|audit)'/g;
   let m;
   while ((m = re.exec(text2)) !== null) {
@@ -7020,11 +6762,11 @@ function validateAgainstEventRegistry(triggers, knownEventTypes) {
     }
   }
 }
-function buildBridgeRegistryContent(triggers) {
+function buildBridgeRegistryContent(triggers, typeImport = "../bridge.protocol") {
   const chunks = [];
-  chunks.push(HEADER5);
+  chunks.push(HEADER3);
   chunks.push("");
-  chunks.push(`import type { BridgeRegistry } from '../bridge.protocol';`);
+  chunks.push(`import type { BridgeRegistry } from '${typeImport}';`);
   chunks.push("");
   if (triggers.length === 0) {
     chunks.push(`export const bridgeRegistry: BridgeRegistry = {};`);
@@ -7057,17 +6799,25 @@ function buildBridgeRegistryContent(triggers) {
   chunks.push("");
   return chunks.join("\n");
 }
-var OUTPUT_FILE_NAME = "registry.ts";
 async function generateBridgeRegistry(opts) {
-  const { handlersDir, eventsGeneratedDir, outputDir, dryRun = false } = opts;
-  const bridgeProtocolPath = path10.resolve(outputDir, "..", "bridge.protocol.ts");
-  if (!fs7.existsSync(bridgeProtocolPath)) {
-    const strayPath = path10.join(outputDir, OUTPUT_FILE_NAME);
-    if (!dryRun && fs7.existsSync(strayPath)) {
-      fs7.rmSync(strayPath);
-    }
-    return {
-      outputDir,
+  const {
+    handlersDir,
+    eventsGeneratedDir,
+    outputDir,
+    mode = "vendored",
+    bridgeInstalled = false,
+    dryRun = false
+  } = opts;
+  const outputFileName = OUTPUT_FILE_BY_MODE[mode];
+  const typeImport = mode === "package" ? PACKAGE_BRIDGE_TYPE_IMPORT : "../bridge.protocol";
+  const installed = mode === "package" ? bridgeInstalled : fs5.existsSync(path8.resolve(outputDir, "..", "bridge.protocol.ts"));
+  if (!installed) {
+    const strayPath = path8.join(outputDir, outputFileName);
+    if (!dryRun && fs5.existsSync(strayPath)) {
+      fs5.rmSync(strayPath);
+    }
+    return {
+      outputDir,
       triggerCount: 0,
       triggers: [],
       eventTypeCount: 0,
@@ -7082,16 +6832,16 @@ async function generateBridgeRegistry(opts) {
   validateAgainstEventRegistry(triggers, knownEventTypes);
   const eventTiers = readEventTiers(eventsGeneratedDir);
   validateNoAuditTriggers(triggers, eventTiers);
-  const content = buildBridgeRegistryContent(triggers);
+  const content = buildBridgeRegistryContent(triggers, typeImport);
   const file = {
-    name: OUTPUT_FILE_NAME,
-    outputPath: path10.join(outputDir, OUTPUT_FILE_NAME),
+    name: outputFileName,
+    outputPath: path8.join(outputDir, outputFileName),
     content
   };
   let written = false;
   if (!dryRun) {
-    fs7.mkdirSync(outputDir, { recursive: true });
-    fs7.writeFileSync(file.outputPath, file.content);
+    fs5.mkdirSync(outputDir, { recursive: true });
+    fs5.writeFileSync(file.outputPath, file.content);
     written = true;
   }
   const eventTypeCount = new Set(triggers.map((t) => t.event)).size;
@@ -7106,1083 +6856,1420 @@ async function generateBridgeRegistry(opts) {
   };
 }
 
-// src/cli/shared/orchestration-generator.ts
-import fs8 from "fs";
-import path11 from "path";
-var OrchestrationEmissionError = class extends Error {
-  constructor(issueType, patternName, message) {
-    super(`[${issueType}] ${patternName}: ${message}`);
-    this.issueType = issueType;
-    this.patternName = patternName;
+// src/cli/shared/event-codegen-generator.ts
+import fs6 from "fs";
+import path9 from "path";
+
+// src/parser/load-events.ts
+import { basename as basename2, resolve as resolve4 } from "path";
+function loadErrorToIssue2(error) {
+  const issues = [];
+  issues.push({
+    severity: "error",
+    type: "parse_error",
+    message: error.error,
+    path: error.filePath
+  });
+  if (error.details) {
+    for (const detail of error.details) {
+      issues.push({
+        severity: "error",
+        type: "schema_error",
+        message: detail,
+        path: error.filePath
+      });
+    }
   }
-  issueType;
-  patternName;
-  name = "OrchestrationEmissionError";
-};
-var HEADER6 = `// AUTO-GENERATED by @pattern-stack/codegen. Do not edit.
-// See ADR-032 \u2014 Orchestration Patterns.
-`;
-function splitWords(str) {
-  return str.replace(/([a-z])([A-Z])/g, "$1 $2").replace(/[_-]/g, " ").split(/\s+/).filter((w) => w.length > 0).map((w) => w.toLowerCase());
-}
-function toKebabCase2(str) {
-  return splitWords(str).join("-");
-}
-function toPascalCase2(str) {
-  return splitWords(str).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
-}
-function toCamelCase(str) {
-  const words = splitWords(str);
-  if (words.length === 0) return "";
-  const [first, ...rest] = words;
-  return (first ?? "") + rest.map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
+  return issues;
 }
-function toScreamingSnake(str) {
-  return splitWords(str).join("_").toUpperCase();
+function stripYamlExt(file) {
+  const base = basename2(file);
+  if (base.endsWith(".yaml")) return base.slice(0, -".yaml".length);
+  if (base.endsWith(".yml")) return base.slice(0, -".yml".length);
+  return base;
 }
-var FORBIDDEN_KEY_TYPES = /* @__PURE__ */ new Set([
-  "string",
-  "number",
-  "symbol",
-  "any",
-  "unknown"
-]);
-function assertEmittable(pattern) {
-  const allRegistries2 = [
-    pattern.registry,
-    ...pattern.coKeyedRegistries ?? []
-  ];
-  for (const sibling of pattern.coKeyedRegistries ?? []) {
-    if (typeof sibling.name !== "string" || sibling.name.length === 0) {
-      throw new OrchestrationEmissionError(
-        "pattern_cokeyed_missing_name",
-        pattern.name,
-        `Co-keyed registry (valueType '${sibling.valueType}') is missing the required 'name' field. Each co-keyed sibling must declare an explicit name; the emitter uppercases it for the token suffix and PascalCases it for the dispatcher method (e.g. name: 'auth' \u21D2 '\${PATTERN_CONST}_AUTH_REGISTRY' + 'selectAuth(...)'). ADR-032 O-1.`
-      );
-    }
+function loadEvents(eventsDir, entityNames) {
+  const events = [];
+  const issues = [];
+  const resolvedDir = resolve4(eventsDir);
+  let files;
+  try {
+    files = findYamlFiles(resolvedDir);
+  } catch {
+    issues.push({
+      severity: "warning",
+      type: "no_events_dir",
+      message: `No events directory found at: ${resolvedDir}`,
+      path: resolvedDir
+    });
+    return { events, issues };
   }
-  for (const reg of allRegistries2) {
-    if (FORBIDDEN_KEY_TYPES.has(reg.keyType)) {
-      throw new OrchestrationEmissionError(
-        "pattern_keytype_unresolved",
-        pattern.name,
-        `registry keyType '${reg.keyType}' is a primitive \u2014 Partial<Record<K, V>> requires a literal-union K, and per-overload narrowing requires a closed enum/union. Use a string-literal union or a TypeScript enum.`
-      );
+  if (files.length === 0) {
+    issues.push({
+      severity: "warning",
+      type: "no_files",
+      message: `No event YAML files found in directory: ${resolvedDir}`,
+      path: resolvedDir
+    });
+    return { events, issues };
+  }
+  const entityNameSet = new Set(entityNames);
+  const seenTypes = /* @__PURE__ */ new Map();
+  for (const filePath of files) {
+    const result = loadEventFromYaml(filePath);
+    if (!result.success) {
+      issues.push(...loadErrorToIssue2(result));
+      continue;
     }
-    if (typeof reg.keyTypeImport !== "string" || reg.keyTypeImport.length === 0) {
-      throw new OrchestrationEmissionError(
-        "pattern_missing_import_path",
-        pattern.name,
-        `registry (keyType '${reg.keyType}') is missing 'keyTypeImport'. Phase 3-2 emission requires every keyType to carry a module specifier.`
-      );
+    const { definition } = result;
+    const baseName = stripYamlExt(filePath);
+    if (baseName !== definition.type) {
+      issues.push({
+        severity: "error",
+        type: "event_filename_mismatch",
+        message: `Event file '${baseName}' must contain 'type: ${baseName}' (found 'type: ${definition.type}')`,
+        path: filePath,
+        suggestion: `Rename the file to '${definition.type}.yaml' or fix the 'type' field to '${baseName}'`
+      });
+      continue;
     }
-    if (typeof reg.valueTypeImport !== "string" || reg.valueTypeImport.length === 0) {
-      throw new OrchestrationEmissionError(
-        "pattern_missing_import_path",
-        pattern.name,
-        `registry (valueType '${reg.valueType}') is missing 'valueTypeImport'.`
-      );
+    if (definition.direction === "change" && definition.aggregate !== void 0 && !entityNameSet.has(definition.aggregate)) {
+      issues.push({
+        severity: "error",
+        type: "unknown_aggregate",
+        message: `change event '${definition.type}' references unknown aggregate entity '${definition.aggregate}'`,
+        path: filePath,
+        suggestion: `Define entities/${definition.aggregate}.yaml or fix the aggregate value`
+      });
+      continue;
     }
-    for (const e of reg.entries) {
-      if (typeof e.providerImport !== "string" || e.providerImport.length === 0) {
-        throw new OrchestrationEmissionError(
-          "pattern_missing_import_path",
-          pattern.name,
-          `entry '${e.key}' provider '${e.provider}' is missing 'providerImport'.`
+    if (seenTypes.has(definition.type)) {
+      issues.push({
+        severity: "error",
+        type: "duplicate_event_type",
+        message: `Duplicate event type '${definition.type}' (already declared in ${seenTypes.get(definition.type)})`,
+        path: filePath
+      });
+      continue;
+    }
+    seenTypes.set(definition.type, filePath);
+    events.push(definition);
+  }
+  return { events, issues };
+}
+function desugarEntityEvents(entity) {
+  const entityName = entity.entity.name;
+  const entityEvents = entity.events ?? [];
+  return entityEvents.map((ev) => {
+    const payload = {};
+    for (const [key, typeString] of Object.entries(ev.body)) {
+      if (!isEventFieldType(typeString)) {
+        throw new Error(
+          `Entity '${entityName}' event '${ev.name}' field '${key}' has unknown type '${typeString}' \u2014 expected one of ${EVENT_FIELD_TYPES.join("|")}`
         );
       }
+      payload[key] = { type: typeString, nullable: false };
     }
-  }
+    const def = {
+      type: ev.name,
+      tier: "domain",
+      direction: "change",
+      aggregate: entityName,
+      payload,
+      retry: { attempts: 3, backoff: "exponential" },
+      version: 1,
+      pool: DIRECTION_TO_POOL.change
+    };
+    return def;
+  });
 }
-function patternNames(pattern) {
-  const slug = toKebabCase2(pattern.name);
-  const pascal = toPascalCase2(pattern.name);
-  const screaming = toScreamingSnake(pattern.name);
-  return { slug, pascal, screaming };
+function isEventFieldType(s) {
+  return EVENT_FIELD_TYPES.includes(s);
 }
-function registryNames(pattern, reg, isPrimary) {
-  const { pascal, screaming } = patternNames(pattern);
-  if (isPrimary) {
+
+// src/cli/shared/event-codegen-generator.ts
+var PACKAGE_EVENTS_RUNTIME_IMPORT = "@pattern-stack/codegen/runtime/subsystems/events/index";
+function eventsRuntimeImports(mode) {
+  if (mode === "package") {
     return {
-      tokenConst: `${screaming}_REGISTRY`,
-      mapType: `${pascal}RegistryMap`,
-      method: "select",
-      overrideField: "overrides",
-      builderFn: `build${pascal}RegistryProviders`
+      protocol: PACKAGE_EVENTS_RUNTIME_IMPORT,
+      tokens: PACKAGE_EVENTS_RUNTIME_IMPORT,
+      errors: PACKAGE_EVENTS_RUNTIME_IMPORT
     };
   }
-  const namePascal = toPascalCase2(reg.name);
-  const nameScreaming = toScreamingSnake(reg.name);
-  const nameCamel = toCamelCase(reg.name);
   return {
-    tokenConst: `${screaming}_${nameScreaming}_REGISTRY`,
-    mapType: `${pascal}${namePascal}RegistryMap`,
-    method: `select${namePascal}`,
-    overrideField: `${nameCamel}Overrides`,
-    builderFn: `build${pascal}RegistryProviders`
+    protocol: "../event-bus.protocol",
+    tokens: "../events.tokens",
+    errors: "../events-errors"
   };
 }
-function dispatcherClassName(pattern) {
-  return pattern.dispatcher?.className ?? `${toPascalCase2(pattern.name)}Dispatcher`;
+var HEADER4 = `// AUTO-GENERATED by @pattern-stack/codegen. Do not edit.
+// Run \`codegen entity new --all\` to refresh.
+`;
+function toCamelCase(input) {
+  const parts = input.split("_").filter(Boolean);
+  if (parts.length === 0) return input;
+  const [first, ...rest] = parts;
+  return (first ?? "") + rest.map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
 }
-function moduleClassName(pattern) {
-  return `${toPascalCase2(pattern.name)}OrchestrationModule`;
+function toPascalCase2(input) {
+  return input.split("_").filter(Boolean).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
 }
-function forRootOptionsTypeName(pattern) {
-  return `${toPascalCase2(pattern.name)}ForRootOptions`;
+var TS_TYPE_BY_FIELD = {
+  uuid: "string",
+  string: "string",
+  number: "number",
+  boolean: "boolean",
+  date: "Date",
+  json: "Record<string, unknown>"
+};
+var ZOD_EXPR_BY_FIELD = {
+  uuid: "z.string().uuid()",
+  string: "z.string()",
+  number: "z.number()",
+  boolean: "z.boolean()",
+  date: "z.coerce.date()",
+  json: "z.record(z.unknown())"
+};
+function tsTypeForField(field) {
+  let base;
+  if (field.type === "array") {
+    const itemType = field.items;
+    base = `${TS_TYPE_BY_FIELD[itemType]}[]`;
+  } else {
+    base = TS_TYPE_BY_FIELD[field.type];
+  }
+  return field.nullable ? `${base} | null` : base;
 }
-function emitTypeImports(imports) {
-  const grouped = /* @__PURE__ */ new Map();
-  for (const i of imports) {
-    const set = grouped.get(i.specifier) ?? /* @__PURE__ */ new Set();
-    set.add(i.name);
-    grouped.set(i.specifier, set);
-  }
-  const out = [];
-  for (const specifier of [...grouped.keys()].sort()) {
-    const names2 = [...grouped.get(specifier)].sort();
-    out.push(`import type { ${names2.join(", ")} } from '${specifier}';`);
-  }
-  return out;
-}
-function emitValueImports(imports) {
-  const grouped = /* @__PURE__ */ new Map();
-  for (const i of imports) {
-    const set = grouped.get(i.specifier) ?? /* @__PURE__ */ new Set();
-    set.add(i.name);
-    grouped.set(i.specifier, set);
-  }
-  const out = [];
-  for (const specifier of [...grouped.keys()].sort()) {
-    const names2 = [...grouped.get(specifier)].sort();
-    out.push(`import { ${names2.join(", ")} } from '${specifier}';`);
+function zodExprForField(field) {
+  let base;
+  if (field.type === "array") {
+    const itemType = field.items;
+    base = `z.array(${ZOD_EXPR_BY_FIELD[itemType]})`;
+  } else {
+    base = ZOD_EXPR_BY_FIELD[field.type];
   }
-  return out;
+  return field.nullable ? `${base}.nullable()` : base;
 }
-function allRegistries(pattern) {
-  const list = [];
-  list.push({
-    reg: pattern.registry,
-    names: registryNames(pattern, pattern.registry, true),
-    isPrimary: true
-  });
-  for (const sibling of pattern.coKeyedRegistries ?? []) {
-    list.push({
-      reg: sibling,
-      names: registryNames(pattern, sibling, false),
-      isPrimary: false
-    });
-  }
-  return list;
+function aggregateTypeLiteral(ev) {
+  return ev.aggregate ?? ev.source ?? ev.destination ?? ev.type;
 }
-function buildTokensTs(pattern) {
-  const registries = allRegistries(pattern);
-  const typeImports = [];
-  for (const { reg } of registries) {
-    typeImports.push({ specifier: reg.keyTypeImport, name: reg.keyType });
-    typeImports.push({ specifier: reg.valueTypeImport, name: reg.valueType });
-  }
-  const lines = [];
-  lines.push(HEADER6.trimEnd());
-  lines.push("");
-  for (const i of emitTypeImports(typeImports)) lines.push(i);
-  lines.push("");
-  for (const { names: names2 } of registries) {
-    lines.push(`export const ${names2.tokenConst} = Symbol('${names2.tokenConst}');`);
+function collectEntityEvents(entitiesDir) {
+  const events = [];
+  const issues = [];
+  if (!fs6.existsSync(entitiesDir)) {
+    return { events, issues };
   }
-  lines.push("");
-  for (const { reg, names: names2 } of registries) {
-    lines.push(
-      `export type ${names2.mapType} = Map<${reg.keyType}, ${reg.valueType}>;`
-    );
+  const files = findYamlFiles(entitiesDir);
+  for (const filePath of files) {
+    const result = loadEntityFromYaml(filePath);
+    if (!result.success) continue;
+    try {
+      events.push(...desugarEntityEvents(result.definition));
+    } catch (err) {
+      issues.push({
+        severity: "error",
+        type: "entity_event_desugar_failed",
+        message: err instanceof Error ? err.message : String(err),
+        path: filePath
+      });
+    }
   }
-  lines.push("");
-  return lines.join("\n");
+  return { events, issues };
 }
-function buildProvidersTs(pattern) {
-  const registries = allRegistries(pattern);
-  const providerImports = [];
-  for (const { reg } of registries) {
-    for (const e of reg.entries) {
-      providerImports.push({ specifier: e.providerImport, name: e.provider });
-    }
+function mergeEvents(topLevel, entitySugar) {
+  const issues = [];
+  const byType = /* @__PURE__ */ new Map();
+  for (const ev of entitySugar) {
+    byType.set(ev.type, ev);
   }
-  const tokenValueImports = registries.map(({ names: names2 }) => names2.tokenConst);
-  const mapTypeImports = registries.map(({ names: names2 }) => names2.mapType);
-  const typeImports = [];
-  for (const { reg } of registries) {
-    typeImports.push({ specifier: reg.keyTypeImport, name: reg.keyType });
-    typeImports.push({ specifier: reg.valueTypeImport, name: reg.valueType });
+  for (const ev of topLevel) {
+    if (byType.has(ev.type)) {
+      issues.push({
+        severity: "warning",
+        type: "event_merge_override",
+        message: `event '${ev.type}' is declared both in an entity \`events:\` block and a top-level \`events/${ev.type}.yaml\` \u2014 top-level definition wins`
+      });
+    }
+    byType.set(ev.type, ev);
   }
-  const optsType = forRootOptionsTypeName(pattern);
-  const lines = [];
-  lines.push(HEADER6.trimEnd());
-  lines.push("");
-  lines.push(`import type { Provider } from '@nestjs/common';`);
-  for (const i of emitTypeImports(typeImports)) lines.push(i);
-  for (const i of emitValueImports(providerImports)) lines.push(i);
-  const tokenLine = [
-    ...tokenValueImports.sort(),
-    ...mapTypeImports.sort().map((m) => `type ${m}`)
-  ].join(", ");
-  lines.push(`import { ${tokenLine} } from './tokens.js';`);
-  lines.push(`import type { ${optsType} } from './module.js';`);
-  lines.push("");
-  const { pascal } = patternNames(pattern);
-  lines.push(
-    `export function build${pascal}RegistryProviders(opts?: ${optsType}): Provider[] {`
+  const events = Array.from(byType.values()).sort(
+    (a, b) => a.type.localeCompare(b.type)
   );
-  lines.push("	return [");
-  for (const { reg, names: names2 } of registries) {
-    const factoryArgs = reg.entries.map((e, i) => `${camelArg(e.provider, i)}: ${e.provider}`).join(", ");
-    lines.push("		{");
-    lines.push(`			provide: ${names2.tokenConst},`);
-    lines.push(`			useFactory: (${factoryArgs}) => {`);
-    lines.push(`				const base: ${names2.mapType} = new Map<${reg.keyType}, ${reg.valueType}>([`);
-    for (const [i, e] of reg.entries.entries()) {
-      lines.push(
-        `					['${e.key}' as ${reg.keyType}, ${camelArg(e.provider, i)}],`
-      );
+  return { events, issues };
+}
+function collectMergedEvents(opts) {
+  const { entitiesDir, eventsDir } = opts;
+  const entityNames = [];
+  if (fs6.existsSync(entitiesDir)) {
+    const entityFiles = findYamlFiles(entitiesDir);
+    for (const f of entityFiles) {
+      const result = loadEntityFromYaml(f);
+      if (result.success) entityNames.push(result.definition.entity.name);
     }
-    lines.push("				]);");
-    lines.push(`				if (opts?.${names2.overrideField}) {`);
-    lines.push(`					for (const [k, v] of Object.entries(opts.${names2.overrideField})) {`);
-    lines.push(`						if (v !== undefined) base.set(k as ${reg.keyType}, v as ${reg.valueType});`);
-    lines.push("					}");
-    lines.push("				}");
-    lines.push(`				return base as ${names2.mapType};`);
-    lines.push("			},");
-    const injectList = reg.entries.map((e) => e.provider).join(", ");
-    lines.push(`			inject: [${injectList}],`);
-    lines.push("		},");
   }
-  lines.push("	];");
-  lines.push("}");
-  lines.push("");
-  return lines.join("\n");
-}
-function camelArg(provider, index2) {
-  const camel = provider.charAt(0).toLowerCase() + provider.slice(1);
-  return `${camel}_${index2}`;
+  const topLevelResult = loadEvents(eventsDir, entityNames);
+  const { events: entitySugar, issues: sugarIssues } = collectEntityEvents(entitiesDir);
+  const { events: merged, issues: mergeIssues } = mergeEvents(
+    topLevelResult.events,
+    entitySugar
+  );
+  const issues = [
+    ...topLevelResult.issues,
+    ...sugarIssues,
+    ...mergeIssues
+  ];
+  return { events: merged, issues };
 }
-function buildDispatcherTs(pattern) {
-  const registries = allRegistries(pattern);
-  const className = dispatcherClassName(pattern);
-  const errorClass = `${className}Error`;
-  const typeImports = [];
-  for (const { reg } of registries) {
-    typeImports.push({ specifier: reg.keyTypeImport, name: reg.keyType });
-    typeImports.push({ specifier: reg.valueTypeImport, name: reg.valueType });
+function buildTypesContent(events, mode = "vendored") {
+  const sorted = [...events].sort((a, b) => a.type.localeCompare(b.type));
+  const protocolImport = eventsRuntimeImports(mode).protocol;
+  if (sorted.length === 0) {
+    return HEADER4 + `
+import type { DomainEvent } from '${protocolImport}';
+
+export type AppDomainEvent = never;
+
+export type EventTypeName = string;
+export type EventOfType<T extends EventTypeName> = DomainEvent;
+export type PayloadOfType<T extends EventTypeName> = DomainEvent['payload'];
+`;
   }
-  const providerImports = [];
-  for (const { reg } of registries) {
-    for (const e of reg.entries) {
-      providerImports.push({ specifier: e.providerImport, name: e.provider });
+  const chunks = [];
+  chunks.push(HEADER4);
+  chunks.push("");
+  chunks.push(`import type { DomainEvent } from '${protocolImport}';`);
+  chunks.push("");
+  for (const ev of sorted) {
+    const interfaceName = `${toPascalCase2(ev.type)}Event`;
+    const aggregateLit = aggregateTypeLiteral(ev);
+    if (ev.description) {
+      chunks.push(`/** ${ev.description} */`);
+    }
+    chunks.push(`export interface ${interfaceName} extends DomainEvent {`);
+    chunks.push(`	readonly type: '${ev.type}';`);
+    chunks.push(`	readonly aggregateType: '${aggregateLit}';`);
+    const payloadKeys = Object.keys(ev.payload).sort();
+    if (payloadKeys.length === 0) {
+      chunks.push(`	readonly payload: Record<string, never>;`);
+    } else {
+      chunks.push(`	readonly payload: {`);
+      for (const key of payloadKeys) {
+        const field = ev.payload[key];
+        if (!field) continue;
+        if (field.description) {
+          chunks.push(`		/** ${field.description} */`);
+        }
+        chunks.push(`		${toCamelCase(key)}: ${tsTypeForField(field)};`);
+      }
+      chunks.push(`	};`);
     }
+    chunks.push(`}`);
+    chunks.push("");
   }
-  const tokenValues = registries.map(({ names: names2 }) => names2.tokenConst);
-  const mapTypes = registries.map(({ names: names2 }) => names2.mapType);
-  const lines = [];
-  lines.push(HEADER6.trimEnd());
-  lines.push("");
-  lines.push(`import { Inject, Injectable } from '@nestjs/common';`);
-  for (const i of emitTypeImports(typeImports)) lines.push(i);
-  for (const i of emitValueImports(providerImports)) lines.push(i);
-  const tokenLine = [
-    ...tokenValues.sort(),
-    ...mapTypes.sort().map((m) => `type ${m}`)
-  ].join(", ");
-  lines.push(`import { ${tokenLine} } from './tokens.js';`);
-  lines.push("");
-  lines.push(`export class ${errorClass} extends Error {}`);
-  lines.push("");
-  lines.push("@Injectable()");
-  lines.push(`export class ${className} {`);
-  lines.push("	constructor(");
-  for (const { names: names2 } of registries) {
-    const fieldName = names2.method === "select" ? "registry" : `${camelFromMethod(names2.method)}Registry`;
-    lines.push(
-      `		@Inject(${names2.tokenConst}) protected readonly ${fieldName}: ${names2.mapType},`
-    );
+  const unionMembers = sorted.map((ev) => `${toPascalCase2(ev.type)}Event`);
+  chunks.push(`export type AppDomainEvent =`);
+  chunks.push(`	| ${unionMembers.join("\n	| ")};`);
+  chunks.push("");
+  chunks.push(`export type EventTypeName = AppDomainEvent['type'];`);
+  chunks.push(
+    `export type EventOfType<T extends EventTypeName> = Extract<AppDomainEvent, { type: T }>;`
+  );
+  chunks.push(
+    `export type PayloadOfType<T extends EventTypeName> = EventOfType<T>['payload'];`
+  );
+  chunks.push("");
+  return chunks.join("\n");
+}
+function buildSchemasContent(events) {
+  const sorted = [...events].sort((a, b) => a.type.localeCompare(b.type));
+  if (sorted.length === 0) {
+    return HEADER4 + `
+import { z } from 'zod';
+import type { EventTypeName } from './types';
+
+export const eventPayloadSchemas = {} as Record<EventTypeName, z.ZodType>;
+`;
   }
-  lines.push("	) {}");
-  lines.push("");
-  for (const { reg, names: names2 } of registries) {
-    const fieldName = names2.method === "select" ? "registry" : `${camelFromMethod(names2.method)}Registry`;
-    for (const e of reg.entries) {
-      lines.push(`	${names2.method}(key: '${e.key}'): ${e.provider};`);
+  const chunks = [];
+  chunks.push(HEADER4);
+  chunks.push("");
+  chunks.push(`import { z } from 'zod';`);
+  chunks.push(`import type { EventTypeName } from './types';`);
+  chunks.push("");
+  for (const ev of sorted) {
+    const schemaConst = `${toCamelCase(ev.type)}PayloadSchema`;
+    const payloadKeys = Object.keys(ev.payload).sort();
+    if (payloadKeys.length === 0) {
+      chunks.push(`export const ${schemaConst} = z.object({}).strict();`);
+      chunks.push("");
+      continue;
     }
-    lines.push(`	${names2.method}(key: ${reg.keyType}): ${reg.valueType};`);
-    lines.push(`	${names2.method}(key: ${reg.keyType}): ${reg.valueType} {`);
-    lines.push(`		const entry = this.${fieldName}.get(key);`);
-    lines.push(
-      `		if (!entry) throw new ${errorClass}(\`Unknown ${reg.keyType}: \${String(key)}\`);`
-    );
-    lines.push(`		return entry;`);
-    lines.push("	}");
-    lines.push("");
-  }
-  if (pattern.dispatcher?.assemblySlot) {
-    lines.push(
-      `	// ADR-032 Decision 5 \u2014 \`assemblySlot: '${pattern.dispatcher.assemblySlot}'\` is a`
-    );
-    lines.push(
-      `	// subclass contract, not emitted here. Consumers subclass and add the`
-    );
-    lines.push(
-      `	// \`${pattern.dispatcher.assemblySlot}(...)\` method themselves.`
-    );
+    chunks.push(`export const ${schemaConst} = z.object({`);
+    for (const key of payloadKeys) {
+      const field = ev.payload[key];
+      if (!field) continue;
+      chunks.push(`	${toCamelCase(key)}: ${zodExprForField(field)},`);
+    }
+    chunks.push(`}).strict();`);
+    chunks.push("");
   }
-  lines.push("}");
-  lines.push("");
-  return lines.join("\n");
-}
-function camelFromMethod(method) {
-  if (method.startsWith("select") && method.length > "select".length) {
-    const tail = method.slice("select".length);
-    return tail.charAt(0).toLowerCase() + tail.slice(1);
+  chunks.push(`export const eventPayloadSchemas = {`);
+  for (const ev of sorted) {
+    chunks.push(`	'${ev.type}': ${toCamelCase(ev.type)}PayloadSchema,`);
   }
-  return method;
+  chunks.push(`} as const satisfies Record<EventTypeName, z.ZodType>;`);
+  chunks.push("");
+  return chunks.join("\n");
 }
-function buildModuleTs(pattern) {
-  const registries = allRegistries(pattern);
-  const className = dispatcherClassName(pattern);
-  const moduleName = moduleClassName(pattern);
-  const optsType = forRootOptionsTypeName(pattern);
-  const { pascal } = patternNames(pattern);
-  const typeImports = [];
-  for (const { reg } of registries) {
-    typeImports.push({ specifier: reg.keyTypeImport, name: reg.keyType });
-    typeImports.push({ specifier: reg.valueTypeImport, name: reg.valueType });
+var REGISTRY_INTERFACE = [
+  "export interface EventMetadata {",
+  "	type: EventTypeName;",
+  "	tier: 'domain' | 'audit';",
+  "	direction: 'inbound' | 'change' | 'outbound' | null;",
+  "	pool: 'events_inbound' | 'events_change' | 'events_outbound' | null;",
+  "	aggregate?: string;",
+  "	source?: string;",
+  "	destination?: string;",
+  "	version: number;",
+  "	retry: { attempts: number; backoff: 'linear' | 'exponential' };",
+  "}"
+].join("\n");
+var REGISTRY_GETTER = [
+  "export function getEventMetadata<T extends EventTypeName>(type: T): EventMetadata {",
+  "	const meta = eventRegistry[type];",
+  "	if (!meta) {",
+  "		throw new Error(`No registry entry for event type '${String(type)}' \u2014 declare events under events/*.yaml and re-run \\`codegen entity new --all\\`.`);",
+  "	}",
+  "	return meta;",
+  "}"
+].join("\n");
+function buildRegistryContent(events) {
+  const sorted = [...events].sort((a, b) => a.type.localeCompare(b.type));
+  const chunks = [];
+  chunks.push(HEADER4);
+  chunks.push("");
+  chunks.push(`import type { EventTypeName } from './types';`);
+  chunks.push("");
+  chunks.push(REGISTRY_INTERFACE);
+  chunks.push("");
+  if (sorted.length === 0) {
+    chunks.push(
+      `export const eventRegistry = {} as Record<EventTypeName, EventMetadata>;`
+    );
+    chunks.push("");
+    chunks.push(REGISTRY_GETTER);
+    chunks.push("");
+    return chunks.join("\n");
   }
-  const tokenValues = registries.map(({ names: names2 }) => names2.tokenConst);
-  const lines = [];
-  lines.push(HEADER6.trimEnd());
-  lines.push("");
-  lines.push(`import { type DynamicModule, Module } from '@nestjs/common';`);
-  for (const i of emitTypeImports(typeImports)) lines.push(i);
-  lines.push(`import { ${className} } from './dispatcher.js';`);
-  lines.push(`import { build${pascal}RegistryProviders } from './registry.providers.js';`);
-  lines.push(`import { ${tokenValues.sort().join(", ")} } from './tokens.js';`);
-  lines.push("");
-  lines.push(`export interface ${optsType} {`);
-  for (const { reg, names: names2 } of registries) {
-    lines.push(
-      `	${names2.overrideField}?: Partial<Record<${reg.keyType}, ${reg.valueType}>>;`
+  chunks.push(`export const eventRegistry = {`);
+  for (const ev of sorted) {
+    const tier = ev.tier ?? "domain";
+    chunks.push(`	'${ev.type}': {`);
+    chunks.push(`		type: '${ev.type}',`);
+    chunks.push(`		tier: '${tier}',`);
+    if (tier === "audit") {
+      chunks.push(`		direction: null,`);
+      chunks.push(`		pool: null,`);
+    } else {
+      chunks.push(`		direction: '${ev.direction}',`);
+      chunks.push(`		pool: '${ev.pool}',`);
+    }
+    if (ev.aggregate !== void 0) {
+      chunks.push(`		aggregate: '${ev.aggregate}',`);
+    }
+    if (ev.source !== void 0) {
+      chunks.push(`		source: '${ev.source}',`);
+    }
+    if (ev.destination !== void 0) {
+      chunks.push(`		destination: '${ev.destination}',`);
+    }
+    chunks.push(`		version: ${ev.version},`);
+    chunks.push(
+      `		retry: { attempts: ${ev.retry.attempts}, backoff: '${ev.retry.backoff}' },`
     );
+    chunks.push(`	},`);
   }
-  lines.push("}");
-  lines.push("");
-  lines.push("@Module({})");
-  lines.push(`export class ${moduleName} {`);
-  lines.push(`	static forRoot(opts?: ${optsType}): DynamicModule {`);
-  lines.push("		return {");
-  lines.push(`			module: ${moduleName},`);
-  lines.push(
-    `			providers: [...build${pascal}RegistryProviders(opts), ${className}],`
+  chunks.push(
+    `} as const satisfies Record<EventTypeName, EventMetadata>;`
   );
-  const exportItems = [...tokenValues.sort(), className];
-  lines.push(`			exports: [${exportItems.join(", ")}],`);
-  lines.push("		};");
-  lines.push("	}");
-  lines.push("}");
-  lines.push("");
-  return lines.join("\n");
+  chunks.push("");
+  chunks.push(REGISTRY_GETTER);
+  chunks.push("");
+  return chunks.join("\n");
 }
-function buildIndexTs(pattern) {
-  const lines = [];
-  lines.push(HEADER6.trimEnd());
-  lines.push("");
-  lines.push(`export * from './tokens.js';`);
-  lines.push(`export * from './dispatcher.js';`);
-  lines.push(`export * from './module.js';`);
-  lines.push(`export * from './registry.providers.js';`);
-  lines.push("");
-  return lines.join("\n");
+var BUS_BODY = `import { Injectable, Inject } from '@nestjs/common';
+import { randomUUID } from 'crypto';
+import { EVENT_BUS, EVENTS_MULTI_TENANT } from '../events.tokens';
+import { MissingTenantIdError } from '../events-errors';
+import type { IEventBus, DrizzleTransaction } from '../event-bus.protocol';
+import { eventPayloadSchemas } from './schemas';
+import { getEventMetadata } from './registry';
+import type { EventTypeName, EventOfType, PayloadOfType } from './types';
+
+/**
+ * Typed facade over IEventBus.
+ *
+ * Stamps \`pool\`, \`direction\`, \`tier\`, and \`version\` into \`event.metadata\`
+ * from the generated \`eventRegistry\` before delegating to
+ * \`IEventBus.publish()\`. Downstream backends (DrizzleEventBus) read those
+ * values to populate the explicit \`domain_events\` columns.
+ *
+ * Tier stamping (AUDIT-3): every event carries \`metadata.tier\`, sourced
+ * from the registry. For \`tier: 'audit'\` events, the bus FORCES
+ * \`metadata.pool = null\` and \`metadata.direction = null\` regardless of
+ * any caller-supplied values in \`opts.metadata\` \u2014 audit routing is
+ * bus-stamped, not caller-controlled. Caller overrides are silently
+ * dropped with a debug-level log (callers should not be specifying these
+ * for audit events; see ai-docs/specs/issue-242/plan.md \xA7AUDIT-3).
+ *
+ * Validation gating (EVT-Q5): \`CODEGEN_EVENT_VALIDATE\` env flag, default on.
+ * Uses \`safeParse\` + \`console.warn\` \u2014 never throws, so a bad publish does
+ * not crash a hot path.
+ *
+ * Multi-tenancy (EVT-6): when the EventsModule is configured with
+ * \`multiTenant: true\`, every publish must supply \`opts.metadata.tenantId\`
+ * \u2014 otherwise \`publish()\` throws \`MissingTenantIdError\`. When \`multiTenant\`
+ * is \`false\` (default), no tenantId is required. If a tenantId IS supplied,
+ * it is preserved on \`event.metadata\` and the Drizzle backend writes it to
+ * \`domain_events.tenant_id\` (EVT-4).
+ */
+@Injectable()
+export class TypedEventBus {
+	constructor(
+		@Inject(EVENT_BUS) private readonly bus: IEventBus,
+		@Inject(EVENTS_MULTI_TENANT) private readonly multiTenant: boolean,
+	) {}
+
+	async publish<T extends EventTypeName>(
+		type: T,
+		aggregateId: string,
+		payload: PayloadOfType<T>,
+		opts?: { tx?: DrizzleTransaction; metadata?: Record<string, unknown> },
+	): Promise<void> {
+		const meta = getEventMetadata(type);
+
+		const flag = process.env['CODEGEN_EVENT_VALIDATE'];
+		const shouldValidate =
+			flag === undefined ? true : flag !== 'false' && flag !== '0';
+		if (shouldValidate) {
+			// \`eventPayloadSchemas\` is typed as \`Record<EventTypeName, z.ZodType>\`,
+			// so under \`noUncheckedIndexedAccess\` the indexed lookup widens
+			// to \`z.ZodType | undefined\`. When no events are registered at
+			// codegen time \`EventTypeName\` degrades to \`string\` and the
+			// schemas object is literally \`{}\` \u2014 the guard below is the
+			// honest handling of that empty-registry case (skip validation;
+			// it's a warn-only best-effort check per the class docblock).
+			const schema = eventPayloadSchemas[type];
+			if (schema) {
+				const check = schema.safeParse(payload);
+				if (!check.success) {
+					console.warn(
+						\`[TypedEventBus] payload validation failed for \${String(type)}:\`,
+						check.error.issues,
+					);
+				}
+			}
+		}
+
+		const tenantId = opts?.metadata?.['tenantId'];
+		if (this.multiTenant && (tenantId === undefined || tenantId === null)) {
+			throw new MissingTenantIdError(type as string);
+		}
+
+		const aggregateType =
+			meta.aggregate ?? meta.source ?? meta.destination ?? (type as string);
+
+		// AUDIT-3: build metadata with tier-aware routing stamping. For
+		// \`tier: 'audit'\` events the bus FORCES pool/direction to null,
+		// even if the caller supplied them in opts.metadata. Audit routing
+		// is bus-stamped, not caller-controlled (see plan \xA7AUDIT-3).
+		const baseMetadata: Record<string, unknown> = { ...(opts?.metadata ?? {}) };
+		if (meta.tier === 'audit') {
+			if (
+				baseMetadata['pool'] !== undefined ||
+				baseMetadata['direction'] !== undefined
+			) {
+				console.debug(
+					\`[TypedEventBus] tier:audit event '\${String(type)}' had pool/direction in opts.metadata; overriding to null.\`,
+				);
+			}
+			baseMetadata['pool'] = null;
+			baseMetadata['direction'] = null;
+			baseMetadata['tier'] = 'audit';
+		} else {
+			baseMetadata['pool'] = meta.pool;
+			baseMetadata['direction'] = meta.direction;
+			baseMetadata['tier'] = 'domain';
+		}
+		baseMetadata['version'] = meta.version;
+
+		await this.bus.publish(
+			{
+				id: randomUUID(),
+				type,
+				aggregateId,
+				aggregateType,
+				payload: payload as Record<string, unknown>,
+				occurredAt: new Date(),
+				metadata: baseMetadata,
+			},
+			opts?.tx,
+		);
+	}
+
+	subscribe<T extends EventTypeName>(
+		type: T,
+		handler: (event: EventOfType<T>) => Promise<void>,
+	): () => void {
+		return this.bus.subscribe<EventOfType<T>>(type, handler as never);
+	}
+}
+`;
+function buildBusContent(_events, mode = "vendored") {
+  let body = BUS_BODY;
+  if (mode === "package") {
+    body = body.replace(`from '../events.tokens'`, `from '${PACKAGE_EVENTS_RUNTIME_IMPORT}'`).replace(`from '../events-errors'`, `from '${PACKAGE_EVENTS_RUNTIME_IMPORT}'`).replace(`from '../event-bus.protocol'`, `from '${PACKAGE_EVENTS_RUNTIME_IMPORT}'`);
+  }
+  return HEADER4 + "\n" + body;
+}
+function buildIndexContent(_events) {
+  return HEADER4 + `
+export * from './types';
+export * from './schemas';
+export * from './registry';
+export * from './bus';
+`;
+}
+function buildEventCodegenContents(events, mode = "vendored") {
+  return [
+    { name: "types.ts", content: buildTypesContent(events, mode) },
+    { name: "schemas.ts", content: buildSchemasContent(events) },
+    { name: "registry.ts", content: buildRegistryContent(events) },
+    { name: "bus.ts", content: buildBusContent(events, mode) },
+    { name: "index.ts", content: buildIndexContent(events) }
+  ];
+}
+async function generateEventCodegen(opts) {
+  const { entitiesDir, eventsDir, outputDir, mode = "vendored", dryRun = false } = opts;
+  const { events: merged, issues } = collectMergedEvents({
+    entitiesDir,
+    eventsDir
+  });
+  const files = buildEventCodegenContents(merged, mode).map(
+    ({ name, content }) => ({
+      name,
+      outputPath: path9.join(outputDir, name),
+      content
+    })
+  );
+  const hasError = issues.some((i) => i.severity === "error");
+  let written = false;
+  if (!dryRun && !hasError) {
+    fs6.mkdirSync(outputDir, { recursive: true });
+    for (const file of files) {
+      fs6.writeFileSync(file.outputPath, file.content);
+    }
+    written = true;
+  }
+  return {
+    outputDir,
+    eventCount: merged.length,
+    events: merged,
+    issues,
+    written,
+    files
+  };
+}
+
+// src/cli/shared/subsystem-barrel-generator.ts
+function quoteOpts(opts) {
+  const entries = Object.entries(opts).filter(([, v]) => v !== void 0);
+  if (entries.length === 0) return "";
+  return "{ " + entries.map(([k, v]) => `${k}: ${typeof v === "string" ? `'${v}'` : String(v)}`).join(", ") + " }";
+}
+function jsonToTs(value) {
+  if (value === null || value === void 0) return "undefined";
+  if (typeof value === "string") return `'${value.replace(/'/g, "\\'")}'`;
+  if (typeof value === "number" || typeof value === "boolean") return String(value);
+  if (Array.isArray(value)) return `[${value.map(jsonToTs).join(", ")}]`;
+  if (typeof value === "object") {
+    const entries = Object.entries(value).filter(
+      ([, v]) => v !== void 0
+    );
+    return `{ ${entries.map(([k, v]) => `${k}: ${jsonToTs(v)}`).join(", ")} }`;
+  }
+  return "undefined";
+}
+function quoteBullmqDomainOpts(input) {
+  const { backend, multiTenant, bullExt } = input;
+  if (backend !== "bullmq" || !bullExt) {
+    return quoteOpts({ backend, multiTenant });
+  }
+  const parts = [`backend: 'bullmq'`];
+  if (multiTenant) parts.push(`multiTenant: true`);
+  parts.push(`extensions: { bullmq: ${jsonToTs(bullExt)} }`);
+  return `{ ${parts.join(", ")} }`;
+}
+function workerPoolsClause(cfg, bridgeInstalled) {
+  const explicit = cfg?.worker_pools;
+  if (Array.isArray(explicit) && explicit.length > 0) {
+    const list = explicit.filter((p) => typeof p === "string").map((p) => `'${p}'`).join(", ");
+    if (list.length > 0) return `pools: [${list}]`;
+  }
+  if (cfg?.all_pools === true) return "allPools: true";
+  if (bridgeInstalled) return "allPools: true";
+  return "";
+}
+var COMPOSERS = {
+  events: ({ moduleImport, cfg, mode }) => {
+    const backend = cfg?.backend ?? "drizzle";
+    const multiTenant = Boolean(cfg?.multi_tenant);
+    const imports = [
+      `import { EventsModule } from '${moduleImport("events", "events.module")}';`
+    ];
+    if (mode === "package") {
+      imports.push(`import { TypedEventBus } from './events/bus';`);
+      return {
+        imports,
+        calls: [
+          `	EventsModule.forRoot({ backend: '${backend}', multiTenant: ${multiTenant}, typedBus: TypedEventBus }),`
+        ]
+      };
+    }
+    return {
+      imports,
+      calls: [
+        `	EventsModule.forRoot(${quoteOpts({ backend, multiTenant })}),`
+      ]
+    };
+  },
+  jobs: ({ moduleImport, cfg, bridgeInstalled }) => {
+    const backend = cfg?.backend ?? "drizzle";
+    const multiTenant = Boolean(cfg?.multi_tenant);
+    const workerMode = (cfg?.worker_mode ?? "standalone").trim();
+    const imports = [
+      `import { JobsDomainModule } from '${moduleImport("jobs", "jobs-domain.module")}';`
+    ];
+    const bullExt = backend === "bullmq" ? cfg?.extensions?.bullmq : void 0;
+    const domainOpts = quoteBullmqDomainOpts({ backend, multiTenant, bullExt });
+    const calls = [`	JobsDomainModule.forRoot(${domainOpts}),`];
+    if (workerMode === "embedded") {
+      imports.push(
+        `import { JobWorkerModule } from '${moduleImport("jobs", "job-worker.module")}';`
+      );
+      const parts = [`mode: 'embedded'`];
+      if (backend === "bullmq") {
+        parts.push(`backend: 'bullmq'`);
+        if (bullExt) {
+          parts.push(`domainModuleExtensions: { bullmq: ${jsonToTs(bullExt)} }`);
+        }
+      }
+      const poolsClause = workerPoolsClause(cfg, bridgeInstalled);
+      if (poolsClause) parts.push(poolsClause);
+      calls.push(`	JobWorkerModule.forRoot({ ${parts.join(", ")} }),`);
+    }
+    return { imports, calls };
+  },
+  bridge: ({ moduleImport, cfg, mode }) => {
+    const backend = cfg?.backend ?? "drizzle";
+    const multiTenant = Boolean(cfg?.multi_tenant);
+    const imports = [
+      `import { BridgeModule } from '${moduleImport("bridge", "bridge.module")}';`
+    ];
+    if (mode === "package") {
+      imports.push(`import { bridgeRegistry } from './bridge-registry';`);
+      return {
+        imports,
+        calls: [
+          `	BridgeModule.forRoot({ backend: '${backend}', multiTenant: ${multiTenant}, registry: bridgeRegistry }),`
+        ]
+      };
+    }
+    return {
+      imports,
+      calls: [
+        `	BridgeModule.forRoot(${quoteOpts({ backend, multiTenant })}),`
+      ]
+    };
+  },
+  integration: ({ moduleImport, cfg }) => {
+    const backend = cfg?.backend ?? "drizzle";
+    const multiTenant = Boolean(cfg?.multi_tenant);
+    return {
+      imports: [
+        `import { IntegrationModule } from '${moduleImport("integration", "integration.module")}';`
+      ],
+      calls: [
+        `	IntegrationModule.forRoot(${quoteOpts({ backend, multiTenant })}),`
+      ]
+    };
+  }
+};
+var PACKAGE2 = "@pattern-stack/codegen";
+function makeModuleImport(mode, subsystemsRel) {
+  if (mode === "vendored") {
+    return (subsystem, moduleBasename) => `${subsystemsRel}/${subsystem}/${moduleBasename}`;
+  }
+  return (subsystem) => subsystem === "events" ? `${PACKAGE2}/subsystems` : `${PACKAGE2}/runtime/subsystems/${subsystem}/index`;
+}
+var COMPOSABLE_ORDER = ["events", "jobs", "bridge", "integration"];
+var HEADER5 = `// AUTO-GENERATED by @pattern-stack/codegen. DO NOT EDIT.
+// Subsystem composition barrel \u2014 reflects \`subsystems.install\` in
+// codegen.config.yaml and the per-subsystem option blocks
+// (\`events:\`, \`jobs:\`, \`bridge:\`, \`integration:\`).
+//
+// Wire into AppModule once:
+//
+//   import { SUBSYSTEM_MODULES } from './generated/subsystems';
+//   @Module({ imports: [DatabaseModule, ...SUBSYSTEM_MODULES, ...GENERATED_MODULES] })
+//
+// Regenerated by every \`codegen entity new\` / \`codegen subsystem install\`.
+
+`;
+function buildSubsystemBarrel(installed, config, subsystemsRel, mode = "vendored") {
+  const moduleImport = makeModuleImport(mode, subsystemsRel);
+  const actable = installed.filter((i) => i.status !== "incomplete");
+  const installedNames = new Set(actable.map((i) => i.name));
+  const bridgeInstalled = installedNames.has("bridge");
+  const emitted = [];
+  const skipped = [];
+  const allImports = [`import type { DynamicModule } from '@nestjs/common';`];
+  const allCalls = [];
+  for (const name of COMPOSABLE_ORDER) {
+    if (!installedNames.has(name)) continue;
+    const composer = COMPOSERS[name];
+    if (!composer) {
+      skipped.push(name);
+      continue;
+    }
+    const cfg = config?.[name] ?? void 0;
+    const out = composer({ moduleImport, cfg, mode, bridgeInstalled });
+    allImports.push(...out.imports);
+    allCalls.push(...out.calls);
+    emitted.push(name);
+  }
+  for (const inst of actable) {
+    if (!COMPOSABLE_ORDER.includes(inst.name) && !COMPOSERS[inst.name]) {
+      skipped.push(inst.name);
+    }
+  }
+  const exportLine = allCalls.length === 0 ? `export const SUBSYSTEM_MODULES: DynamicModule[] = [];
+` : `export const SUBSYSTEM_MODULES: DynamicModule[] = [
+${allCalls.join("\n")}
+];
+`;
+  const body = allImports.join("\n") + "\n\n" + exportLine;
+  return { content: HEADER5 + body, emitted, skipped };
+}
+async function regenerateSubsystemBarrel(opts) {
+  const { ctx, dryRun = false } = opts;
+  const generatedDir = opts.generatedDir ?? resolveGeneratedDir(ctx);
+  const mode = resolveRuntimeMode(ctx.config);
+  const installed = mode === "package" ? configuredInstalledSubsystems(
+    ctx.config
+  ) : await detectInstalledSubsystems(ctx);
+  const subsystemsAbs = resolveSubsystemsRoot(ctx);
+  const barrelAbs = path10.resolve(generatedDir, "subsystems.ts");
+  let subsystemsRel = path10.relative(path10.dirname(barrelAbs), subsystemsAbs).split(path10.sep).join("/");
+  if (!subsystemsRel.startsWith(".")) subsystemsRel = "./" + subsystemsRel;
+  const { content, emitted, skipped } = buildSubsystemBarrel(
+    installed,
+    ctx.config,
+    subsystemsRel,
+    mode
+  );
+  let written = false;
+  if (!dryRun) {
+    fs7.mkdirSync(path10.dirname(barrelAbs), { recursive: true });
+    fs7.writeFileSync(barrelAbs, content);
+    written = true;
+    if (mode === "package" && emitted.includes("bridge")) {
+      const registryPath = path10.resolve(generatedDir, "bridge-registry.ts");
+      if (!fs7.existsSync(registryPath)) {
+        fs7.writeFileSync(
+          registryPath,
+          buildBridgeRegistryContent([], PACKAGE_BRIDGE_TYPE_IMPORT)
+        );
+      }
+    }
+    if (mode === "package" && emitted.includes("events")) {
+      const eventsDir = path10.resolve(generatedDir, "events");
+      if (!fs7.existsSync(path10.resolve(eventsDir, "bus.ts"))) {
+        fs7.mkdirSync(eventsDir, { recursive: true });
+        for (const { name, content: content2 } of buildEventCodegenContents([], "package")) {
+          fs7.writeFileSync(path10.resolve(eventsDir, name), content2);
+        }
+      }
+    }
+  }
+  return {
+    subsystemBarrel: barrelAbs,
+    emitted,
+    skipped,
+    content,
+    written
+  };
+}
+
+// src/cli/shared/subsystem-schema-generator.ts
+import fs8 from "fs";
+import path11 from "path";
+var PACKAGE3 = "@pattern-stack/codegen";
+var SCHEMA_SYMBOLS = {
+  events: ["domainEvents"],
+  jobs: [
+    "jobs",
+    "jobRuns",
+    "jobSteps",
+    "jobRunStatusEnum",
+    "jobStepKindEnum",
+    "jobStepStatusEnum",
+    "collisionModeEnum",
+    "replayFromEnum",
+    "parentClosePolicyEnum",
+    "waitKindEnum",
+    "triggerSourceEnum"
+  ],
+  bridge: ["bridgeDelivery", "bridgeDeliveryStatusEnum"],
+  integration: [
+    "integrationSubscriptions",
+    "integrationRuns",
+    "integrationRunItems",
+    "integrationRunDirectionEnum",
+    "integrationRunActionEnum",
+    "integrationRunStatusEnum",
+    "integrationRunItemOperationEnum",
+    "integrationRunItemStatusEnum"
+  ]
+};
+var SCHEMA_ORDER = ["events", "jobs", "bridge", "integration"];
+var HEADER6 = `// AUTO-GENERATED by @pattern-stack/codegen. Do not edit.
+// Subsystem Drizzle schema barrel \u2014 re-exports the tables + pgEnums of every
+// installed subsystem so drizzle-kit emits their CREATE TABLE / CREATE TYPE.
+//
+// Fold into your drizzle-kit schema entrypoint once, alongside the entity
+// schema barrel:
+//
+//   // src/schema.ts
+//   export * from './generated/schema';            // entity tables
+//   export * from './generated/subsystems-schema'; // subsystem tables + enums
+//
+// Regenerated by every \`codegen entity new\` / \`codegen subsystem install\`.
+
+`;
+function schemaImportFor(mode, subsystem, subsystemsRel) {
+  return mode === "vendored" ? `${subsystemsRel}/${subsystem}` : `${PACKAGE3}/runtime/subsystems/${subsystem}/index`;
 }
-function buildRootBarrelTs(patterns) {
+function buildSubsystemSchemaBarrel(installed, subsystemsRel, mode) {
+  const actable = installed.filter((i) => i.status !== "incomplete");
+  const installedNames = new Set(actable.map((i) => i.name));
+  const emitted = [];
   const lines = [];
-  lines.push(HEADER6.trimEnd());
-  lines.push("");
-  if (patterns.length === 0) {
-    lines.push("// No orchestration patterns registered.");
-    lines.push("export {};");
-    lines.push("");
-    return lines.join("\n");
-  }
-  const slugs = patterns.map((p) => toKebabCase2(p.name)).sort();
-  for (const slug of slugs) {
-    lines.push(`export * from './${slug}/index.js';`);
+  for (const name of SCHEMA_ORDER) {
+    if (!installedNames.has(name)) continue;
+    const symbols = SCHEMA_SYMBOLS[name];
+    if (!symbols || symbols.length === 0) continue;
+    const importSpec = schemaImportFor(mode, name, subsystemsRel);
+    lines.push(`export { ${symbols.join(", ")} } from '${importSpec}';`);
+    emitted.push(name);
   }
-  lines.push("");
-  return lines.join("\n");
-}
-function buildPatternFiles(pattern, outputRoot) {
-  assertEmittable(pattern);
-  const slug = toKebabCase2(pattern.name);
-  const outputDir = path11.join(outputRoot, slug);
-  const make = (name, content) => ({
-    name,
-    outputPath: path11.join(outputDir, name),
-    relativePath: path11.join(slug, name),
-    content
-  });
-  const files = [
-    make("tokens.ts", buildTokensTs(pattern)),
-    make("registry.providers.ts", buildProvidersTs(pattern)),
-    make("dispatcher.ts", buildDispatcherTs(pattern)),
-    make("module.ts", buildModuleTs(pattern)),
-    make("index.ts", buildIndexTs(pattern))
-  ];
-  return {
-    patternName: pattern.name,
-    slug,
-    outputDir,
-    files
-  };
+  const body = lines.length === 0 ? "export {};\n" : lines.join("\n") + "\n";
+  return { content: HEADER6 + body, emitted };
 }
-function generateOrchestrationModules(opts) {
-  const { patterns, outputRoot, dryRun = false } = opts;
-  const perPattern = [];
-  const allFiles = [];
-  for (const pattern of patterns) {
-    const result = buildPatternFiles(pattern, outputRoot);
-    perPattern.push(result);
-    allFiles.push(...result.files);
-  }
-  const rootBarrel = {
-    name: "index.ts",
-    outputPath: path11.join(outputRoot, "index.ts"),
-    relativePath: "index.ts",
-    content: buildRootBarrelTs(patterns)
-  };
-  allFiles.push(rootBarrel);
+async function regenerateSubsystemSchemaBarrel(opts) {
+  const { ctx, dryRun = false } = opts;
+  const generatedDir = opts.generatedDir ?? resolveGeneratedDir(ctx);
+  const mode = resolveRuntimeMode(ctx.config);
+  const installed = mode === "package" ? configuredInstalledSubsystems(
+    ctx.config
+  ) : await detectInstalledSubsystems(ctx);
+  const subsystemsAbs = resolveSubsystemsRoot(ctx);
+  const barrelAbs = path11.resolve(generatedDir, "subsystems-schema.ts");
+  let subsystemsRel = path11.relative(path11.dirname(barrelAbs), subsystemsAbs).split(path11.sep).join("/");
+  if (!subsystemsRel.startsWith(".")) subsystemsRel = "./" + subsystemsRel;
+  const { content, emitted } = buildSubsystemSchemaBarrel(
+    installed,
+    subsystemsRel,
+    mode
+  );
   let written = false;
-  if (!dryRun && patterns.length > 0) {
-    fs8.mkdirSync(outputRoot, { recursive: true });
-    for (const r of perPattern) {
-      fs8.mkdirSync(r.outputDir, { recursive: true });
-      for (const f of r.files) {
-        fs8.writeFileSync(f.outputPath, f.content);
-      }
-    }
-    fs8.writeFileSync(rootBarrel.outputPath, rootBarrel.content);
+  if (!dryRun) {
+    fs8.mkdirSync(path11.dirname(barrelAbs), { recursive: true });
+    fs8.writeFileSync(barrelAbs, content);
     written = true;
   }
-  return {
-    outputRoot,
-    patterns: perPattern,
-    files: allFiles,
-    written
-  };
+  return { schemaBarrel: barrelAbs, emitted, content, written };
 }
 
-// src/cli/shared/event-codegen-generator.ts
+// src/cli/shared/orchestration-generator.ts
 import fs9 from "fs";
 import path12 from "path";
-
-// src/parser/load-events.ts
-import { basename as basename2, resolve as resolve4 } from "path";
-function loadErrorToIssue2(error) {
-  const issues = [];
-  issues.push({
-    severity: "error",
-    type: "parse_error",
-    message: error.error,
-    path: error.filePath
-  });
-  if (error.details) {
-    for (const detail of error.details) {
-      issues.push({
-        severity: "error",
-        type: "schema_error",
-        message: detail,
-        path: error.filePath
-      });
-    }
+var OrchestrationEmissionError = class extends Error {
+  constructor(issueType, patternName, message) {
+    super(`[${issueType}] ${patternName}: ${message}`);
+    this.issueType = issueType;
+    this.patternName = patternName;
   }
-  return issues;
+  issueType;
+  patternName;
+  name = "OrchestrationEmissionError";
+};
+var HEADER7 = `// AUTO-GENERATED by @pattern-stack/codegen. Do not edit.
+// See ADR-032 \u2014 Orchestration Patterns.
+`;
+function splitWords(str) {
+  return str.replace(/([a-z])([A-Z])/g, "$1 $2").replace(/[_-]/g, " ").split(/\s+/).filter((w) => w.length > 0).map((w) => w.toLowerCase());
 }
-function stripYamlExt(file) {
-  const base = basename2(file);
-  if (base.endsWith(".yaml")) return base.slice(0, -".yaml".length);
-  if (base.endsWith(".yml")) return base.slice(0, -".yml".length);
-  return base;
+function toKebabCase2(str) {
+  return splitWords(str).join("-");
 }
-function loadEvents(eventsDir, entityNames) {
-  const events = [];
-  const issues = [];
-  const resolvedDir = resolve4(eventsDir);
-  let files;
-  try {
-    files = findYamlFiles(resolvedDir);
-  } catch {
-    issues.push({
-      severity: "warning",
-      type: "no_events_dir",
-      message: `No events directory found at: ${resolvedDir}`,
-      path: resolvedDir
-    });
-    return { events, issues };
-  }
-  if (files.length === 0) {
-    issues.push({
-      severity: "warning",
-      type: "no_files",
-      message: `No event YAML files found in directory: ${resolvedDir}`,
-      path: resolvedDir
-    });
-    return { events, issues };
-  }
-  const entityNameSet = new Set(entityNames);
-  const seenTypes = /* @__PURE__ */ new Map();
-  for (const filePath of files) {
-    const result = loadEventFromYaml(filePath);
-    if (!result.success) {
-      issues.push(...loadErrorToIssue2(result));
-      continue;
-    }
-    const { definition } = result;
-    const baseName = stripYamlExt(filePath);
-    if (baseName !== definition.type) {
-      issues.push({
-        severity: "error",
-        type: "event_filename_mismatch",
-        message: `Event file '${baseName}' must contain 'type: ${baseName}' (found 'type: ${definition.type}')`,
-        path: filePath,
-        suggestion: `Rename the file to '${definition.type}.yaml' or fix the 'type' field to '${baseName}'`
-      });
-      continue;
-    }
-    if (definition.direction === "change" && definition.aggregate !== void 0 && !entityNameSet.has(definition.aggregate)) {
-      issues.push({
-        severity: "error",
-        type: "unknown_aggregate",
-        message: `change event '${definition.type}' references unknown aggregate entity '${definition.aggregate}'`,
-        path: filePath,
-        suggestion: `Define entities/${definition.aggregate}.yaml or fix the aggregate value`
-      });
-      continue;
-    }
-    if (seenTypes.has(definition.type)) {
-      issues.push({
-        severity: "error",
-        type: "duplicate_event_type",
-        message: `Duplicate event type '${definition.type}' (already declared in ${seenTypes.get(definition.type)})`,
-        path: filePath
-      });
-      continue;
+function toPascalCase3(str) {
+  return splitWords(str).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
+}
+function toCamelCase2(str) {
+  const words = splitWords(str);
+  if (words.length === 0) return "";
+  const [first, ...rest] = words;
+  return (first ?? "") + rest.map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
+}
+function toScreamingSnake(str) {
+  return splitWords(str).join("_").toUpperCase();
+}
+var FORBIDDEN_KEY_TYPES = /* @__PURE__ */ new Set([
+  "string",
+  "number",
+  "symbol",
+  "any",
+  "unknown"
+]);
+function assertEmittable(pattern) {
+  const allRegistries2 = [
+    pattern.registry,
+    ...pattern.coKeyedRegistries ?? []
+  ];
+  for (const sibling of pattern.coKeyedRegistries ?? []) {
+    if (typeof sibling.name !== "string" || sibling.name.length === 0) {
+      throw new OrchestrationEmissionError(
+        "pattern_cokeyed_missing_name",
+        pattern.name,
+        `Co-keyed registry (valueType '${sibling.valueType}') is missing the required 'name' field. Each co-keyed sibling must declare an explicit name; the emitter uppercases it for the token suffix and PascalCases it for the dispatcher method (e.g. name: 'auth' \u21D2 '\${PATTERN_CONST}_AUTH_REGISTRY' + 'selectAuth(...)'). ADR-032 O-1.`
+      );
     }
-    seenTypes.set(definition.type, filePath);
-    events.push(definition);
   }
-  return { events, issues };
-}
-function desugarEntityEvents(entity) {
-  const entityName = entity.entity.name;
-  const entityEvents = entity.events ?? [];
-  return entityEvents.map((ev) => {
-    const payload = {};
-    for (const [key, typeString] of Object.entries(ev.body)) {
-      if (!isEventFieldType(typeString)) {
-        throw new Error(
-          `Entity '${entityName}' event '${ev.name}' field '${key}' has unknown type '${typeString}' \u2014 expected one of ${EVENT_FIELD_TYPES.join("|")}`
+  for (const reg of allRegistries2) {
+    if (FORBIDDEN_KEY_TYPES.has(reg.keyType)) {
+      throw new OrchestrationEmissionError(
+        "pattern_keytype_unresolved",
+        pattern.name,
+        `registry keyType '${reg.keyType}' is a primitive \u2014 Partial<Record<K, V>> requires a literal-union K, and per-overload narrowing requires a closed enum/union. Use a string-literal union or a TypeScript enum.`
+      );
+    }
+    if (typeof reg.keyTypeImport !== "string" || reg.keyTypeImport.length === 0) {
+      throw new OrchestrationEmissionError(
+        "pattern_missing_import_path",
+        pattern.name,
+        `registry (keyType '${reg.keyType}') is missing 'keyTypeImport'. Phase 3-2 emission requires every keyType to carry a module specifier.`
+      );
+    }
+    if (typeof reg.valueTypeImport !== "string" || reg.valueTypeImport.length === 0) {
+      throw new OrchestrationEmissionError(
+        "pattern_missing_import_path",
+        pattern.name,
+        `registry (valueType '${reg.valueType}') is missing 'valueTypeImport'.`
+      );
+    }
+    for (const e of reg.entries) {
+      if (typeof e.providerImport !== "string" || e.providerImport.length === 0) {
+        throw new OrchestrationEmissionError(
+          "pattern_missing_import_path",
+          pattern.name,
+          `entry '${e.key}' provider '${e.provider}' is missing 'providerImport'.`
         );
       }
-      payload[key] = { type: typeString, nullable: false };
     }
-    const def = {
-      type: ev.name,
-      tier: "domain",
-      direction: "change",
-      aggregate: entityName,
-      payload,
-      retry: { attempts: 3, backoff: "exponential" },
-      version: 1,
-      pool: DIRECTION_TO_POOL.change
-    };
-    return def;
-  });
-}
-function isEventFieldType(s) {
-  return EVENT_FIELD_TYPES.includes(s);
-}
-
-// src/cli/shared/event-codegen-generator.ts
-var HEADER7 = `// AUTO-GENERATED by @pattern-stack/codegen. Do not edit.
-// Run \`codegen entity new --all\` to refresh.
-`;
-function toCamelCase2(input) {
-  const parts = input.split("_").filter(Boolean);
-  if (parts.length === 0) return input;
-  const [first, ...rest] = parts;
-  return (first ?? "") + rest.map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
+  }
 }
-function toPascalCase3(input) {
-  return input.split("_").filter(Boolean).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
+function patternNames(pattern) {
+  const slug = toKebabCase2(pattern.name);
+  const pascal = toPascalCase3(pattern.name);
+  const screaming = toScreamingSnake(pattern.name);
+  return { slug, pascal, screaming };
 }
-var TS_TYPE_BY_FIELD = {
-  uuid: "string",
-  string: "string",
-  number: "number",
-  boolean: "boolean",
-  date: "Date",
-  json: "Record<string, unknown>"
-};
-var ZOD_EXPR_BY_FIELD = {
-  uuid: "z.string().uuid()",
-  string: "z.string()",
-  number: "z.number()",
-  boolean: "z.boolean()",
-  date: "z.coerce.date()",
-  json: "z.record(z.unknown())"
-};
-function tsTypeForField(field) {
-  let base;
-  if (field.type === "array") {
-    const itemType = field.items;
-    base = `${TS_TYPE_BY_FIELD[itemType]}[]`;
-  } else {
-    base = TS_TYPE_BY_FIELD[field.type];
+function registryNames(pattern, reg, isPrimary) {
+  const { pascal, screaming } = patternNames(pattern);
+  if (isPrimary) {
+    return {
+      tokenConst: `${screaming}_REGISTRY`,
+      mapType: `${pascal}RegistryMap`,
+      method: "select",
+      overrideField: "overrides",
+      builderFn: `build${pascal}RegistryProviders`
+    };
   }
-  return field.nullable ? `${base} | null` : base;
+  const namePascal = toPascalCase3(reg.name);
+  const nameScreaming = toScreamingSnake(reg.name);
+  const nameCamel = toCamelCase2(reg.name);
+  return {
+    tokenConst: `${screaming}_${nameScreaming}_REGISTRY`,
+    mapType: `${pascal}${namePascal}RegistryMap`,
+    method: `select${namePascal}`,
+    overrideField: `${nameCamel}Overrides`,
+    builderFn: `build${pascal}RegistryProviders`
+  };
 }
-function zodExprForField(field) {
-  let base;
-  if (field.type === "array") {
-    const itemType = field.items;
-    base = `z.array(${ZOD_EXPR_BY_FIELD[itemType]})`;
-  } else {
-    base = ZOD_EXPR_BY_FIELD[field.type];
-  }
-  return field.nullable ? `${base}.nullable()` : base;
+function dispatcherClassName(pattern) {
+  return pattern.dispatcher?.className ?? `${toPascalCase3(pattern.name)}Dispatcher`;
 }
-function aggregateTypeLiteral(ev) {
-  return ev.aggregate ?? ev.source ?? ev.destination ?? ev.type;
+function moduleClassName(pattern) {
+  return `${toPascalCase3(pattern.name)}OrchestrationModule`;
 }
-function collectEntityEvents(entitiesDir) {
-  const events = [];
-  const issues = [];
-  if (!fs9.existsSync(entitiesDir)) {
-    return { events, issues };
+function forRootOptionsTypeName(pattern) {
+  return `${toPascalCase3(pattern.name)}ForRootOptions`;
+}
+function emitTypeImports(imports) {
+  const grouped = /* @__PURE__ */ new Map();
+  for (const i of imports) {
+    const set = grouped.get(i.specifier) ?? /* @__PURE__ */ new Set();
+    set.add(i.name);
+    grouped.set(i.specifier, set);
   }
-  const files = findYamlFiles(entitiesDir);
-  for (const filePath of files) {
-    const result = loadEntityFromYaml(filePath);
-    if (!result.success) continue;
-    try {
-      events.push(...desugarEntityEvents(result.definition));
-    } catch (err) {
-      issues.push({
-        severity: "error",
-        type: "entity_event_desugar_failed",
-        message: err instanceof Error ? err.message : String(err),
-        path: filePath
-      });
-    }
+  const out = [];
+  for (const specifier of [...grouped.keys()].sort()) {
+    const names2 = [...grouped.get(specifier)].sort();
+    out.push(`import type { ${names2.join(", ")} } from '${specifier}';`);
   }
-  return { events, issues };
+  return out;
 }
-function mergeEvents(topLevel, entitySugar) {
-  const issues = [];
-  const byType = /* @__PURE__ */ new Map();
-  for (const ev of entitySugar) {
-    byType.set(ev.type, ev);
+function emitValueImports(imports) {
+  const grouped = /* @__PURE__ */ new Map();
+  for (const i of imports) {
+    const set = grouped.get(i.specifier) ?? /* @__PURE__ */ new Set();
+    set.add(i.name);
+    grouped.set(i.specifier, set);
   }
-  for (const ev of topLevel) {
-    if (byType.has(ev.type)) {
-      issues.push({
-        severity: "warning",
-        type: "event_merge_override",
-        message: `event '${ev.type}' is declared both in an entity \`events:\` block and a top-level \`events/${ev.type}.yaml\` \u2014 top-level definition wins`
-      });
-    }
-    byType.set(ev.type, ev);
+  const out = [];
+  for (const specifier of [...grouped.keys()].sort()) {
+    const names2 = [...grouped.get(specifier)].sort();
+    out.push(`import { ${names2.join(", ")} } from '${specifier}';`);
   }
-  const events = Array.from(byType.values()).sort(
-    (a, b) => a.type.localeCompare(b.type)
-  );
-  return { events, issues };
+  return out;
 }
-function collectMergedEvents(opts) {
-  const { entitiesDir, eventsDir } = opts;
-  const entityNames = [];
-  if (fs9.existsSync(entitiesDir)) {
-    const entityFiles = findYamlFiles(entitiesDir);
-    for (const f of entityFiles) {
-      const result = loadEntityFromYaml(f);
-      if (result.success) entityNames.push(result.definition.entity.name);
-    }
+function allRegistries(pattern) {
+  const list = [];
+  list.push({
+    reg: pattern.registry,
+    names: registryNames(pattern, pattern.registry, true),
+    isPrimary: true
+  });
+  for (const sibling of pattern.coKeyedRegistries ?? []) {
+    list.push({
+      reg: sibling,
+      names: registryNames(pattern, sibling, false),
+      isPrimary: false
+    });
   }
-  const topLevelResult = loadEvents(eventsDir, entityNames);
-  const { events: entitySugar, issues: sugarIssues } = collectEntityEvents(entitiesDir);
-  const { events: merged, issues: mergeIssues } = mergeEvents(
-    topLevelResult.events,
-    entitySugar
-  );
-  const issues = [
-    ...topLevelResult.issues,
-    ...sugarIssues,
-    ...mergeIssues
-  ];
-  return { events: merged, issues };
+  return list;
 }
-function buildTypesContent(events) {
-  const sorted = [...events].sort((a, b) => a.type.localeCompare(b.type));
-  if (sorted.length === 0) {
-    return HEADER7 + `
-import type { DomainEvent } from '../event-bus.protocol';
-
-export type AppDomainEvent = never;
-
-export type EventTypeName = string;
-export type EventOfType<T extends EventTypeName> = DomainEvent;
-export type PayloadOfType<T extends EventTypeName> = DomainEvent['payload'];
-`;
+function buildTokensTs(pattern) {
+  const registries = allRegistries(pattern);
+  const typeImports = [];
+  for (const { reg } of registries) {
+    typeImports.push({ specifier: reg.keyTypeImport, name: reg.keyType });
+    typeImports.push({ specifier: reg.valueTypeImport, name: reg.valueType });
   }
-  const chunks = [];
-  chunks.push(HEADER7);
-  chunks.push("");
-  chunks.push(`import type { DomainEvent } from '../event-bus.protocol';`);
-  chunks.push("");
-  for (const ev of sorted) {
-    const interfaceName = `${toPascalCase3(ev.type)}Event`;
-    const aggregateLit = aggregateTypeLiteral(ev);
-    if (ev.description) {
-      chunks.push(`/** ${ev.description} */`);
-    }
-    chunks.push(`export interface ${interfaceName} extends DomainEvent {`);
-    chunks.push(`	readonly type: '${ev.type}';`);
-    chunks.push(`	readonly aggregateType: '${aggregateLit}';`);
-    const payloadKeys = Object.keys(ev.payload).sort();
-    if (payloadKeys.length === 0) {
-      chunks.push(`	readonly payload: Record<string, never>;`);
-    } else {
-      chunks.push(`	readonly payload: {`);
-      for (const key of payloadKeys) {
-        const field = ev.payload[key];
-        if (!field) continue;
-        if (field.description) {
-          chunks.push(`		/** ${field.description} */`);
-        }
-        chunks.push(`		${toCamelCase2(key)}: ${tsTypeForField(field)};`);
-      }
-      chunks.push(`	};`);
+  const lines = [];
+  lines.push(HEADER7.trimEnd());
+  lines.push("");
+  for (const i of emitTypeImports(typeImports)) lines.push(i);
+  lines.push("");
+  for (const { names: names2 } of registries) {
+    lines.push(`export const ${names2.tokenConst} = Symbol('${names2.tokenConst}');`);
+  }
+  lines.push("");
+  for (const { reg, names: names2 } of registries) {
+    lines.push(
+      `export type ${names2.mapType} = Map<${reg.keyType}, ${reg.valueType}>;`
+    );
+  }
+  lines.push("");
+  return lines.join("\n");
+}
+function buildProvidersTs(pattern) {
+  const registries = allRegistries(pattern);
+  const providerImports = [];
+  for (const { reg } of registries) {
+    for (const e of reg.entries) {
+      providerImports.push({ specifier: e.providerImport, name: e.provider });
     }
-    chunks.push(`}`);
-    chunks.push("");
   }
-  const unionMembers = sorted.map((ev) => `${toPascalCase3(ev.type)}Event`);
-  chunks.push(`export type AppDomainEvent =`);
-  chunks.push(`	| ${unionMembers.join("\n	| ")};`);
-  chunks.push("");
-  chunks.push(`export type EventTypeName = AppDomainEvent['type'];`);
-  chunks.push(
-    `export type EventOfType<T extends EventTypeName> = Extract<AppDomainEvent, { type: T }>;`
-  );
-  chunks.push(
-    `export type PayloadOfType<T extends EventTypeName> = EventOfType<T>['payload'];`
+  const tokenValueImports = registries.map(({ names: names2 }) => names2.tokenConst);
+  const mapTypeImports = registries.map(({ names: names2 }) => names2.mapType);
+  const typeImports = [];
+  for (const { reg } of registries) {
+    typeImports.push({ specifier: reg.keyTypeImport, name: reg.keyType });
+    typeImports.push({ specifier: reg.valueTypeImport, name: reg.valueType });
+  }
+  const optsType = forRootOptionsTypeName(pattern);
+  const lines = [];
+  lines.push(HEADER7.trimEnd());
+  lines.push("");
+  lines.push(`import type { Provider } from '@nestjs/common';`);
+  for (const i of emitTypeImports(typeImports)) lines.push(i);
+  for (const i of emitValueImports(providerImports)) lines.push(i);
+  const tokenLine = [
+    ...tokenValueImports.sort(),
+    ...mapTypeImports.sort().map((m) => `type ${m}`)
+  ].join(", ");
+  lines.push(`import { ${tokenLine} } from './tokens.js';`);
+  lines.push(`import type { ${optsType} } from './module.js';`);
+  lines.push("");
+  const { pascal } = patternNames(pattern);
+  lines.push(
+    `export function build${pascal}RegistryProviders(opts?: ${optsType}): Provider[] {`
   );
-  chunks.push("");
-  return chunks.join("\n");
+  lines.push("	return [");
+  for (const { reg, names: names2 } of registries) {
+    const factoryArgs = reg.entries.map((e, i) => `${camelArg(e.provider, i)}: ${e.provider}`).join(", ");
+    lines.push("		{");
+    lines.push(`			provide: ${names2.tokenConst},`);
+    lines.push(`			useFactory: (${factoryArgs}) => {`);
+    lines.push(`				const base: ${names2.mapType} = new Map<${reg.keyType}, ${reg.valueType}>([`);
+    for (const [i, e] of reg.entries.entries()) {
+      lines.push(
+        `					['${e.key}' as ${reg.keyType}, ${camelArg(e.provider, i)}],`
+      );
+    }
+    lines.push("				]);");
+    lines.push(`				if (opts?.${names2.overrideField}) {`);
+    lines.push(`					for (const [k, v] of Object.entries(opts.${names2.overrideField})) {`);
+    lines.push(`						if (v !== undefined) base.set(k as ${reg.keyType}, v as ${reg.valueType});`);
+    lines.push("					}");
+    lines.push("				}");
+    lines.push(`				return base as ${names2.mapType};`);
+    lines.push("			},");
+    const injectList = reg.entries.map((e) => e.provider).join(", ");
+    lines.push(`			inject: [${injectList}],`);
+    lines.push("		},");
+  }
+  lines.push("	];");
+  lines.push("}");
+  lines.push("");
+  return lines.join("\n");
 }
-function buildSchemasContent(events) {
-  const sorted = [...events].sort((a, b) => a.type.localeCompare(b.type));
-  if (sorted.length === 0) {
-    return HEADER7 + `
-import { z } from 'zod';
-import type { EventTypeName } from './types';
-
-export const eventPayloadSchemas = {} as Record<EventTypeName, z.ZodType>;
-`;
+function camelArg(provider, index2) {
+  const camel = provider.charAt(0).toLowerCase() + provider.slice(1);
+  return `${camel}_${index2}`;
+}
+function buildDispatcherTs(pattern) {
+  const registries = allRegistries(pattern);
+  const className = dispatcherClassName(pattern);
+  const errorClass = `${className}Error`;
+  const typeImports = [];
+  for (const { reg } of registries) {
+    typeImports.push({ specifier: reg.keyTypeImport, name: reg.keyType });
+    typeImports.push({ specifier: reg.valueTypeImport, name: reg.valueType });
   }
-  const chunks = [];
-  chunks.push(HEADER7);
-  chunks.push("");
-  chunks.push(`import { z } from 'zod';`);
-  chunks.push(`import type { EventTypeName } from './types';`);
-  chunks.push("");
-  for (const ev of sorted) {
-    const schemaConst = `${toCamelCase2(ev.type)}PayloadSchema`;
-    const payloadKeys = Object.keys(ev.payload).sort();
-    if (payloadKeys.length === 0) {
-      chunks.push(`export const ${schemaConst} = z.object({}).strict();`);
-      chunks.push("");
-      continue;
+  const providerImports = [];
+  for (const { reg } of registries) {
+    for (const e of reg.entries) {
+      providerImports.push({ specifier: e.providerImport, name: e.provider });
     }
-    chunks.push(`export const ${schemaConst} = z.object({`);
-    for (const key of payloadKeys) {
-      const field = ev.payload[key];
-      if (!field) continue;
-      chunks.push(`	${toCamelCase2(key)}: ${zodExprForField(field)},`);
+  }
+  const tokenValues = registries.map(({ names: names2 }) => names2.tokenConst);
+  const mapTypes = registries.map(({ names: names2 }) => names2.mapType);
+  const lines = [];
+  lines.push(HEADER7.trimEnd());
+  lines.push("");
+  lines.push(`import { Inject, Injectable } from '@nestjs/common';`);
+  for (const i of emitTypeImports(typeImports)) lines.push(i);
+  for (const i of emitValueImports(providerImports)) lines.push(i);
+  const tokenLine = [
+    ...tokenValues.sort(),
+    ...mapTypes.sort().map((m) => `type ${m}`)
+  ].join(", ");
+  lines.push(`import { ${tokenLine} } from './tokens.js';`);
+  lines.push("");
+  lines.push(`export class ${errorClass} extends Error {}`);
+  lines.push("");
+  lines.push("@Injectable()");
+  lines.push(`export class ${className} {`);
+  lines.push("	constructor(");
+  for (const { names: names2 } of registries) {
+    const fieldName = names2.method === "select" ? "registry" : `${camelFromMethod(names2.method)}Registry`;
+    lines.push(
+      `		@Inject(${names2.tokenConst}) protected readonly ${fieldName}: ${names2.mapType},`
+    );
+  }
+  lines.push("	) {}");
+  lines.push("");
+  for (const { reg, names: names2 } of registries) {
+    const fieldName = names2.method === "select" ? "registry" : `${camelFromMethod(names2.method)}Registry`;
+    for (const e of reg.entries) {
+      lines.push(`	${names2.method}(key: '${e.key}'): ${e.provider};`);
     }
-    chunks.push(`}).strict();`);
-    chunks.push("");
+    lines.push(`	${names2.method}(key: ${reg.keyType}): ${reg.valueType};`);
+    lines.push(`	${names2.method}(key: ${reg.keyType}): ${reg.valueType} {`);
+    lines.push(`		const entry = this.${fieldName}.get(key);`);
+    lines.push(
+      `		if (!entry) throw new ${errorClass}(\`Unknown ${reg.keyType}: \${String(key)}\`);`
+    );
+    lines.push(`		return entry;`);
+    lines.push("	}");
+    lines.push("");
   }
-  chunks.push(`export const eventPayloadSchemas = {`);
-  for (const ev of sorted) {
-    chunks.push(`	'${ev.type}': ${toCamelCase2(ev.type)}PayloadSchema,`);
+  if (pattern.dispatcher?.assemblySlot) {
+    lines.push(
+      `	// ADR-032 Decision 5 \u2014 \`assemblySlot: '${pattern.dispatcher.assemblySlot}'\` is a`
+    );
+    lines.push(
+      `	// subclass contract, not emitted here. Consumers subclass and add the`
+    );
+    lines.push(
+      `	// \`${pattern.dispatcher.assemblySlot}(...)\` method themselves.`
+    );
   }
-  chunks.push(`} as const satisfies Record<EventTypeName, z.ZodType>;`);
-  chunks.push("");
-  return chunks.join("\n");
+  lines.push("}");
+  lines.push("");
+  return lines.join("\n");
 }
-var REGISTRY_INTERFACE = [
-  "export interface EventMetadata {",
-  "	type: EventTypeName;",
-  "	tier: 'domain' | 'audit';",
-  "	direction: 'inbound' | 'change' | 'outbound' | null;",
-  "	pool: 'events_inbound' | 'events_change' | 'events_outbound' | null;",
-  "	aggregate?: string;",
-  "	source?: string;",
-  "	destination?: string;",
-  "	version: number;",
-  "	retry: { attempts: number; backoff: 'linear' | 'exponential' };",
-  "}"
-].join("\n");
-var REGISTRY_GETTER = [
-  "export function getEventMetadata<T extends EventTypeName>(type: T): EventMetadata {",
-  "	const meta = eventRegistry[type];",
-  "	if (!meta) {",
-  "		throw new Error(`No registry entry for event type '${String(type)}' \u2014 declare events under events/*.yaml and re-run \\`codegen entity new --all\\`.`);",
-  "	}",
-  "	return meta;",
-  "}"
-].join("\n");
-function buildRegistryContent(events) {
-  const sorted = [...events].sort((a, b) => a.type.localeCompare(b.type));
-  const chunks = [];
-  chunks.push(HEADER7);
-  chunks.push("");
-  chunks.push(`import type { EventTypeName } from './types';`);
-  chunks.push("");
-  chunks.push(REGISTRY_INTERFACE);
-  chunks.push("");
-  if (sorted.length === 0) {
-    chunks.push(
-      `export const eventRegistry = {} as Record<EventTypeName, EventMetadata>;`
-    );
-    chunks.push("");
-    chunks.push(REGISTRY_GETTER);
-    chunks.push("");
-    return chunks.join("\n");
+function camelFromMethod(method) {
+  if (method.startsWith("select") && method.length > "select".length) {
+    const tail = method.slice("select".length);
+    return tail.charAt(0).toLowerCase() + tail.slice(1);
   }
-  chunks.push(`export const eventRegistry = {`);
-  for (const ev of sorted) {
-    const tier = ev.tier ?? "domain";
-    chunks.push(`	'${ev.type}': {`);
-    chunks.push(`		type: '${ev.type}',`);
-    chunks.push(`		tier: '${tier}',`);
-    if (tier === "audit") {
-      chunks.push(`		direction: null,`);
-      chunks.push(`		pool: null,`);
-    } else {
-      chunks.push(`		direction: '${ev.direction}',`);
-      chunks.push(`		pool: '${ev.pool}',`);
-    }
-    if (ev.aggregate !== void 0) {
-      chunks.push(`		aggregate: '${ev.aggregate}',`);
-    }
-    if (ev.source !== void 0) {
-      chunks.push(`		source: '${ev.source}',`);
-    }
-    if (ev.destination !== void 0) {
-      chunks.push(`		destination: '${ev.destination}',`);
-    }
-    chunks.push(`		version: ${ev.version},`);
-    chunks.push(
-      `		retry: { attempts: ${ev.retry.attempts}, backoff: '${ev.retry.backoff}' },`
+  return method;
+}
+function buildModuleTs(pattern) {
+  const registries = allRegistries(pattern);
+  const className = dispatcherClassName(pattern);
+  const moduleName = moduleClassName(pattern);
+  const optsType = forRootOptionsTypeName(pattern);
+  const { pascal } = patternNames(pattern);
+  const typeImports = [];
+  for (const { reg } of registries) {
+    typeImports.push({ specifier: reg.keyTypeImport, name: reg.keyType });
+    typeImports.push({ specifier: reg.valueTypeImport, name: reg.valueType });
+  }
+  const tokenValues = registries.map(({ names: names2 }) => names2.tokenConst);
+  const lines = [];
+  lines.push(HEADER7.trimEnd());
+  lines.push("");
+  lines.push(`import { type DynamicModule, Module } from '@nestjs/common';`);
+  for (const i of emitTypeImports(typeImports)) lines.push(i);
+  lines.push(`import { ${className} } from './dispatcher.js';`);
+  lines.push(`import { build${pascal}RegistryProviders } from './registry.providers.js';`);
+  lines.push(`import { ${tokenValues.sort().join(", ")} } from './tokens.js';`);
+  lines.push("");
+  lines.push(`export interface ${optsType} {`);
+  for (const { reg, names: names2 } of registries) {
+    lines.push(
+      `	${names2.overrideField}?: Partial<Record<${reg.keyType}, ${reg.valueType}>>;`
     );
-    chunks.push(`	},`);
   }
-  chunks.push(
-    `} as const satisfies Record<EventTypeName, EventMetadata>;`
+  lines.push("}");
+  lines.push("");
+  lines.push("@Module({})");
+  lines.push(`export class ${moduleName} {`);
+  lines.push(`	static forRoot(opts?: ${optsType}): DynamicModule {`);
+  lines.push("		return {");
+  lines.push(`			module: ${moduleName},`);
+  lines.push(
+    `			providers: [...build${pascal}RegistryProviders(opts), ${className}],`
   );
-  chunks.push("");
-  chunks.push(REGISTRY_GETTER);
-  chunks.push("");
-  return chunks.join("\n");
-}
-var BUS_BODY = `import { Injectable, Inject } from '@nestjs/common';
-import { randomUUID } from 'crypto';
-import { EVENT_BUS, EVENTS_MULTI_TENANT } from '../events.tokens';
-import { MissingTenantIdError } from '../events-errors';
-import type { IEventBus, DrizzleTransaction } from '../event-bus.protocol';
-import { eventPayloadSchemas } from './schemas';
-import { getEventMetadata } from './registry';
-import type { EventTypeName, EventOfType, PayloadOfType } from './types';
-
-/**
- * Typed facade over IEventBus.
- *
- * Stamps \`pool\`, \`direction\`, \`tier\`, and \`version\` into \`event.metadata\`
- * from the generated \`eventRegistry\` before delegating to
- * \`IEventBus.publish()\`. Downstream backends (DrizzleEventBus) read those
- * values to populate the explicit \`domain_events\` columns.
- *
- * Tier stamping (AUDIT-3): every event carries \`metadata.tier\`, sourced
- * from the registry. For \`tier: 'audit'\` events, the bus FORCES
- * \`metadata.pool = null\` and \`metadata.direction = null\` regardless of
- * any caller-supplied values in \`opts.metadata\` \u2014 audit routing is
- * bus-stamped, not caller-controlled. Caller overrides are silently
- * dropped with a debug-level log (callers should not be specifying these
- * for audit events; see ai-docs/specs/issue-242/plan.md \xA7AUDIT-3).
- *
- * Validation gating (EVT-Q5): \`CODEGEN_EVENT_VALIDATE\` env flag, default on.
- * Uses \`safeParse\` + \`console.warn\` \u2014 never throws, so a bad publish does
- * not crash a hot path.
- *
- * Multi-tenancy (EVT-6): when the EventsModule is configured with
- * \`multiTenant: true\`, every publish must supply \`opts.metadata.tenantId\`
- * \u2014 otherwise \`publish()\` throws \`MissingTenantIdError\`. When \`multiTenant\`
- * is \`false\` (default), no tenantId is required. If a tenantId IS supplied,
- * it is preserved on \`event.metadata\` and the Drizzle backend writes it to
- * \`domain_events.tenant_id\` (EVT-4).
- */
-@Injectable()
-export class TypedEventBus {
-	constructor(
-		@Inject(EVENT_BUS) private readonly bus: IEventBus,
-		@Inject(EVENTS_MULTI_TENANT) private readonly multiTenant: boolean,
-	) {}
-
-	async publish<T extends EventTypeName>(
-		type: T,
-		aggregateId: string,
-		payload: PayloadOfType<T>,
-		opts?: { tx?: DrizzleTransaction; metadata?: Record<string, unknown> },
-	): Promise<void> {
-		const meta = getEventMetadata(type);
-
-		const flag = process.env['CODEGEN_EVENT_VALIDATE'];
-		const shouldValidate =
-			flag === undefined ? true : flag !== 'false' && flag !== '0';
-		if (shouldValidate) {
-			// \`eventPayloadSchemas\` is typed as \`Record<EventTypeName, z.ZodType>\`,
-			// so under \`noUncheckedIndexedAccess\` the indexed lookup widens
-			// to \`z.ZodType | undefined\`. When no events are registered at
-			// codegen time \`EventTypeName\` degrades to \`string\` and the
-			// schemas object is literally \`{}\` \u2014 the guard below is the
-			// honest handling of that empty-registry case (skip validation;
-			// it's a warn-only best-effort check per the class docblock).
-			const schema = eventPayloadSchemas[type];
-			if (schema) {
-				const check = schema.safeParse(payload);
-				if (!check.success) {
-					console.warn(
-						\`[TypedEventBus] payload validation failed for \${String(type)}:\`,
-						check.error.issues,
-					);
-				}
-			}
-		}
-
-		const tenantId = opts?.metadata?.['tenantId'];
-		if (this.multiTenant && (tenantId === undefined || tenantId === null)) {
-			throw new MissingTenantIdError(type as string);
-		}
-
-		const aggregateType =
-			meta.aggregate ?? meta.source ?? meta.destination ?? (type as string);
-
-		// AUDIT-3: build metadata with tier-aware routing stamping. For
-		// \`tier: 'audit'\` events the bus FORCES pool/direction to null,
-		// even if the caller supplied them in opts.metadata. Audit routing
-		// is bus-stamped, not caller-controlled (see plan \xA7AUDIT-3).
-		const baseMetadata: Record<string, unknown> = { ...(opts?.metadata ?? {}) };
-		if (meta.tier === 'audit') {
-			if (
-				baseMetadata['pool'] !== undefined ||
-				baseMetadata['direction'] !== undefined
-			) {
-				console.debug(
-					\`[TypedEventBus] tier:audit event '\${String(type)}' had pool/direction in opts.metadata; overriding to null.\`,
-				);
-			}
-			baseMetadata['pool'] = null;
-			baseMetadata['direction'] = null;
-			baseMetadata['tier'] = 'audit';
-		} else {
-			baseMetadata['pool'] = meta.pool;
-			baseMetadata['direction'] = meta.direction;
-			baseMetadata['tier'] = 'domain';
-		}
-		baseMetadata['version'] = meta.version;
-
-		await this.bus.publish(
-			{
-				id: randomUUID(),
-				type,
-				aggregateId,
-				aggregateType,
-				payload: payload as Record<string, unknown>,
-				occurredAt: new Date(),
-				metadata: baseMetadata,
-			},
-			opts?.tx,
-		);
-	}
-
-	subscribe<T extends EventTypeName>(
-		type: T,
-		handler: (event: EventOfType<T>) => Promise<void>,
-	): () => void {
-		return this.bus.subscribe<EventOfType<T>>(type, handler as never);
-	}
+  const exportItems = [...tokenValues.sort(), className];
+  lines.push(`			exports: [${exportItems.join(", ")}],`);
+  lines.push("		};");
+  lines.push("	}");
+  lines.push("}");
+  lines.push("");
+  return lines.join("\n");
 }
-`;
-function buildBusContent(_events) {
-  return HEADER7 + "\n" + BUS_BODY;
+function buildIndexTs(pattern) {
+  const lines = [];
+  lines.push(HEADER7.trimEnd());
+  lines.push("");
+  lines.push(`export * from './tokens.js';`);
+  lines.push(`export * from './dispatcher.js';`);
+  lines.push(`export * from './module.js';`);
+  lines.push(`export * from './registry.providers.js';`);
+  lines.push("");
+  return lines.join("\n");
 }
-function buildIndexContent(_events) {
-  return HEADER7 + `
-export * from './types';
-export * from './schemas';
-export * from './registry';
-export * from './bus';
-`;
+function buildRootBarrelTs(patterns) {
+  const lines = [];
+  lines.push(HEADER7.trimEnd());
+  lines.push("");
+  if (patterns.length === 0) {
+    lines.push("// No orchestration patterns registered.");
+    lines.push("export {};");
+    lines.push("");
+    return lines.join("\n");
+  }
+  const slugs = patterns.map((p) => toKebabCase2(p.name)).sort();
+  for (const slug of slugs) {
+    lines.push(`export * from './${slug}/index.js';`);
+  }
+  lines.push("");
+  return lines.join("\n");
 }
-var OUTPUT_FILE_NAMES = [
-  "types.ts",
-  "schemas.ts",
-  "registry.ts",
-  "bus.ts",
-  "index.ts"
-];
-async function generateEventCodegen(opts) {
-  const { entitiesDir, eventsDir, outputDir, dryRun = false } = opts;
-  const { events: merged, issues } = collectMergedEvents({
-    entitiesDir,
-    eventsDir
-  });
-  const builders = {
-    "types.ts": buildTypesContent,
-    "schemas.ts": buildSchemasContent,
-    "registry.ts": buildRegistryContent,
-    "bus.ts": buildBusContent,
-    "index.ts": buildIndexContent
-  };
-  const files = OUTPUT_FILE_NAMES.map((name) => ({
+function buildPatternFiles(pattern, outputRoot) {
+  assertEmittable(pattern);
+  const slug = toKebabCase2(pattern.name);
+  const outputDir = path12.join(outputRoot, slug);
+  const make = (name, content) => ({
     name,
     outputPath: path12.join(outputDir, name),
-    content: builders[name](merged)
-  }));
-  const hasError = issues.some((i) => i.severity === "error");
+    relativePath: path12.join(slug, name),
+    content
+  });
+  const files = [
+    make("tokens.ts", buildTokensTs(pattern)),
+    make("registry.providers.ts", buildProvidersTs(pattern)),
+    make("dispatcher.ts", buildDispatcherTs(pattern)),
+    make("module.ts", buildModuleTs(pattern)),
+    make("index.ts", buildIndexTs(pattern))
+  ];
+  return {
+    patternName: pattern.name,
+    slug,
+    outputDir,
+    files
+  };
+}
+function generateOrchestrationModules(opts) {
+  const { patterns, outputRoot, dryRun = false } = opts;
+  const perPattern = [];
+  const allFiles = [];
+  for (const pattern of patterns) {
+    const result = buildPatternFiles(pattern, outputRoot);
+    perPattern.push(result);
+    allFiles.push(...result.files);
+  }
+  const rootBarrel = {
+    name: "index.ts",
+    outputPath: path12.join(outputRoot, "index.ts"),
+    relativePath: "index.ts",
+    content: buildRootBarrelTs(patterns)
+  };
+  allFiles.push(rootBarrel);
   let written = false;
-  if (!dryRun && !hasError) {
-    fs9.mkdirSync(outputDir, { recursive: true });
-    for (const file of files) {
-      fs9.writeFileSync(file.outputPath, file.content);
+  if (!dryRun && patterns.length > 0) {
+    fs9.mkdirSync(outputRoot, { recursive: true });
+    for (const r of perPattern) {
+      fs9.mkdirSync(r.outputDir, { recursive: true });
+      for (const f of r.files) {
+        fs9.writeFileSync(f.outputPath, f.content);
+      }
     }
+    fs9.writeFileSync(rootBarrel.outputPath, rootBarrel.content);
     written = true;
   }
   return {
-    outputDir,
-    eventCount: merged.length,
-    events: merged,
-    issues,
-    written,
-    files
+    outputRoot,
+    patterns: perPattern,
+    files: allFiles,
+    written
   };
 }
 
@@ -9728,21 +9815,15 @@ var EntityNewCommand = class extends Command2 {
     const generatedDir = resolveGeneratedDir(ctx);
     const architecture = resolveArchitecture(ctx);
     const subsystemsRoot = resolveSubsystemsRoot(ctx);
-    const scopeEntityTypePath = path14.resolve(
-      subsystemsRoot,
-      "jobs/generated/scope-entity-type.ts"
-    );
+    const runtimeMode = resolveRuntimeMode(ctx.config);
+    const scopeEntityTypePath = runtimeMode === "package" ? path14.resolve(generatedDir, "scope-entity-type.ts") : path14.resolve(subsystemsRoot, "jobs/generated/scope-entity-type.ts");
     const eventsDir = resolveEventsDir(ctx);
-    const eventCodegenOutputDir = path14.resolve(
-      subsystemsRoot,
-      "events/generated"
-    );
-    const bridgeRegistryOutputDir = path14.resolve(
-      subsystemsRoot,
-      "bridge/generated"
-    );
+    const eventCodegenOutputDir = runtimeMode === "package" ? path14.resolve(generatedDir, "events") : path14.resolve(subsystemsRoot, "events/generated");
+    const bridgeInstalledForRegistry = configuredSubsystemNames(
+      ctx.config
+    ).includes("bridge");
+    const bridgeRegistryOutputDir = runtimeMode === "package" ? generatedDir : path14.resolve(subsystemsRoot, "bridge/generated");
     const backendSrcForHandlers = ctx.config?.paths?.backend_src ?? "src";
-    const runtimeMode = resolveRuntimeMode(ctx.config);
     const bridgeHandlersDir = path14.resolve(
       ctx.cwd,
       backendSrcForHandlers,
@@ -9787,12 +9868,15 @@ var EntityNewCommand = class extends Command2 {
         entitiesDir,
         eventsDir,
         outputDir: eventCodegenOutputDir,
+        mode: runtimeMode,
         dryRun: true
       });
       const bridgeRegistryPlan = await generateBridgeRegistry({
         handlersDir: bridgeHandlersDir,
         eventsGeneratedDir: eventCodegenOutputDir,
         outputDir: bridgeRegistryOutputDir,
+        mode: runtimeMode,
+        bridgeInstalled: bridgeInstalledForRegistry,
         dryRun: true
       });
       const orchestrationPatterns = await loadOrchestrationPatterns();
@@ -9965,7 +10049,8 @@ var EntityNewCommand = class extends Command2 {
       eventCodegenResult = await generateEventCodegen({
         entitiesDir,
         eventsDir,
-        outputDir: eventCodegenOutputDir
+        outputDir: eventCodegenOutputDir,
+        mode: runtimeMode
       });
       if (!isJsonMode()) {
         for (const issue of eventCodegenResult.issues) {
@@ -9987,7 +10072,9 @@ var EntityNewCommand = class extends Command2 {
       bridgeRegistryResult = await generateBridgeRegistry({
         handlersDir: bridgeHandlersDir,
         eventsGeneratedDir: eventCodegenOutputDir,
-        outputDir: bridgeRegistryOutputDir
+        outputDir: bridgeRegistryOutputDir,
+        mode: runtimeMode,
+        bridgeInstalled: bridgeInstalledForRegistry
       });
       if (bridgeRegistryResult.skipped && !isJsonMode()) {
         printInfo(