Merge main into fix-ir-validation (resolve version conflict)

Co-Authored-By: naman.anand@buildwithfern.com <iamnamananand996@gmail.com>

Author: devin-ai-integration[bot]

packages/cli/api-importers/v3-importer-commons/src/converters/ExampleConverter.ts

@@ -886,9 +886,6 @@ export class ExampleConverter extends AbstractConverter<AbstractConverterContext
             return exampleConverter.convert();
         });
 
-        const isValid =
-            resultsByKey.every((entry) => entry.result.isValid) && allOfResults.every((result) => result.isValid);
-
         const usedProvidedExample =
             this.example !== undefined &&
             (resultsByKey.some(({ result }) => result.usedProvidedExample) ||
@@ -939,26 +936,43 @@ export class ExampleConverter extends AbstractConverter<AbstractConverterContext
                         }
                     });
                 });
-            } else {
-                // Additional properties are allowed, but create warning errors for unexpected properties
-                // We'll add these as separate warning results that don't affect validation
+            } else if (
+                resolvedSchema.additionalProperties === true ||
+                resolvedSchema.additionalProperties === undefined
+            ) {
+                // additionalProperties: true or undefined - preserve values without validation
                 additionalPropertyKeys.forEach((key) => {
-                    const breadcrumbPath = [...this.breadcrumbs, key].join(".");
-                    const warningError = {
-                        message: `Additional property ${key} is not allowed`,
-                        path: [...this.breadcrumbs, key]
-                    };
                     additionalPropertiesResults.push({
                         key,
                         result: {
-                            isValid: true, // Keep as valid since additional properties are allowed
+                            isValid: true,
                             coerced: false,
                             usedProvidedExample: true,
-                            validExample: undefined, // Don't provide a valid example to avoid further validation
-                            errors: [warningError] // Include as warning error
+                            validExample: exampleObj[key],
+                            errors: []
                         }
                     });
                 });
+            } else {
+                // additionalProperties is a schema object - validate each additional property against it
+                const additionalPropsSchema = resolvedSchema.additionalProperties as OpenAPIV3_1.SchemaObject;
+                additionalPropertyKeys.forEach((key) => {
+                    const exampleConverter = new ExampleConverter({
+                        breadcrumbs: [...this.breadcrumbs, key],
+                        context: this.context,
+                        schema: additionalPropsSchema,
+                        example: exampleObj[key],
+                        depth: this.depth + 1,
+                        generateOptionalProperties: this.generateOptionalProperties,
+                        exampleGenerationStrategy: this.exampleGenerationStrategy,
+                        seenRefs: this.getMaybeUpdatedSeenRefs()
+                    });
+                    const result = exampleConverter.convert();
+                    additionalPropertiesResults.push({
+                        key,
+                        result
+                    });
+                });
             }
         }
 
@@ -969,6 +983,11 @@ export class ExampleConverter extends AbstractConverter<AbstractConverterContext
             }
         }
 
+        const isValid =
+            resultsByKey.every((entry) => entry.result.isValid) &&
+            allOfResults.every((result) => result.isValid) &&
+            additionalPropertiesResults.every(({ result }) => result.isValid);
+
         if (Object.keys(example).length === 0) {
             const firstValidNonObject = allOfResults.find(
                 (result) =>