diff --git a/.github/workflow-resource-files/seed-groups/csharp-model-seed-groups.json b/.github/workflow-resource-files/seed-groups/csharp-model-seed-groups.json
index 65c671b7b4ee..c332b56819f1 100644
--- a/.github/workflow-resource-files/seed-groups/csharp-model-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/csharp-model-seed-groups.json
@@ -1,150 +1,150 @@
 {
-  "totalTestTimeSeconds": 14383,
+  "totalTestTimeSeconds": 14300,
   "groups": [
     {
       "fixtures": [
-        "csharp-grpc-proto",
+        "auth-environment-variables",
+        "nullable-optional",
+        "request-parameters",
+        "nullable",
+        "oauth-client-credentials-default",
+        "single-url-environment-default",
+        "oauth-client-credentials-custom",
+        "csharp-namespace-collision",
+        "oauth-client-credentials-with-variables",
+        "trace"
+      ],
+      "groupTotalTimeSeconds": 1466
+    },
+    {
+      "fixtures": [
+        "csharp-grpc-proto-exhaustive",
         "literals-unions",
-        "object",
-        "server-sent-event-examples",
-        "validation",
-        "websocket-inferred-auth",
-        "custom-auth",
-        "query-parameters",
-        "reserved-keywords",
+        "license",
+        "multiple-request-bodies",
+        "oauth-client-credentials",
+        "websocket-bearer-auth",
+        "path-parameters",
+        "enum:forward-compatible-enums",
+        "circular-references",
         "examples"
       ],
-      "groupTotalTimeSeconds": 1469
+      "groupTotalTimeSeconds": 1465
     },
     {
       "fixtures": [
-        "query-parameters-openapi",
+        "api-wide-base-path",
+        "mixed-case",
         "file-upload",
+        "file-download",
         "imdb",
-        "plain-text",
-        "single-url-environment-no-default",
-        "empty-clients",
-        "extra-properties",
-        "errors",
-        "mixed-file-directory",
+        "simple-fhir",
+        "query-parameters",
+        "websocket-inferred-auth",
+        "oauth-client-credentials-environment-variables",
         "audiences"
       ],
-      "groupTotalTimeSeconds": 1477
+      "groupTotalTimeSeconds": 1464
     },
     {
       "fixtures": [
-        "version",
-        "file-download",
-        "multiple-request-bodies",
-        "license",
-        "http-head",
-        "public-object",
+        "version-no-default",
+        "server-sent-event-examples",
+        "server-sent-events",
+        "reserved-keywords",
+        "plain-text",
+        "streaming",
+        "response-property",
+        "objects-with-imports",
+        "simple-api",
+        "folders"
+      ],
+      "groupTotalTimeSeconds": 1465
+    },
+    {
+      "fixtures": [
+        "query-parameters-openapi",
+        "csharp-system-collision",
+        "optional",
         "required-nullable",
-        "circular-references",
-        "csharp-namespace-conflict",
-        "trace"
+        "client-side-params",
+        "oauth-client-credentials-nested-root",
+        "empty-clients",
+        "websocket",
+        "basic-auth",
+        "exhaustive"
       ],
-      "groupTotalTimeSeconds": 1476
+      "groupTotalTimeSeconds": 1490
     },
     {
       "fixtures": [
+        "accept-header",
         "alias",
-        "bytes-download",
         "no-environment",
-        "circular-references-advanced",
-        "inferred-auth-implicit-no-expiry",
-        "pagination-custom",
-        "streaming",
-        "oauth-client-credentials-environment-variables",
-        "enum:plain-enums"
+        "object",
+        "package-yml",
+        "multi-url-environment",
+        "errors",
+        "extra-properties",
+        "basic-auth-environment-variables"
       ],
-      "groupTotalTimeSeconds": 1405
+      "groupTotalTimeSeconds": 1390
     },
     {
       "fixtures": [
-        "auth-environment-variables",
-        "bytes-upload",
-        "nullable",
-        "any-auth",
-        "inferred-auth-implicit",
-        "websocket-bearer-auth",
+        "alias-extends",
+        "query-parameters-openapi-as-objects",
+        "public-object",
+        "single-url-environment-no-default",
         "error-property",
-        "streaming-parameter",
-        "basic-auth"
+        "inferred-auth-implicit",
+        "unknown",
+        "variables",
+        "any-auth"
       ],
-      "groupTotalTimeSeconds": 1403
+      "groupTotalTimeSeconds": 1391
     },
     {
       "fixtures": [
+        "bytes-upload",
         "bearer-token-environment-variable",
-        "content-type",
-        "mixed-case",
-        "oauth-client-credentials-custom",
-        "oauth-client-credentials",
-        "multi-url-environment",
-        "objects-with-imports",
-        "oauth-client-credentials-with-variables",
-        "folders"
-      ],
-      "groupTotalTimeSeconds": 1403
-    },
-    {
-      "fixtures": [
-        "csharp-grpc-proto-exhaustive",
-        "csharp-system-collision",
-        "optional",
-        "unions",
+        "http-head",
+        "validation",
+        "mixed-file-directory",
         "undiscriminated-unions",
+        "literal",
         "multi-url-environment-no-default",
-        "path-parameters",
-        "request-parameters",
-        "literal"
-      ],
-      "groupTotalTimeSeconds": 1403
-    },
-    {
-      "fixtures": [
-        "query-parameters-openapi-as-objects",
-        "alias-extends",
-        "client-side-params",
-        "server-sent-events",
-        "package-yml",
-        "websocket",
-        "single-url-environment-default",
-        "response-property",
-        "multi-line-docs",
-        "pagination"
+        "cross-package-type-names"
       ],
-      "groupTotalTimeSeconds": 1473
+      "groupTotalTimeSeconds": 1390
     },
     {
       "fixtures": [
-        "version-no-default",
-        "nullable-optional",
-        "extends",
+        "csharp-grpc-proto",
+        "bytes-download",
         "idempotency-headers",
-        "oauth-client-credentials-default",
-        "unknown",
-        "oauth-client-credentials-nested-root",
-        "simple-api",
         "inferred-auth-explicit",
-        "exhaustive"
+        "multi-line-docs",
+        "pagination-custom",
+        "csharp-namespace-conflict",
+        "circular-references-advanced",
+        "enum:plain-enums"
       ],
-      "groupTotalTimeSeconds": 1470
+      "groupTotalTimeSeconds": 1391
     },
     {
       "fixtures": [
-        "accept-header",
-        "api-wide-base-path",
+        "version",
+        "content-type",
+        "unions",
+        "extends",
         "property-access",
-        "csharp-namespace-collision",
-        "variables",
-        "simple-fhir",
-        "basic-auth-environment-variables",
-        "enum:forward-compatible-enums",
-        "cross-package-type-names"
+        "inferred-auth-implicit-no-expiry",
+        "custom-auth",
+        "streaming-parameter",
+        "pagination"
       ],
-      "groupTotalTimeSeconds": 1404
+      "groupTotalTimeSeconds": 1388
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/csharp-sdk-seed-groups.json b/.github/workflow-resource-files/seed-groups/csharp-sdk-seed-groups.json
index 8211c9e55a18..bc529f7e8f3f 100644
--- a/.github/workflow-resource-files/seed-groups/csharp-sdk-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/csharp-sdk-seed-groups.json
@@ -1,171 +1,171 @@
 {
-  "totalTestTimeSeconds": 39259,
+  "totalTestTimeSeconds": 38772,
   "groups": [
     {
       "fixtures": [
         "csharp-grpc-proto-exhaustive:read-only-memory",
-        "unions:no-custom-config",
-        "circular-references-advanced",
-        "imdb:extra-dependencies",
-        "websocket:with-websockets",
-        "extra-properties:no-additional-properties",
+        "oauth-client-credentials-nested-root",
+        "unions:no-discriminated-unions",
+        "idempotency-headers",
+        "websocket-inferred-auth",
+        "oauth-client-credentials-with-variables",
+        "nullable",
+        "empty-clients",
         "enum:forward-compatible-enums",
-        "websocket-bearer-auth",
-        "folders",
-        "nullable-optional",
-        "examples:readme-config"
+        "websocket:with-websockets",
+        "exhaustive:no-generate-error-types",
+        "imdb:exported-client-class-name"
       ],
-      "groupTotalTimeSeconds": 3843
+      "groupTotalTimeSeconds": 3966
     },
     {
       "fixtures": [
         "csharp-grpc-proto-exhaustive:no-custom-config",
         "circular-references",
-        "pagination-custom",
-        "multiple-request-bodies",
-        "multi-line-docs",
-        "streaming-parameter",
+        "objects-with-imports",
+        "imdb:exception-class-names",
+        "path-parameters:no-custom-config",
+        "variables",
+        "literals-unions",
         "no-environment",
-        "websocket:no-custom-config",
         "trace",
-        "variables",
-        "property-access"
+        "undiscriminated-unions",
+        "optional:simplify-object-dictionaries"
       ],
-      "groupTotalTimeSeconds": 3841
+      "groupTotalTimeSeconds": 3788
     },
     {
       "fixtures": [
         "query-parameters-openapi",
-        "custom-auth",
-        "errors",
+        "unions:no-custom-config",
         "imdb:no-custom-config",
-        "multi-url-environment:environment-class-name",
+        "inferred-auth-explicit",
+        "license:custom-license",
+        "inferred-auth-implicit-no-expiry",
+        "multi-line-docs",
         "server-sent-event-examples",
-        "license:mit-license",
-        "any-auth",
-        "basic-auth",
-        "public-object",
-        "exhaustive:explicit-namespaces",
-        "imdb:exported-client-class-name"
+        "enum:plain-enums",
+        "property-access",
+        "auth-environment-variables",
+        "exhaustive:include-exception-handler"
       ],
-      "groupTotalTimeSeconds": 4003
+      "groupTotalTimeSeconds": 3977
     },
     {
       "fixtures": [
-        "version",
-        "unions:no-discriminated-unions",
-        "bytes-upload",
-        "response-property",
-        "imdb:include-exception-handler",
-        "simple-fhir",
-        "inferred-auth-explicit",
+        "csharp-grpc-proto",
+        "imdb:extra-dependencies",
+        "content-type",
         "extra-properties:no-custom-config",
-        "file-download",
-        "exhaustive:include-exception-handler",
-        "exhaustive:no-generate-error-types",
-        "exhaustive:no-root-namespace-for-core-classes"
+        "custom-auth",
+        "unknown",
+        "mixed-case",
+        "client-side-params",
+        "extends",
+        "request-parameters",
+        "streaming",
+        "pagination:custom-pager-with-exception-handler"
       ],
-      "groupTotalTimeSeconds": 4012
+      "groupTotalTimeSeconds": 3931
     },
     {
       "fixtures": [
-        "csharp-grpc-proto-exhaustive:package-id",
         "csharp-grpc-proto-exhaustive:include-exception-handler",
-        "csharp-system-collision:system-client",
-        "websocket-inferred-auth",
-        "oauth-client-credentials-environment-variables",
-        "oauth-client-credentials:include-exception-handler",
-        "client-side-params",
-        "query-parameters",
-        "license:custom-license",
-        "examples:no-custom-config",
-        "auth-environment-variables",
+        "csharp-namespace-collision:fully-qualified-namespaces",
+        "error-property",
+        "imdb:include-exception-handler",
+        "plain-text",
+        "file-upload",
+        "oauth-client-credentials-default",
+        "streaming-parameter",
+        "inferred-auth-implicit",
+        "audiences",
+        "single-url-environment-default",
         "pagination:no-custom-config"
       ],
-      "groupTotalTimeSeconds": 3981
+      "groupTotalTimeSeconds": 3926
     },
     {
       "fixtures": [
         "bytes-download",
-        "csharp-grpc-proto",
-        "objects-with-imports",
-        "mixed-file-directory",
-        "oauth-client-credentials-default",
-        "basic-auth-environment-variables",
-        "optional:simplify-object-dictionaries",
-        "reserved-keywords",
-        "file-upload",
-        "object",
-        "unknown"
-      ],
-      "groupTotalTimeSeconds": 3834
-    },
-    {
-      "fixtures": [
-        "alias-extends",
-        "api-wide-base-path",
-        "error-property",
-        "enum:plain-enums",
+        "version-no-default",
+        "errors",
         "csharp-namespace-conflict",
-        "oauth-client-credentials-nested-root",
-        "undiscriminated-unions",
-        "required-nullable",
+        "circular-references-advanced",
+        "oauth-client-credentials:include-exception-handler",
+        "oauth-client-credentials-environment-variables",
+        "websocket:no-custom-config",
         "multi-url-environment:no-pascal-case-environments",
-        "plain-text",
-        "validation"
+        "simple-api",
+        "object",
+        "pagination:custom-pager"
       ],
-      "groupTotalTimeSeconds": 3834
+      "groupTotalTimeSeconds": 3930
     },
     {
       "fixtures": [
         "query-parameters-openapi-as-objects",
-        "csharp-namespace-collision:fully-qualified-namespaces",
+        "alias",
         "package-yml",
-        "oauth-client-credentials:no-custom-config",
-        "literal",
-        "audiences",
-        "imdb:exception-class-names",
-        "empty-clients",
-        "server-sent-events",
-        "simple-api",
         "optional:no-custom-config",
-        "pagination:custom-pager"
+        "csharp-system-collision:system-client",
+        "http-head",
+        "server-sent-events",
+        "mixed-file-directory",
+        "single-url-environment-no-default",
+        "cross-package-type-names",
+        "exhaustive:explicit-namespaces"
       ],
-      "groupTotalTimeSeconds": 3977
+      "groupTotalTimeSeconds": 3785
     },
     {
       "fixtures": [
-        "alias",
-        "bearer-token-environment-variable",
-        "content-type",
+        "alias-extends",
+        "version",
+        "file-download",
+        "multi-url-environment:environment-class-name",
         "path-parameters:no-inline-path-parameters",
-        "inferred-auth-implicit-no-expiry",
-        "request-parameters",
-        "nullable",
-        "idempotency-headers",
-        "mixed-case",
-        "single-url-environment-default",
-        "single-url-environment-no-default",
-        "pagination:custom-pager-with-exception-handler"
+        "basic-auth-environment-variables",
+        "multiple-request-bodies",
+        "examples:readme-config",
+        "folders",
+        "examples:no-custom-config",
+        "exhaustive:no-root-namespace-for-core-classes"
       ],
-      "groupTotalTimeSeconds": 3977
+      "groupTotalTimeSeconds": 3784
+    },
+    {
+      "fixtures": [
+        "api-wide-base-path",
+        "bearer-token-environment-variable",
+        "pagination-custom",
+        "license:mit-license",
+        "bytes-upload",
+        "extra-properties:no-additional-properties",
+        "oauth-client-credentials:no-custom-config",
+        "nullable-optional",
+        "query-parameters",
+        "validation",
+        "websocket-bearer-auth",
+        "oauth-client-credentials-custom"
+      ],
+      "groupTotalTimeSeconds": 3896
     },
     {
       "fixtures": [
+        "csharp-grpc-proto-exhaustive:package-id",
         "accept-header",
-        "version-no-default",
-        "path-parameters:no-custom-config",
-        "oauth-client-credentials-with-variables",
         "multi-url-environment-no-default",
-        "cross-package-type-names",
-        "extends",
-        "inferred-auth-implicit",
-        "http-head",
-        "literals-unions",
-        "streaming",
-        "oauth-client-credentials-custom"
+        "response-property",
+        "any-auth",
+        "basic-auth",
+        "simple-fhir",
+        "literal",
+        "required-nullable",
+        "reserved-keywords",
+        "public-object"
       ],
-      "groupTotalTimeSeconds": 3957
+      "groupTotalTimeSeconds": 3789
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/fastapi-seed-groups.json b/.github/workflow-resource-files/seed-groups/fastapi-seed-groups.json
index 036da29d220c..67265cc01202 100644
--- a/.github/workflow-resource-files/seed-groups/fastapi-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/fastapi-seed-groups.json
@@ -1,160 +1,160 @@
 {
-  "totalTestTimeSeconds": 2724,
+  "totalTestTimeSeconds": 2691,
   "groups": [
     {
       "fixtures": [
         "accept-header",
-        "file-download:no-custom-config",
+        "content-type",
+        "object",
         "oauth-client-credentials-with-variables",
-        "basic-auth",
+        "multi-url-environment-no-default",
+        "path-parameters",
         "simple-api",
-        "imdb:no-custom-config",
-        "circular-references:no-custom-config",
-        "trace",
-        "folders",
+        "examples",
+        "websocket-inferred-auth",
+        "exhaustive:skip-formatting",
+        "exhaustive:ignore-extra-fields"
+      ],
+      "groupTotalTimeSeconds": 280
+    },
+    {
+      "fixtures": [
+        "alias",
+        "extends",
+        "unions:no-custom-config",
+        "simple-fhir:no-custom-config",
+        "oauth-client-credentials",
+        "required-nullable",
+        "single-url-environment-default",
+        "optional",
+        "client-side-params",
         "streaming"
       ],
-      "groupTotalTimeSeconds": 260
+      "groupTotalTimeSeconds": 269
     },
     {
       "fixtures": [
         "alias-extends:no-inheritance-for-extended-models",
-        "file-download:no-inheritance-for-extended-models",
-        "objects-with-imports",
-        "circular-references-advanced:no-custom-config",
-        "undiscriminated-unions",
-        "imdb:includes-extra-fields",
-        "imdb:async-handlers",
-        "variables",
-        "inferred-auth-implicit",
-        "exhaustive:no-custom-config",
-        "literal"
+        "file-download:no-custom-config",
+        "nullable",
+        "simple-fhir:no-inheritance-for-extended-models",
+        "single-url-environment-no-default",
+        "validation",
+        "trace",
+        "plain-text",
+        "enum",
+        "streaming-parameter"
       ],
-      "groupTotalTimeSeconds": 275
+      "groupTotalTimeSeconds": 269
     },
     {
       "fixtures": [
         "query-parameters-openapi",
         "oauth-client-credentials-custom",
-        "oauth-client-credentials-nested-root",
-        "simple-fhir:no-inheritance-for-extended-models",
-        "nullable",
+        "mixed-case",
+        "extra-properties",
+        "circular-references:no-custom-config",
+        "custom-auth",
         "error-property",
-        "websocket",
-        "audiences",
-        "client-side-params",
-        "inferred-auth-explicit",
-        "query-parameters"
+        "basic-auth",
+        "folders",
+        "query-parameters",
+        "exhaustive:frozen_utils"
       ],
-      "groupTotalTimeSeconds": 275
+      "groupTotalTimeSeconds": 268
     },
     {
       "fixtures": [
         "query-parameters-openapi-as-objects",
-        "oauth-client-credentials",
-        "errors",
         "nullable-optional",
-        "multi-line-docs",
-        "circular-references-advanced:no-inheritance-for-extended-models",
-        "reserved-keywords",
-        "cross-package-type-names",
-        "plain-text",
-        "inferred-auth-implicit-no-expiry",
-        "websocket-inferred-auth"
+        "objects-with-imports",
+        "imdb:no-custom-config",
+        "circular-references:no-inheritance-for-extended-models",
+        "empty-clients",
+        "license",
+        "basic-auth-environment-variables",
+        "response-property",
+        "request-parameters",
+        "exhaustive:include-validators"
       ],
-      "groupTotalTimeSeconds": 275
+      "groupTotalTimeSeconds": 268
     },
     {
       "fixtures": [
         "version",
-        "pagination:no-custom-config",
         "oauth-client-credentials-environment-variables",
-        "package-yml",
-        "multi-url-environment-no-default",
-        "custom-auth",
-        "single-url-environment-default",
-        "http-head",
-        "response-property",
-        "request-parameters",
+        "pagination:no-inheritance-for-extended-models",
+        "mixed-file-directory",
+        "circular-references-advanced:no-inheritance-for-extended-models",
+        "imdb:v1_on_v2",
+        "literals-unions",
+        "idempotency-headers",
+        "imdb:includes-extra-fields",
+        "file-download:no-inheritance-for-extended-models",
         "exhaustive:pydantic-v2"
       ],
-      "groupTotalTimeSeconds": 274
+      "groupTotalTimeSeconds": 268
     },
     {
       "fixtures": [
         "version-no-default",
-        "oauth-client-credentials-default",
-        "unions:no-inheritance-for-extended-models",
-        "simple-fhir:no-custom-config",
-        "no-environment",
-        "empty-clients",
-        "single-url-environment-no-default",
-        "public-object",
-        "any-auth",
-        "multiple-request-bodies",
-        "exhaustive:frozen_utils"
-      ],
-      "groupTotalTimeSeconds": 274
-    },
-    {
-      "fixtures": [
-        "alias",
-        "bytes-download",
-        "extra-properties",
-        "idempotency-headers",
-        "unions:no-custom-config",
+        "oauth-client-credentials-nested-root",
+        "imdb:async-handlers",
+        "errors",
+        "unknown",
+        "multi-url-environment",
         "pagination-custom",
-        "required-nullable",
-        "file-upload",
-        "server-sent-events",
-        "exhaustive:ignore-extra-fields"
+        "property-access",
+        "inferred-auth-explicit",
+        "literal",
+        "exhaustive:no-custom-config"
       ],
-      "groupTotalTimeSeconds": 273
+      "groupTotalTimeSeconds": 267
     },
     {
       "fixtures": [
         "alias-extends:no-custom-config",
-        "bytes-upload",
-        "mixed-case",
-        "imdb:v1_on_v2",
-        "unknown",
-        "path-parameters",
+        "bearer-token-environment-variable",
+        "oauth-client-credentials-default",
+        "undiscriminated-unions",
+        "websocket",
+        "variables",
         "websocket-bearer-auth",
-        "optional",
-        "server-sent-event-examples",
-        "exhaustive:skip-formatting"
+        "any-auth",
+        "inferred-auth-implicit",
+        "server-sent-event-examples"
       ],
-      "groupTotalTimeSeconds": 272
+      "groupTotalTimeSeconds": 268
     },
     {
       "fixtures": [
         "api-wide-base-path",
-        "content-type",
-        "multi-url-environment",
-        "literals-unions",
-        "validation",
-        "property-access",
-        "basic-auth-environment-variables",
-        "examples",
-        "streaming-parameter",
+        "bytes-download",
+        "pagination:no-custom-config",
+        "unions:no-inheritance-for-extended-models",
+        "circular-references-advanced:no-custom-config",
+        "no-environment",
+        "public-object",
+        "audiences",
+        "inferred-auth-implicit-no-expiry",
         "exhaustive:pydantic-v1"
       ],
-      "groupTotalTimeSeconds": 272
+      "groupTotalTimeSeconds": 267
     },
     {
       "fixtures": [
         "auth-environment-variables",
-        "bearer-token-environment-variable",
-        "pagination:no-inheritance-for-extended-models",
-        "mixed-file-directory",
-        "circular-references:no-inheritance-for-extended-models",
-        "object",
-        "license",
-        "extends",
-        "enum",
-        "exhaustive:include-validators"
+        "bytes-upload",
+        "http-head",
+        "multi-line-docs",
+        "file-upload",
+        "package-yml",
+        "reserved-keywords",
+        "cross-package-type-names",
+        "server-sent-events",
+        "multiple-request-bodies"
       ],
-      "groupTotalTimeSeconds": 274
+      "groupTotalTimeSeconds": 267
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/go-fiber-seed-groups.json b/.github/workflow-resource-files/seed-groups/go-fiber-seed-groups.json
index 2d832c32e30e..159c79b5d31e 100644
--- a/.github/workflow-resource-files/seed-groups/go-fiber-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/go-fiber-seed-groups.json
@@ -1,128 +1,131 @@
 {
-  "totalTestTimeSeconds": 3477,
+  "totalTestTimeSeconds": 3603,
   "groups": [
     {
       "fixtures": [
-        "version-no-default",
-        "multiple-request-bodies",
-        "nullable-optional",
-        "client-side-params",
-        "any-auth",
-        "pagination",
-        "trace",
-        "inferred-auth-explicit",
-        "oauth-client-credentials-nested-root",
-        "server-sent-event-examples",
-        "variables",
-        "custom-auth",
-        "errors",
-        "oauth-client-credentials-default",
-        "streaming:.",
-        "multi-url-environment",
-        "public-object"
-      ],
-      "groupTotalTimeSeconds": 346
-    },
-    {
-      "fixtures": ["accept-header", "file-download", "error-property", "audiences", "folders"],
-      "groupTotalTimeSeconds": 349
-    },
-    {
-      "fixtures": ["alias", "file-upload", "extra-properties", "cross-package-type-names", "go-content-type"],
-      "groupTotalTimeSeconds": 349
-    },
-    {
-      "fixtures": [
-        "api-wide-base-path",
-        "http-head",
-        "oauth-client-credentials-custom",
-        "server-sent-events",
-        "inferred-auth-implicit-no-expiry",
-        "path-parameters",
-        "reserved-keywords"
+        "alias",
+        "go-bytes-request",
+        "extra-properties",
+        "response-property",
+        "package-yml",
+        "multi-url-environment-no-default"
       ],
-      "groupTotalTimeSeconds": 349
+      "groupTotalTimeSeconds": 363
     },
     {
       "fixtures": [
         "query-parameters-openapi",
-        "exhaustive",
-        "multi-url-environment-no-default",
-        "response-property",
-        "imdb",
+        "alias-extends",
+        "oauth-client-credentials",
+        "oauth-client-credentials-nested-root",
+        "object",
+        "unknown",
+        "custom-auth",
+        "optional",
+        "variables",
+        "errors",
+        "validation",
         "mixed-file-directory",
+        "single-url-environment-default",
+        "mixed-case",
+        "examples",
+        "literals-unions",
+        "multi-line-docs",
         "license"
       ],
-      "groupTotalTimeSeconds": 348
+      "groupTotalTimeSeconds": 359
     },
     {
       "fixtures": [
         "query-parameters-openapi-as-objects",
-        "alias-extends",
-        "no-environment",
-        "optional",
-        "mixed-case",
+        "simple-fhir",
         "plain-text",
-        "undiscriminated-unions",
-        "inferred-auth-implicit",
+        "oauth-client-credentials-custom",
+        "circular-references-advanced",
+        "unions",
+        "client-side-params",
+        "objects-with-imports",
+        "streaming-parameter",
+        "error-property",
+        "server-sent-event-examples",
+        "idempotency-headers:.",
         "property-access",
-        "simple-api",
+        "audiences",
+        "websocket-inferred-auth",
+        "imdb",
+        "folders",
+        "pagination-custom",
+        "reserved-keywords"
+      ],
+      "groupTotalTimeSeconds": 363
+    },
+    {
+      "fixtures": [
+        "version",
+        "no-environment",
+        "nullable-optional",
+        "multiple-request-bodies",
+        "trace",
+        "public-object",
+        "any-auth",
+        "inferred-auth-explicit",
+        "pagination",
         "websocket",
+        "simple-api",
+        "inferred-auth-implicit-no-expiry",
+        "required-nullable",
         "empty-clients",
-        "go-bytes-request",
-        "oauth-client-credentials-environment-variables",
-        "unknown",
-        "oauth-client-credentials-with-variables",
-        "enum",
+        "circular-references",
+        "go-content-type",
+        "single-url-environment-no-default",
+        "path-parameters",
         "request-parameters"
       ],
-      "groupTotalTimeSeconds": 348
+      "groupTotalTimeSeconds": 360
     },
     {
       "fixtures": [
-        "version",
-        "simple-fhir",
-        "literals-unions",
-        "query-parameters",
+        "version-no-default",
         "nullable",
-        "single-url-environment-default",
+        "inferred-auth-implicit",
+        "oauth-client-credentials-default",
+        "undiscriminated-unions",
+        "query-parameters",
         "basic-auth-environment-variables",
-        "circular-references-advanced",
-        "oauth-client-credentials",
-        "required-nullable",
-        "streaming-parameter",
+        "oauth-client-credentials-environment-variables",
+        "streaming:.",
+        "basic-auth",
+        "oauth-client-credentials-with-variables",
         "websocket-bearer-auth",
-        "multi-line-docs",
-        "objects-with-imports",
-        "validation",
-        "package-yml",
-        "examples"
+        "server-sent-events",
+        "enum",
+        "cross-package-type-names",
+        "http-head",
+        "exhaustive",
+        "multi-url-environment",
+        "literal"
       ],
-      "groupTotalTimeSeconds": 345
+      "groupTotalTimeSeconds": 362
     },
     {
-      "fixtures": [
-        "auth-environment-variables",
-        "bytes-upload",
-        "websocket-inferred-auth",
-        "pagination-custom",
-        "literal"
-      ],
-      "groupTotalTimeSeconds": 348
+      "fixtures": ["accept-header", "content-type"],
+      "groupTotalTimeSeconds": 360
     },
     {
-      "fixtures": [
-        "bearer-token-environment-variable",
-        "content-type",
-        "basic-auth",
-        "single-url-environment-no-default",
-        "object"
-      ],
-      "groupTotalTimeSeconds": 348
+      "fixtures": ["api-wide-base-path", "bytes-download"],
+      "groupTotalTimeSeconds": 359
+    },
+    {
+      "fixtures": ["auth-environment-variables", "extends"],
+      "groupTotalTimeSeconds": 359
+    },
+    {
+      "fixtures": ["bearer-token-environment-variable", "file-download"],
+      "groupTotalTimeSeconds": 359
     },
     {
-      "fixtures": ["bytes-download", "extends", "circular-references", "unions", "idempotency-headers:."],
-      "groupTotalTimeSeconds": 347
+      "fixtures": ["bytes-upload", "file-upload"],
+      "groupTotalTimeSeconds": 359
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/go-model-seed-groups.json b/.github/workflow-resource-files/seed-groups/go-model-seed-groups.json
index addd5eda6cbf..4d95660c73e4 100644
--- a/.github/workflow-resource-files/seed-groups/go-model-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/go-model-seed-groups.json
@@ -1,130 +1,120 @@
 {
-  "totalTestTimeSeconds": 4057,
+  "totalTestTimeSeconds": 4101,
   "groups": [
     {
       "fixtures": [
-        "alias",
-        "file-upload",
-        "oauth-client-credentials-environment-variables",
-        "inferred-auth-implicit-no-expiry"
+        "version",
+        "nullable-optional",
+        "object",
+        "go-bytes-request",
+        "no-environment",
+        "pagination-custom",
+        "single-url-environment-no-default",
+        "multi-line-docs",
+        "streaming:.",
+        "websocket-inferred-auth",
+        "required-nullable",
+        "imdb",
+        "any-auth",
+        "custom-auth",
+        "multi-url-environment-no-default",
+        "trace"
       ],
-      "groupTotalTimeSeconds": 403
+      "groupTotalTimeSeconds": 409
+    },
+    {
+      "fixtures": ["accept-header", "file-download", "cross-package-type-names", "variables"],
+      "groupTotalTimeSeconds": 409
+    },
+    {
+      "fixtures": ["api-wide-base-path", "file-upload", "folders", "basic-auth", "public-object"],
+      "groupTotalTimeSeconds": 415
     },
     {
       "fixtures": [
         "query-parameters-openapi",
         "client-side-params",
-        "property-access",
-        "http-head",
-        "nullable",
+        "server-sent-events",
+        "mixed-case",
+        "oauth-client-credentials",
         "response-property",
+        "validation",
+        "plain-text",
+        "websocket",
+        "package-yml",
         "circular-references",
+        "circular-references-advanced",
+        "oauth-client-credentials-default",
         "extra-properties",
-        "pagination",
-        "imdb",
-        "required-nullable",
-        "error-property",
-        "oauth-client-credentials-custom",
-        "server-sent-events",
-        "basic-auth",
-        "trace"
+        "oauth-client-credentials-with-variables",
+        "enum",
+        "exhaustive"
       ],
-      "groupTotalTimeSeconds": 407
+      "groupTotalTimeSeconds": 414
     },
     {
       "fixtures": [
         "query-parameters-openapi-as-objects",
-        "path-parameters",
-        "idempotency-headers:.",
-        "simple-api",
-        "mixed-case",
-        "nullable-optional",
-        "streaming:.",
-        "go-bytes-request",
-        "single-url-environment-default",
-        "multi-url-environment-no-default",
         "unions",
-        "errors",
-        "oauth-client-credentials-default",
-        "websocket",
-        "empty-clients",
-        "basic-auth-environment-variables"
-      ],
-      "groupTotalTimeSeconds": 406
-    },
-    {
-      "fixtures": [
-        "version",
-        "server-sent-event-examples",
-        "package-yml",
         "simple-fhir",
         "multiple-request-bodies",
         "optional",
-        "unknown",
+        "simple-api",
         "literals-unions",
-        "single-url-environment-no-default",
-        "oauth-client-credentials",
-        "variables",
-        "inferred-auth-implicit",
-        "oauth-client-credentials-with-variables",
-        "websocket-bearer-auth",
+        "oauth-client-credentials-custom",
+        "streaming-parameter",
+        "basic-auth-environment-variables",
+        "pagination",
+        "error-property",
+        "oauth-client-credentials-nested-root",
+        "multi-url-environment",
         "go-content-type",
-        "exhaustive"
+        "examples",
+        "request-parameters"
       ],
-      "groupTotalTimeSeconds": 406
+      "groupTotalTimeSeconds": 414
     },
     {
       "fixtures": [
         "version-no-default",
-        "websocket-inferred-auth",
-        "pagination-custom",
-        "streaming-parameter",
-        "no-environment",
-        "query-parameters",
-        "validation",
-        "multi-line-docs",
+        "empty-clients",
+        "server-sent-event-examples",
+        "license",
+        "nullable",
+        "property-access",
+        "unknown",
+        "path-parameters",
         "undiscriminated-unions",
         "objects-with-imports",
-        "audiences",
-        "circular-references-advanced",
-        "multi-url-environment",
-        "object",
-        "any-auth",
-        "enum"
+        "query-parameters",
+        "errors",
+        "single-url-environment-default",
+        "oauth-client-credentials-environment-variables",
+        "mixed-file-directory",
+        "literal"
       ],
-      "groupTotalTimeSeconds": 406
+      "groupTotalTimeSeconds": 408
     },
     {
-      "fixtures": [
-        "accept-header",
-        "bytes-upload",
-        "oauth-client-credentials-nested-root",
-        "custom-auth",
-        "plain-text"
-      ],
-      "groupTotalTimeSeconds": 409
+      "fixtures": ["alias", "bytes-download", "http-head", "inferred-auth-explicit"],
+      "groupTotalTimeSeconds": 408
     },
     {
-      "fixtures": ["alias-extends", "extends", "reserved-keywords", "examples", "public-object"],
+      "fixtures": ["alias-extends", "bytes-upload", "idempotency-headers:.", "inferred-auth-implicit"],
       "groupTotalTimeSeconds": 408
     },
     {
       "fixtures": [
-        "api-wide-base-path",
-        "bearer-token-environment-variable",
-        "cross-package-type-names",
-        "folders",
-        "request-parameters"
+        "auth-environment-variables",
+        "content-type",
+        "websocket-bearer-auth",
+        "inferred-auth-implicit-no-expiry"
       ],
       "groupTotalTimeSeconds": 408
     },
     {
-      "fixtures": ["auth-environment-variables", "content-type", "license", "literal"],
-      "groupTotalTimeSeconds": 402
-    },
-    {
-      "fixtures": ["bytes-download", "file-download", "mixed-file-directory", "inferred-auth-explicit"],
-      "groupTotalTimeSeconds": 402
+      "fixtures": ["bearer-token-environment-variable", "extends", "audiences", "reserved-keywords"],
+      "groupTotalTimeSeconds": 408
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/go-sdk-seed-groups.json b/.github/workflow-resource-files/seed-groups/go-sdk-seed-groups.json
index 7c17fb73bd22..a5328ee7dacf 100644
--- a/.github/workflow-resource-files/seed-groups/go-sdk-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/go-sdk-seed-groups.json
@@ -1,166 +1,166 @@
 {
-  "totalTestTimeSeconds": 8155,
+  "totalTestTimeSeconds": 7946,
   "groups": [
     {
       "fixtures": [
-        "query-parameters-openapi-as-objects",
-        "inferred-auth-implicit",
-        "oauth-client-credentials",
-        "examples:client-name",
-        "oauth-client-credentials-environment-variables",
+        "version-no-default",
+        "examples:always-send-required-properties",
+        "examples:client-name-with-custom-constructor-name",
+        "mixed-file-directory",
         "imdb:no-custom-config",
-        "undiscriminated-unions:no-custom-config",
-        "single-url-environment-no-default",
+        "nullable-optional",
+        "literals-unions:no-custom-config",
         "path-parameters:package-name",
-        "property-access",
-        "circular-references",
-        "response-property"
+        "extra-properties",
+        "variables",
+        "examples:exported-client-name",
+        "exhaustive"
       ],
-      "groupTotalTimeSeconds": 809
+      "groupTotalTimeSeconds": 796
     },
     {
       "fixtures": [
-        "version",
-        "oauth-client-credentials-nested-root",
-        "oauth-client-credentials-custom",
-        "idempotency-headers:.",
+        "query-parameters-openapi",
+        "imdb:with-wiremock-tests",
         "pagination",
+        "imdb:package-path",
         "inferred-auth-implicit-no-expiry",
-        "extra-properties",
-        "multi-url-environment-no-default",
-        "error-property",
-        "nullable-optional",
-        "oauth-client-credentials-with-variables",
-        "unknown",
+        "inferred-auth-explicit",
+        "mixed-case:default-values",
+        "circular-references-advanced",
+        "oauth-client-credentials",
+        "undiscriminated-unions:no-custom-config",
+        "objects-with-imports",
+        "pagination-custom",
         "streaming-parameter"
       ],
-      "groupTotalTimeSeconds": 810
+      "groupTotalTimeSeconds": 789
     },
     {
       "fixtures": [
-        "bytes-upload",
-        "file-upload:package-name",
-        "no-environment",
-        "examples:client-name-with-custom-constructor-name",
-        "mixed-case:no-custom-config",
-        "imdb:package-path",
-        "oauth-client-credentials-default",
+        "query-parameters-openapi-as-objects",
+        "examples:no-custom-config",
+        "examples:client-name",
+        "audiences",
+        "imdb:deep-package-path",
+        "optional",
+        "multiple-request-bodies",
+        "public-object",
         "go-bytes-request:use-reader-for-bytes-request",
-        "trace",
-        "validation",
-        "literal"
+        "websocket",
+        "oauth-client-credentials-environment-variables",
+        "undiscriminated-unions:v0"
       ],
-      "groupTotalTimeSeconds": 812
+      "groupTotalTimeSeconds": 794
     },
     {
       "fixtures": [
-        "query-parameters-openapi",
-        "imdb:with-wiremock-tests",
-        "bearer-token-environment-variable",
-        "multiple-request-bodies",
+        "version",
         "examples:v0",
-        "examples:exported-client-name",
-        "exhaustive",
-        "license",
-        "public-object",
-        "go-content-type",
-        "enum",
-        "request-parameters"
+        "oauth-client-credentials-with-variables",
+        "cross-package-type-names",
+        "idempotency-headers:.",
+        "no-environment",
+        "inferred-auth-implicit",
+        "multi-url-environment",
+        "empty-clients",
+        "single-url-environment-no-default",
+        "multi-line-docs",
+        "multi-url-environment-no-default"
       ],
-      "groupTotalTimeSeconds": 809
+      "groupTotalTimeSeconds": 793
     },
     {
       "fixtures": [
-        "version-no-default",
-        "imdb:deep-package-path",
+        "alias",
+        "file-upload:no-custom-config",
         "unions:no-custom-config",
-        "inferred-auth-explicit",
-        "examples:readme-config",
-        "examples:export-all-requests-at-root",
+        "simple-fhir",
         "custom-auth",
-        "query-parameters",
-        "package-yml:no-custom-config",
-        "path-parameters:v0",
-        "http-head",
-        "object",
-        "pagination-custom"
-      ],
-      "groupTotalTimeSeconds": 809
-    },
-    {
-      "fixtures": [
-        "accept-header",
-        "file-upload:no-custom-config",
-        "client-side-params",
         "server-sent-event-examples",
-        "required-nullable",
-        "basic-auth-environment-variables",
-        "path-parameters:no-custom-config",
-        "unions:v0",
-        "websocket-bearer-auth",
-        "audiences"
+        "single-url-environment-default",
+        "examples:readme-config",
+        "alias-extends",
+        "oauth-client-credentials-nested-root"
       ],
-      "groupTotalTimeSeconds": 824
+      "groupTotalTimeSeconds": 799
     },
     {
       "fixtures": [
-        "alias",
-        "extends",
-        "examples:package-path",
-        "simple-fhir",
-        "simple-api",
-        "empty-clients",
-        "unions:package-name",
+        "api-wide-base-path",
+        "auth-environment-variables",
+        "mixed-case:no-custom-config",
+        "plain-text",
+        "server-sent-events",
+        "streaming:.",
+        "websocket-bearer-auth",
+        "unknown",
         "bytes-download",
-        "folders",
-        "cross-package-type-names"
+        "package-yml:no-custom-config"
       ],
-      "groupTotalTimeSeconds": 824
+      "groupTotalTimeSeconds": 799
     },
     {
       "fixtures": [
-        "api-wide-base-path",
-        "file-download",
-        "mixed-case:default-values",
-        "single-url-environment-default",
-        "examples:no-custom-config",
-        "multi-url-environment",
+        "bytes-upload",
+        "file-upload:v0",
+        "enum",
+        "unions:package-name",
+        "go-content-type",
+        "license",
         "any-auth",
-        "undiscriminated-unions:v0",
-        "optional",
-        "websocket"
+        "examples:getters-pass-by-value",
+        "websocket-inferred-auth",
+        "path-parameters:no-custom-config",
+        "trace"
       ],
-      "groupTotalTimeSeconds": 825
+      "groupTotalTimeSeconds": 795
     },
     {
       "fixtures": [
-        "auth-environment-variables",
-        "file-upload:v0",
-        "objects-with-imports",
-        "examples:always-send-required-properties",
-        "literals-unions:no-custom-config",
-        "server-sent-events",
+        "content-type",
+        "file-upload:package-name",
+        "folders",
+        "http-head",
+        "client-side-params",
+        "error-property",
         "errors",
-        "alias-extends",
-        "mixed-file-directory",
-        "websocket-inferred-auth"
+        "go-bytes-request:no-custom-config",
+        "validation",
+        "oauth-client-credentials-custom",
+        "request-parameters"
       ],
-      "groupTotalTimeSeconds": 824
+      "groupTotalTimeSeconds": 788
     },
     {
       "fixtures": [
-        "content-type",
-        "go-bytes-request:no-custom-config",
+        "accept-header",
+        "extends",
         "nullable",
-        "examples:getters-pass-by-value",
+        "property-access",
+        "simple-api",
         "basic-auth",
-        "multi-line-docs",
-        "streaming:.",
-        "plain-text",
-        "variables",
-        "circular-references-advanced"
+        "object",
+        "circular-references",
+        "oauth-client-credentials-default",
+        "examples:package-path"
+      ],
+      "groupTotalTimeSeconds": 795
+    },
+    {
+      "fixtures": [
+        "bearer-token-environment-variable",
+        "file-download",
+        "query-parameters",
+        "required-nullable",
+        "unions:v0",
+        "basic-auth-environment-variables",
+        "response-property",
+        "path-parameters:v0",
+        "examples:export-all-requests-at-root",
+        "literal"
       ],
-      "groupTotalTimeSeconds": 809
+      "groupTotalTimeSeconds": 798
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/java-model-seed-groups.json b/.github/workflow-resource-files/seed-groups/java-model-seed-groups.json
index bddbd98da82c..b84029b60319 100644
--- a/.github/workflow-resource-files/seed-groups/java-model-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/java-model-seed-groups.json
@@ -1,151 +1,151 @@
 {
-  "totalTestTimeSeconds": 28049,
+  "totalTestTimeSeconds": 27055,
   "groups": [
     {
       "fixtures": [
-        "java-inline-types",
+        "undiscriminated-unions",
         "accept-header",
-        "file-upload",
-        "multiple-request-bodies",
-        "license",
-        "simple-fhir",
-        "oauth-client-credentials-custom",
-        "websocket-inferred-auth",
-        "audiences",
-        "examples"
+        "alias",
+        "optional",
+        "basic-auth-environment-variables",
+        "nullable",
+        "errors",
+        "reserved-keywords",
+        "server-sent-events",
+        "trace"
       ],
-      "groupTotalTimeSeconds": 2855
+      "groupTotalTimeSeconds": 2744
     },
     {
       "fixtures": [
-        "nullable-optional",
-        "package-yml",
-        "version-no-default",
-        "client-side-params",
-        "literals-unions",
+        "any-auth",
+        "java-nullable-named-request-types",
+        "auth-environment-variables",
+        "oauth-client-credentials",
+        "unions",
         "java-builder-extension",
-        "oauth-client-credentials-default",
-        "pagination",
-        "required-nullable",
-        "empty-clients"
+        "simple-fhir",
+        "enum",
+        "multi-url-environment",
+        "alias-extends"
       ],
-      "groupTotalTimeSeconds": 2829
+      "groupTotalTimeSeconds": 2705
     },
     {
       "fixtures": [
-        "optional",
-        "java-single-property-endpoint",
-        "circular-references-advanced",
-        "alias",
-        "variables",
+        "unknown",
+        "mixed-case",
+        "idempotency-headers",
+        "oauth-client-credentials-default",
+        "nullable-optional",
         "inferred-auth-implicit",
-        "imdb:disable-required-property-builder-checks",
-        "oauth-client-credentials-with-variables",
-        "simple-api"
+        "pagination",
+        "simple-api",
+        "property-access"
       ],
-      "groupTotalTimeSeconds": 2747
+      "groupTotalTimeSeconds": 2651
     },
     {
       "fixtures": [
-        "error-property",
-        "version",
-        "query-parameters-openapi",
-        "reserved-keywords",
-        "java-custom-package-prefix",
-        "objects-with-imports",
-        "oauth-client-credentials-environment-variables",
-        "path-parameters",
-        "server-sent-event-examples",
-        "trace"
+        "websocket-bearer-auth",
+        "api-wide-base-path",
+        "http-head",
+        "public-object",
+        "websocket",
+        "single-url-environment-default",
+        "imdb:disable-required-property-builder-checks",
+        "mixed-file-directory",
+        "query-parameters",
+        "exhaustive"
       ],
-      "groupTotalTimeSeconds": 2848
+      "groupTotalTimeSeconds": 2738
     },
     {
       "fixtures": [
-        "nullable",
-        "multi-line-docs",
-        "plain-text",
-        "mixed-case",
-        "websocket-bearer-auth",
-        "unknown",
-        "mixed-file-directory",
-        "enum",
-        "server-sent-events",
-        "alias-extends"
+        "java-inline-types",
+        "file-upload",
+        "bytes-download",
+        "inferred-auth-implicit-no-expiry",
+        "oauth-client-credentials-with-variables",
+        "custom-auth",
+        "error-property",
+        "inferred-auth-explicit",
+        "examples",
+        "folders"
       ],
-      "groupTotalTimeSeconds": 2793
+      "groupTotalTimeSeconds": 2771
     },
     {
       "fixtures": [
-        "custom-auth",
-        "api-wide-base-path",
-        "pagination-custom",
-        "bytes-upload",
-        "any-auth",
-        "streaming",
+        "client-side-params",
+        "multi-line-docs",
+        "object",
+        "query-parameters-openapi-as-objects",
+        "java-custom-package-prefix",
+        "validation",
         "response-property",
-        "inferred-auth-implicit-no-expiry",
-        "idempotency-headers",
-        "cross-package-type-names"
+        "package-yml",
+        "required-nullable",
+        "empty-clients"
       ],
-      "groupTotalTimeSeconds": 2867
+      "groupTotalTimeSeconds": 2732
     },
     {
       "fixtures": [
-        "java-pagination-deep-cursor-path",
-        "basic-auth-environment-variables",
+        "single-url-environment-no-default",
+        "query-parameters-openapi",
         "content-type",
-        "public-object",
-        "undiscriminated-unions",
-        "imdb:enable-public-constructors",
-        "inferred-auth-explicit",
+        "bearer-token-environment-variable",
+        "basic-auth",
+        "circular-references",
+        "cross-package-type-names",
+        "server-sent-event-examples",
         "request-parameters",
-        "file-download"
+        "plain-text"
       ],
-      "groupTotalTimeSeconds": 2749
+      "groupTotalTimeSeconds": 2765
     },
     {
       "fixtures": [
-        "object",
-        "no-environment",
-        "extends",
-        "exhaustive",
-        "validation",
-        "multi-url-environment-no-default",
-        "single-url-environment-no-default",
-        "single-url-environment-default",
-        "auth-environment-variables"
+        "extra-properties",
+        "java-pagination-deep-cursor-path",
+        "bytes-upload",
+        "version-no-default",
+        "variables",
+        "streaming",
+        "objects-with-imports",
+        "literal",
+        "websocket-inferred-auth"
       ],
-      "groupTotalTimeSeconds": 2749
+      "groupTotalTimeSeconds": 2648
     },
     {
       "fixtures": [
-        "basic-auth",
-        "bytes-download",
-        "java-nullable-named-request-types",
-        "http-head",
-        "property-access",
-        "unions",
-        "oauth-client-credentials-nested-root",
-        "query-parameters",
+        "multiple-request-bodies",
+        "path-parameters",
+        "extends",
+        "version",
+        "java-single-property-endpoint",
         "streaming-parameter",
-        "folders"
+        "circular-references-advanced",
+        "audiences",
+        "multi-url-environment-no-default"
       ],
-      "groupTotalTimeSeconds": 2865
+      "groupTotalTimeSeconds": 2652
     },
     {
       "fixtures": [
-        "websocket",
-        "extra-properties",
-        "query-parameters-openapi-as-objects",
-        "bearer-token-environment-variable",
-        "errors",
-        "multi-url-environment",
-        "oauth-client-credentials",
-        "literal",
-        "circular-references"
+        "literals-unions",
+        "no-environment",
+        "license",
+        "oauth-client-credentials-environment-variables",
+        "file-download",
+        "oauth-client-credentials-nested-root",
+        "oauth-client-credentials-custom",
+        "imdb:enable-public-constructors",
+        "pagination-custom"
       ],
-      "groupTotalTimeSeconds": 2747
+      "groupTotalTimeSeconds": 2649
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/java-sdk-seed-groups.json b/.github/workflow-resource-files/seed-groups/java-sdk-seed-groups.json
index efd9b887d905..9c4b809953a4 100644
--- a/.github/workflow-resource-files/seed-groups/java-sdk-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/java-sdk-seed-groups.json
@@ -1,196 +1,196 @@
 {
-  "totalTestTimeSeconds": 66530,
+  "totalTestTimeSeconds": 59335,
   "groups": [
     {
       "fixtures": [
-        "java-pagination-deep-cursor-path:java-pagination-deep-cursor-path",
-        "query-parameters-openapi-as-objects",
-        "literals-unions",
-        "exhaustive:custom-error-names",
-        "examples:no-custom-config",
-        "exhaustive:custom-license",
-        "nullable-optional:legacy",
-        "optional",
-        "streaming-parameter"
+        "license",
+        "examples:readme-config",
+        "oauth-client-credentials:oauth-client-credentials",
+        "property-access",
+        "exhaustive:flat-package-layout",
+        "simple-fhir",
+        "single-url-environment-no-default",
+        "request-parameters",
+        "inferred-auth-implicit-no-expiry"
       ],
-      "groupTotalTimeSeconds": 4739
+      "groupTotalTimeSeconds": 4229
     },
     {
       "fixtures": [
-        "java-custom-package-prefix:java-custom-package-prefix",
-        "object",
-        "errors",
-        "examples:inline-file-properties",
-        "java-inline-types:no-inline",
-        "exhaustive:json-include-non-empty",
-        "plain-text",
-        "package-yml"
+        "java-single-property-endpoint:java-single-property-endpoint",
+        "undiscriminated-unions",
+        "oauth-client-credentials-environment-variables",
+        "exhaustive:forward-compatible-enums",
+        "client-side-params:default",
+        "extends",
+        "literal",
+        "server-sent-events",
+        "bytes-download"
       ],
-      "groupTotalTimeSeconds": 4760
+      "groupTotalTimeSeconds": 4255
     },
     {
       "fixtures": [
-        "java-pagination-deep-cursor-path:wire-tests",
-        "error-property",
-        "reserved-keywords",
-        "examples:readme-config",
-        "unions:default",
-        "no-environment",
-        "extends",
-        "oauth-client-credentials-custom"
+        "java-inline-types:no-wrapped-aliases",
+        "trace",
+        "multi-url-environment-no-default",
+        "oauth-client-credentials-custom",
+        "java-builder-extension:extensible-builders",
+        "basic-auth:basic-auth",
+        "unknown",
+        "enum:forward-compatible-enums",
+        "alias-extends",
+        "streaming-parameter",
+        "inferred-auth-implicit"
       ],
-      "groupTotalTimeSeconds": 4753
+      "groupTotalTimeSeconds": 4234
     },
     {
       "fixtures": [
-        "java-inline-types:inline",
+        "alias",
+        "unions:default",
+        "examples:no-custom-config",
+        "exhaustive:enable-public-constructors",
+        "java-custom-package-prefix:java-custom-package-prefix",
         "websocket",
-        "java-builder-extension:extensible-builders",
-        "exhaustive:no-custom-config",
-        "exhaustive:custom-dependency",
-        "exhaustive:publish-to",
-        "simple-fhir",
-        "nullable:wrapped-aliases",
-        "websocket-inferred-auth",
-        "inferred-auth-implicit"
+        "circular-references",
+        "server-sent-event-examples"
       ],
-      "groupTotalTimeSeconds": 4739
+      "groupTotalTimeSeconds": 4240
     },
     {
       "fixtures": [
-        "java-single-property-endpoint:java-single-property-endpoint",
-        "pagination:default",
+        "error-property",
+        "version:no-custom-config",
+        "examples:default",
+        "exhaustive:custom-error-names",
+        "java-inline-types:inline",
         "any-auth",
-        "http-head",
-        "client-side-params:default",
-        "basic-auth-environment-variables",
-        "exhaustive:signed_publish",
-        "bytes-upload"
+        "path-parameters",
+        "reserved-keywords"
       ],
-      "groupTotalTimeSeconds": 4758
+      "groupTotalTimeSeconds": 4229
     },
     {
       "fixtures": [
-        "license",
+        "object",
+        "java-inline-types:no-inline",
         "bearer-token-environment-variable",
-        "server-sent-event-examples",
-        "public-object",
-        "exhaustive:enable-public-constructors",
-        "basic-auth:basic-auth",
-        "circular-references",
-        "enum:forward-compatible-enums",
-        "exhaustive:local-files"
+        "response-property",
+        "examples:inline-file-properties",
+        "simple-api",
+        "streaming",
+        "objects-with-imports"
       ],
-      "groupTotalTimeSeconds": 4773
+      "groupTotalTimeSeconds": 4253
     },
     {
       "fixtures": [
-        "exhaustive:forward-compatible-enums",
-        "empty-clients",
-        "java-inline-types:enable-forward-compatible-enums",
-        "file-upload:no-custom-config",
-        "trace",
-        "objects-with-imports",
-        "custom-auth:custom-auth",
-        "enum:no-custom-config",
-        "alias-extends",
-        "inferred-auth-implicit-no-expiry"
+        "no-environment",
+        "query-parameters-openapi",
+        "basic-auth-environment-variables",
+        "websocket-bearer-auth",
+        "exhaustive:publish-to",
+        "multi-url-environment",
+        "oauth-client-credentials-default",
+        "multiple-request-bodies",
+        "pagination-custom"
       ],
-      "groupTotalTimeSeconds": 4742
+      "groupTotalTimeSeconds": 4227
     },
     {
       "fixtures": [
-        "exhaustive:flat-package-layout",
-        "file-download",
-        "api-wide-base-path",
+        "literals-unions",
+        "java-nullable-named-request-types:custom-config",
+        "accept-header:accept-header",
+        "java-inline-types:enable-forward-compatible-enums",
         "idempotency-headers",
-        "mixed-file-directory",
-        "oauth-client-credentials-with-variables",
-        "imdb:flat-package-layout",
-        "single-url-environment-default",
-        "bytes-download"
+        "multi-line-docs",
+        "variables",
+        "enum:no-custom-config",
+        "exhaustive:local-files"
       ],
-      "groupTotalTimeSeconds": 4762
+      "groupTotalTimeSeconds": 4248
     },
     {
       "fixtures": [
+        "extra-properties",
+        "query-parameters-openapi-as-objects",
+        "single-url-environment-default",
         "file-upload:wrapped-aliases",
-        "version:forward-compatible-enums",
-        "websocket-bearer-auth",
-        "required-nullable",
-        "examples:default",
-        "server-sent-events",
-        "multi-url-environment-no-default",
-        "oauth-client-credentials-default"
+        "pagination:default",
+        "errors",
+        "nullable:no-custom-config",
+        "plain-text"
       ],
-      "groupTotalTimeSeconds": 4754
+      "groupTotalTimeSeconds": 4228
     },
     {
       "fixtures": [
-        "circular-references-advanced",
-        "nullable:no-custom-config",
-        "multi-url-environment",
-        "multiple-request-bodies",
-        "java-inline-types:no-wrapped-aliases",
-        "exhaustive:custom-client-class-name",
-        "path-parameters",
-        "oauth-client-credentials-environment-variables"
+        "optional",
+        "api-wide-base-path",
+        "file-download",
+        "exhaustive:json-include-non-empty",
+        "java-pagination-deep-cursor-path:wire-tests",
+        "nullable:wrapped-aliases",
+        "imdb:flat-package-layout",
+        "http-head",
+        "websocket-inferred-auth"
       ],
-      "groupTotalTimeSeconds": 4738
+      "groupTotalTimeSeconds": 4231
     },
     {
       "fixtures": [
-        "auth-environment-variables",
+        "java-pagination-deep-cursor-path:java-pagination-deep-cursor-path",
         "version-no-default",
-        "alias",
-        "request-parameters",
-        "property-access",
-        "literal",
-        "streaming",
-        "query-parameters"
+        "java-builder-extension:base-client",
+        "public-object",
+        "folders",
+        "exhaustive:custom-license",
+        "package-yml",
+        "query-parameters",
+        "inferred-auth-explicit"
       ],
-      "groupTotalTimeSeconds": 4764
+      "groupTotalTimeSeconds": 4225
     },
     {
       "fixtures": [
-        "version:no-custom-config",
-        "java-nullable-named-request-types:custom-config",
-        "unknown",
-        "audiences",
-        "java-builder-extension:base-client",
-        "undiscriminated-unions",
-        "multi-line-docs",
-        "nullable-optional:with-nullable-annotation"
+        "version:forward-compatible-enums",
+        "bytes-upload",
+        "custom-auth:custom-auth",
+        "circular-references-advanced",
+        "nullable-optional:legacy",
+        "exhaustive:custom-dependency",
+        "oauth-client-credentials-nested-root",
+        "audiences"
       ],
-      "groupTotalTimeSeconds": 4752
+      "groupTotalTimeSeconds": 4254
     },
     {
       "fixtures": [
-        "file-upload:inline-file-properties",
-        "accept-header:accept-header",
-        "oauth-client-credentials:oauth-client-credentials",
-        "extra-properties",
-        "variables",
+        "auth-environment-variables",
+        "nullable-optional:with-nullable-annotation",
+        "mixed-file-directory",
+        "exhaustive:custom-client-class-name",
         "imdb:disable-required-property-builder-checks",
-        "oauth-client-credentials-nested-root",
-        "mixed-case"
+        "validation",
+        "oauth-client-credentials-with-variables",
+        "empty-clients"
       ],
-      "groupTotalTimeSeconds": 4762
+      "groupTotalTimeSeconds": 4243
     },
     {
       "fixtures": [
-        "response-property",
+        "file-upload:inline-file-properties",
         "content-type",
-        "query-parameters-openapi",
         "cross-package-type-names",
-        "folders",
-        "validation",
-        "single-url-environment-no-default",
-        "simple-api",
-        "pagination-custom",
-        "inferred-auth-explicit"
+        "exhaustive:no-custom-config",
+        "file-upload:no-custom-config",
+        "mixed-case",
+        "exhaustive:signed_publish",
+        "required-nullable"
       ],
-      "groupTotalTimeSeconds": 4734
+      "groupTotalTimeSeconds": 4239
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/java-spring-seed-groups.json b/.github/workflow-resource-files/seed-groups/java-spring-seed-groups.json
index 0150966ad153..9195a57bde02 100644
--- a/.github/workflow-resource-files/seed-groups/java-spring-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/java-spring-seed-groups.json
@@ -1,152 +1,152 @@
 {
-  "totalTestTimeSeconds": 1970,
+  "totalTestTimeSeconds": 2015,
   "groups": [
     {
       "fixtures": [
-        "nullable-optional:with-nullable-annotation",
-        "unions",
+        "query-parameters-openapi-as-objects",
+        "api-wide-base-path",
+        "file-download",
         "pagination",
-        "request-parameters",
-        "websocket",
-        "java-custom-package-prefix",
-        "enum",
-        "unknown",
+        "mixed-file-directory",
+        "streaming",
         "cross-package-type-names",
-        "reserved-keywords"
+        "single-url-environment-no-default",
+        "multi-url-environment",
+        "java-single-property-endpoint"
       ],
-      "groupTotalTimeSeconds": 201
+      "groupTotalTimeSeconds": 206
     },
     {
       "fixtures": [
-        "nullable-optional:legacy",
-        "client-side-params",
-        "simple-fhir",
-        "inferred-auth-explicit",
-        "imdb:enable-public-constructors",
-        "mixed-file-directory",
-        "http-head",
-        "any-auth",
-        "no-environment"
+        "query-parameters-openapi",
+        "accept-header",
+        "bytes-upload",
+        "oauth-client-credentials-default",
+        "enum",
+        "package-yml",
+        "query-parameters",
+        "unknown",
+        "optional",
+        "literals-unions"
       ],
-      "groupTotalTimeSeconds": 192
+      "groupTotalTimeSeconds": 206
     },
     {
       "fixtures": [
         "java-nullable-named-request-types",
-        "bytes-download",
-        "java-inline-types",
-        "imdb:disable-required-property-builder-checks",
-        "websocket-bearer-auth",
-        "multi-url-environment-no-default",
-        "license",
-        "error-property",
-        "plain-text"
+        "nullable",
+        "extends",
+        "websocket-inferred-auth",
+        "multi-line-docs",
+        "any-auth",
+        "server-sent-events",
+        "validation",
+        "server-sent-event-examples",
+        "folders"
       ],
-      "groupTotalTimeSeconds": 192
+      "groupTotalTimeSeconds": 204
     },
     {
       "fixtures": [
-        "query-parameters-openapi",
-        "bytes-upload",
-        "mixed-case",
-        "basic-auth",
-        "response-property",
+        "version-no-default",
+        "simple-fhir",
+        "oauth-client-credentials-environment-variables",
         "inferred-auth-implicit-no-expiry",
-        "custom-auth",
-        "package-yml",
-        "examples",
-        "server-sent-events"
+        "literal",
+        "response-property",
+        "streaming-parameter",
+        "websocket",
+        "trace",
+        "exhaustive"
       ],
       "groupTotalTimeSeconds": 201
     },
     {
       "fixtures": [
-        "query-parameters-openapi-as-objects",
+        "alias",
+        "client-side-params",
+        "imdb:disable-required-property-builder-checks",
+        "property-access",
+        "inferred-auth-explicit",
+        "multiple-request-bodies",
+        "reserved-keywords",
+        "multi-url-environment-no-default",
+        "plain-text"
+      ],
+      "groupTotalTimeSeconds": 194
+    },
+    {
+      "fixtures": [
         "content-type:package-prefix",
+        "java-inline-types",
+        "imdb:enable-public-constructors",
         "oauth-client-credentials-custom",
-        "query-parameters",
-        "validation",
-        "java-builder-extension",
-        "empty-clients",
-        "single-url-environment-default",
-        "idempotency-headers",
-        "single-url-environment-no-default"
+        "oauth-client-credentials-with-variables",
+        "audiences",
+        "websocket-bearer-auth",
+        "error-property",
+        "custom-auth",
+        "single-url-environment-default"
       ],
-      "groupTotalTimeSeconds": 201
+      "groupTotalTimeSeconds": 206
     },
     {
       "fixtures": [
-        "version",
-        "extends",
-        "oauth-client-credentials-default",
+        "auth-environment-variables",
+        "alias-extends",
+        "object",
+        "request-parameters",
+        "mixed-case",
         "objects-with-imports",
-        "property-access",
-        "inferred-auth-implicit",
-        "server-sent-event-examples",
-        "streaming-parameter",
-        "java-single-property-endpoint",
-        "folders"
+        "simple-api",
+        "required-nullable",
+        "public-object"
       ],
-      "groupTotalTimeSeconds": 200
+      "groupTotalTimeSeconds": 194
     },
     {
       "fixtures": [
-        "version-no-default",
-        "file-upload",
+        "nullable-optional:legacy",
+        "unions",
         "undiscriminated-unions",
-        "errors",
-        "multiple-request-bodies",
-        "simple-api",
+        "circular-references",
         "basic-auth-environment-variables",
-        "literals-unions",
-        "file-download",
+        "basic-auth",
+        "empty-clients",
+        "extra-properties",
         "variables"
       ],
-      "groupTotalTimeSeconds": 199
+      "groupTotalTimeSeconds": 194
     },
     {
       "fixtures": [
-        "accept-header",
-        "api-wide-base-path",
-        "websocket-inferred-auth",
+        "bytes-download",
+        "bearer-token-environment-variable",
+        "errors",
         "oauth-client-credentials-nested-root",
-        "oauth-client-credentials",
-        "streaming",
-        "circular-references",
-        "multi-line-docs",
-        "literal",
-        "exhaustive"
+        "circular-references-advanced",
+        "http-head",
+        "inferred-auth-implicit",
+        "idempotency-headers",
+        "java-custom-package-prefix",
+        "examples"
       ],
-      "groupTotalTimeSeconds": 195
+      "groupTotalTimeSeconds": 205
     },
     {
       "fixtures": [
-        "alias",
-        "auth-environment-variables",
-        "nullable",
+        "version",
+        "nullable-optional:with-nullable-annotation",
+        "oauth-client-credentials",
         "path-parameters",
-        "object",
-        "extra-properties",
-        "oauth-client-credentials-with-variables",
-        "multi-url-environment",
-        "trace"
-      ],
-      "groupTotalTimeSeconds": 189
-    },
-    {
-      "fixtures": [
-        "alias-extends",
-        "bearer-token-environment-variable",
-        "oauth-client-credentials-environment-variables",
-        "circular-references-advanced",
+        "file-upload",
         "java-pagination-deep-cursor-path",
-        "required-nullable",
         "pagination-custom",
-        "optional",
-        "audiences",
-        "public-object"
+        "license",
+        "no-environment",
+        "java-builder-extension"
       ],
-      "groupTotalTimeSeconds": 200
+      "groupTotalTimeSeconds": 205
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/openapi-seed-groups.json b/.github/workflow-resource-files/seed-groups/openapi-seed-groups.json
index b851fc609784..773674539d91 100644
--- a/.github/workflow-resource-files/seed-groups/openapi-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/openapi-seed-groups.json
@@ -1,149 +1,149 @@
 {
-  "totalTestTimeSeconds": 1016,
+  "totalTestTimeSeconds": 1027,
   "groups": [
     {
       "fixtures": [
-        "bytes-upload",
-        "pagination",
-        "folders",
-        "literal",
-        "client-side-params",
-        "websocket-inferred-auth",
-        "simple-fhir",
-        "http-head",
-        "validation",
-        "plain-text",
-        "simple-api"
+        "accept-header",
+        "file-download",
+        "circular-references-advanced",
+        "empty-clients",
+        "streaming-parameter",
+        "imdb:custom-filename",
+        "basic-auth-environment-variables",
+        "property-access"
       ],
-      "groupTotalTimeSeconds": 103
+      "groupTotalTimeSeconds": 102
+    },
+    {
+      "fixtures": [
+        "alias",
+        "idempotency-headers",
+        "nullable-optional",
+        "exhaustive",
+        "undiscriminated-unions",
+        "imdb:json-format",
+        "custom-auth",
+        "variables"
+      ],
+      "groupTotalTimeSeconds": 102
     },
     {
       "fixtures": [
         "query-parameters-openapi",
+        "audiences",
+        "folders",
+        "pagination",
+        "mixed-case",
+        "request-parameters",
+        "server-sent-events",
+        "http-head",
+        "no-environment",
         "oauth-client-credentials-default",
-        "trace",
-        "enum:custom-overrides",
-        "cross-package-type-names",
-        "circular-references",
-        "multi-url-environment",
-        "single-url-environment-no-default",
-        "websocket",
-        "property-access",
-        "single-url-environment-default"
+        "multi-url-environment"
       ],
       "groupTotalTimeSeconds": 103
     },
     {
       "fixtures": [
         "query-parameters-openapi-as-objects",
+        "cross-package-type-names",
+        "literal",
+        "simple-fhir",
+        "nullable",
+        "response-property",
+        "single-url-environment-default",
+        "imdb:no-custom-config",
+        "oauth-client-credentials",
         "oauth-client-credentials-nested-root",
-        "examples",
-        "nullable-optional",
-        "imdb:override",
-        "empty-clients",
-        "multi-url-environment-no-default",
-        "unions",
-        "websocket-bearer-auth",
-        "public-object",
-        "streaming-parameter"
+        "multi-url-environment-no-default"
       ],
       "groupTotalTimeSeconds": 103
     },
     {
       "fixtures": [
-        "version-no-default",
-        "objects-with-imports",
-        "exhaustive",
-        "enum:no-custom-config",
-        "path-parameters",
-        "idempotency-headers",
+        "version",
+        "enum:custom-overrides",
+        "inferred-auth-explicit",
+        "oauth-client-credentials-custom",
+        "trace",
+        "websocket-inferred-auth",
+        "single-url-environment-no-default",
+        "imdb:override",
+        "oauth-client-credentials-with-variables",
         "package-yml",
-        "unknown",
-        "error-property",
-        "license",
-        "variables"
+        "pagination-custom"
       ],
       "groupTotalTimeSeconds": 103
     },
     {
       "fixtures": [
-        "accept-header",
-        "extends",
-        "multiple-request-bodies",
-        "inferred-auth-explicit",
-        "pagination-custom",
-        "any-auth",
-        "imdb:no-custom-config",
-        "literals-unions"
-      ],
-      "groupTotalTimeSeconds": 100
-    },
-    {
-      "fixtures": [
-        "alias",
-        "file-upload",
-        "no-environment",
+        "version-no-default",
+        "examples",
         "inferred-auth-implicit",
-        "request-parameters",
-        "basic-auth",
-        "imdb:custom-overrides",
-        "mixed-case"
+        "objects-with-imports",
+        "file-upload",
+        "oauth-client-credentials-environment-variables",
+        "server-sent-event-examples",
+        "enum:no-custom-config",
+        "multiple-request-bodies",
+        "multi-line-docs",
+        "error-property"
       ],
-      "groupTotalTimeSeconds": 100
+      "groupTotalTimeSeconds": 102
     },
     {
       "fixtures": [
         "alias-extends",
-        "file-download",
-        "mixed-file-directory",
-        "inferred-auth-implicit-no-expiry",
-        "reserved-keywords",
-        "basic-auth-environment-variables",
-        "imdb:custom-filename",
-        "oauth-client-credentials"
+        "bytes-download",
+        "object",
+        "plain-text",
+        "unions",
+        "license",
+        "errors",
+        "websocket"
       ],
-      "groupTotalTimeSeconds": 100
+      "groupTotalTimeSeconds": 102
     },
     {
       "fixtures": [
-        "version",
-        "auth-environment-variables",
-        "audiences",
-        "nullable",
-        "response-property",
-        "custom-auth",
-        "imdb:json-format",
-        "optional"
+        "api-wide-base-path",
+        "bytes-upload",
+        "optional",
+        "public-object",
+        "unknown",
+        "literals-unions",
+        "extra-properties",
+        "websocket-bearer-auth"
       ],
-      "groupTotalTimeSeconds": 100
+      "groupTotalTimeSeconds": 102
     },
     {
       "fixtures": [
-        "api-wide-base-path",
-        "bytes-download",
-        "oauth-client-credentials-with-variables",
-        "multi-line-docs",
-        "server-sent-event-examples",
-        "errors",
-        "streaming",
-        "oauth-client-credentials-custom",
-        "query-parameters"
+        "auth-environment-variables",
+        "content-type",
+        "path-parameters",
+        "query-parameters",
+        "validation",
+        "mixed-file-directory",
+        "inferred-auth-implicit-no-expiry",
+        "any-auth",
+        "required-nullable"
       ],
-      "groupTotalTimeSeconds": 102
+      "groupTotalTimeSeconds": 104
     },
     {
       "fixtures": [
         "bearer-token-environment-variable",
-        "content-type",
-        "circular-references-advanced",
-        "object",
-        "server-sent-events",
-        "extra-properties",
-        "undiscriminated-unions",
-        "oauth-client-credentials-environment-variables",
-        "required-nullable"
+        "extends",
+        "circular-references",
+        "client-side-params",
+        "streaming",
+        "imdb:custom-overrides",
+        "reserved-keywords",
+        "basic-auth",
+        "simple-api"
       ],
-      "groupTotalTimeSeconds": 102
+      "groupTotalTimeSeconds": 104
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/php-model-seed-groups.json b/.github/workflow-resource-files/seed-groups/php-model-seed-groups.json
index 31d3a47dfc41..824a95b6cd9f 100644
--- a/.github/workflow-resource-files/seed-groups/php-model-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/php-model-seed-groups.json
@@ -1,144 +1,144 @@
 {
-  "totalTestTimeSeconds": 4322,
+  "totalTestTimeSeconds": 4215,
   "groups": [
     {
       "fixtures": [
-        "version-no-default",
-        "oauth-client-credentials",
-        "empty-clients",
-        "websocket-inferred-auth",
-        "oauth-client-credentials-default",
-        "validation",
-        "websocket",
-        "package-yml",
-        "mixed-file-directory"
-      ],
-      "groupTotalTimeSeconds": 432
-    },
-    {
-      "fixtures": [
-        "api-wide-base-path",
-        "unions",
-        "custom-auth",
-        "circular-references",
-        "object",
-        "variables",
-        "errors",
+        "accept-header",
+        "client-side-params",
+        "inferred-auth-implicit-no-expiry",
+        "oauth-client-credentials-environment-variables",
+        "any-auth",
+        "imdb",
+        "multi-url-environment",
         "literals-unions",
         "literal"
       ],
-      "groupTotalTimeSeconds": 431
+      "groupTotalTimeSeconds": 425
     },
     {
       "fixtures": [
-        "bytes-download",
-        "client-side-params",
-        "multiple-request-bodies",
-        "circular-references-advanced",
-        "property-access",
-        "basic-auth",
-        "license",
-        "multi-url-environment",
-        "trace"
+        "query-parameters-openapi",
+        "nullable",
+        "empty-clients",
+        "oauth-client-credentials",
+        "query-parameters",
+        "basic-auth-environment-variables",
+        "undiscriminated-unions",
+        "multi-url-environment-no-default",
+        "audiences"
       ],
-      "groupTotalTimeSeconds": 431
+      "groupTotalTimeSeconds": 424
     },
     {
       "fixtures": [
-        "alias",
-        "query-parameters-openapi",
-        "websocket-bearer-auth",
-        "multi-url-environment-no-default",
-        "unknown",
-        "single-url-environment-default",
-        "imdb",
+        "alias-extends",
+        "nullable-optional",
+        "mixed-case",
+        "property-access",
+        "multiple-request-bodies",
+        "no-environment",
         "pagination-custom",
+        "single-url-environment-default",
         "examples"
       ],
-      "groupTotalTimeSeconds": 439
+      "groupTotalTimeSeconds": 424
     },
     {
       "fixtures": [
-        "bearer-token-environment-variable",
-        "content-type",
-        "inferred-auth-explicit",
-        "mixed-case",
-        "single-url-environment-no-default",
-        "optional",
-        "query-parameters",
-        "path-parameters",
-        "enum"
+        "extends",
+        "unions",
+        "http-head",
+        "objects-with-imports",
+        "license",
+        "multi-line-docs",
+        "pagination",
+        "server-sent-events",
+        "cross-package-type-names"
       ],
-      "groupTotalTimeSeconds": 438
+      "groupTotalTimeSeconds": 424
     },
     {
       "fixtures": [
         "file-upload",
-        "nullable-optional",
-        "response-property",
+        "bytes-download",
+        "request-parameters",
+        "oauth-client-credentials-nested-root",
+        "object",
+        "path-parameters",
+        "streaming-parameter",
         "extra-properties",
-        "required-nullable",
-        "basic-auth-environment-variables",
-        "nullable",
-        "no-environment",
-        "audiences"
+        "mixed-file-directory"
       ],
-      "groupTotalTimeSeconds": 430
+      "groupTotalTimeSeconds": 426
     },
     {
       "fixtures": [
-        "version",
-        "file-download",
-        "simple-fhir",
-        "inferred-auth-implicit-no-expiry",
-        "streaming",
-        "request-parameters",
-        "error-property",
-        "oauth-client-credentials-with-variables"
+        "query-parameters-openapi-as-objects",
+        "bytes-upload",
+        "inferred-auth-explicit",
+        "idempotency-headers",
+        "single-url-environment-no-default",
+        "reserved-keywords",
+        "basic-auth",
+        "validation",
+        "exhaustive"
       ],
-      "groupTotalTimeSeconds": 412
+      "groupTotalTimeSeconds": 423
     },
     {
       "fixtures": [
-        "auth-environment-variables",
-        "extends",
-        "inferred-auth-implicit",
-        "oauth-client-credentials-environment-variables",
-        "streaming-parameter",
-        "server-sent-event-examples",
-        "http-head",
-        "multi-line-docs",
-        "cross-package-type-names"
+        "version-no-default",
+        "content-type",
+        "simple-fhir",
+        "public-object",
+        "unknown",
+        "response-property",
+        "custom-auth",
+        "variables",
+        "folders"
       ],
-      "groupTotalTimeSeconds": 437
+      "groupTotalTimeSeconds": 423
     },
     {
       "fixtures": [
-        "bytes-upload",
-        "accept-header",
+        "alias",
+        "bearer-token-environment-variable",
+        "websocket-inferred-auth",
+        "oauth-client-credentials-default",
         "oauth-client-credentials-custom",
-        "simple-api",
-        "undiscriminated-unions",
-        "server-sent-events",
-        "idempotency-headers",
+        "optional",
         "plain-text",
-        "exhaustive"
+        "websocket"
       ],
-      "groupTotalTimeSeconds": 437
+      "groupTotalTimeSeconds": 398
     },
     {
       "fixtures": [
-        "query-parameters-openapi-as-objects",
-        "alias-extends",
-        "oauth-client-credentials-nested-root",
-        "any-auth",
-        "reserved-keywords",
-        "objects-with-imports",
-        "pagination",
-        "public-object",
-        "folders"
+        "api-wide-base-path",
+        "file-download",
+        "circular-references-advanced",
+        "required-nullable",
+        "websocket-bearer-auth",
+        "streaming",
+        "errors",
+        "simple-api",
+        "trace"
+      ],
+      "groupTotalTimeSeconds": 424
+    },
+    {
+      "fixtures": [
+        "auth-environment-variables",
+        "version",
+        "inferred-auth-implicit",
+        "circular-references",
+        "oauth-client-credentials-with-variables",
+        "package-yml",
+        "server-sent-event-examples",
+        "error-property",
+        "enum"
       ],
-      "groupTotalTimeSeconds": 435
+      "groupTotalTimeSeconds": 424
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/php-sdk-seed-groups.json b/.github/workflow-resource-files/seed-groups/php-sdk-seed-groups.json
index 5e224d3b9278..928b2db577cb 100644
--- a/.github/workflow-resource-files/seed-groups/php-sdk-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/php-sdk-seed-groups.json
@@ -1,158 +1,158 @@
 {
-  "totalTestTimeSeconds": 7580,
+  "totalTestTimeSeconds": 7614,
   "groups": [
     {
       "fixtures": [
-        "query-parameters-openapi-as-objects",
-        "unions:property-accessors",
-        "oauth-client-credentials-nested-root",
-        "inferred-auth-implicit",
-        "client-side-params",
-        "imdb:namespace",
-        "http-head",
-        "reserved-keywords",
-        "imdb:package-path",
-        "literals-unions"
+        "query-parameters-openapi",
+        "response-property",
+        "alias:composer-json",
+        "query-parameters:private",
+        "server-sent-event-examples",
+        "file-download",
+        "path-parameters:inline-path-parameters-private",
+        "required-nullable",
+        "websocket-bearer-auth",
+        "exhaustive"
       ],
-      "groupTotalTimeSeconds": 767
+      "groupTotalTimeSeconds": 744
     },
     {
       "fixtures": [
-        "version",
-        "unions:no-custom-config",
-        "inferred-auth-explicit",
-        "file-upload",
-        "enum",
-        "multiple-request-bodies",
-        "mixed-case",
-        "single-url-environment-no-default",
-        "public-object",
-        "simple-api"
+        "content-type",
+        "oauth-client-credentials",
+        "inferred-auth-implicit-no-expiry",
+        "validation",
+        "websocket",
+        "idempotency-headers",
+        "basic-auth-environment-variables",
+        "unknown",
+        "variables",
+        "folders"
       ],
-      "groupTotalTimeSeconds": 767
+      "groupTotalTimeSeconds": 777
     },
     {
       "fixtures": [
-        "query-parameters-openapi",
-        "path-parameters:inline-path-parameters-private",
+        "query-parameters-openapi-as-objects",
+        "oauth-client-credentials-custom",
+        "any-auth",
+        "query-parameters:no-custom-config",
+        "undiscriminated-unions",
+        "imdb:no-custom-config",
+        "custom-auth",
+        "reserved-keywords",
+        "literals-unions",
+        "empty-clients"
+      ],
+      "groupTotalTimeSeconds": 775
+    },
+    {
+      "fixtures": [
+        "extends:private",
+        "pagination:property-accessors",
         "path-parameters:inline-path-parameters",
-        "package-yml:private",
-        "oauth-client-credentials",
-        "nullable",
-        "streaming",
-        "unknown",
-        "websocket-bearer-auth",
-        "exhaustive",
+        "file-upload",
+        "imdb:private",
+        "extra-properties",
+        "errors",
+        "cross-package-type-names",
+        "streaming-parameter",
+        "single-url-environment-default",
+        "multi-url-environment",
         "multi-url-environment-no-default",
         "pagination-custom"
       ],
-      "groupTotalTimeSeconds": 742
+      "groupTotalTimeSeconds": 737
     },
     {
       "fixtures": [
-        "content-type",
-        "path-parameters:no-custom-config",
+        "bearer-token-environment-variable",
         "pagination:no-custom-config",
-        "plain-text",
-        "file-download",
-        "optional",
-        "circular-references-advanced",
-        "required-nullable",
-        "error-property",
-        "folders"
+        "unions:property-accessors",
+        "oauth-client-credentials-nested-root",
+        "websocket-inferred-auth",
+        "nullable-optional",
+        "enum",
+        "inferred-auth-implicit",
+        "circular-references",
+        "mixed-case"
       ],
-      "groupTotalTimeSeconds": 766
+      "groupTotalTimeSeconds": 777
     },
     {
       "fixtures": [
         "accept-header",
-        "pagination:property-accessors",
-        "response-property",
-        "objects-with-imports",
+        "version",
+        "unions:no-custom-config",
+        "oauth-client-credentials-environment-variables",
+        "error-property",
+        "optional",
         "imdb:packageName",
-        "single-url-environment-default",
-        "imdb:clientName",
-        "streaming-parameter",
-        "object",
+        "server-sent-events",
+        "audiences",
         "literal"
       ],
-      "groupTotalTimeSeconds": 766
+      "groupTotalTimeSeconds": 776
     },
     {
       "fixtures": [
-        "version-no-default",
-        "extends:no-custom-config",
-        "package-yml:no-custom-config",
-        "alias:composer-json",
-        "mixed-file-directory",
-        "errors",
-        "server-sent-event-examples",
-        "validation",
-        "any-auth",
-        "server-sent-events"
-      ],
-      "groupTotalTimeSeconds": 765
-    },
-    {
-      "fixtures": [
-        "bytes-upload",
         "alias:no-custom-config",
-        "oauth-client-credentials-custom",
-        "simple-fhir",
-        "nullable-optional",
-        "extra-properties",
-        "custom-auth",
-        "audiences",
+        "bytes-upload",
+        "multi-line-docs",
+        "oauth-client-credentials-with-variables",
+        "imdb:clientName",
+        "public-object",
         "license",
+        "single-url-environment-no-default",
+        "no-environment",
         "examples:no-custom-config"
       ],
-      "groupTotalTimeSeconds": 751
+      "groupTotalTimeSeconds": 759
     },
     {
       "fixtures": [
-        "extends:private",
-        "bearer-token-environment-variable",
-        "oauth-client-credentials-default",
-        "websocket-inferred-auth",
-        "imdb:no-custom-config",
-        "property-access",
-        "multi-line-docs",
-        "circular-references",
-        "variables",
-        "examples:readme-config"
+        "bytes-download",
+        "version-no-default",
+        "multiple-request-bodies",
+        "imdb:namespace",
+        "objects-with-imports",
+        "request-parameters",
+        "nullable",
+        "streaming",
+        "object",
+        "trace"
       ],
-      "groupTotalTimeSeconds": 750
+      "groupTotalTimeSeconds": 748
     },
     {
       "fixtures": [
-        "alias-extends",
-        "api-wide-base-path",
-        "oauth-client-credentials-environment-variables",
-        "inferred-auth-implicit-no-expiry",
-        "oauth-client-credentials-with-variables",
-        "query-parameters:no-custom-config",
-        "cross-package-type-names",
-        "imdb:private",
-        "websocket",
-        "trace",
-        "multi-url-environment"
+        "extends:no-custom-config",
+        "auth-environment-variables",
+        "oauth-client-credentials-default",
+        "imdb:package-path",
+        "package-yml:no-custom-config",
+        "simple-api",
+        "basic-auth",
+        "http-head",
+        "circular-references-advanced",
+        "simple-fhir"
       ],
-      "groupTotalTimeSeconds": 740
+      "groupTotalTimeSeconds": 777
     },
     {
       "fixtures": [
-        "auth-environment-variables",
-        "bytes-download",
-        "request-parameters",
-        "basic-auth-environment-variables",
-        "undiscriminated-unions",
-        "query-parameters:private",
-        "idempotency-headers",
-        "no-environment",
-        "basic-auth",
-        "empty-clients"
+        "alias-extends",
+        "api-wide-base-path",
+        "property-access",
+        "mixed-file-directory",
+        "path-parameters:no-custom-config",
+        "client-side-params",
+        "package-yml:private",
+        "plain-text",
+        "inferred-auth-explicit",
+        "examples:readme-config"
       ],
-      "groupTotalTimeSeconds": 766
+      "groupTotalTimeSeconds": 744
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/postman-seed-groups.json b/.github/workflow-resource-files/seed-groups/postman-seed-groups.json
index ba217046495e..19713ef091bf 100644
--- a/.github/workflow-resource-files/seed-groups/postman-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/postman-seed-groups.json
@@ -1,145 +1,145 @@
 {
-  "totalTestTimeSeconds": 1040,
+  "totalTestTimeSeconds": 850,
   "groups": [
     {
       "fixtures": [
-        "version",
-        "objects-with-imports",
-        "examples",
-        "oauth-client-credentials-default",
-        "nullable-optional",
-        "nullable",
-        "streaming-parameter",
-        "websocket-inferred-auth",
-        "query-parameters",
+        "version-no-default",
+        "mixed-file-directory",
         "exhaustive",
-        "server-sent-event-examples"
+        "nullable",
+        "plain-text",
+        "pagination",
+        "idempotency-headers",
+        "enum",
+        "multi-url-environment-no-default",
+        "server-sent-event-examples",
+        "unknown"
       ],
-      "groupTotalTimeSeconds": 106
+      "groupTotalTimeSeconds": 86
     },
     {
       "fixtures": [
+        "alias",
         "accept-header",
-        "extends",
-        "path-parameters",
-        "object",
-        "undiscriminated-unions",
+        "imdb:no-custom-config",
         "any-auth",
-        "basic-auth-environment-variables",
-        "server-sent-events"
-      ],
-      "groupTotalTimeSeconds": 104
-    },
-    {
-      "fixtures": [
-        "alias",
-        "file-download",
-        "response-property",
-        "optional",
-        "unknown",
-        "basic-auth",
-        "client-side-params",
+        "inferred-auth-implicit-no-expiry",
+        "folders",
+        "pagination-custom",
         "validation"
       ],
-      "groupTotalTimeSeconds": 104
+      "groupTotalTimeSeconds": 86
     },
     {
       "fixtures": [
         "alias-extends",
-        "file-upload",
-        "unions",
-        "plain-text",
-        "circular-references",
-        "extra-properties",
-        "custom-auth",
+        "bytes-upload",
+        "inferred-auth-explicit",
+        "basic-auth",
+        "oauth-client-credentials-default",
+        "license",
+        "path-parameters",
         "variables"
       ],
-      "groupTotalTimeSeconds": 104
+      "groupTotalTimeSeconds": 86
     },
     {
       "fixtures": [
-        "query-parameters-openapi",
+        "api-wide-base-path",
+        "file-download",
         "oauth-client-credentials",
-        "pagination",
-        "oauth-client-credentials-nested-root",
-        "circular-references-advanced",
-        "http-head",
-        "simple-api",
-        "inferred-auth-explicit",
-        "idempotency-headers",
-        "websocket"
+        "basic-auth-environment-variables",
+        "response-property",
+        "literals-unions",
+        "public-object",
+        "error-property"
       ],
-      "groupTotalTimeSeconds": 104
+      "groupTotalTimeSeconds": 85
     },
     {
       "fixtures": [
-        "query-parameters-openapi-as-objects",
+        "auth-environment-variables",
+        "file-upload",
         "oauth-client-credentials-custom",
-        "audiences",
-        "folders",
-        "oauth-client-credentials-with-variables",
-        "property-access",
-        "empty-clients",
-        "inferred-auth-implicit-no-expiry",
-        "imdb:no-custom-config",
-        "websocket-bearer-auth"
+        "circular-references",
+        "unions",
+        "mixed-case",
+        "request-parameters",
+        "streaming"
       ],
-      "groupTotalTimeSeconds": 104
+      "groupTotalTimeSeconds": 85
     },
     {
       "fixtures": [
-        "version-no-default",
+        "bearer-token-environment-variable",
+        "query-parameters-openapi",
         "oauth-client-credentials-environment-variables",
-        "cross-package-type-names",
-        "literal",
-        "trace",
-        "public-object",
-        "errors",
+        "circular-references-advanced",
+        "websocket",
         "multi-line-docs",
-        "imdb:collection-name",
-        "request-parameters",
-        "error-property"
+        "required-nullable",
+        "streaming-parameter"
       ],
-      "groupTotalTimeSeconds": 105
+      "groupTotalTimeSeconds": 85
     },
     {
       "fixtures": [
-        "api-wide-base-path",
         "bytes-download",
-        "enum",
-        "license",
-        "simple-fhir",
+        "query-parameters-openapi-as-objects",
+        "oauth-client-credentials-nested-root",
+        "custom-auth",
+        "websocket-bearer-auth",
         "multi-url-environment",
-        "inferred-auth-implicit",
-        "required-nullable"
+        "reserved-keywords",
+        "undiscriminated-unions"
       ],
-      "groupTotalTimeSeconds": 103
+      "groupTotalTimeSeconds": 85
     },
     {
       "fixtures": [
-        "auth-environment-variables",
-        "bytes-upload",
-        "mixed-file-directory",
-        "literals-unions",
-        "single-url-environment-no-default",
+        "content-type",
+        "audiences",
+        "trace",
+        "object",
+        "query-parameters",
+        "single-url-environment-default",
+        "inferred-auth-implicit",
+        "extra-properties",
         "package-yml",
-        "multi-url-environment-no-default",
-        "reserved-keywords"
+        "single-url-environment-no-default"
       ],
-      "groupTotalTimeSeconds": 103
+      "groupTotalTimeSeconds": 84
     },
     {
       "fixtures": [
-        "bearer-token-environment-variable",
-        "content-type",
-        "mixed-case",
+        "extends",
+        "cross-package-type-names",
+        "examples",
+        "nullable-optional",
+        "property-access",
+        "simple-fhir",
+        "imdb:collection-name",
+        "errors",
         "multiple-request-bodies",
-        "streaming",
-        "pagination-custom",
+        "server-sent-events",
+        "http-head"
+      ],
+      "groupTotalTimeSeconds": 85
+    },
+    {
+      "fixtures": [
+        "version",
+        "literal",
+        "client-side-params",
         "no-environment",
-        "single-url-environment-default"
+        "optional",
+        "objects-with-imports",
+        "empty-clients",
+        "websocket-inferred-auth",
+        "oauth-client-credentials-with-variables",
+        "simple-api"
       ],
-      "groupTotalTimeSeconds": 103
+      "groupTotalTimeSeconds": 83
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/pydantic-seed-groups.json b/.github/workflow-resource-files/seed-groups/pydantic-seed-groups.json
index ec79cb781010..3647803f0ee6 100644
--- a/.github/workflow-resource-files/seed-groups/pydantic-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/pydantic-seed-groups.json
@@ -1,152 +1,152 @@
 {
-  "totalTestTimeSeconds": 4920,
+  "totalTestTimeSeconds": 5008,
   "groups": [
     {
       "fixtures": [
-        "query-parameters-openapi",
+        "version",
+        "errors",
+        "undiscriminated-unions",
+        "streaming-parameter",
+        "accept-header",
         "reserved-keywords",
-        "nullable-optional",
-        "property-access",
-        "multiple-request-bodies",
-        "server-sent-events",
-        "inferred-auth-implicit-no-expiry",
-        "pagination:no-custom-config",
-        "trace"
+        "validation",
+        "file-download:no-inheritance-for-extended-models",
+        "required-nullable"
       ],
-      "groupTotalTimeSeconds": 464
+      "groupTotalTimeSeconds": 476
     },
     {
       "fixtures": [
-        "query-parameters-openapi-as-objects",
-        "simple-fhir:no-inheritance-for-extended-models",
-        "request-parameters",
-        "required-nullable",
-        "streaming",
-        "simple-api",
-        "license",
-        "path-parameters",
-        "audiences",
-        "oauth-client-credentials-with-variables"
+        "alias",
+        "inferred-auth-implicit",
+        "server-sent-events",
+        "oauth-client-credentials-environment-variables",
+        "object",
+        "server-sent-event-examples",
+        "websocket",
+        "pagination:no-custom-config",
+        "http-head",
+        "folders"
       ],
-      "groupTotalTimeSeconds": 507
+      "groupTotalTimeSeconds": 513
     },
     {
       "fixtures": [
-        "accept-header",
-        "alias",
-        "simple-fhir:no-custom-config",
-        "server-sent-event-examples",
-        "streaming-parameter",
-        "inferred-auth-explicit",
+        "alias-extends:no-inheritance-for-extended-models",
         "unions:no-inheritance-for-extended-models",
-        "single-url-environment-default",
-        "cross-package-type-names",
-        "pagination-custom"
+        "alias-extends:no-custom-config",
+        "multi-line-docs",
+        "nullable-optional",
+        "package-yml",
+        "property-access",
+        "pagination:no-inheritance-for-extended-models",
+        "idempotency-headers",
+        "exhaustive:pydantic-v2"
       ],
-      "groupTotalTimeSeconds": 505
+      "groupTotalTimeSeconds": 510
     },
     {
       "fixtures": [
-        "alias-extends:no-custom-config",
-        "client-side-params",
+        "query-parameters-openapi-as-objects",
         "error-property",
-        "errors",
-        "circular-references-advanced:no-inheritance-for-extended-models",
-        "object",
-        "unknown",
-        "websocket-inferred-auth",
-        "enum",
-        "public-object"
+        "simple-fhir:no-inheritance-for-extended-models",
+        "oauth-client-credentials-nested-root",
+        "streaming",
+        "single-url-environment-default",
+        "websocket-bearer-auth",
+        "plain-text",
+        "oauth-client-credentials-with-variables",
+        "exhaustive:pydantic-v1"
       ],
-      "groupTotalTimeSeconds": 505
+      "groupTotalTimeSeconds": 509
     },
     {
       "fixtures": [
-        "alias-extends:no-inheritance-for-extended-models",
-        "mixed-case",
-        "file-upload",
+        "query-parameters-openapi",
+        "circular-references:no-inheritance-for-extended-models",
         "extra-properties",
-        "imdb",
-        "objects-with-imports",
-        "websocket",
-        "http-head",
-        "oauth-client-credentials-environment-variables",
+        "license",
+        "inferred-auth-implicit-no-expiry",
+        "multiple-request-bodies",
+        "multi-url-environment-no-default",
+        "single-url-environment-no-default",
         "variables"
       ],
-      "groupTotalTimeSeconds": 505
+      "groupTotalTimeSeconds": 475
     },
     {
       "fixtures": [
-        "extends",
-        "inferred-auth-implicit",
-        "undiscriminated-unions",
-        "validation",
-        "unions:no-custom-config",
-        "multi-url-environment-no-default",
-        "circular-references:no-custom-config",
-        "optional",
-        "plain-text",
-        "exhaustive:pydantic-v1"
+        "version-no-default",
+        "custom-auth",
+        "imdb",
+        "mixed-case",
+        "nullable",
+        "oauth-client-credentials-custom",
+        "pagination-custom",
+        "objects-with-imports",
+        "no-environment"
       ],
-      "groupTotalTimeSeconds": 503
+      "groupTotalTimeSeconds": 475
     },
     {
       "fixtures": [
-        "bytes-download",
-        "api-wide-base-path",
-        "circular-references-advanced:no-custom-config",
+        "auth-environment-variables",
+        "unions:no-custom-config",
         "any-auth",
-        "circular-references:no-inheritance-for-extended-models",
-        "oauth-client-credentials-nested-root",
-        "literals-unions",
-        "mixed-file-directory",
-        "examples",
-        "exhaustive:pydantic-v2"
+        "unknown",
+        "circular-references:no-custom-config",
+        "bytes-upload",
+        "request-parameters",
+        "query-parameters",
+        "public-object",
+        "cross-package-type-names"
       ],
-      "groupTotalTimeSeconds": 503
+      "groupTotalTimeSeconds": 512
     },
     {
       "fixtures": [
-        "version-no-default",
-        "bytes-upload",
-        "version",
-        "websocket-bearer-auth",
-        "multi-line-docs",
-        "package-yml",
-        "multi-url-environment",
+        "bearer-token-environment-variable",
+        "client-side-params",
+        "simple-fhir:no-custom-config",
+        "oauth-client-credentials-default",
+        "oauth-client-credentials",
+        "path-parameters",
+        "simple-api",
         "response-property",
-        "file-download:no-inheritance-for-extended-models",
-        "folders"
+        "mixed-file-directory",
+        "trace"
       ],
-      "groupTotalTimeSeconds": 502
+      "groupTotalTimeSeconds": 512
     },
     {
       "fixtures": [
-        "auth-environment-variables",
-        "bearer-token-environment-variable",
-        "empty-clients",
+        "api-wide-base-path",
+        "bytes-download",
+        "extends",
         "basic-auth-environment-variables",
-        "oauth-client-credentials-default",
-        "single-url-environment-no-default",
-        "oauth-client-credentials",
-        "literal",
-        "oauth-client-credentials-custom"
+        "inferred-auth-explicit",
+        "multi-url-environment",
+        "optional",
+        "literals-unions",
+        "audiences",
+        "examples"
       ],
-      "groupTotalTimeSeconds": 463
+      "groupTotalTimeSeconds": 513
     },
     {
       "fixtures": [
-        "file-download:no-custom-config",
         "content-type",
-        "custom-auth",
+        "file-download:no-custom-config",
+        "empty-clients",
         "basic-auth",
-        "nullable",
-        "pagination:no-inheritance-for-extended-models",
-        "no-environment",
-        "idempotency-headers",
-        "query-parameters"
+        "circular-references-advanced:no-inheritance-for-extended-models",
+        "circular-references-advanced:no-custom-config",
+        "file-upload",
+        "websocket-inferred-auth",
+        "enum",
+        "literal"
       ],
-      "groupTotalTimeSeconds": 463
+      "groupTotalTimeSeconds": 513
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/ruby-model-seed-groups.json b/.github/workflow-resource-files/seed-groups/ruby-model-seed-groups.json
index 6263db4aea6a..41e6776e19ee 100644
--- a/.github/workflow-resource-files/seed-groups/ruby-model-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/ruby-model-seed-groups.json
@@ -1,145 +1,145 @@
 {
-  "totalTestTimeSeconds": 2272,
+  "totalTestTimeSeconds": 2342,
   "groups": [
     {
       "fixtures": [
-        "version",
-        "oauth-client-credentials-nested-root",
-        "pagination",
-        "empty-clients",
+        "client-side-params",
+        "alias",
+        "nullable",
+        "multiple-request-bodies",
+        "any-auth",
+        "public-object",
+        "server-sent-event-examples",
+        "single-url-environment-no-default",
+        "no-environment"
+      ],
+      "groupTotalTimeSeconds": 232
+    },
+    {
+      "fixtures": [
+        "file-upload",
+        "api-wide-base-path",
+        "audiences",
         "extra-properties",
-        "ruby-reserved-word-properties",
-        "license",
-        "oauth-client-credentials",
-        "cross-package-type-names"
+        "variables",
+        "oauth-client-credentials-nested-root",
+        "streaming-parameter",
+        "unknown",
+        "circular-references"
       ],
-      "groupTotalTimeSeconds": 228
+      "groupTotalTimeSeconds": 230
     },
     {
       "fixtures": [
-        "alias",
-        "unions",
+        "nullable-optional",
         "auth-environment-variables",
-        "examples",
-        "optional",
-        "server-sent-event-examples",
-        "multi-url-environment-no-default",
-        "package-yml",
-        "mixed-case"
+        "undiscriminated-unions",
+        "websocket-inferred-auth",
+        "plain-text",
+        "query-parameters",
+        "server-sent-events",
+        "http-head",
+        "inferred-auth-explicit"
       ],
-      "groupTotalTimeSeconds": 228
+      "groupTotalTimeSeconds": 236
     },
     {
       "fixtures": [
         "query-parameters-openapi",
-        "undiscriminated-unions",
-        "file-upload",
+        "file-download",
+        "errors",
+        "cross-package-type-names",
+        "folders",
         "response-property",
-        "multi-line-docs",
-        "server-sent-events",
-        "path-parameters",
-        "pagination-custom",
-        "single-url-environment-no-default"
+        "validation",
+        "idempotency-headers",
+        "multi-url-environment"
       ],
-      "groupTotalTimeSeconds": 228
+      "groupTotalTimeSeconds": 236
     },
     {
       "fixtures": [
         "query-parameters-openapi-as-objects",
         "oauth-client-credentials-custom",
-        "extends",
-        "websocket-inferred-auth",
-        "plain-text",
-        "unknown",
-        "audiences",
-        "inferred-auth-implicit-no-expiry",
-        "multi-url-environment"
+        "bytes-upload",
+        "multi-line-docs",
+        "object",
+        "request-parameters",
+        "basic-auth",
+        "empty-clients",
+        "oauth-client-credentials-environment-variables"
       ],
-      "groupTotalTimeSeconds": 229
+      "groupTotalTimeSeconds": 236
     },
     {
       "fixtures": [
-        "version-no-default",
-        "oauth-client-credentials-environment-variables",
-        "objects-with-imports",
-        "validation",
-        "any-auth",
-        "property-access",
-        "basic-auth",
-        "streaming",
-        "circular-references"
+        "unions",
+        "pagination",
+        "bytes-download",
+        "literal",
+        "path-parameters",
+        "websocket",
+        "custom-auth",
+        "imdb",
+        "optional"
       ],
-      "groupTotalTimeSeconds": 225
+      "groupTotalTimeSeconds": 236
     },
     {
       "fixtures": [
+        "version",
+        "oauth-client-credentials-with-variables",
         "alias-extends",
         "circular-references-advanced",
-        "oauth-client-credentials-with-variables",
-        "errors",
         "basic-auth-environment-variables",
-        "public-object",
-        "custom-auth",
-        "streaming-parameter",
-        "simple-api"
+        "exhaustive",
+        "required-nullable",
+        "literals-unions",
+        "streaming"
       ],
-      "groupTotalTimeSeconds": 225
+      "groupTotalTimeSeconds": 235
     },
     {
       "fixtures": [
-        "client-side-params",
-        "file-download",
-        "api-wide-base-path",
-        "mixed-file-directory",
-        "error-property",
-        "query-parameters",
-        "http-head",
-        "variables",
-        "exhaustive"
+        "version-no-default",
+        "objects-with-imports",
+        "bearer-token-environment-variable",
+        "enum",
+        "pagination-custom",
+        "oauth-client-credentials",
+        "reserved-keywords",
+        "mixed-case",
+        "inferred-auth-implicit"
       ],
-      "groupTotalTimeSeconds": 223
+      "groupTotalTimeSeconds": 234
     },
     {
       "fixtures": [
-        "nullable-optional",
-        "bearer-token-environment-variable",
         "content-type",
-        "websocket",
-        "idempotency-headers",
-        "request-parameters",
-        "folders",
-        "literal",
-        "oauth-client-credentials-default"
+        "accept-header",
+        "extends",
+        "multi-url-environment-no-default",
+        "package-yml",
+        "oauth-client-credentials-default",
+        "ruby-reserved-word-properties",
+        "simple-api",
+        "inferred-auth-implicit-no-expiry"
       ],
-      "groupTotalTimeSeconds": 229
+      "groupTotalTimeSeconds": 234
     },
     {
       "fixtures": [
         "trace",
-        "bytes-upload",
-        "enum",
-        "websocket-bearer-auth",
-        "imdb",
-        "required-nullable",
-        "inferred-auth-explicit",
-        "no-environment",
-        "single-url-environment-default"
-      ],
-      "groupTotalTimeSeconds": 229
-    },
-    {
-      "fixtures": [
         "simple-fhir",
-        "accept-header",
-        "bytes-download",
-        "multiple-request-bodies",
-        "object",
-        "reserved-keywords",
-        "inferred-auth-implicit",
-        "nullable",
-        "literals-unions"
+        "websocket-bearer-auth",
+        "mixed-file-directory",
+        "examples",
+        "property-access",
+        "error-property",
+        "single-url-environment-default",
+        "license"
       ],
-      "groupTotalTimeSeconds": 228
+      "groupTotalTimeSeconds": 233
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/ruby-sdk-seed-groups.json b/.github/workflow-resource-files/seed-groups/ruby-sdk-seed-groups.json
index 574a6f7916cc..b4e8b49ef5b9 100644
--- a/.github/workflow-resource-files/seed-groups/ruby-sdk-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/ruby-sdk-seed-groups.json
@@ -1,147 +1,147 @@
 {
-  "totalTestTimeSeconds": 1099,
+  "totalTestTimeSeconds": 1268,
   "groups": [
-    {
-      "fixtures": [
-        "accept-header",
-        "file-download",
-        "any-auth",
-        "mixed-case",
-        "basic-auth-environment-variables",
-        "oauth-client-credentials-with-variables",
-        "unknown"
-      ],
-      "groupTotalTimeSeconds": 110
-    },
-    {
-      "fixtures": [
-        "alias-extends",
-        "file-upload",
-        "audiences",
-        "multiple-request-bodies",
-        "custom-auth",
-        "object",
-        "validation"
-      ],
-      "groupTotalTimeSeconds": 110
-    },
     {
       "fixtures": [
         "query-parameters-openapi",
-        "client-side-params",
-        "literal",
-        "simple-fhir",
+        "nullable-optional",
         "enum",
-        "exhaustive:extra-deps",
-        "optional",
-        "response-property",
-        "inferred-auth-implicit",
-        "streaming-parameter",
-        "objects-with-imports",
-        "websocket"
+        "exhaustive:flattened-module-structure",
+        "simple-fhir",
+        "errors",
+        "path-parameters",
+        "extra-properties",
+        "single-url-environment-default",
+        "mixed-file-directory",
+        "server-sent-events",
+        "required-nullable"
       ],
-      "groupTotalTimeSeconds": 110
+      "groupTotalTimeSeconds": 127
     },
     {
       "fixtures": [
         "query-parameters-openapi-as-objects",
-        "pagination",
+        "client-side-params",
+        "unions",
         "nullable",
         "websocket-inferred-auth",
-        "error-property",
-        "exhaustive:flattened-module-structure",
+        "folders",
         "plain-text",
-        "variables",
-        "inferred-auth-implicit-no-expiry",
-        "undiscriminated-unions",
-        "package-yml",
-        "idempotency-headers",
-        "server-sent-events"
+        "license",
+        "streaming-parameter",
+        "multi-line-docs",
+        "single-url-environment-no-default",
+        "reserved-keywords"
       ],
-      "groupTotalTimeSeconds": 112
+      "groupTotalTimeSeconds": 127
     },
     {
       "fixtures": [
         "version",
-        "nullable-optional",
-        "unions",
-        "circular-references",
+        "pagination",
+        "audiences",
+        "exhaustive:extra-deps",
+        "query-parameters",
         "circular-references-advanced",
-        "errors",
-        "no-environment",
-        "property-access",
-        "http-head",
-        "single-url-environment-no-default",
-        "oauth-client-credentials-default",
-        "ruby-reserved-word-properties",
-        "simple-api"
+        "mixed-case",
+        "error-property",
+        "package-yml",
+        "imdb",
+        "oauth-client-credentials-environment-variables",
+        "inferred-auth-implicit",
+        "http-head"
       ],
-      "groupTotalTimeSeconds": 112
+      "groupTotalTimeSeconds": 129
     },
     {
       "fixtures": [
         "version-no-default",
-        "trace",
         "examples",
-        "public-object",
-        "empty-clients",
+        "trace",
         "exhaustive:no-custom-config",
-        "oauth-client-credentials",
-        "query-parameters",
-        "inferred-auth-explicit",
+        "object",
+        "circular-references",
+        "literal",
         "streaming",
-        "oauth-client-credentials-environment-variables",
-        "server-sent-event-examples"
+        "property-access",
+        "inferred-auth-explicit",
+        "oauth-client-credentials-nested-root",
+        "no-environment",
+        "idempotency-headers"
       ],
-      "groupTotalTimeSeconds": 109
+      "groupTotalTimeSeconds": 129
+    },
+    {
+      "fixtures": [
+        "accept-header",
+        "bytes-upload",
+        "websocket-bearer-auth",
+        "response-property",
+        "inferred-auth-implicit-no-expiry",
+        "oauth-client-credentials-with-variables",
+        "oauth-client-credentials-custom"
+      ],
+      "groupTotalTimeSeconds": 126
     },
     {
       "fixtures": [
         "alias",
-        "bytes-download",
-        "basic-auth",
-        "oauth-client-credentials-custom",
-        "extra-properties",
+        "content-type",
+        "any-auth",
+        "literals-unions",
+        "undiscriminated-unions",
         "pagination-custom",
-        "imdb"
+        "optional"
       ],
-      "groupTotalTimeSeconds": 109
+      "groupTotalTimeSeconds": 126
+    },
+    {
+      "fixtures": [
+        "alias-extends",
+        "extends",
+        "basic-auth",
+        "multi-url-environment",
+        "variables",
+        "ruby-reserved-word-properties",
+        "public-object"
+      ],
+      "groupTotalTimeSeconds": 126
     },
     {
       "fixtures": [
         "api-wide-base-path",
-        "bytes-upload",
+        "file-download",
         "cross-package-type-names",
-        "oauth-client-credentials-nested-root",
-        "mixed-file-directory",
-        "request-parameters",
-        "license"
+        "multi-url-environment-no-default",
+        "websocket",
+        "server-sent-event-examples",
+        "request-parameters"
       ],
-      "groupTotalTimeSeconds": 109
+      "groupTotalTimeSeconds": 126
     },
     {
       "fixtures": [
         "auth-environment-variables",
-        "content-type",
-        "folders",
-        "path-parameters",
-        "multi-line-docs",
-        "required-nullable",
-        "literals-unions"
+        "file-upload",
+        "empty-clients",
+        "multiple-request-bodies",
+        "basic-auth-environment-variables",
+        "oauth-client-credentials",
+        "unknown"
       ],
-      "groupTotalTimeSeconds": 109
+      "groupTotalTimeSeconds": 126
     },
     {
       "fixtures": [
         "bearer-token-environment-variable",
-        "extends",
-        "websocket-bearer-auth",
-        "single-url-environment-default",
-        "multi-url-environment-no-default",
-        "reserved-keywords",
-        "multi-url-environment"
+        "bytes-download",
+        "simple-api",
+        "objects-with-imports",
+        "custom-auth",
+        "oauth-client-credentials-default",
+        "validation"
       ],
-      "groupTotalTimeSeconds": 109
+      "groupTotalTimeSeconds": 126
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/ruby-sdk-v2-seed-groups.json b/.github/workflow-resource-files/seed-groups/ruby-sdk-v2-seed-groups.json
index 40c14f512698..3f7c134b6890 100644
--- a/.github/workflow-resource-files/seed-groups/ruby-sdk-v2-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/ruby-sdk-v2-seed-groups.json
@@ -1,146 +1,146 @@
 {
-  "totalTestTimeSeconds": 21437,
+  "totalTestTimeSeconds": 20128,
   "groups": [
     {
       "fixtures": [
-        "accept-header",
-        "auth-environment-variables",
-        "path-parameters",
-        "oauth-client-credentials-custom",
-        "nullable",
-        "ruby-reserved-word-properties",
-        "response-property",
-        "enum",
-        "basic-auth"
+        "file-upload",
+        "package-yml",
+        "extra-properties",
+        "streaming",
+        "client-side-params",
+        "multiple-request-bodies",
+        "inferred-auth-explicit",
+        "empty-clients",
+        "examples:no-custom-config"
       ],
-      "groupTotalTimeSeconds": 2149
+      "groupTotalTimeSeconds": 1991
     },
     {
       "fixtures": [
-        "content-type",
-        "simple-fhir",
+        "bearer-token-environment-variable",
         "oauth-client-credentials-environment-variables",
-        "multi-url-environment-no-default",
-        "query-parameters",
-        "object",
-        "websocket",
-        "websocket-bearer-auth",
-        "examples:readme-config"
+        "path-parameters",
+        "multi-line-docs",
+        "property-access",
+        "custom-auth",
+        "http-head",
+        "mixed-file-directory",
+        "websocket-bearer-auth"
       ],
-      "groupTotalTimeSeconds": 2103
+      "groupTotalTimeSeconds": 2027
     },
     {
       "fixtures": [
-        "file-upload",
-        "streaming-parameter",
-        "single-url-environment-default",
-        "oauth-client-credentials",
-        "unions",
-        "circular-references-advanced",
-        "mixed-case",
-        "basic-auth-environment-variables",
-        "cross-package-type-names"
+        "content-type",
+        "pagination",
+        "oauth-client-credentials-custom",
+        "unknown",
+        "plain-text",
+        "optional",
+        "inferred-auth-implicit",
+        "basic-auth",
+        "audiences"
       ],
-      "groupTotalTimeSeconds": 2139
+      "groupTotalTimeSeconds": 2009
     },
     {
       "fixtures": [
-        "bearer-token-environment-variable",
-        "streaming",
+        "file-download",
+        "oauth-client-credentials",
         "multi-url-environment",
+        "single-url-environment-no-default",
+        "mixed-case",
         "error-property",
-        "simple-api",
-        "circular-references",
-        "any-auth",
-        "literals-unions",
-        "examples:no-custom-config"
+        "imdb",
+        "required-nullable",
+        "cross-package-type-names"
       ],
-      "groupTotalTimeSeconds": 2115
+      "groupTotalTimeSeconds": 2003
     },
     {
       "fixtures": [
-        "bytes-download",
-        "validation",
+        "auth-environment-variables",
+        "query-parameters-openapi",
         "pagination-custom",
-        "package-yml",
-        "inferred-auth-implicit",
-        "public-object",
-        "errors",
+        "server-sent-events",
+        "single-url-environment-default",
+        "server-sent-event-examples",
         "idempotency-headers",
+        "reserved-keywords",
         "trace",
         "exhaustive"
       ],
-      "groupTotalTimeSeconds": 2233
+      "groupTotalTimeSeconds": 2051
     },
     {
       "fixtures": [
-        "extends",
-        "unknown",
-        "version",
-        "multi-line-docs",
-        "websocket-inferred-auth",
-        "no-environment",
-        "inferred-auth-explicit",
-        "http-head",
-        "audiences"
+        "alias",
+        "query-parameters-openapi-as-objects",
+        "simple-fhir",
+        "errors",
+        "literals-unions",
+        "simple-api",
+        "circular-references",
+        "ruby-reserved-word-properties",
+        "literal"
       ],
-      "groupTotalTimeSeconds": 2144
+      "groupTotalTimeSeconds": 2031
     },
     {
       "fixtures": [
-        "query-parameters-openapi-as-objects",
-        "alias",
+        "bytes-download",
         "version-no-default",
-        "server-sent-events",
-        "reserved-keywords",
+        "objects-with-imports",
+        "streaming-parameter",
+        "no-environment",
+        "unions",
+        "circular-references-advanced",
         "request-parameters",
-        "imdb",
-        "empty-clients",
-        "folders"
+        "enum"
       ],
-      "groupTotalTimeSeconds": 2115
+      "groupTotalTimeSeconds": 2028
     },
     {
       "fixtures": [
-        "alias-extends",
-        "file-download",
-        "query-parameters-openapi",
+        "api-wide-base-path",
+        "accept-header",
+        "oauth-client-credentials-nested-root",
         "nullable-optional",
-        "extra-properties",
+        "validation",
+        "query-parameters",
         "inferred-auth-implicit-no-expiry",
-        "oauth-client-credentials-default",
-        "custom-auth",
-        "literal"
+        "oauth-client-credentials-with-variables",
+        "examples:readme-config"
       ],
-      "groupTotalTimeSeconds": 2143
+      "groupTotalTimeSeconds": 1974
     },
     {
       "fixtures": [
-        "api-wide-base-path",
-        "undiscriminated-unions",
+        "alias-extends",
         "bytes-upload",
-        "objects-with-imports",
-        "server-sent-event-examples",
-        "property-access",
+        "oauth-client-credentials-default",
+        "variables",
+        "object",
         "license",
-        "plain-text",
-        "oauth-client-credentials-with-variables"
+        "response-property",
+        "any-auth",
+        "folders"
       ],
-      "groupTotalTimeSeconds": 2148
+      "groupTotalTimeSeconds": 1988
     },
     {
       "fixtures": [
-        "variables",
-        "single-url-environment-no-default",
-        "pagination",
-        "client-side-params",
-        "multiple-request-bodies",
-        "oauth-client-credentials-nested-root",
-        "optional",
-        "mixed-file-directory",
-        "required-nullable"
+        "version",
+        "extends",
+        "multi-url-environment-no-default",
+        "undiscriminated-unions",
+        "nullable",
+        "public-object",
+        "websocket-inferred-auth",
+        "basic-auth-environment-variables",
+        "websocket"
       ],
-      "groupTotalTimeSeconds": 2148
+      "groupTotalTimeSeconds": 2026
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/rust-model-seed-groups.json b/.github/workflow-resource-files/seed-groups/rust-model-seed-groups.json
index ba467e8ab791..84e82ef7246f 100644
--- a/.github/workflow-resource-files/seed-groups/rust-model-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/rust-model-seed-groups.json
@@ -1,144 +1,144 @@
 {
-  "totalTestTimeSeconds": 827,
+  "totalTestTimeSeconds": 808,
   "groups": [
     {
       "fixtures": [
-        "query-parameters-openapi",
-        "client-side-params",
-        "file-upload",
-        "oauth-client-credentials-default",
-        "any-auth",
-        "custom-auth",
+        "version",
+        "nullable",
+        "objects-with-imports",
         "response-property",
-        "oauth-client-credentials-with-variables",
-        "unknown"
+        "examples",
+        "websocket",
+        "oauth-client-credentials-default",
+        "streaming-parameter",
+        "package-yml"
       ],
-      "groupTotalTimeSeconds": 82
+      "groupTotalTimeSeconds": 80
     },
     {
       "fixtures": [
-        "query-parameters-openapi-as-objects",
-        "unions",
-        "circular-references-advanced",
-        "nullable",
+        "query-parameters-openapi",
+        "circular-references",
+        "simple-fhir",
+        "trace",
+        "exhaustive",
         "websocket-bearer-auth",
-        "enum",
-        "variables",
-        "optional",
-        "validation"
+        "object",
+        "unknown",
+        "plain-text"
       ],
-      "groupTotalTimeSeconds": 82
+      "groupTotalTimeSeconds": 80
     },
     {
       "fixtures": [
-        "version",
-        "nullable-optional",
+        "query-parameters-openapi-as-objects",
+        "client-side-params",
+        "oauth-client-credentials",
         "pagination",
-        "literals-unions",
-        "simple-fhir",
         "cross-package-type-names",
-        "plain-text",
-        "inferred-auth-implicit-no-expiry",
-        "reserved-keywords",
-        "exhaustive"
-      ],
-      "groupTotalTimeSeconds": 84
-    },
-    {
-      "fixtures": [
-        "version-no-default",
-        "oauth-client-credentials-custom",
-        "oauth-client-credentials-environment-variables",
-        "license",
-        "request-parameters",
-        "basic-auth",
-        "path-parameters",
-        "inferred-auth-implicit",
-        "required-nullable",
-        "single-url-environment-no-default"
+        "mixed-file-directory",
+        "extra-properties",
+        "property-access",
+        "http-head",
+        "validation"
       ],
-      "groupTotalTimeSeconds": 84
+      "groupTotalTimeSeconds": 83
     },
     {
       "fixtures": [
         "alias",
-        "bytes-upload",
-        "public-object",
+        "file-download",
         "websocket-inferred-auth",
-        "multi-line-docs",
-        "inferred-auth-explicit",
-        "package-yml",
-        "simple-api",
-        "imdb"
+        "folders",
+        "any-auth",
+        "idempotency-headers",
+        "required-nullable",
+        "license",
+        "variables"
       ],
-      "groupTotalTimeSeconds": 84
+      "groupTotalTimeSeconds": 83
     },
     {
       "fixtures": [
         "alias-extends",
-        "content-type",
-        "query-parameters",
+        "extends",
+        "nullable-optional",
         "audiences",
-        "error-property",
-        "websocket",
+        "literal",
+        "basic-auth-environment-variables",
         "pagination-custom",
-        "single-url-environment-default",
-        "mixed-case"
+        "error-property",
+        "public-object"
       ],
-      "groupTotalTimeSeconds": 84
+      "groupTotalTimeSeconds": 81
     },
     {
       "fixtures": [
         "api-wide-base-path",
-        "extends",
-        "oauth-client-credentials-nested-root",
-        "basic-auth-environment-variables",
-        "errors",
-        "accept-header",
-        "multi-url-environment",
+        "unions",
+        "circular-references-advanced",
+        "undiscriminated-unions",
+        "inferred-auth-implicit-no-expiry",
+        "basic-auth",
+        "inferred-auth-explicit",
         "server-sent-event-examples",
+        "literals-unions",
         "multiple-request-bodies"
       ],
-      "groupTotalTimeSeconds": 84
+      "groupTotalTimeSeconds": 82
     },
     {
       "fixtures": [
-        "auth-environment-variables",
-        "file-download",
-        "object",
-        "circular-references",
-        "examples",
-        "empty-clients",
+        "content-type",
+        "bytes-download",
+        "imdb",
+        "custom-auth",
         "multi-url-environment-no-default",
-        "server-sent-events"
+        "inferred-auth-implicit",
+        "server-sent-events",
+        "mixed-case",
+        "single-url-environment-default"
       ],
-      "groupTotalTimeSeconds": 81
+      "groupTotalTimeSeconds": 82
     },
     {
       "fixtures": [
-        "bearer-token-environment-variable",
-        "http-head",
-        "objects-with-imports",
-        "trace",
-        "literal",
-        "extra-properties",
-        "no-environment",
-        "streaming"
+        "version-no-default",
+        "bytes-upload",
+        "oauth-client-credentials-environment-variables",
+        "empty-clients",
+        "oauth-client-credentials-with-variables",
+        "multi-line-docs",
+        "simple-api",
+        "no-environment"
       ],
-      "groupTotalTimeSeconds": 81
+      "groupTotalTimeSeconds": 79
     },
     {
       "fixtures": [
-        "bytes-download",
-        "idempotency-headers",
-        "property-access",
-        "undiscriminated-unions",
-        "mixed-file-directory",
-        "folders",
-        "oauth-client-credentials",
-        "streaming-parameter"
+        "file-upload",
+        "auth-environment-variables",
+        "query-parameters",
+        "enum",
+        "path-parameters",
+        "multi-url-environment",
+        "single-url-environment-no-default",
+        "oauth-client-credentials-nested-root"
       ],
-      "groupTotalTimeSeconds": 81
+      "groupTotalTimeSeconds": 79
+    },
+    {
+      "fixtures": [
+        "accept-header",
+        "bearer-token-environment-variable",
+        "request-parameters",
+        "errors",
+        "reserved-keywords",
+        "oauth-client-credentials-custom",
+        "streaming",
+        "optional"
+      ],
+      "groupTotalTimeSeconds": 79
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/rust-sdk-seed-groups.json b/.github/workflow-resource-files/seed-groups/rust-sdk-seed-groups.json
index bd38390961f5..6419c237db7e 100644
--- a/.github/workflow-resource-files/seed-groups/rust-sdk-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/rust-sdk-seed-groups.json
@@ -1,148 +1,148 @@
 {
-  "totalTestTimeSeconds": 3162,
+  "totalTestTimeSeconds": 3141,
   "groups": [
     {
       "fixtures": [
         "errors",
-        "accept-header",
-        "oauth-client-credentials-with-variables",
-        "error-property",
-        "mixed-case",
-        "variables",
-        "validation",
-        "audiences",
-        "multiple-request-bodies"
+        "version",
+        "custom-auth",
+        "inferred-auth-explicit",
+        "streaming",
+        "literal",
+        "examples:readme-config",
+        "single-url-environment-default:basic",
+        "empty-clients",
+        "websocket-bearer-auth"
       ],
-      "groupTotalTimeSeconds": 326
+      "groupTotalTimeSeconds": 311
     },
     {
       "fixtures": [
-        "content-type",
-        "file-download",
-        "bytes-upload",
-        "request-parameters",
-        "imdb:imdb",
-        "multi-line-docs",
+        "nullable-optional",
+        "query-parameters-openapi",
+        "basic-auth-environment-variables",
+        "inferred-auth-implicit-no-expiry",
         "trace",
-        "file-upload",
-        "cross-package-type-names"
+        "mixed-case",
+        "http-head",
+        "multiple-request-bodies",
+        "no-environment"
       ],
-      "groupTotalTimeSeconds": 324
+      "groupTotalTimeSeconds": 317
     },
     {
       "fixtures": [
-        "query-parameters-openapi-as-objects",
-        "oauth-client-credentials-custom",
-        "api-wide-base-path",
-        "enum",
+        "content-type",
+        "alias-extends",
+        "oauth-client-credentials-with-variables",
+        "package-yml",
+        "multi-line-docs",
         "multi-url-environment",
-        "oauth-client-credentials-default",
-        "examples:no-custom-config",
         "reserved-keywords",
-        "empty-clients",
-        "circular-references"
+        "property-access",
+        "literals-unions"
       ],
-      "groupTotalTimeSeconds": 312
+      "groupTotalTimeSeconds": 314
     },
     {
       "fixtures": [
-        "version-no-default",
+        "accept-header",
+        "alias",
         "oauth-client-credentials-environment-variables",
-        "bearer-token-environment-variable",
-        "mixed-file-directory",
-        "inferred-auth-implicit-no-expiry",
-        "server-sent-event-examples",
-        "websocket-inferred-auth",
-        "no-environment",
-        "folders"
+        "imdb:imdb",
+        "any-auth",
+        "simple-fhir",
+        "simple-api",
+        "required-nullable",
+        "object"
       ],
-      "groupTotalTimeSeconds": 324
+      "groupTotalTimeSeconds": 313
     },
     {
       "fixtures": [
         "auth-environment-variables",
-        "unions",
-        "bytes-download",
-        "oauth-client-credentials-nested-root",
-        "optional",
-        "required-nullable",
+        "extends",
+        "undiscriminated-unions",
         "exhaustive",
+        "error-property",
         "single-url-environment-no-default",
-        "object",
-        "objects-with-imports"
+        "single-url-environment-default:full-custom",
+        "websocket-inferred-auth",
+        "circular-references",
+        "public-object"
       ],
-      "groupTotalTimeSeconds": 312
+      "groupTotalTimeSeconds": 310
     },
     {
       "fixtures": [
-        "nullable-optional",
-        "path-parameters",
-        "response-property",
-        "basic-auth-environment-variables",
-        "literal",
-        "single-url-environment-default:custom-environment",
-        "idempotency-headers",
+        "client-side-params",
+        "unions",
+        "oauth-client-credentials-custom",
+        "mixed-file-directory",
+        "nullable",
         "streaming-parameter",
-        "websocket-bearer-auth",
-        "public-object"
+        "unknown",
+        "license",
+        "folders"
       ],
-      "groupTotalTimeSeconds": 312
+      "groupTotalTimeSeconds": 321
     },
     {
       "fixtures": [
-        "version",
-        "inferred-auth-explicit",
-        "alias",
-        "basic-auth",
+        "pagination",
+        "path-parameters",
+        "bytes-upload",
+        "inferred-auth-implicit",
+        "oauth-client-credentials-nested-root",
+        "enum",
+        "server-sent-event-examples",
         "server-sent-events",
-        "single-url-environment-default:basic",
-        "extra-properties",
-        "pagination-custom",
-        "license"
+        "cross-package-type-names"
       ],
-      "groupTotalTimeSeconds": 321
+      "groupTotalTimeSeconds": 318
     },
     {
       "fixtures": [
-        "client-side-params",
-        "oauth-client-credentials",
-        "extends",
-        "inferred-auth-implicit",
-        "any-auth",
-        "examples:readme-config",
+        "version-no-default",
+        "response-property",
+        "bytes-download",
         "imdb:imdb-custom-config",
-        "property-access",
-        "literals-unions"
+        "idempotency-headers",
+        "optional",
+        "validation",
+        "audiences",
+        "plain-text"
       ],
-      "groupTotalTimeSeconds": 315
+      "groupTotalTimeSeconds": 321
     },
     {
       "fixtures": [
-        "http-head",
-        "pagination",
-        "undiscriminated-unions",
-        "package-yml",
-        "multi-url-environment-no-default",
-        "plain-text",
-        "nullable",
-        "query-parameters",
-        "circular-references-advanced"
+        "file-download",
+        "oauth-client-credentials",
+        "api-wide-base-path",
+        "request-parameters",
+        "oauth-client-credentials-default",
+        "single-url-environment-default:custom-environment",
+        "examples:no-custom-config",
+        "variables",
+        "objects-with-imports"
       ],
-      "groupTotalTimeSeconds": 308
+      "groupTotalTimeSeconds": 306
     },
     {
       "fixtures": [
-        "alias-extends",
-        "query-parameters-openapi",
-        "custom-auth",
-        "simple-fhir",
-        "simple-api",
-        "streaming",
-        "unknown",
-        "single-url-environment-default:full-custom",
+        "file-upload",
+        "query-parameters-openapi-as-objects",
+        "bearer-token-environment-variable",
+        "basic-auth",
+        "extra-properties",
+        "multi-url-environment-no-default",
+        "pagination-custom",
+        "query-parameters",
+        "circular-references-advanced",
         "websocket"
       ],
-      "groupTotalTimeSeconds": 308
+      "groupTotalTimeSeconds": 310
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/swift-sdk-seed-groups.json b/.github/workflow-resource-files/seed-groups/swift-sdk-seed-groups.json
index 684d7aae0e5f..59d6d3090d21 100644
--- a/.github/workflow-resource-files/seed-groups/swift-sdk-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/swift-sdk-seed-groups.json
@@ -1,149 +1,149 @@
 {
-  "totalTestTimeSeconds": 13248,
+  "totalTestTimeSeconds": 13234,
   "groups": [
     {
       "fixtures": [
         "client-side-params:no-custom-config",
-        "unknown",
-        "single-url-environment-default:no-custom-config",
-        "single-url-environment-no-default",
-        "oauth-client-credentials",
+        "validation",
+        "http-head",
+        "object",
+        "oauth-client-credentials-default",
         "streaming-parameter",
-        "auth-environment-variables",
-        "query-parameters-openapi-as-objects",
-        "circular-references-advanced"
+        "streaming",
+        "unions",
+        "literal"
       ],
-      "groupTotalTimeSeconds": 1312
+      "groupTotalTimeSeconds": 1317
     },
     {
       "fixtures": [
         "client-side-params:with-custom-config",
-        "error-property",
-        "imdb",
-        "simple-api",
-        "objects-with-imports",
+        "unknown",
+        "empty-clients",
+        "multiple-request-bodies",
+        "oauth-client-credentials-environment-variables",
         "inferred-auth-explicit",
-        "api-wide-base-path",
-        "multi-url-environment",
-        "query-parameters",
-        "simple-fhir"
+        "plain-text",
+        "query-parameters-openapi-as-objects",
+        "mixed-file-directory",
+        "cross-package-type-names"
       ],
-      "groupTotalTimeSeconds": 1336
+      "groupTotalTimeSeconds": 1337
     },
     {
       "fixtures": [
         "errors",
-        "bearer-token-environment-variable",
-        "bytes-download",
-        "server-sent-events",
-        "oauth-client-credentials-nested-root",
-        "inferred-auth-implicit",
-        "inferred-auth-implicit-no-expiry",
-        "path-parameters",
-        "circular-references",
-        "literal"
+        "extends",
+        "file-download",
+        "single-url-environment-no-default",
+        "public-object",
+        "websocket-inferred-auth",
+        "oauth-client-credentials-custom",
+        "oauth-client-credentials-with-variables",
+        "nullable-optional",
+        "reserved-keywords"
       ],
-      "groupTotalTimeSeconds": 1339
+      "groupTotalTimeSeconds": 1337
     },
     {
       "fixtures": [
         "content-type",
         "basic-auth-environment-variables",
-        "accept-header",
-        "literals-unions",
-        "license",
+        "bytes-upload",
+        "server-sent-events",
+        "optional",
         "pagination:no-custom-config",
-        "exhaustive",
-        "trace",
-        "examples:no-custom-config"
+        "mixed-case",
+        "path-parameters",
+        "circular-references-advanced"
       ],
-      "groupTotalTimeSeconds": 1311
+      "groupTotalTimeSeconds": 1316
     },
     {
       "fixtures": [
         "custom-auth",
-        "version-no-default",
-        "websocket",
-        "object",
-        "single-url-environment-default:with-custom-config",
-        "response-property",
-        "nullable",
-        "undiscriminated-unions",
-        "mixed-file-directory"
+        "extra-properties",
+        "bytes-download",
+        "license",
+        "simple-api",
+        "inferred-auth-implicit",
+        "inferred-auth-implicit-no-expiry",
+        "variables",
+        "circular-references",
+        "simple-fhir"
       ],
-      "groupTotalTimeSeconds": 1312
+      "groupTotalTimeSeconds": 1336
     },
     {
       "fixtures": [
-        "alias-extends",
-        "alias",
+        "file-upload",
         "any-auth",
-        "oauth-client-credentials-environment-variables",
-        "server-sent-event-examples",
-        "websocket-inferred-auth",
-        "oauth-client-credentials-custom",
-        "streaming",
-        "nullable-optional",
-        "property-access"
+        "websocket",
+        "single-url-environment-default:with-custom-config",
+        "single-url-environment-default:no-custom-config",
+        "response-property",
+        "nullable",
+        "trace",
+        "query-parameters"
       ],
-      "groupTotalTimeSeconds": 1339
+      "groupTotalTimeSeconds": 1314
     },
     {
       "fixtures": [
+        "version",
         "multi-line-docs",
-        "package-yml",
-        "bytes-upload",
-        "http-head",
-        "required-nullable",
-        "folders",
-        "plain-text",
-        "query-parameters-openapi",
-        "examples:readme-config"
+        "error-property",
+        "idempotency-headers",
+        "literals-unions",
+        "pagination:custom-pager",
+        "exhaustive",
+        "multi-url-environment-no-default",
+        "examples:no-custom-config"
       ],
-      "groupTotalTimeSeconds": 1311
+      "groupTotalTimeSeconds": 1313
     },
     {
       "fixtures": [
-        "pagination-custom",
-        "extends",
-        "validation",
-        "multiple-request-bodies",
-        "no-environment",
-        "pagination:custom-pager",
-        "mixed-case",
+        "basic-auth",
+        "package-yml",
+        "accept-header",
+        "imdb",
+        "oauth-client-credentials-nested-root",
+        "objects-with-imports",
+        "undiscriminated-unions",
         "request-parameters",
-        "audiences",
-        "cross-package-type-names"
+        "property-access"
       ],
-      "groupTotalTimeSeconds": 1338
+      "groupTotalTimeSeconds": 1316
     },
     {
       "fixtures": [
-        "basic-auth",
-        "file-upload",
-        "empty-clients",
+        "pagination-custom",
+        "alias",
         "websocket-bearer-auth",
-        "optional",
-        "pagination:custom-pager-with-exception-handler",
-        "oauth-client-credentials-with-variables",
-        "unions",
-        "enum"
+        "oauth-client-credentials",
+        "required-nullable",
+        "folders",
+        "api-wide-base-path",
+        "multi-url-environment",
+        "examples:readme-config"
       ],
       "groupTotalTimeSeconds": 1312
     },
     {
       "fixtures": [
-        "extra-properties",
-        "version",
-        "file-download",
-        "idempotency-headers",
-        "public-object",
-        "oauth-client-credentials-default",
-        "multi-url-environment-no-default",
-        "variables",
-        "reserved-keywords"
+        "version-no-default",
+        "alias-extends",
+        "bearer-token-environment-variable",
+        "server-sent-event-examples",
+        "no-environment",
+        "pagination:custom-pager-with-exception-handler",
+        "auth-environment-variables",
+        "query-parameters-openapi",
+        "enum",
+        "audiences"
       ],
-      "groupTotalTimeSeconds": 1338
+      "groupTotalTimeSeconds": 1336
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/ts-express-seed-groups.json b/.github/workflow-resource-files/seed-groups/ts-express-seed-groups.json
index 11f672d9d1df..eb5c2f8722f5 100644
--- a/.github/workflow-resource-files/seed-groups/ts-express-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/ts-express-seed-groups.json
@@ -1,158 +1,158 @@
 {
-  "totalTestTimeSeconds": 3990,
+  "totalTestTimeSeconds": 4583,
   "groups": [
     {
       "fixtures": [
-        "content-type",
-        "trace:no-zurg-trace",
+        "exhaustive:union-utils",
+        "nullable-optional",
+        "oauth-client-credentials-default",
+        "websocket-bearer-auth",
         "circular-references",
-        "client-side-params",
-        "any-auth",
-        "empty-clients",
-        "accept-header",
-        "cross-package-type-names",
-        "mixed-case:retain-original-casing",
+        "query-parameters",
+        "error-property",
+        "basic-auth-environment-variables",
+        "exhaustive:retain-original-casing",
         "server-sent-event-examples"
       ],
-      "groupTotalTimeSeconds": 392
-    },
-    {
-      "fixtures": [
-        "http-head",
-        "oauth-client-credentials-nested-root",
-        "oauth-client-credentials-environment-variables",
-        "literal",
-        "license",
-        "exhaustive:test-package-path",
-        "audiences",
-        "custom-auth",
-        "multi-url-environment",
-        "public-object",
-        "multiple-request-bodies"
-      ],
-      "groupTotalTimeSeconds": 400
+      "groupTotalTimeSeconds": 453
     },
     {
       "fixtures": [
-        "query-parameters-openapi-as-objects",
-        "objects-with-imports",
+        "exhaustive:allow-extra-fields",
+        "client-side-params",
+        "mixed-case:retain-original-casing",
         "validation",
-        "response-property",
-        "oauth-client-credentials-default",
-        "imdb:no-custom-config",
-        "exhaustive:no-optional-properties",
-        "error-property",
+        "path-parameters",
+        "multi-line-docs",
+        "audiences",
         "ts-express-casing:no-custom-config",
+        "cross-package-type-names",
         "streaming",
-        "server-sent-events"
+        "public-object"
       ],
-      "groupTotalTimeSeconds": 399
+      "groupTotalTimeSeconds": 461
     },
     {
       "fixtures": [
-        "unions",
-        "undiscriminated-unions",
-        "inferred-auth-explicit",
-        "inferred-auth-implicit",
-        "query-parameters",
-        "imdb:skip-response-validation",
-        "exhaustive:allow-extra-fields",
         "exhaustive:no-custom-config",
-        "bytes-upload",
-        "single-url-environment-no-default"
-      ],
-      "groupTotalTimeSeconds": 405
-    },
-    {
-      "fixtures": [
-        "query-parameters-openapi",
+        "ts-inline-types",
+        "pagination",
         "trace:no-custom-config",
-        "mixed-file-directory",
         "basic-auth",
-        "object",
-        "multi-url-environment-no-default",
-        "mixed-case:no-custom-config",
-        "exhaustive:retain-original-casing",
-        "required-nullable",
-        "file-upload",
-        "api-wide-base-path"
+        "extra-properties",
+        "simple-api",
+        "errors",
+        "trace:no-zurg-trace",
+        "multiple-request-bodies",
+        "server-sent-events"
       ],
-      "groupTotalTimeSeconds": 391
+      "groupTotalTimeSeconds": 461
     },
     {
       "fixtures": [
-        "extends",
-        "nullable-optional",
+        "unions",
+        "oauth-client-credentials-custom",
         "nullable",
-        "basic-auth-environment-variables",
-        "request-parameters",
-        "circular-references-advanced",
+        "object",
+        "any-auth",
+        "property-access",
+        "imdb:no-custom-config",
         "pagination-custom",
-        "exhaustive:union-utils",
-        "imdb:skip-request-validation",
-        "ts-express-casing:no-serde-layer"
+        "bytes-upload",
+        "variables"
       ],
-      "groupTotalTimeSeconds": 407
+      "groupTotalTimeSeconds": 462
     },
     {
       "fixtures": [
         "imdb:output-compiled",
-        "oauth-client-credentials-custom",
-        "inferred-auth-implicit-no-expiry",
-        "enum",
-        "reserved-keywords",
-        "extra-properties",
-        "simple-fhir",
-        "no-environment",
-        "optional",
-        "variables"
+        "http-head",
+        "inferred-auth-implicit",
+        "circular-references-advanced",
+        "inferred-auth-explicit",
+        "request-parameters",
+        "imdb:skip-response-validation",
+        "single-url-environment-default",
+        "examples",
+        "exhaustive:test-package-path"
       ],
-      "groupTotalTimeSeconds": 407
+      "groupTotalTimeSeconds": 461
     },
     {
       "fixtures": [
+        "content-type",
         "bearer-token-environment-variable",
-        "pagination",
-        "bytes-download",
+        "api-wide-base-path",
+        "objects-with-imports",
+        "package-yml",
+        "multi-url-environment-no-default",
+        "response-property",
+        "single-url-environment-no-default",
         "file-download",
-        "websocket-inferred-auth",
+        "folders"
+      ],
+      "groupTotalTimeSeconds": 459
+    },
+    {
+      "fixtures": [
+        "extends",
+        "auth-environment-variables",
+        "inferred-auth-implicit-no-expiry",
+        "mixed-case:no-custom-config",
+        "optional",
+        "required-nullable",
         "imdb:validation-status-code",
-        "single-url-environment-default",
-        "path-parameters",
+        "websocket-inferred-auth",
         "literals-unions",
-        "package-yml"
+        "exhaustive:no-optional-properties"
       ],
-      "groupTotalTimeSeconds": 406
+      "groupTotalTimeSeconds": 458
     },
     {
       "fixtures": [
-        "version",
-        "ts-inline-types",
-        "oauth-client-credentials",
-        "idempotency-headers",
-        "alias",
         "alias-extends",
+        "version-no-default",
+        "accept-header",
+        "oauth-client-credentials",
         "websocket",
-        "errors",
-        "folders",
+        "unknown",
+        "multi-url-environment",
+        "custom-auth",
+        "license",
+        "streaming-parameter",
         "plain-text"
       ],
-      "groupTotalTimeSeconds": 391
+      "groupTotalTimeSeconds": 459
     },
     {
       "fixtures": [
-        "version-no-default",
-        "auth-environment-variables",
-        "property-access",
+        "query-parameters-openapi-as-objects",
+        "alias",
+        "oauth-client-credentials-nested-root",
+        "simple-fhir",
         "oauth-client-credentials-with-variables",
-        "unknown",
-        "multi-line-docs",
-        "websocket-bearer-auth",
-        "examples",
-        "simple-api",
-        "streaming-parameter"
+        "no-environment",
+        "enum",
+        "idempotency-headers",
+        "bytes-download",
+        "imdb:skip-request-validation"
+      ],
+      "groupTotalTimeSeconds": 455
+    },
+    {
+      "fixtures": [
+        "version",
+        "query-parameters-openapi",
+        "undiscriminated-unions",
+        "oauth-client-credentials-environment-variables",
+        "mixed-file-directory",
+        "empty-clients",
+        "reserved-keywords",
+        "literal",
+        "ts-express-casing:no-serde-layer",
+        "file-upload"
       ],
-      "groupTotalTimeSeconds": 392
+      "groupTotalTimeSeconds": 454
     }
   ]
 }
diff --git a/.github/workflow-resource-files/seed-groups/ts-sdk-seed-groups.json b/.github/workflow-resource-files/seed-groups/ts-sdk-seed-groups.json
index aecb90896b61..68bdfa74b016 100644
--- a/.github/workflow-resource-files/seed-groups/ts-sdk-seed-groups.json
+++ b/.github/workflow-resource-files/seed-groups/ts-sdk-seed-groups.json
@@ -1,205 +1,205 @@
 {
-  "totalTestTimeSeconds": 26532,
+  "totalTestTimeSeconds": 26015,
   "groups": [
     {
       "fixtures": [
         "trace:serde-trace",
-        "file-upload:use-jest",
-        "content-type",
-        "exhaustive:custom-package-json",
-        "imdb:noScripts",
-        "imdb:branded-string-aliases",
-        "single-url-environment-default",
+        "file-download:no-custom-config",
+        "examples:examples-with-api-reference",
+        "enum",
+        "audiences:with-partner-audience",
+        "exhaustive:node-fetch",
+        "websocket-inferred-auth:websockets",
         "path-parameters:default",
-        "mixed-case:retain-original-casing",
-        "undiscriminated-unions:no-custom-config",
-        "simple-fhir",
-        "custom-auth",
-        "reserved-keywords",
-        "empty-clients"
+        "optional",
+        "query-parameters:no-custom-config",
+        "ts-inline-types:inline",
+        "streaming:no-custom-config",
+        "websocket-bearer-auth:websockets",
+        "websocket:no-websocket-clients"
       ],
-      "groupTotalTimeSeconds": 2651
+      "groupTotalTimeSeconds": 2608
     },
     {
       "fixtures": [
         "trace:serde-no-throwing",
-        "exhaustive:omit-fern-headers",
-        "streaming:wrapper",
-        "extends",
-        "file-upload:no-custom-config",
-        "inferred-auth-explicit",
-        "inferred-auth-implicit-no-expiry",
-        "basic-auth-environment-variables",
-        "property-access:no-custom-config",
-        "optional",
-        "license",
-        "query-parameters:no-custom-config",
-        "streaming-parameter",
-        "exhaustive:legacy-exports"
+        "auth-environment-variables",
+        "exhaustive:bigint",
+        "version",
+        "audiences:no-custom-config",
+        "client-side-params",
+        "error-property:union-utils",
+        "path-parameters:inline-path-parameters-retain-original-casing",
+        "simple-fhir",
+        "custom-auth",
+        "ts-express-casing",
+        "server-sent-event-examples",
+        "streaming:allow-custom-fetcher",
+        "public-object"
       ],
-      "groupTotalTimeSeconds": 2651
+      "groupTotalTimeSeconds": 2615
     },
     {
       "fixtures": [
         "exhaustive:use-yarn",
-        "examples:examples-with-api-reference",
-        "file-download:no-custom-config",
-        "exhaustive:allow-extra-fields",
-        "audiences:no-custom-config",
+        "accept-header",
+        "exhaustive:use-jest",
+        "exhaustive:never-throw-errors",
+        "exhaustive:web-stream-wrapper",
         "inferred-auth-implicit",
         "nullable-optional",
-        "multi-url-environment-no-default",
-        "path-parameters:inline-path-parameters",
-        "basic-auth",
-        "exhaustive:consolidate-type-files",
-        "required-nullable",
-        "ts-express-casing",
-        "object",
-        "circular-references"
+        "multiple-request-bodies",
+        "imdb:omit-undefined",
+        "license",
+        "unknown:no-custom-config",
+        "request-parameters:flatten-request-parameters",
+        "plain-text",
+        "unknown:unknown-as-any",
+        "exhaustive:local-files-no-source"
       ],
-      "groupTotalTimeSeconds": 2657
+      "groupTotalTimeSeconds": 2596
     },
     {
       "fixtures": [
-        "exhaustive:serde-layer",
-        "exhaustive:package-path",
-        "exhaustive:bigint-serde-layer",
-        "version",
-        "exhaustive:jsr",
-        "mixed-file-directory",
-        "exhaustive:web-stream-wrapper",
-        "multi-line-docs",
-        "path-parameters:retain-original-casing",
-        "package-yml",
+        "file-download:wrapper",
+        "path-parameters:inline-path-parameters-serde",
+        "streaming:wrapper",
+        "exhaustive:custom-package-json",
+        "version-no-default",
+        "request-parameters:use-big-int-and-default-request-parameter-values",
+        "oauth-client-credentials-nested-root:no-custom-config",
+        "imdb:branded-string-aliases",
+        "idempotency-headers",
         "any-auth:generate-endpoint-metadata",
+        "objects-with-imports",
         "request-parameters:no-custom-config",
-        "http-head",
-        "validation",
-        "bytes-download"
+        "nullable",
+        "exhaustive:export-all-requests-at-root",
+        "circular-references",
+        "exhaustive:bigint-serde-layer"
       ],
-      "groupTotalTimeSeconds": 2648
+      "groupTotalTimeSeconds": 2594
     },
     {
       "fixtures": [
-        "file-upload:wrapper",
-        "accept-header",
-        "alias-extends",
-        "exhaustive:never-throw-errors",
-        "exhaustive:dev-dependencies",
-        "exhaustive:bundle",
-        "client-side-params",
-        "oauth-client-credentials-default",
-        "unions",
-        "undiscriminated-unions:skip-response-validation",
-        "streaming:no-custom-config",
-        "mixed-case:no-custom-config",
-        "request-parameters:use-default-request-parameter-values",
-        "websocket:no-serde",
-        "literals-unions"
+        "exhaustive:serde-layer",
+        "exhaustive:retain-original-casing",
+        "file-download:file-download-response-headers",
+        "websocket:serde",
+        "literal",
+        "inferred-auth-implicit-no-expiry",
+        "basic-auth",
+        "simple-api",
+        "errors",
+        "any-auth:no-custom-config",
+        "pagination-custom",
+        "file-upload:form-data-node16",
+        "response-property",
+        "variables",
+        "bytes-download"
       ],
-      "groupTotalTimeSeconds": 2638
+      "groupTotalTimeSeconds": 2569
     },
     {
       "fixtures": [
         "trace:exhaustive",
-        "exhaustive:bigint",
-        "query-parameters-openapi-as-objects:no-custom-config",
-        "auth-environment-variables",
-        "file-upload:form-data-node16",
-        "audiences:with-partner-audience",
-        "exhaustive:node-fetch",
-        "exhaustive:export-all-requests-at-root",
-        "simple-api",
-        "oauth-client-credentials:no-custom-config",
-        "extra-properties",
-        "response-property",
-        "streaming:allow-custom-fetcher",
-        "file-download:stream",
+        "oauth-client-credentials:serde",
+        "query-parameters-openapi:no-custom-config",
+        "bytes-upload",
+        "imdb:noScripts",
+        "inferred-auth-explicit",
+        "oauth-client-credentials-environment-variables",
+        "single-url-environment-no-default",
+        "server-sent-events",
+        "multi-line-docs",
+        "undiscriminated-unions:skip-response-validation",
+        "ts-inline-types:no-inline",
+        "websocket:no-serde",
+        "exhaustive:with-audiences",
         "circular-references-advanced"
       ],
-      "groupTotalTimeSeconds": 2650
+      "groupTotalTimeSeconds": 2614
     },
     {
       "fixtures": [
-        "trace:no-custom-config",
-        "pagination",
+        "file-upload:wrapper",
+        "bearer-token-environment-variable",
+        "query-parameters-openapi-as-objects:no-custom-config",
         "examples:retain-original-casing",
-        "alias",
-        "cross-package-type-names",
-        "file-upload:inline",
-        "imdb:no-custom-config",
-        "oauth-client-credentials-environment-variables",
-        "websocket-inferred-auth:websockets",
-        "error-property:union-utils",
-        "no-environment",
+        "folders",
+        "content-type",
+        "multi-url-environment",
+        "single-url-environment-default",
         "streaming:no-serde-layer",
-        "websocket-bearer-auth:websockets",
-        "variables",
-        "plain-text"
+        "request-parameters:use-default-request-parameter-values",
+        "validation",
+        "property-access:no-custom-config",
+        "streaming-parameter",
+        "required-nullable",
+        "object"
       ],
-      "groupTotalTimeSeconds": 2650
+      "groupTotalTimeSeconds": 2611
     },
     {
       "fixtures": [
-        "file-upload:serde",
-        "oauth-client-credentials:serde",
-        "file-download:wrapper",
+        "trace:no-custom-config",
+        "exhaustive:package-path",
+        "extends",
+        "query-parameters:serde-layer-query",
+        "cross-package-type-names",
         "api-wide-base-path",
-        "enum",
-        "websocket:serde",
-        "multiple-request-bodies",
-        "request-parameters:use-big-int-and-default-request-parameter-values",
-        "errors",
-        "path-parameters:inline-path-parameters-retain-original-casing",
-        "server-sent-event-examples",
-        "server-sent-events",
-        "objects-with-imports",
-        "public-object",
-        "websocket:no-websocket-clients"
+        "oauth-client-credentials:no-custom-config",
+        "oauth-client-credentials-default",
+        "path-parameters:inline-path-parameters",
+        "multi-url-environment-no-default",
+        "mixed-case:retain-original-casing",
+        "alias-extends",
+        "undiscriminated-unions:no-custom-config",
+        "empty-clients",
+        "exhaustive:legacy-exports"
       ],
-      "groupTotalTimeSeconds": 2637
+      "groupTotalTimeSeconds": 2613
     },
     {
       "fixtures": [
-        "exhaustive:use-jest",
         "exhaustive:no-custom-config",
-        "query-parameters-openapi:no-custom-config",
-        "version-no-default",
-        "folders",
-        "query-parameters:serde-layer-query",
+        "file-upload:serde",
+        "pagination",
+        "exhaustive:bundle",
+        "exhaustive:jsr",
+        "oauth-client-credentials-with-variables",
         "oauth-client-credentials-nested-root:never-throw-errors",
-        "oauth-client-credentials-nested-root:no-custom-config",
-        "pagination-custom",
-        "idempotency-headers",
+        "file-upload:inline",
+        "basic-auth-environment-variables",
+        "extra-properties",
+        "no-environment",
+        "file-download:stream",
         "property-access:generate-read-write-only-types",
-        "ts-inline-types:no-inline",
-        "ts-inline-types:inline",
-        "unknown:no-custom-config",
-        "exhaustive:with-audiences",
+        "http-head",
+        "oauth-client-credentials-custom",
         "exhaustive:local-files"
       ],
-      "groupTotalTimeSeconds": 2677
+      "groupTotalTimeSeconds": 2588
     },
     {
       "fixtures": [
-        "exhaustive:retain-original-casing",
-        "path-parameters:inline-path-parameters-serde",
-        "bearer-token-environment-variable",
-        "bytes-upload",
-        "file-download:file-download-response-headers",
-        "literal",
-        "oauth-client-credentials-with-variables",
-        "multi-url-environment",
-        "single-url-environment-no-default",
-        "imdb:omit-undefined",
-        "request-parameters:flatten-request-parameters",
-        "any-auth:no-custom-config",
-        "nullable",
-        "unknown:unknown-as-any",
-        "oauth-client-credentials-custom",
-        "exhaustive:local-files-no-source"
+        "exhaustive:omit-fern-headers",
+        "exhaustive:allow-extra-fields",
+        "alias",
+        "exhaustive:dev-dependencies",
+        "file-upload:use-jest",
+        "mixed-file-directory",
+        "unions",
+        "path-parameters:retain-original-casing",
+        "mixed-case:no-custom-config",
+        "imdb:no-custom-config",
+        "package-yml",
+        "file-upload:no-custom-config",
+        "reserved-keywords",
+        "exhaustive:consolidate-type-files",
+        "literals-unions"
       ],
-      "groupTotalTimeSeconds": 2673
+      "groupTotalTimeSeconds": 2607
     }
   ]
 }
diff --git a/generators/java-v2/CLAUDE.md b/generators/java-v2/CLAUDE.md
new file mode 100644
index 000000000000..d086a35c5600
--- /dev/null
+++ b/generators/java-v2/CLAUDE.md
@@ -0,0 +1,256 @@
+# Java v2 Generator
+
+This file provides guidance for Claude Code when working with the Java v2 generator.
+
+## Important Context
+
+**Java v2 is NOT a standalone generator.** It is a supplementary component that is **always invoked by Java v1** as part of the unified Java SDK generation process. Users cannot run Java v2 independently - it exists only as a sub-module of the Java v1 generator.
+
+## Architecture
+
+### Relationship with Java v1
+
+Java v2 is called by Java v1 during every SDK generation:
+
+1. **Invocation**: Java v1 calls v2 via `JavaV2Adapter.java` which executes `node /bin/java-v2 <config-path>`
+2. **Packaging**: Both v1 and v2 are packaged in a single Docker image (see `generators/java/sdk/Dockerfile`)
+3. **Execution**: v2 runs after v1 completes core SDK generation
+4. **Output**: v2's output (README, reference, snippets, tests) is combined with v1's SDK code
+
+### Primary Responsibilities
+
+Java v2 handles **documentation and testing artifacts only**:
+
+- **README.md generation**: SDK documentation with usage examples
+- **reference.md generation**: API reference documentation
+- **Dynamic snippets**: Code examples for documentation (via `@fern-api/java-dynamic-snippets`)
+- **Wire tests**: HTTP-level SDK validation tests
+
+### What Java v2 Does NOT Do
+
+Java v2 does NOT generate:
+- SDK client classes (handled by v1)
+- Model/POJO classes (handled by v1)
+- Authentication logic (handled by v1)
+- HTTP client infrastructure (handled by v1)
+- Error handling classes (handled by v1)
+- Gradle build configuration (handled by v1)
+
+## Key Files and Directories
+
+```
+generators/java-v2/
+├── ast/                          # Java AST utilities (TypeScript)
+│   └── src/                      # AST node builders for Java syntax
+├── base/                         # Base generator infrastructure
+│   └── src/                      # Shared utilities with other TS generators
+├── dynamic-snippets/             # Dynamic code snippet generation
+│   └── src/                      # Snippet generation logic
+└── sdk/                          # Main v2 generator
+    ├── src/
+    │   ├── cli.ts                # CLI entry point (disables notifications)
+    │   ├── SdkGeneratorCli.ts    # Main generator class
+    │   ├── SdkGeneratorContext.ts # Generator context and configuration
+    │   ├── readme/               # README.md generation
+    │   ├── reference/            # reference.md generation
+    │   │   ├── buildReference.ts # Reference builder
+    │   │   └── EndpointSnippetsGenerator.ts # Endpoint examples
+    │   ├── sdk-wire-tests/       # Wire test generation
+    │   │   ├── SdkWireTestGenerator.ts # Main test generator
+    │   │   ├── builders/         # Test class builders
+    │   │   ├── extractors/       # Test data extractors
+    │   │   └── validators/       # Test validators
+    │   └── utils/                # Utility functions
+    ├── features.yml              # Feature flags for v2
+    ├── package.json              # Node.js dependencies
+    └── tsconfig.json             # TypeScript configuration
+```
+
+## How v2 is Invoked
+
+### From Java v1
+
+**Entry Point**: `generators/java/sdk/src/main/java/com/fern/java/client/Cli.java:118-121`
+
+```java
+@Override
+public void runV2Generator(DefaultGeneratorExecClient defaultGeneratorExecClient, String[] args) {
+    JavaV2Adapter.run(defaultGeneratorExecClient, new JavaV2Arguments(args[0]));
+}
+```
+
+**Adapter**: `generators/java/generator-utils/src/main/java/com/fern/java/JavaV2Adapter.java`
+
+The adapter:
+1. Constructs command: `node /bin/java-v2 <config-path>`
+2. Executes v2 as a subprocess
+3. Streams stdout/stderr to v1's logging
+4. Fails v1 generation if v2 exits with non-zero code
+
+### Docker Packaging
+
+**Dockerfile**: `generators/java/sdk/Dockerfile`
+
+Multi-stage build:
+1. **Stage 1 (Node)**: Builds v2 TypeScript code to `dist/cli.cjs`
+2. **Stage 2 (Java)**: Builds v1, copies Node runtime and v2 CLI
+3. **Result**: Single image with both generators, v2 at `/bin/java-v2`
+
+## Generation Flow
+
+```
+User: fern generate
+  ↓
+Fern CLI invokes Java generator Docker container
+  ↓
+v1 starts (Java/Gradle)
+  ↓
+v1 generates:
+  - Client classes
+  - Models/POJOs
+  - Authentication
+  - Error handling
+  - HTTP infrastructure
+  ↓
+v1 calls runV2Generator()
+  ↓
+JavaV2Adapter executes: node /bin/java-v2 <config>
+  ↓
+v2 starts (Node.js/TypeScript)
+  ↓
+v2 generates:
+  - README.md
+  - reference.md
+  - snippets.json
+  - Wire tests
+  ↓
+v2 exits (success or failure)
+  ↓
+v1 checks v2 exit code
+  ↓
+If v2 failed: v1 fails entire generation
+If v2 succeeded: v1 completes successfully
+  ↓
+Combined output: SDK code + documentation + tests
+```
+
+## Key Implementation Details
+
+### SdkGeneratorCli.ts
+
+Main generator class that extends `AbstractJavaGeneratorCli`:
+
+```typescript
+export class SdkGeneratorCLI extends AbstractJavaGeneratorCli<SdkCustomConfigSchema, SdkGeneratorContext> {
+    protected async generate(context: SdkGeneratorContext): Promise<void> {
+        // Generate snippets, README, reference, wire tests
+        // All generation wrapped in try-catch with warnings (non-fatal)
+    }
+}
+```
+
+**Important**: v2 generation failures are logged as warnings but don't fail the build (within v2). However, if v2 exits with non-zero code, v1 will fail.
+
+### Notification Disabling
+
+**File**: `sdk/src/cli.ts`
+
+```typescript
+await cli.run({
+    // We disable notifications because the `java-v2` generator notifications
+    // prevent the `java` generator from succeeding in remote code generation
+    // environments.
+    disableNotifications: true
+});
+```
+
+This prevents v2 from sending status updates that would conflict with v1's notifications.
+
+### Dynamic Snippets
+
+v2 uses `@fern-api/java-dynamic-snippets` to generate code examples:
+
+1. Receives dynamic IR from Fern CLI
+2. Converts IR to snippet requests
+3. Generates Java code snippets for each endpoint example
+4. Outputs snippets.json for documentation
+
+### Wire Tests
+
+v2 generates HTTP-level tests to validate SDK behavior:
+
+- **Validators**: JSON, pagination, header validation
+- **Extractors**: Test data and snippet extraction
+- **Builders**: Test class construction
+
+## Development Commands
+
+### Building v2
+
+```bash
+cd generators/java-v2/sdk
+pnpm install
+pnpm compile
+```
+
+### Testing v2 (via v1)
+
+Since v2 cannot run standalone, test via v1:
+
+```bash
+# From repository root
+pnpm seed test --generator java-sdk --fixture <fixture-name> --skip-scripts
+```
+
+### Local Development
+
+To test v2 changes:
+
+1. Build v2: `cd generators/java-v2/sdk && pnpm compile`
+2. Build Docker image: Build the Java v1 Docker image (includes v2)
+3. Run seed tests: `pnpm seed test --generator java-sdk`
+
+## Common Issues
+
+### v2 Not Found in Docker
+
+**Symptom**: `Could not find v2 executable at provided path /bin/java-v2`
+
+**Solution**: Check Dockerfile multi-stage build:
+- Verify v2 is compiled in stage 1
+- Verify v2 CLI is copied to `/bin/java-v2` in stage 2
+- Verify `/bin/java-v2` is made executable (`chmod +x`)
+
+### v2 Generation Failures
+
+**Symptom**: v1 fails with "Java V2 generator exited with code X"
+
+**Solution**: 
+- Check v2 logs in v1 output (prefixed with `[Java V2 STDOUT]` or `[Java V2 STDERR]`)
+- Common causes: Missing dynamic IR, TypeScript compilation errors, missing dependencies
+
+### Missing README/reference
+
+**Symptom**: Generated SDK lacks README.md or reference.md
+
+**Solution**:
+- Check if `config.output.snippetFilepath` is set (required for v2 generation)
+- Check v2 logs for warnings about generation failures
+- Verify dynamic IR is available in generator config
+
+### Notification Conflicts
+
+**Symptom**: Remote generation fails with notification errors
+
+**Solution**: Ensure `disableNotifications: true` in `cli.ts` (already configured)
+
+## Future Direction
+
+Currently, Java v2 is tightly coupled to v1. Future work may include:
+
+1. **True Separation**: Make v2 a standalone generator users can configure independently
+2. **Feature Parity**: Move more SDK generation logic from v1 to v2
+3. **Independent Versioning**: Allow v1 and v2 to version independently
+4. **Optional Invocation**: Allow users to skip v2 if they don't need documentation/tests
+
+For now, treat v1 and v2 as a single unified generator where v2 is a sub-module of v1.
diff --git a/generators/java/CLAUDE.md b/generators/java/CLAUDE.md
index ef9c91d46afa..760bb685bf2a 100644
--- a/generators/java/CLAUDE.md
+++ b/generators/java/CLAUDE.md
@@ -4,36 +4,99 @@ This file provides guidance for Claude Code when working with the Java generator
 
 ## Architecture
 
-The Java generator operates as a **tandem system** with both v1 and v2 implementations:
+The Java generator operates as a **tandem system** where v1 calls v2 as part of its generation process. **Important: This is NOT yet a true separation into two independent generator versions.** Instead, v1 contains the core SDK generation functionality and invokes v2 for supplementary features.
 
-- **v1 (generators/java/)**: Native Java implementation (legacy)
-  - Written in Java using Gradle for build management
-  - Generates: SDK, models, Spring server
-  - Complex, mature codebase with extensive configuration options
-
-- **v2 (generators/java-v2/)**: TypeScript-based implementation (modern)
-  - Written in TypeScript with cleaner architecture
-  - Structured as: `ast/`, `base/`, `dynamic-snippets/`, `sdk/`
-  - Uses improved patterns from newer generator design
+### Java v1 (generators/java/)
+- **Language**: Native Java implementation using Gradle for build management
+- **Primary Responsibilities**:
+  - Core SDK generation (client classes, request/response models, authentication)
+  - Model/POJO generation with Jackson annotations
+  - Spring Boot server generator
+  - Error handling classes
+  - HTTP client infrastructure (OkHttp-based)
+  - Gradle build configuration and dependency management
+- **Status**: Mature, feature-complete codebase with extensive configuration options
 
-- **Docker Integration**: Both v1 and v2 run in a single Docker image and coordinate during generation
+### Java v2 (generators/java-v2/)
+- **Language**: TypeScript-based implementation with cleaner architecture
+- **Structure**: `ast/`, `base/`, `dynamic-snippets/`, `sdk/`
+- **Primary Responsibilities**:
+  - README.md generation
+  - reference.md generation
+  - Dynamic snippet generation for documentation
+  - Wire test generation
+- **Status**: Supplementary generator focused on documentation and testing artifacts
+
+### How v1 Calls v2
+
+**Key Implementation Details**:
+1. **Entry Point**: `generators/java/sdk/src/main/java/com/fern/java/client/Cli.java:118-121`
+   - The `runV2Generator()` method is called as part of the v1 generation lifecycle
+   - This is an abstract method defined in `AbstractGeneratorCli` that all Java generators must implement
+
+2. **Adapter Pattern**: `generators/java/generator-utils/src/main/java/com/fern/java/JavaV2Adapter.java`
+   - Wraps the Node.js execution of the v2 generator
+   - Executes: `node /bin/java-v2 <config-path>`
+   - Streams stdout/stderr from v2 back to v1's logging system
+   - Fails the entire generation if v2 exits with non-zero code
+
+3. **Docker Packaging**: `generators/java/sdk/Dockerfile`
+   - Multi-stage build: First stage builds v2 (Node.js), second stage builds v1 (Java/Gradle)
+   - v2 CLI compiled to `/bin/java-v2` and made executable
+   - Both Node.js runtime and v2 CLI copied into the final Java-based image
+   - Single Docker image contains both generators
+
+4. **Execution Flow**:
+   ```
+   User runs: fern generate
+   ↓
+   CLI invokes Java generator Docker container
+   ↓
+   v1 generator starts (Java/Gradle)
+   ↓
+   v1 generates core SDK code (models, clients, errors, etc.)
+   ↓
+   v1 calls runV2Generator() via JavaV2Adapter
+   ↓
+   v2 generator executes (Node.js/TypeScript)
+   ↓
+   v2 generates README.md, reference.md, snippets, wire tests
+   ↓
+   Both outputs combined in final SDK package
+   ```
+
+### Why This Isn't a True Separation Yet
+
+- v1 **always** calls v2 as part of its generation process
+- Users cannot choose to run only v1 or only v2
+- There's no separate `fernapi/fern-java-v2` generator users can configure
+- v2 is essentially a sub-module of v1, not an independent generator version
+- The tandem system exists in a single Docker image and single generator invocation
 
 ## Key Directories
 
 ### Java v1 (generators/java/)
-- `sdk/` - Java SDK generation logic
-- `model/` - Java model/POJO generation
+- `sdk/` - Core Java SDK generation logic (clients, endpoints, authentication)
+- `sdk/src/main/java/com/fern/java/client/Cli.java` - Main entry point, calls v2 via `runV2Generator()`
+- `model/` - Java model/POJO generation with Jackson serialization
 - `spring/` - Spring Boot server generator
-- `generator-utils/` - Shared Java utilities
+- `generator-utils/` - Shared Java utilities including `JavaV2Adapter` and `JavaV2Arguments`
+- `generator-utils/src/main/java/com/fern/java/JavaV2Adapter.java` - Adapter that invokes v2 generator
 - `build.gradle` - Gradle build configuration
 - `versions.props` - Dependency version management
 - `gradlew` / `gradlew.bat` - Gradle wrapper scripts
+- `sdk/Dockerfile` - Multi-stage Docker build that packages both v1 and v2
 
 ### Java v2 (generators/java-v2/)
-- `ast/` - Java AST utilities (TypeScript)
-- `base/` - Base generator infrastructure
-- `sdk/` - SDK generator (TypeScript)
-- `dynamic-snippets/` - Dynamic code snippet generation
+- `ast/` - Java AST utilities (TypeScript) for code generation
+- `base/` - Base generator infrastructure shared with other TypeScript generators
+- `sdk/` - SDK supplementary generator (README, reference, snippets, wire tests)
+- `sdk/src/SdkGeneratorCli.ts` - Main v2 CLI entry point
+- `sdk/src/cli.ts` - CLI wrapper that disables notifications (to avoid conflicts with v1)
+- `dynamic-snippets/` - Dynamic code snippet generation for documentation
+- `sdk/src/readme/` - README.md generation logic
+- `sdk/src/reference/` - reference.md generation logic
+- `sdk/src/sdk-wire-tests/` - Wire test generation for SDK validation
 
 ## Common Issues & Debugging
 
@@ -43,16 +106,23 @@ The Java generator operates as a **tandem system** with both v1 and v2 implement
 - **Java compilation errors**: Check Java source compatibility (Java 8+)
 - **Spring configuration issues**: Check Spring Boot version compatibility
 - **Null handling**: Uses Optional patterns and @Nullable annotations
+- **Core SDK generation**: Models, clients, authentication, error handling
 
 ### v2 (TypeScript) Issues
 - **TypeScript compilation**: Standard TS generator patterns apply
 - **AST generation**: Issues often in `ast/` utilities for Java syntax
 - **Dynamic snippets**: Check `dynamic-snippets/` for code generation issues
+- **README/reference generation**: Check `sdk/src/readme/` and `sdk/src/reference/`
+- **Wire test failures**: Check `sdk/src/sdk-wire-tests/` for test generation logic
 
 ### Tandem Operation Issues
-- **Version mismatches**: Ensure IR versions are compatible between v1 and v2
+- **v2 invocation failures**: Check `JavaV2Adapter.java` for Node.js execution issues
+- **v2 not found**: Verify `/bin/java-v2` exists in Docker image (check Dockerfile)
+- **v2 exit code errors**: v1 will fail if v2 exits with non-zero code; check v2 logs
 - **Docker build failures**: Both generators must build successfully in single image
-- **Output coordination**: Check that v1 and v2 don't conflict in their responsibilities
+- **Missing README/reference**: v2 may fail silently; check logs for warnings
+- **Notification conflicts**: v2 disables notifications to avoid interfering with v1's remote generation
+- **Output coordination**: v1 generates SDK code, v2 generates documentation/tests - no overlap
 
 ## Development Commands
 
diff --git a/generators/swift/sdk/src/generators/client/EndpointMethodGenerator.ts b/generators/swift/sdk/src/generators/client/EndpointMethodGenerator.ts
index c7911873fc92..2266cc576395 100644
--- a/generators/swift/sdk/src/generators/client/EndpointMethodGenerator.ts
+++ b/generators/swift/sdk/src/generators/client/EndpointMethodGenerator.ts
@@ -282,7 +282,7 @@ export class EndpointMethodGenerator {
                                             arguments_: [
                                                 swift.functionArgument({
                                                     value:
-                                                        swiftType.nonOptionalType === "custom"
+                                                        swiftType.nonOptional().nonNullableType === "custom"
                                                             ? swift.Expression.memberAccess({
                                                                   target: swift.Expression.reference("$0"),
                                                                   memberName: "rawValue"
diff --git a/generators/swift/sdk/versions.yml b/generators/swift/sdk/versions.yml
index 7bcc0d4a2f5c..85e405db761d 100644
--- a/generators/swift/sdk/versions.yml
+++ b/generators/swift/sdk/versions.yml
@@ -1,5 +1,13 @@
 # yaml-language-server: $schema=../../../fern-versions-yml.schema.json
 
+- version: 0.18.2
+  changelogEntry:
+    - type: fix
+      summary: |
+        Fixed a bug where nullable query parameters were not accessed correctly in endpoint methods.
+  createdAt: "2025-10-19"
+  irVersion: 59
+
 - version: 0.18.1
   changelogEntry:
     - type: fix
diff --git a/seed/swift-sdk/nullable-optional/Sources/Resources/NullableOptional/NullableOptionalClient_.swift b/seed/swift-sdk/nullable-optional/Sources/Resources/NullableOptional/NullableOptionalClient_.swift
index c08710b23a58..21508b179ad7 100644
--- a/seed/swift-sdk/nullable-optional/Sources/Resources/NullableOptional/NullableOptionalClient_.swift
+++ b/seed/swift-sdk/nullable-optional/Sources/Resources/NullableOptional/NullableOptionalClient_.swift
@@ -142,7 +142,7 @@ public final class NullableOptionalClient_: Sendable {
             queryParams: [
                 "role": role.wrappedValue.map { .string($0) }, 
                 "status": status.map { .string($0.rawValue) }, 
-                "secondaryRole": secondaryRole?.wrappedValue.map { .string($0) }
+                "secondaryRole": secondaryRole?.wrappedValue.map { .string($0.rawValue) }
             ],
             requestOptions: requestOptions,
             responseType: [UserResponse].self