@openai/agents-core 0.8.5 → 0.9.1

package/dist/utils/strictToolSchema.mjs

@@ -0,0 +1,353 @@
+import { readZodDefinition, readZodType } from "./zodCompat.mjs";
+export function toOpenAIStrictToolSchema(schema) {
+    return ensureStrictSchemaEntry(structuredClone(schema));
+}
+function ensureStrictSchemaEntry(entry) {
+    if (typeof entry !== 'object' || entry === null) {
+        return entry;
+    }
+    const record = entry;
+    if (record.type === 'object' &&
+        typeof record.properties === 'object' &&
+        record.properties !== null &&
+        !Array.isArray(record.properties)) {
+        const properties = record.properties;
+        const originalRequired = new Set(Array.isArray(record.required) ? record.required.map(String) : []);
+        for (const [key, value] of Object.entries(properties)) {
+            const normalized = ensureStrictSchemaEntry(value);
+            properties[key] = originalRequired.has(key)
+                ? normalized
+                : wrapNullableSchema(normalized);
+        }
+        record.required = Object.keys(properties);
+        record.additionalProperties = false;
+    }
+    for (const key of ['$defs', 'definitions']) {
+        const nested = record[key];
+        if (typeof nested === 'object' &&
+            nested !== null &&
+            !Array.isArray(nested)) {
+            for (const [nestedKey, nestedValue] of Object.entries(nested)) {
+                nested[nestedKey] =
+                    ensureStrictSchemaEntry(nestedValue);
+            }
+        }
+    }
+    for (const key of ['anyOf', 'allOf', 'oneOf']) {
+        const nested = record[key];
+        if (Array.isArray(nested)) {
+            record[key] = nested.map((value) => ensureStrictSchemaEntry(value));
+        }
+    }
+    const items = record.items;
+    if (Array.isArray(items)) {
+        record.items = items.map((value) => ensureStrictSchemaEntry(value));
+    }
+    else if (typeof items === 'object' && items !== null) {
+        record.items = ensureStrictSchemaEntry(items);
+    }
+    if (record.default === null) {
+        delete record.default;
+    }
+    return record;
+}
+function wrapNullableSchema(schema) {
+    if (typeof schema !== 'object' ||
+        schema === null ||
+        isSchemaNullable(schema)) {
+        return schema;
+    }
+    const description = typeof schema.description === 'string'
+        ? { description: schema.description }
+        : {};
+    return {
+        ...description,
+        anyOf: [schema, { type: 'null' }],
+    };
+}
+function isSchemaNullable(schema) {
+    const type = schema.type;
+    if (type === 'null') {
+        return true;
+    }
+    if (Array.isArray(type) && type.includes('null')) {
+        return true;
+    }
+    for (const key of ['anyOf', 'oneOf', 'allOf']) {
+        const entries = schema[key];
+        if (Array.isArray(entries) &&
+            entries.some((entry) => typeof entry === 'object' &&
+                entry !== null &&
+                isSchemaNullable(entry))) {
+            return true;
+        }
+    }
+    return false;
+}
+export function stripStrictNullsForJsonSchema(schema, value, optionalProperty = false) {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        if (optionalProperty && !jsonSchemaAllowsNull(schema)) {
+            return undefined;
+        }
+        return value;
+    }
+    if (Array.isArray(value)) {
+        const schemaRecord = isRecord(schema) ? schema : undefined;
+        const items = schemaRecord?.items;
+        if (Array.isArray(items)) {
+            return value.map((entry, index) => stripStrictNullsForJsonSchema(items[index], entry));
+        }
+        if (items && typeof items === 'object') {
+            return value.map((entry) => stripStrictNullsForJsonSchema(items, entry));
+        }
+        return value;
+    }
+    if (!isRecord(value) || !isJsonSchemaObject(schema)) {
+        return value;
+    }
+    const properties = isRecord(schema.properties) ? schema.properties : {};
+    const required = new Set(Array.isArray(schema.required) ? schema.required.map(String) : []);
+    const normalized = { ...value };
+    for (const [key, propertySchema] of Object.entries(properties)) {
+        const nextValue = stripStrictNullsForJsonSchema(propertySchema, normalized[key], !required.has(key));
+        if (typeof nextValue === 'undefined') {
+            delete normalized[key];
+        }
+        else {
+            normalized[key] = nextValue;
+        }
+    }
+    return normalized;
+}
+function isJsonSchemaObject(schema) {
+    if (!isRecord(schema)) {
+        return false;
+    }
+    return (schema.type === 'object' ||
+        (isRecord(schema.properties) && !Array.isArray(schema.properties)));
+}
+function jsonSchemaAllowsNull(schema) {
+    return isRecord(schema) ? isSchemaNullable(schema) : false;
+}
+export function stripStrictNullsForZodSchema(schema, value) {
+    const { inner, optional, nullable } = unwrapZodOptionalNullable(schema);
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        if (optional && !nullable && !zodSchemaAccepts(inner, null)) {
+            return undefined;
+        }
+        return value;
+    }
+    const type = readZodType(inner);
+    const def = readZodDefinition(inner);
+    if ((type === 'union' || type === 'discriminatedunion') && value !== null) {
+        for (const option of readZodUnionOptions(def)) {
+            const normalized = stripStrictNullsForZodSchema(option, value);
+            if (zodSchemaAccepts(option, normalized)) {
+                return normalized;
+            }
+        }
+    }
+    if (type === 'object' && isRecord(value)) {
+        const shape = readShape(inner);
+        if (!shape) {
+            return value;
+        }
+        const normalized = { ...value };
+        for (const [key, field] of Object.entries(shape)) {
+            const nextValue = stripStrictNullsForZodSchema(field, normalized[key]);
+            if (typeof nextValue === 'undefined') {
+                delete normalized[key];
+            }
+            else {
+                normalized[key] = nextValue;
+            }
+        }
+        return normalized;
+    }
+    if (type === 'array' && Array.isArray(value)) {
+        const itemSchema = extractFirst(def, 'element', 'items', 'type');
+        return value.map((entry) => stripStrictNullsForZodSchema(itemSchema, entry));
+    }
+    if (type === 'tuple' && Array.isArray(value)) {
+        const items = coerceArray(def?.items);
+        return value.map((entry, index) => stripStrictNullsForZodSchema(items[index], entry));
+    }
+    if (type === 'record' && isRecord(value)) {
+        const valueSchema = def?.valueType ?? def?.values;
+        return Object.fromEntries(Object.entries(value).flatMap(([key, entry]) => {
+            const normalized = stripStrictNullsForZodSchema(valueSchema, entry);
+            return typeof normalized === 'undefined' ? [] : [[key, normalized]];
+        }));
+    }
+    if (type === 'set' && Array.isArray(value)) {
+        const valueSchema = def?.valueType;
+        return value.map((entry) => stripStrictNullsForZodSchema(valueSchema, entry));
+    }
+    return value;
+}
+function unwrapZodOptionalNullable(schema) {
+    let current = unwrapDecorators(schema);
+    let optional = false;
+    let nullable = false;
+    const visited = new Set();
+    while (current && typeof current === 'object' && !visited.has(current)) {
+        visited.add(current);
+        const type = readZodType(current);
+        const def = readZodDefinition(current);
+        if (type === 'optional') {
+            optional = true;
+            const next = unwrapDecorators(def?.innerType);
+            if (!next || next === current) {
+                break;
+            }
+            current = next;
+            continue;
+        }
+        if (type === 'nullable') {
+            nullable = true;
+            const next = unwrapDecorators(def?.innerType ?? def?.type);
+            if (!next || next === current) {
+                break;
+            }
+            current = next;
+            continue;
+        }
+        break;
+    }
+    return { inner: current, optional, nullable };
+}
+function unwrapDecorators(schema) {
+    let current = schema;
+    const visited = new Set();
+    while (current && typeof current === 'object' && !visited.has(current)) {
+        visited.add(current);
+        const type = readZodType(current);
+        if (!type ||
+            !new Set([
+                'brand',
+                'branded',
+                'catch',
+                'default',
+                'effects',
+                'pipeline',
+                'pipe',
+                'prefault',
+                'readonly',
+                'refinement',
+                'transform',
+            ]).has(type)) {
+            break;
+        }
+        const def = readZodDefinition(current);
+        const next = def?.innerType ??
+            def?.schema ??
+            def?.base ??
+            def?.type ??
+            def?.wrapped ??
+            def?.underlying;
+        if (!next || next === current) {
+            break;
+        }
+        current = next;
+    }
+    return current;
+}
+function extractFirst(def, ...keys) {
+    if (!def) {
+        return undefined;
+    }
+    for (const key of keys) {
+        if (key in def && def[key] !== undefined) {
+            return def[key];
+        }
+    }
+    return undefined;
+}
+function coerceArray(value) {
+    if (Array.isArray(value)) {
+        return value;
+    }
+    return value === undefined ? [] : [value];
+}
+function readZodUnionOptions(def) {
+    const options = def?.options;
+    if (Array.isArray(options)) {
+        return options;
+    }
+    if (options instanceof Map) {
+        return [...options.values()];
+    }
+    if (options && typeof options === 'object') {
+        return Object.values(options);
+    }
+    const optionsMap = def?.optionsMap;
+    if (optionsMap instanceof Map) {
+        return [...optionsMap.values()];
+    }
+    if (optionsMap && typeof optionsMap === 'object') {
+        return Object.values(optionsMap);
+    }
+    return [];
+}
+function zodSchemaAccepts(schema, value) {
+    const candidate = unwrapDecorators(schema);
+    if (typeof candidate?.safeParse === 'function') {
+        try {
+            return candidate.safeParse(value).success;
+        }
+        catch {
+            return false;
+        }
+    }
+    if (typeof candidate?.parse === 'function') {
+        try {
+            candidate.parse(value);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    return false;
+}
+function readShape(input) {
+    if (typeof input !== 'object' || input === null) {
+        return undefined;
+    }
+    const candidate = input;
+    if (candidate.shape && typeof candidate.shape === 'object') {
+        return candidate.shape;
+    }
+    if (typeof candidate.shape === 'function') {
+        try {
+            return candidate.shape();
+        }
+        catch {
+            return undefined;
+        }
+    }
+    const def = readZodDefinition(candidate);
+    const shape = def?.shape;
+    if (shape && typeof shape === 'object') {
+        return shape;
+    }
+    if (typeof shape === 'function') {
+        try {
+            return shape();
+        }
+        catch {
+            return undefined;
+        }
+    }
+    return undefined;
+}
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+//# sourceMappingURL=strictToolSchema.mjs.map

package/dist/utils/strictToolSchema.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"strictToolSchema.mjs","sourceRoot":"","sources":["../../src/utils/strictToolSchema.ts"],"names":[],"mappings":"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"}

package/dist/utils/tools.d.ts

@@ -21,7 +21,9 @@ export declare function toFunctionToolName(name: string): FunctionToolName;
  * @param name - The name of the tool.
  * @returns The schema and parser.
  */
-export declare function getSchemaAndParserFromInputType<T extends ToolInputParameters>(inputType: T, name: string): {
+export declare function getSchemaAndParserFromInputType<T extends ToolInputParameters>(inputType: T, name: string, options?: {
+    strict?: boolean;
+}): {
     schema: JsonObjectSchema<any>;
     parser: (input: string) => any;
 };

package/dist/utils/tools.js

@@ -8,6 +8,7 @@ const errors_1 = require("../errors.js");
 const typeGuards_1 = require("./typeGuards.js");
 const zodJsonSchemaCompat_1 = require("./zodJsonSchemaCompat.js");
 const zodCompat_1 = require("./zodCompat.js");
+const strictToolSchema_1 = require("./strictToolSchema.js");
 const zodResponsesFunctionCompat = zod_1.zodResponsesFunction;
 // The `.schema` payload is all we need, so a lightweight signature keeps the compiler happy.
 const zodTextFormatCompat = zod_1.zodTextFormat;
@@ -42,15 +43,19 @@ function toFunctionToolName(name) {
  * @param name - The name of the tool.
  * @returns The schema and parser.
  */
-function getSchemaAndParserFromInputType(inputType, name) {
+function getSchemaAndParserFromInputType(inputType, name, options = {}) {
     const parser = (input) => JSON.parse(input);
     if ((0, typeGuards_1.isZodObject)(inputType)) {
         const useFallback = (originalError) => {
             const fallbackSchema = buildJsonSchemaFromZod(inputType);
             if (fallbackSchema) {
                 return {
-                    schema: fallbackSchema,
-                    parser: (rawInput) => inputType.parse(JSON.parse(rawInput)),
+                    schema: options.strict
+                        ? (0, strictToolSchema_1.toOpenAIStrictToolSchema)(fallbackSchema)
+                        : fallbackSchema,
+                    parser: (rawInput) => inputType.parse(options.strict
+                        ? (0, strictToolSchema_1.stripStrictNullsForZodSchema)(inputType, JSON.parse(rawInput))
+                        : JSON.parse(rawInput)),
                 };
             }
             const errorMessage = originalError instanceof Error
@@ -76,16 +81,22 @@ function getSchemaAndParserFromInputType(inputType, name) {
                 (0, zodJsonSchemaCompat_1.mergeJsonSchemaDescriptions)(formattedFunction.parameters, fallbackSchema);
             }
             return {
-                schema: formattedFunction.parameters,
-                parser: formattedFunction.$parseRaw,
+                schema: options.strict
+                    ? (0, strictToolSchema_1.toOpenAIStrictToolSchema)(formattedFunction.parameters)
+                    : formattedFunction.parameters,
+                parser: options.strict
+                    ? (rawInput) => inputType.parse((0, strictToolSchema_1.stripStrictNullsForZodSchema)(inputType, JSON.parse(rawInput)))
+                    : formattedFunction.$parseRaw,
             };
         }
         return useFallback();
     }
     else if (typeof inputType === 'object' && inputType !== null) {
         return {
-            schema: inputType,
-            parser,
+            schema: options.strict ? (0, strictToolSchema_1.toOpenAIStrictToolSchema)(inputType) : inputType,
+            parser: options.strict
+                ? (rawInput) => (0, strictToolSchema_1.stripStrictNullsForJsonSchema)(inputType, JSON.parse(rawInput))
+                : parser,
         };
     }
     throw new errors_1.UserError('Input type is not a ZodObject or a valid JSON schema');

package/dist/utils/tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/utils/tools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/utils/tools.ts"],"names":[],"mappings":"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"}

package/dist/utils/tools.mjs

@@ -3,6 +3,7 @@ import { UserError } from "../errors.mjs";
 import { isZodObject } from "./typeGuards.mjs";
 import { zodJsonSchemaCompat, hasJsonSchemaObjectShape, mergeJsonSchemaDescriptions, } from "./zodJsonSchemaCompat.mjs";
 import { asZodType } from "./zodCompat.mjs";
+import { stripStrictNullsForJsonSchema, stripStrictNullsForZodSchema, toOpenAIStrictToolSchema, } from "./strictToolSchema.mjs";
 const zodResponsesFunctionCompat = zodResponsesFunction;
 // The `.schema` payload is all we need, so a lightweight signature keeps the compiler happy.
 const zodTextFormatCompat = zodTextFormat;
@@ -37,15 +38,19 @@ export function toFunctionToolName(name) {
  * @param name - The name of the tool.
  * @returns The schema and parser.
  */
-export function getSchemaAndParserFromInputType(inputType, name) {
+export function getSchemaAndParserFromInputType(inputType, name, options = {}) {
     const parser = (input) => JSON.parse(input);
     if (isZodObject(inputType)) {
         const useFallback = (originalError) => {
             const fallbackSchema = buildJsonSchemaFromZod(inputType);
             if (fallbackSchema) {
                 return {
-                    schema: fallbackSchema,
-                    parser: (rawInput) => inputType.parse(JSON.parse(rawInput)),
+                    schema: options.strict
+                        ? toOpenAIStrictToolSchema(fallbackSchema)
+                        : fallbackSchema,
+                    parser: (rawInput) => inputType.parse(options.strict
+                        ? stripStrictNullsForZodSchema(inputType, JSON.parse(rawInput))
+                        : JSON.parse(rawInput)),
                 };
             }
             const errorMessage = originalError instanceof Error
@@ -71,16 +76,22 @@ export function getSchemaAndParserFromInputType(inputType, name) {
                 mergeJsonSchemaDescriptions(formattedFunction.parameters, fallbackSchema);
             }
             return {
-                schema: formattedFunction.parameters,
-                parser: formattedFunction.$parseRaw,
+                schema: options.strict
+                    ? toOpenAIStrictToolSchema(formattedFunction.parameters)
+                    : formattedFunction.parameters,
+                parser: options.strict
+                    ? (rawInput) => inputType.parse(stripStrictNullsForZodSchema(inputType, JSON.parse(rawInput)))
+                    : formattedFunction.$parseRaw,
             };
         }
         return useFallback();
     }
     else if (typeof inputType === 'object' && inputType !== null) {
         return {
-            schema: inputType,
-            parser,
+            schema: options.strict ? toOpenAIStrictToolSchema(inputType) : inputType,
+            parser: options.strict
+                ? (rawInput) => stripStrictNullsForJsonSchema(inputType, JSON.parse(rawInput))
+                : parser,
         };
     }
     throw new UserError('Input type is not a ZodObject or a valid JSON schema');

package/dist/utils/tools.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"tools.mjs","sourceRoot":"","sources":["../../src/utils/tools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tools.mjs","sourceRoot":"","sources":["../../src/utils/tools.ts"],"names":[],"mappings":"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"}

package/dist/utils/zodJsonSchemaCompat.js

@@ -24,9 +24,7 @@ const DECORATOR_WRAPPERS = new Set([
 const SIMPLE_TYPE_MAPPING = {
     string: { type: 'string' },
     number: { type: 'number' },
-    bigint: { type: 'integer' },
     boolean: { type: 'boolean' },
-    date: { type: 'string', format: 'date-time' },
 };
 function hasJsonSchemaObjectShape(value) {
     return (typeof value === 'object' &&
@@ -196,10 +194,6 @@ function convertSchema(value) {
             return buildEnum(def);
         case 'record':
             return buildRecordSchema(def);
-        case 'map':
-            return buildMapSchema(def);
-        case 'set':
-            return buildSetSchema(def);
         case 'nullable':
             return buildNullableSchema(def);
         default:
@@ -245,16 +239,6 @@ function buildRecordSchema(def) {
         ? { type: 'object', additionalProperties: valueSchema }
         : undefined;
 }
-function buildMapSchema(def) {
-    const valueSchema = convertSchema(def?.valueType ?? def?.values);
-    return valueSchema ? { type: 'array', items: valueSchema } : undefined;
-}
-function buildSetSchema(def) {
-    const valueSchema = convertSchema(def?.valueType);
-    return valueSchema
-        ? { type: 'array', items: valueSchema, uniqueItems: true }
-        : undefined;
-}
 function buildNullableSchema(def) {
     const inner = convertSchema(def?.innerType ?? def?.type);
     return inner ? { anyOf: [inner, { type: 'null' }] } : undefined;
@@ -326,6 +310,24 @@ function buildLiteral(def) {
         return undefined;
     }
     const literal = extractFirst(def, 'value', 'literal');
+    if (literal === undefined && Array.isArray(def.values)) {
+        const values = def.values;
+        if (values.length === 1) {
+            const [value] = values;
+            return {
+                const: value,
+                type: value === null ? 'null' : typeof value,
+            };
+        }
+        if (values.length > 1) {
+            return {
+                enum: values,
+                type: [
+                    ...new Set(values.map((value) => (value === null ? 'null' : typeof value))),
+                ],
+            };
+        }
+    }
     if (literal === undefined) {
         return undefined;
     }