@workos/oagen-emitters 0.18.3 → 0.19.0

package/dist/plugin.mjs

@@ -1,2 +1,2 @@
-import { t as workosEmittersPlugin } from "./plugin-1ckLMpgo.mjs";
+import { t as workosEmittersPlugin } from "./plugin-BXDPA9pJ.mjs";
 export { workosEmittersPlugin };

package/docs/sdk-architecture/rust.md

@@ -316,8 +316,8 @@ surface that the `rust` extractor reads.
 Every generated file begins with:
 
 ```rust
-// Code generated by oagen. DO NOT EDIT.
+// This file is auto-generated by oagen. Do not edit.
 ```
 
-`Cargo.toml` uses the TOML-style equivalent (`# Code generated by oagen. DO NOT EDIT.`)
+`Cargo.toml` uses the TOML-style equivalent (`# This file is auto-generated by oagen. Do not edit.`)
 and JSON fixtures skip the header (`headerPlacement: 'skip'`).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workos/oagen-emitters",
-  "version": "0.18.3",
+  "version": "0.19.0",
   "description": "WorkOS' oagen emitters",
   "license": "MIT",
   "author": "WorkOS",
@@ -40,10 +40,10 @@
   "devDependencies": {
     "@commitlint/cli": "^21.0.2",
     "@commitlint/config-conventional": "^21.0.2",
-    "@types/node": "^25.9.3",
+    "@types/node": "^26.0.0",
     "husky": "^9.1.7",
-    "oxfmt": "^0.55.0",
-    "oxlint": "^1.70.0",
+    "oxfmt": "^0.56.0",
+    "oxlint": "^1.71.0",
     "prettier": "^3.8.4",
     "tsdown": "^0.22.3",
     "tsx": "^4.22.4",
@@ -54,6 +54,6 @@
     "node": ">=24.10.0"
   },
   "dependencies": {
-    "@workos/oagen": "^0.22.6"
+    "@workos/oagen": "^0.23.0"
   }
 }

package/src/dotnet/enums.ts

@@ -3,6 +3,7 @@ import { walkTypeRef } from '@workos/oagen';
 import { className, deprecationMessage, escapeCsAttributeString, humanize } from './naming.js';
 import { setEnumAliases, setSingleValueEnumNames } from './type-map.js';
 import { enrichModelsFromSpec } from '../shared/model-utils.js';
+import { isEnumInScope } from '../shared/resolved-ops.js';
 
 /**
  * Generate C# enum definitions from IR Enum definitions.
@@ -135,11 +136,16 @@ export function generateEnums(enums: Enum[], ctx: EmitterContext): GeneratedFile
     lines.push('    }');
     lines.push('}');
 
-    files.push({
-      path: `Enums/${typeName}.cs`,
-      content: lines.join('\n'),
-      overwriteExisting: true,
-    });
+    // FR-1.4: write the per-enum FILE only when in scope. .NET uses a flat
+    // Enums/ directory with C# namespaces (no barrel/index), so an
+    // out-of-scope enum left untouched on disk stays referenceable.
+    if (isEnumInScope(enumDef.name, ctx)) {
+      files.push({
+        path: `Enums/${typeName}.cs`,
+        content: lines.join('\n'),
+        overwriteExisting: true,
+      });
+    }
   }
 
   return files;

package/src/dotnet/fixtures.ts

@@ -1,5 +1,5 @@
 import type { Model, TypeRef, Enum } from '@workos/oagen';
-import { fixtureFileName, fieldName } from './naming.js';
+import { fixtureFileName, domainFieldName } from './naming.js';
 import { isListMetadataModel, isListWrapperModel } from './models.js';
 import { collectNonPaginatedResponseModelNames } from '../shared/model-utils.js';
 
@@ -155,7 +155,10 @@ export function generateModelFixture(
 
   const seenFieldNames = new Set<string>();
   const deduplicatedFields = model.fields.filter((f) => {
-    const csName = fieldName(f.name);
+    // Dedup on the DOMAIN identifier (the C# property name, honoring a
+    // `domainName` override) to mirror the dedup in models.ts. The fixture
+    // payload below still keys on the wire name (`field.name`).
+    const csName = domainFieldName(f);
     if (seenFieldNames.has(csName)) return false;
     seenFieldNames.add(csName);
     return true;

package/src/dotnet/index.ts

@@ -20,6 +20,7 @@ import { generateTests } from './tests.js';
 import { buildOperationsMap } from './manifest.js';
 import { generateWrapperOptionsClasses } from './wrappers.js';
 import { groupByMount } from '../shared/resolved-ops.js';
+import { AUTOGEN_NOTICE } from '../shared/file-header.js';
 import { discriminatedUnions, resolveModelName } from './type-map.js';
 import { modelClassName } from './naming.js';
 
@@ -315,7 +316,7 @@ export const dotnetEmitter: Emitter = {
   },
 
   fileHeader(): string {
-    return '// This file is auto-generated by oagen. Do not edit.';
+    return `// ${AUTOGEN_NOTICE}`;
   },
 
   formatCommand(targetDir: string): FormatCommand | null {

package/src/dotnet/models.ts

@@ -12,6 +12,7 @@ import {
 import {
   articleFor,
   fieldName,
+  domainFieldName,
   humanize,
   emitXmlDoc,
   deprecationMessage,
@@ -25,6 +26,7 @@ import {
   isListMetadataModel,
   collectNonPaginatedResponseModelNames,
 } from '../shared/model-utils.js';
+import { isModelInScope } from '../shared/resolved-ops.js';
 export { isListWrapperModel, isListMetadataModel };
 
 /**
@@ -93,7 +95,10 @@ export function generateModels(models: Model[], ctx: EmitterContext, discCtx?: D
         const baseClassName = modelClassName(model.name);
         const fieldMap = new Map<string, string>();
         for (const field of model.fields) {
-          let csName = fieldName(field.name);
+          // DOMAIN identifier: the C# property name used for inheritance
+          // comparison (honors a `domainName` override). Must match the
+          // property name emitted below so variant fields dedup correctly.
+          let csName = domainFieldName(field);
           if (csName === baseClassName) csName = `${csName}Value`;
           fieldMap.set(csName, mapTypeRef(field.type));
         }
@@ -119,8 +124,16 @@ export function generateModels(models: Model[], ctx: EmitterContext, discCtx?: D
     // Required enums need JsonProperty / STJS; a field whose PascalCase name
     // collides with the enclosing class needs the same imports for the wire-
     // name override emitted below.
-    const hasClassNameCollision = model.fields.some((f) => fieldName(f.name) === csClassName);
-    const needsJsonAttrs = hasClassNameCollision || model.fields.some((f) => f.required && isEnumRef(f.type));
+    // DOMAIN identifier: the emitted C# property name (honors `domainName`)
+    // is what can collide with the enclosing class name.
+    const hasClassNameCollision = model.fields.some((f) => domainFieldName(f) === csClassName);
+    // A `domainName` override renames the C# property away from the wire key
+    // (e.g. wire `connection_type` surfaced as domain `Type`). The
+    // SnakeCaseLower naming policy would otherwise serialize the domain name,
+    // so these fields need an explicit pinned wire name (and thus the imports).
+    const hasDomainRename = model.fields.some((f) => domainFieldName(f) !== fieldName(f.name));
+    const needsJsonAttrs =
+      hasClassNameCollision || hasDomainRename || model.fields.some((f) => f.required && isEnumRef(f.type));
 
     lines.push(`namespace ${ctx.namespacePascal}`);
     lines.push('{');
@@ -175,9 +188,16 @@ export function generateModels(models: Model[], ctx: EmitterContext, discCtx?: D
       // when that happens. Track the rename so we emit an explicit
       // `[JsonProperty]` attribute below — the SnakeCaseLower naming policy
       // would otherwise serialize `ErrorValue` as `error_value`, not `error`.
-      let csFieldName = fieldName(field.name);
+      // DOMAIN identifier: the C# property name, honoring a `domainName`
+      // override (e.g. wire `connection_type` → domain `Type`). The wire key
+      // passed to `emitJsonPropertyAttributes` below still derives from
+      // `field.name`.
+      let csFieldName = domainFieldName(field);
       const collidesWithClassName = csFieldName === csClassName;
       if (collidesWithClassName) csFieldName = `${csFieldName}Value`;
+      // When the domain rename diverges from the wire key, the SnakeCaseLower
+      // naming policy can't recover the wire name from the property — pin it.
+      const hasDomainOverride = domainFieldName(field) !== fieldName(field.name);
       if (seenFieldNames.has(csFieldName)) continue;
       seenFieldNames.add(csFieldName);
 
@@ -257,8 +277,14 @@ export function generateModels(models: Model[], ctx: EmitterContext, discCtx?: D
       }
 
       const isRequiredEnum = field.required && isEnumRef(field.type) && constInit === null;
+      // WIRE key: always derives from `field.name`. Pin it explicitly when the
+      // C# property name (collision suffix or `domainName` override) no longer
+      // round-trips to the wire name via the SnakeCaseLower naming policy.
       lines.push(
-        ...emitJsonPropertyAttributes(field.name, { isRequiredEnum, explicitWireName: collidesWithClassName }),
+        ...emitJsonPropertyAttributes(field.name, {
+          isRequiredEnum,
+          explicitWireName: collidesWithClassName || hasDomainOverride,
+        }),
       );
       // Discriminated-union-typed field: attach the variant-dispatching converter
       // so Newtonsoft picks the right subtype on deserialization. The converter
@@ -330,11 +356,16 @@ export function generateModels(models: Model[], ctx: EmitterContext, discCtx?: D
     lines.push('    }');
     lines.push('}');
 
-    files.push({
-      path: `Entities/${csClassName}.cs`,
-      content: lines.join('\n'),
-      overwriteExisting: true,
-    });
+    // FR-1.4: write the per-model FILE only when in scope. .NET uses a flat
+    // Entities/ directory with C# namespaces (no barrel/index), so an
+    // out-of-scope model left untouched on disk stays referenceable.
+    if (isModelInScope(model.name, ctx)) {
+      files.push({
+        path: `Entities/${csClassName}.cs`,
+        content: lines.join('\n'),
+        overwriteExisting: true,
+      });
+    }
   }
 
   return files;

package/src/dotnet/naming.ts

@@ -39,6 +39,16 @@ export function fieldName(name: string): string {
   return toPascalCase(name);
 }
 
+/**
+ * PascalCase domain property name for a model field, honoring a `domainName`
+ * override (set via the `fieldHints` config) so a wire field can surface under
+ * a friendlier C# property name. The wire/serialization key (the
+ * `[JsonPropertyName("...")]` value) still derives from `field.name`.
+ */
+export function domainFieldName(field: { name: string; domainName?: string }): string {
+  return toPascalCase(field.domainName ?? field.name);
+}
+
 /** PascalCase directory name for service modules. */
 export function moduleName(name: string): string {
   return toPascalCase(name);

package/src/dotnet/resources.ts

@@ -35,7 +35,7 @@ import {
 import {
   buildResolvedLookup,
   lookupResolved,
-  groupByMount,
+  scopedMountGroups,
   getOpDefaults,
   getOpInferFromClient,
   buildHiddenParams,
@@ -71,10 +71,10 @@ export function generateResources(services: Service[], ctx: EmitterContext): Gen
   if (services.length === 0) return [];
 
   const files: GeneratedFile[] = [];
-  const mountGroups = groupByMount(ctx);
+  const mountGroups = scopedMountGroups(ctx);
 
   const entries: Array<{ name: string; operations: Operation[] }> =
-    mountGroups.size > 0
+    mountGroups.size > 0 || ctx.scopedServices?.size
       ? [...mountGroups].map(([name, group]) => ({ name, operations: group.operations }))
       : services.map((s) => ({ name: resolveResourceClassName(s, ctx), operations: s.operations }));
 

package/src/dotnet/tests.ts

@@ -3,6 +3,7 @@ import { planOperation } from '@workos/oagen';
 import {
   fixtureFileName,
   fieldName as csFieldName,
+  domainFieldName as csDomainFieldName,
   methodName as csMethodName,
   appendAsyncSuffix,
   modelClassName,
@@ -15,7 +16,7 @@ import { resolveResourceClassName, sortPathParamsByTemplateOrder, optionsClassNa
 import { generateFixtures, generateModelFixture } from './fixtures.js';
 import { isListWrapperModel } from './models.js';
 import {
-  groupByMount,
+  scopedMountGroups,
   buildResolvedLookup,
   lookupResolved,
   buildHiddenParams,
@@ -39,9 +40,9 @@ export function generateTests(spec: ApiSpec, ctx: EmitterContext): GeneratedFile
   }
 
   // Generate per-mount-target test files
-  const mountGroups = groupByMount(ctx);
+  const mountGroups = scopedMountGroups(ctx);
   const testEntries: Array<{ name: string; operations: Operation[] }> =
-    mountGroups.size > 0
+    mountGroups.size > 0 || ctx.scopedServices?.size
       ? [...mountGroups].map(([name, group]) => ({ name, operations: group.operations }))
       : spec.services.map((s) => ({
           name: resolveResourceClassName(s, ctx),
@@ -694,7 +695,10 @@ function buildFixtureAssertions(model: import('@workos/oagen').Model, spec: ApiS
     if (field.type.kind !== 'primitive' || field.type.type !== 'string') continue;
     if (field.type.format === 'date-time' || field.type.format === 'date') continue;
     if (field.type.format === 'binary') continue;
-    const csField = csFieldName(field.name);
+    // DOMAIN identifier: the C# property accessed on the deserialized model
+    // (honors a `domainName` override). The fixture lookup below uses the wire
+    // key (`field.name`).
+    const csField = csDomainFieldName(field);
     const val = fixture[field.name];
     if (typeof val === 'string' && val.length > 0) {
       assertions.push(`Assert.Equal(${csStringLiteral(val)}, result.${csField});`);

package/src/go/fixtures.ts

@@ -1,5 +1,5 @@
 import type { Model, TypeRef, Enum } from '@workos/oagen';
-import { fileName, fieldName } from './naming.js';
+import { fileName, domainFieldName } from './naming.js';
 import { isListMetadataModel, isListWrapperModel } from './models.js';
 import { collectNonPaginatedResponseModelNames, collectReferencedListMetadataModels } from '../shared/model-utils.js';
 
@@ -131,7 +131,9 @@ export function generateModelFixture(
 
   const seenFieldNames = new Set<string>();
   const deduplicatedFields = model.fields.filter((f) => {
-    const goName = fieldName(f.name);
+    // Dedup by the domain Go field name to mirror the struct in models.ts; the
+    // fixture key itself (wireName below) still derives from field.name.
+    const goName = domainFieldName(f);
     if (seenFieldNames.has(goName)) return false;
     seenFieldNames.add(goName);
     return true;

package/src/go/index.ts

@@ -88,6 +88,10 @@ export const goEmitter: Emitter = {
   },
 
   fileHeader(): string {
+    // Go-specific: this exact form matches the standard generated-file regex
+    // (`^// Code generated .* DO NOT EDIT\.$`) that gofmt, gopls, golangci-lint,
+    // and other Go tooling use to classify a file as generated. It intentionally
+    // does NOT use the shared AUTOGEN_NOTICE, which would break that detection.
     return '// Code generated by oagen. DO NOT EDIT.';
   },
 

package/src/go/models.ts

@@ -1,7 +1,7 @@
 import type { Model, EmitterContext, GeneratedFile, TypeRef, Service } from '@workos/oagen';
 import { walkTypeRef } from '@workos/oagen';
 import { mapTypeRef } from './type-map.js';
-import { className, fieldName } from './naming.js';
+import { className, domainFieldName } from './naming.js';
 import { lowerFirstForDoc, fieldDocComment, articleFor } from '../shared/naming-utils.js';
 
 // Import and re-export shared model detection utilities
@@ -185,7 +185,9 @@ export function generateModels(models: Model[], ctx: EmitterContext): GeneratedF
     // Deduplicate fields by Go field name
     const seenFieldNames = new Set<string>();
     for (const field of model.fields) {
-      const goFieldName = fieldName(field.name);
+      // Domain identifier honors a `fieldHints` override (e.g. connection_type
+      // → type); the json struct tag below still derives from `field.name`.
+      const goFieldName = domainFieldName(field);
       if (seenFieldNames.has(goFieldName)) continue;
       seenFieldNames.add(goFieldName);
 

package/src/go/naming.ts

@@ -61,6 +61,16 @@ export function fieldName(name: string): string {
   return applyAcronyms(toPascalCase(name));
 }
 
+/**
+ * PascalCase domain field name for a model field, honoring a `domainName`
+ * override (set via the `fieldHints` config) so a wire field can surface under
+ * a friendlier name. The wire name (the `json:"..."` struct tag) still derives
+ * from `field.name`.
+ */
+export function domainFieldName(field: { name: string; domainName?: string }): string {
+  return applyAcronyms(toPascalCase(field.domainName ?? field.name));
+}
+
 /** snake_case module/directory name. */
 export function moduleName(name: string): string {
   return toSnakeCase(name);

package/src/go/resources.ts

@@ -9,11 +9,19 @@ import type {
 import { planOperation, toSnakeCase } from '@workos/oagen';
 import { isListWrapperModel } from './models.js';
 import { mapTypeRef, mapTypeRefValue } from './type-map.js';
-import { className, fieldName, methodName, resolveClassName, resolveMethodName, unexportedName } from './naming.js';
+import {
+  className,
+  domainFieldName,
+  fieldName,
+  methodName,
+  resolveClassName,
+  resolveMethodName,
+  unexportedName,
+} from './naming.js';
 import {
   buildResolvedLookup,
   lookupResolved,
-  groupByMount,
+  scopedMountGroups,
   getOpDefaults,
   getOpInferFromClient,
   buildHiddenParams,
@@ -52,11 +60,11 @@ export function generateResources(services: Service[], ctx: EmitterContext): Gen
   if (services.length === 0) return [];
 
   const files: GeneratedFile[] = [];
-  const mountGroups = groupByMount(ctx);
+  const mountGroups = scopedMountGroups(ctx);
 
   // If no resolved operations, fall back to raw services
   const entries: Array<{ name: string; operations: Operation[] }> =
-    mountGroups.size > 0
+    mountGroups.size > 0 || ctx.scopedServices?.size
       ? [...mountGroups].map(([name, group]) => ({ name, operations: group.operations }))
       : services.map((s) => ({ name: resolveResourceClassName(s, ctx), operations: s.operations }));
 
@@ -404,7 +412,8 @@ function generateParamsStruct(
       for (const field of bodyModel.fields) {
         if (hidden.has(field.name)) continue;
         if (groupedParams.has(field.name)) continue;
-        const goField = fieldName(field.name);
+        // Domain struct field; the json tag below keeps deriving from field.name.
+        const goField = domainFieldName(field);
         if (emittedFields.has(goField)) continue;
         emittedFields.add(goField);
         const isOptional = !field.required;
@@ -942,7 +951,8 @@ function emitHiddenParamsBodyStruct(
       if (hidden.has(field.name)) continue;
       if (groupedParamNames.has(field.name)) continue;
       if (!field.required) continue;
-      const goField = fieldName(field.name);
+      // Domain struct field; the json tag below keeps deriving from field.name.
+      const goField = domainFieldName(field);
       const goType = mapTypeRef(field.type);
       lines.push(`\t${goField} ${goType} \`json:"${field.name}"\``);
     }
@@ -960,7 +970,8 @@ function emitHiddenParamsBodyStruct(
       if (hidden.has(field.name)) continue;
       if (groupedParamNames.has(field.name)) continue;
       if (field.required) continue;
-      const goField = fieldName(field.name);
+      // Domain struct field; the json tag below keeps deriving from field.name.
+      const goField = domainFieldName(field);
       const goType = makeOptional(mapTypeRef(field.type));
       lines.push(`\t${goField} ${goType} \`json:"${field.name},omitempty"\``);
     }
@@ -1007,7 +1018,8 @@ function emitBodyWithHiddenParams(
     for (const field of bodyModel.fields) {
       if (hidden.has(field.name)) continue;
       if (!field.required) continue;
-      const goField = fieldName(field.name);
+      // Domain struct field on both the body literal and the params struct.
+      const goField = domainFieldName(field);
       lines.push(`\t\t${goField}: params.${goField},`);
     }
   }
@@ -1025,7 +1037,8 @@ function emitBodyWithHiddenParams(
     for (const field of bodyModel.fields) {
       if (hidden.has(field.name)) continue;
       if (field.required) continue;
-      const goField = fieldName(field.name);
+      // Domain struct field on both the body struct and the params struct.
+      const goField = domainFieldName(field);
       lines.push(`\tbody.${goField} = params.${goField}`);
     }
   }

package/src/go/tests.ts

@@ -5,7 +5,7 @@ import { resolveResourceClassName, paramsStructName, sortPathParamsByTemplateOrd
 import { buildServiceAccessPaths } from './client.js';
 import { generateFixtures } from './fixtures.js';
 import { isListWrapperModel } from './models.js';
-import { groupByMount, buildResolvedLookup, lookupResolved, buildHiddenParams } from '../shared/resolved-ops.js';
+import { scopedMountGroups, buildResolvedLookup, lookupResolved, buildHiddenParams } from '../shared/resolved-ops.js';
 import { existsSync, readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
 
@@ -85,9 +85,9 @@ export function generateTests(spec: ApiSpec, ctx: EmitterContext): GeneratedFile
   const accessPaths = buildServiceAccessPaths(spec.services, ctx);
 
   // Generate per-mount-target test files
-  const mountGroups = groupByMount(ctx);
+  const mountGroups = scopedMountGroups(ctx);
   const testEntries: Array<{ name: string; operations: Operation[] }> =
-    mountGroups.size > 0
+    mountGroups.size > 0 || ctx.scopedServices?.size
       ? [...mountGroups].map(([name, group]) => ({ name, operations: group.operations }))
       : spec.services.map((s) => ({
           name: resolveResourceClassName(s, ctx),

package/src/kotlin/enums.ts

@@ -1,5 +1,6 @@
 import type { Enum, EmitterContext, GeneratedFile } from '@workos/oagen';
 import { className, ktStringLiteral } from './naming.js';
+import { isEnumInScope } from '../shared/resolved-ops.js';
 
 const KOTLIN_SRC_PREFIX = 'src/main/kotlin/';
 const ENUMS_PACKAGE = 'com.workos.types';
@@ -24,7 +25,7 @@ export const enumCanonicalMap = new Map<string, string>();
  * shortest PascalCase name becomes canonical and the rest emit `typealias`
  * files pointing at the canonical class.
  */
-export function generateEnums(enums: Enum[], _ctx: EmitterContext): GeneratedFile[] {
+export function generateEnums(enums: Enum[], ctx: EmitterContext): GeneratedFile[] {
   if (enums.length === 0) return [];
 
   // Reset the canonical map on every generation run (guards against re-entry).
@@ -74,6 +75,11 @@ export function generateEnums(enums: Enum[], _ctx: EmitterContext): GeneratedFil
 
     const typeName = canonicalEnumTypeName(enumDef);
 
+    // FR-1.4: write per-enum FILES only when in scope. Each enum is its own
+    // `.kt` file (no barrel), so an out-of-scope enum left untouched on disk
+    // stays importable.
+    const enumInScope = isEnumInScope(enumDef.name, ctx);
+
     // Non-canonical enum: emit a typealias instead of a full enum class.
     const sharedSortEmitter = sharedSortEmitters.has(enumDef.name);
     const canonicalName = sharedSortEmitter
@@ -94,11 +100,13 @@ export function generateEnums(enums: Enum[], _ctx: EmitterContext): GeneratedFil
         aliasLine,
         '',
       ].join('\n');
-      files.push({
-        path: `${KOTLIN_SRC_PREFIX}${ENUMS_DIR}/${typeName}.kt`,
-        content: aliasContent,
-        overwriteExisting: true,
-      });
+      if (enumInScope) {
+        files.push({
+          path: `${KOTLIN_SRC_PREFIX}${ENUMS_DIR}/${typeName}.kt`,
+          content: aliasContent,
+          overwriteExisting: true,
+        });
+      }
       continue;
     }
 
@@ -175,11 +183,13 @@ export function generateEnums(enums: Enum[], _ctx: EmitterContext): GeneratedFil
     lines.push('}');
     lines.push('');
 
-    files.push({
-      path: `${KOTLIN_SRC_PREFIX}${ENUMS_DIR}/${typeName}.kt`,
-      content: lines.join('\n'),
-      overwriteExisting: true,
-    });
+    if (enumInScope) {
+      files.push({
+        path: `${KOTLIN_SRC_PREFIX}${ENUMS_DIR}/${typeName}.kt`,
+        content: lines.join('\n'),
+        overwriteExisting: true,
+      });
+    }
   }
 
   return files;

package/src/kotlin/index.ts

@@ -19,6 +19,7 @@ import { generateTests } from './tests.js';
 import { buildOperationsMap } from './manifest.js';
 import { enrichModelsFromSpec, getSyntheticEnums } from '../shared/model-utils.js';
 import { flattenDiscriminatedUnionFields } from '../shared/union-flatten.js';
+import { AUTOGEN_NOTICE } from '../shared/file-header.js';
 
 /** Ensure every generated file ends with a trailing newline. */
 function ensureTrailingNewlines(files: GeneratedFile[]): GeneratedFile[] {
@@ -95,7 +96,7 @@ export const kotlinEmitter: Emitter = {
   },
 
   fileHeader(): string {
-    return '// This file is auto-generated by oagen. Do not edit.';
+    return `// ${AUTOGEN_NOTICE}`;
   },
 
   formatCommand(targetDir: string): FormatCommand | null {

package/src/kotlin/models.ts

@@ -1,6 +1,6 @@
 import type { Model, EmitterContext, GeneratedFile, TypeRef, Field } from '@workos/oagen';
 import { mapTypeRef, discriminatedUnions } from './type-map.js';
-import { className, propertyName, ktStringLiteral, humanize } from './naming.js';
+import { className, domainPropertyName, ktStringLiteral, humanize } from './naming.js';
 import { enumCanonicalMap } from './enums.js';
 import {
   isListWrapperModel,
@@ -8,6 +8,7 @@ import {
   collectNonPaginatedResponseModelNames,
   collectReferencedListMetadataModels,
 } from '../shared/model-utils.js';
+import { isModelInScope } from '../shared/resolved-ops.js';
 
 const KOTLIN_SRC_PREFIX = 'src/main/kotlin/';
 const MODELS_PACKAGE = 'com.workos.models';
@@ -123,10 +124,17 @@ export function generateModels(models: Model[], ctx: EmitterContext): GeneratedF
   for (const model of models) {
     if (skipAsListWrapper(model) || skipAsListMetadata(model)) continue;
     const typeName = className(model.name);
+    // FR-1.4: write per-model FILES only when in scope. Each model is its own
+    // `.kt` file (no barrel), so an out-of-scope model left untouched on disk
+    // stays importable. The WorkOSEvent sealed interface below is an aggregate
+    // built from many event models, so it is NOT gated.
+    const modelInScope = isModelInScope(model.name, ctx);
 
     // Parent of a discriminated union: emit a sealed class.
     if (model.fields.length === 0 && discriminatedUnions.has(typeName)) {
-      files.push(emitSealedUnion(typeName, discriminatedUnions.get(typeName)!));
+      if (modelInScope) {
+        files.push(emitSealedUnion(typeName, discriminatedUnions.get(typeName)!));
+      }
       continue;
     }
 
@@ -142,15 +150,19 @@ export function generateModels(models: Model[], ctx: EmitterContext): GeneratedF
         `typealias ${typeName} = ${canonicalType}`,
         '',
       ].join('\n');
-      files.push({
-        path: `${KOTLIN_SRC_PREFIX}${MODELS_DIR}/${typeName}.kt`,
-        content: aliasContent,
-        overwriteExisting: true,
-      });
+      if (modelInScope) {
+        files.push({
+          path: `${KOTLIN_SRC_PREFIX}${MODELS_DIR}/${typeName}.kt`,
+          content: aliasContent,
+          overwriteExisting: true,
+        });
+      }
       continue;
     }
 
-    files.push(emitDataClass(model));
+    if (modelInScope) {
+      files.push(emitDataClass(model));
+    }
   }
 
   // Generate the sealed WorkOSEvent interface. Collect all event envelope
@@ -374,7 +386,10 @@ function renderFields(fields: Field[], overrideFields: Set<string> = new Set()):
 
   for (const rawField of fields) {
     const field = promoteFieldType(rawField);
-    const kotlinName = propertyName(field.name);
+    // DOMAIN identifier: the data class property name. Honors a `domainName`
+    // override (e.g. connection_type -> type); the `@JsonProperty(...)` wire
+    // key below still derives from `field.name`.
+    const kotlinName = domainPropertyName(field);
     if (seen.has(kotlinName)) continue;
     seen.add(kotlinName);
 

package/src/kotlin/naming.ts

@@ -57,6 +57,17 @@ export function propertyName(name: string): string {
   return escapeReserved(camel);
 }
 
+/**
+ * camelCase domain property name for a MODEL field, honoring a `domainName`
+ * override (set via the `fieldHints` config) so a wire field can surface under
+ * a friendlier name. The wire key (the `@JsonProperty("...")` argument) still
+ * derives from `field.name`. No-op when `domainName` is unset, so it is also
+ * safe on params. Only apply to model fields.
+ */
+export function domainPropertyName(field: { name: string; domainName?: string }): string {
+  return propertyName(field.domainName ?? field.name);
+}
+
 /** camelCase alias (kept for parity with other emitters). */
 export const fieldName = propertyName;
 export const localName = propertyName;