@openai/agents-core 0.11.8 → 0.12.1

package/dist/runner/toolOutputNormalization.mjs

@@ -0,0 +1,324 @@
+import { encodeUint8ArrayToBase64 } from "../utils/base64.mjs";
+import { formatInlineData, getInlineMediaType } from "../utils/inlineData.mjs";
+/**
+ * Accepts whatever the tool returned and attempts to coerce it into the structured protocol
+ * shapes we expose to downstream model adapters (input_text/input_image/input_file). Tools are
+ * allowed to return either a single structured object or an array of them; anything else falls
+ * back to the legacy string pipeline.
+ */
+export function normalizeStructuredToolOutputs(output) {
+    if (Array.isArray(output)) {
+        if (output.length === 0) {
+            return null;
+        }
+        const structured = [];
+        for (const item of output) {
+            const normalized = normalizeStructuredToolOutput(item);
+            if (!normalized) {
+                return null;
+            }
+            structured.push(normalized);
+        }
+        return structured;
+    }
+    const normalized = normalizeStructuredToolOutput(output);
+    return normalized ? [normalized] : null;
+}
+/**
+ * Best-effort normalization of a single tool output item. If the object already matches the
+ * protocol shape we simply cast it; otherwise we copy the recognised fields into the canonical
+ * structure. Returning null lets the caller know we should revert to plain-string handling.
+ */
+function normalizeStructuredToolOutput(value) {
+    if (!isRecord(value)) {
+        return null;
+    }
+    const type = value.type;
+    if (type === 'text' && typeof value.text === 'string') {
+        const output = { type: 'text', text: value.text };
+        if (isRecord(value.providerData)) {
+            output.providerData = value.providerData;
+        }
+        return output;
+    }
+    if (type === 'image') {
+        const output = { type: 'image' };
+        let imageString;
+        let imageFileId;
+        const fallbackImageMediaType = getInlineMediaType(value);
+        const imageField = value.image;
+        if (typeof imageField === 'string' && imageField.length > 0) {
+            imageString = imageField;
+        }
+        else if (isRecord(imageField)) {
+            const imageObj = imageField;
+            const inlineMediaType = getInlineMediaType(imageObj) ?? fallbackImageMediaType;
+            if (isNonEmptyString(imageObj.url)) {
+                imageString = imageObj.url;
+            }
+            else if (isNonEmptyString(imageObj.data)) {
+                imageString = formatInlineData(imageObj.data, inlineMediaType);
+            }
+            else if (imageObj.data instanceof Uint8Array &&
+                imageObj.data.length > 0) {
+                imageString = formatInlineData(imageObj.data, inlineMediaType);
+            }
+            if (!imageString) {
+                const candidateId = (isNonEmptyString(imageObj.fileId) && imageObj.fileId) ||
+                    (isNonEmptyString(imageObj.id) && imageObj.id) ||
+                    undefined;
+                if (candidateId) {
+                    imageFileId = candidateId;
+                }
+            }
+        }
+        if (!imageString &&
+            typeof value.imageUrl === 'string' &&
+            value.imageUrl.length > 0) {
+            imageString = value.imageUrl;
+        }
+        if (!imageFileId &&
+            typeof value.fileId === 'string' &&
+            value.fileId.length > 0) {
+            imageFileId = value.fileId;
+        }
+        if (!imageString &&
+            typeof value.data === 'string' &&
+            value.data.length > 0) {
+            imageString = fallbackImageMediaType
+                ? formatInlineData(value.data, fallbackImageMediaType)
+                : value.data;
+        }
+        else if (!imageString &&
+            value.data instanceof Uint8Array &&
+            value.data.length > 0) {
+            imageString = formatInlineData(value.data, fallbackImageMediaType);
+        }
+        if (typeof value.detail === 'string' && value.detail.length > 0) {
+            output.detail = value.detail;
+        }
+        if (imageString) {
+            output.image = imageString;
+        }
+        else if (imageFileId) {
+            output.image = { fileId: imageFileId };
+        }
+        else {
+            return null;
+        }
+        if (isRecord(value.providerData)) {
+            output.providerData = value.providerData;
+        }
+        return output;
+    }
+    if (type === 'file') {
+        const fileValue = normalizeFileValue(value);
+        if (!fileValue) {
+            return null;
+        }
+        const output = { type: 'file', file: fileValue };
+        if (isRecord(value.providerData)) {
+            output.providerData = value.providerData;
+        }
+        return output;
+    }
+    return null;
+}
+/**
+ * Translates the normalized tool output into the protocol `input_*` items. This is the last hop
+ * before we hand the data to model-specific adapters, so we generate the exact schema expected by
+ * the protocol definitions.
+ */
+export function convertStructuredToolOutputToInputItem(output) {
+    if (output.type === 'text') {
+        const result = {
+            type: 'input_text',
+            text: output.text,
+        };
+        if (output.providerData) {
+            result.providerData = output.providerData;
+        }
+        return result;
+    }
+    if (output.type === 'image') {
+        const result = { type: 'input_image' };
+        if (typeof output.detail === 'string' && output.detail.length > 0) {
+            result.detail = output.detail;
+        }
+        if (typeof output.image === 'string' && output.image.length > 0) {
+            result.image = output.image;
+        }
+        else if (isRecord(output.image)) {
+            const imageObj = output.image;
+            const inlineMediaType = getInlineMediaType(imageObj);
+            if (isNonEmptyString(imageObj.url)) {
+                result.image = imageObj.url;
+            }
+            else if (isNonEmptyString(imageObj.data)) {
+                result.image =
+                    inlineMediaType && !imageObj.data.startsWith('data:')
+                        ? asDataUrl(imageObj.data, inlineMediaType)
+                        : imageObj.data;
+            }
+            else if (imageObj.data instanceof Uint8Array &&
+                imageObj.data.length > 0) {
+                const base64 = encodeUint8ArrayToBase64(imageObj.data);
+                result.image = asDataUrl(base64, inlineMediaType);
+            }
+            else {
+                const referencedId = (isNonEmptyString(imageObj.fileId) && imageObj.fileId) ||
+                    (isNonEmptyString(imageObj.id) && imageObj.id) ||
+                    undefined;
+                if (referencedId) {
+                    result.image = { id: referencedId };
+                }
+            }
+        }
+        if (output.providerData) {
+            result.providerData = output.providerData;
+        }
+        return result;
+    }
+    if (output.type === 'file') {
+        const result = { type: 'input_file' };
+        const fileValue = output.file;
+        if (typeof fileValue === 'string') {
+            result.file = fileValue;
+        }
+        else if (fileValue && typeof fileValue === 'object') {
+            const record = fileValue;
+            if ('data' in record && record.data) {
+                const mediaType = record.mediaType ?? 'text/plain';
+                if (typeof record.data === 'string') {
+                    result.file = asDataUrl(record.data, mediaType);
+                }
+                else {
+                    const base64 = encodeUint8ArrayToBase64(record.data);
+                    result.file = asDataUrl(base64, mediaType);
+                }
+            }
+            else if (typeof record.url === 'string' && record.url.length > 0) {
+                result.file = { url: record.url };
+            }
+            else {
+                const referencedId = (typeof record.id === 'string' &&
+                    record.id.length > 0 &&
+                    record.id) ||
+                    (typeof record.fileId === 'string' && record.fileId.length > 0
+                        ? record.fileId
+                        : undefined);
+                if (referencedId) {
+                    result.file = { id: referencedId };
+                }
+            }
+            if (typeof record.filename === 'string' && record.filename.length > 0) {
+                result.filename = record.filename;
+            }
+        }
+        if (output.providerData) {
+            result.providerData = output.providerData;
+        }
+        return result;
+    }
+    const exhaustiveCheck = output;
+    return exhaustiveCheck;
+}
+function normalizeFileValue(value) {
+    const directFile = value.file;
+    if (typeof directFile === 'string' && directFile.length > 0) {
+        return directFile;
+    }
+    const normalizedObject = normalizeFileObjectCandidate(directFile);
+    if (normalizedObject) {
+        return normalizedObject;
+    }
+    const legacyValue = normalizeLegacyFileValue(value);
+    if (legacyValue) {
+        return legacyValue;
+    }
+    return null;
+}
+function normalizeFileObjectCandidate(value) {
+    if (!isRecord(value)) {
+        return null;
+    }
+    if ('data' in value && value.data !== undefined) {
+        const dataValue = value.data;
+        const hasStringData = typeof dataValue === 'string' && dataValue.length > 0;
+        const hasBinaryData = dataValue instanceof Uint8Array && dataValue.length > 0;
+        if (!hasStringData && !hasBinaryData) {
+            return null;
+        }
+        if (!isNonEmptyString(value.mediaType) ||
+            !isNonEmptyString(value.filename)) {
+            return null;
+        }
+        return {
+            data: typeof dataValue === 'string' ? dataValue : new Uint8Array(dataValue),
+            mediaType: value.mediaType,
+            filename: value.filename,
+        };
+    }
+    if (isNonEmptyString(value.url)) {
+        const result = { url: value.url };
+        if (isNonEmptyString(value.filename)) {
+            result.filename = value.filename;
+        }
+        return result;
+    }
+    const referencedId = (isNonEmptyString(value.id) && value.id) ||
+        (isNonEmptyString(value.fileId) && value.fileId);
+    if (referencedId) {
+        const result = { id: referencedId };
+        if (isNonEmptyString(value.filename)) {
+            result.filename = value.filename;
+        }
+        return result;
+    }
+    return null;
+}
+function normalizeLegacyFileValue(value) {
+    const filename = typeof value.filename === 'string' && value.filename.length > 0
+        ? value.filename
+        : undefined;
+    const mediaType = typeof value.mediaType === 'string' && value.mediaType.length > 0
+        ? value.mediaType
+        : undefined;
+    if (typeof value.fileData === 'string' && value.fileData.length > 0) {
+        if (!mediaType || !filename) {
+            return null;
+        }
+        return { data: value.fileData, mediaType, filename };
+    }
+    if (value.fileData instanceof Uint8Array && value.fileData.length > 0) {
+        if (!mediaType || !filename) {
+            return null;
+        }
+        return { data: new Uint8Array(value.fileData), mediaType, filename };
+    }
+    if (typeof value.fileUrl === 'string' && value.fileUrl.length > 0) {
+        const result = { url: value.fileUrl };
+        if (filename) {
+            result.filename = filename;
+        }
+        return result;
+    }
+    if (typeof value.fileId === 'string' && value.fileId.length > 0) {
+        const result = { id: value.fileId };
+        if (filename) {
+            result.filename = filename;
+        }
+        return result;
+    }
+    return null;
+}
+function isRecord(value) {
+    return typeof value === 'object' && value !== null;
+}
+function isNonEmptyString(value) {
+    return typeof value === 'string' && value.length > 0;
+}
+function asDataUrl(base64, mediaType) {
+    return mediaType ? `data:${mediaType};base64,${base64}` : base64;
+}
+//# sourceMappingURL=toolOutputNormalization.mjs.map

package/dist/runner/toolOutputNormalization.mjs.map

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

package/dist/runner/toolResultCorrelation.d.ts

@@ -0,0 +1,22 @@
+import type { AgentInputItem } from '../types';
+declare const SIMPLE_TOOL_RESULT_TYPE_BY_CALL_TYPE: {
+    readonly function_call: "function_call_result";
+    readonly computer_call: "computer_call_result";
+    readonly shell_call: "shell_call_output";
+    readonly apply_patch_call: "apply_patch_call_output";
+};
+type SimpleToolResultType = (typeof SIMPLE_TOOL_RESULT_TYPE_BY_CALL_TYPE)[keyof typeof SIMPLE_TOOL_RESULT_TYPE_BY_CALL_TYPE];
+declare const TOOL_SEARCH_OUTPUT = "tool_search_output";
+declare const HOSTED_MCP_APPROVAL_RESPONSE = "mcp_approval_response";
+type ToolResultType = SimpleToolResultType | typeof TOOL_SEARCH_OUTPUT | typeof HOSTED_MCP_APPROVAL_RESPONSE;
+export type ToolResultCorrelation = Readonly<{
+    resultType: ToolResultType;
+    id: string;
+}>;
+export declare function getSimpleToolResultTypeForCall(type: unknown): SimpleToolResultType | undefined;
+export declare function isSimpleToolResultType(type: unknown): type is SimpleToolResultType;
+export declare function getToolResultCorrelationForCall(item: AgentInputItem): ToolResultCorrelation | undefined;
+export declare function getToolResultCorrelationForResult(item: AgentInputItem): ToolResultCorrelation | undefined;
+export declare function getToolResultCorrelationKey(correlation: ToolResultCorrelation): string;
+export declare function getUnresolvedToolResultCorrelationsForResponse(items: readonly AgentInputItem[]): ToolResultCorrelation[];
+export {};

package/dist/runner/toolResultCorrelation.js

@@ -0,0 +1,138 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSimpleToolResultTypeForCall = getSimpleToolResultTypeForCall;
+exports.isSimpleToolResultType = isSimpleToolResultType;
+exports.getToolResultCorrelationForCall = getToolResultCorrelationForCall;
+exports.getToolResultCorrelationForResult = getToolResultCorrelationForResult;
+exports.getToolResultCorrelationKey = getToolResultCorrelationKey;
+exports.getUnresolvedToolResultCorrelationsForResponse = getUnresolvedToolResultCorrelationsForResponse;
+const tooling_1 = require("../tooling.js");
+const SIMPLE_TOOL_RESULT_TYPE_BY_CALL_TYPE = {
+    function_call: 'function_call_result',
+    computer_call: 'computer_call_result',
+    shell_call: 'shell_call_output',
+    apply_patch_call: 'apply_patch_call_output',
+};
+const SIMPLE_TOOL_RESULT_TYPES = new Set(Object.values(SIMPLE_TOOL_RESULT_TYPE_BY_CALL_TYPE));
+const TOOL_SEARCH_OUTPUT = 'tool_search_output';
+const HOSTED_MCP_APPROVAL_REQUEST = 'mcp_approval_request';
+const HOSTED_MCP_APPROVAL_RESPONSE = 'mcp_approval_response';
+function createCorrelation(resultType, id) {
+    return typeof id === 'string' ? { resultType, id } : undefined;
+}
+function getSimpleToolResultTypeForCall(type) {
+    return typeof type === 'string'
+        ? SIMPLE_TOOL_RESULT_TYPE_BY_CALL_TYPE[type]
+        : undefined;
+}
+function isSimpleToolResultType(type) {
+    return typeof type === 'string' && SIMPLE_TOOL_RESULT_TYPES.has(type);
+}
+function getToolResultCorrelationForCall(item) {
+    if (!item || typeof item !== 'object') {
+        return undefined;
+    }
+    const type = item.type;
+    if (type === 'tool_search_call') {
+        if ((0, tooling_1.getToolSearchExecution)(item) === 'server') {
+            return undefined;
+        }
+        return createCorrelation(TOOL_SEARCH_OUTPUT, (0, tooling_1.getToolSearchMatchKey)(item));
+    }
+    const callId = item.callId;
+    const resultType = getSimpleToolResultTypeForCall(type);
+    if (resultType) {
+        return createCorrelation(resultType, callId);
+    }
+    if (type !== 'hosted_tool_call') {
+        return undefined;
+    }
+    const hostedItem = item;
+    const providerData = hostedItem.providerData;
+    if (!providerData || typeof providerData !== 'object') {
+        return undefined;
+    }
+    const approvalRequest = providerData;
+    if (hostedItem.name !== HOSTED_MCP_APPROVAL_REQUEST &&
+        approvalRequest.type !== HOSTED_MCP_APPROVAL_REQUEST) {
+        return undefined;
+    }
+    return createCorrelation(HOSTED_MCP_APPROVAL_RESPONSE, approvalRequest.id ?? hostedItem.id);
+}
+function getToolResultCorrelationForResult(item) {
+    if (!item || typeof item !== 'object') {
+        return undefined;
+    }
+    const type = item.type;
+    if (type === TOOL_SEARCH_OUTPUT) {
+        if ((0, tooling_1.getToolSearchExecution)(item) === 'server') {
+            return undefined;
+        }
+        return createCorrelation(TOOL_SEARCH_OUTPUT, (0, tooling_1.getToolSearchProviderCallId)(item));
+    }
+    const callId = item.callId;
+    if (isSimpleToolResultType(type)) {
+        return createCorrelation(type, callId);
+    }
+    if (type !== 'hosted_tool_call') {
+        return undefined;
+    }
+    const hostedItem = item;
+    if (hostedItem.name !== HOSTED_MCP_APPROVAL_RESPONSE) {
+        return undefined;
+    }
+    const providerData = hostedItem.providerData;
+    if (!providerData || typeof providerData !== 'object') {
+        return undefined;
+    }
+    return createCorrelation(HOSTED_MCP_APPROVAL_RESPONSE, providerData.approval_request_id);
+}
+function getToolResultCorrelationKey(correlation) {
+    return JSON.stringify([correlation.resultType, correlation.id]);
+}
+function removePendingCorrelation(pending, correlation) {
+    const key = getToolResultCorrelationKey(correlation);
+    const index = pending.findIndex((candidate) => getToolResultCorrelationKey(candidate) === key);
+    if (index >= 0) {
+        pending.splice(index, 1);
+    }
+}
+function getUnresolvedToolResultCorrelationsForResponse(items) {
+    const calls = [];
+    const results = [];
+    const pendingToolSearchCalls = [];
+    for (const item of items) {
+        const call = getToolResultCorrelationForCall(item);
+        if (call) {
+            calls.push(call);
+            if (item.type === 'tool_search_call') {
+                pendingToolSearchCalls.push(call);
+            }
+        }
+        if (item.type === TOOL_SEARCH_OUTPUT) {
+            if ((0, tooling_1.getToolSearchExecution)(item) === 'server') {
+                continue;
+            }
+            const providerCallId = (0, tooling_1.getToolSearchProviderCallId)(item);
+            const result = providerCallId
+                ? createCorrelation(TOOL_SEARCH_OUTPUT, providerCallId)
+                : pendingToolSearchCalls.shift();
+            if (result) {
+                results.push(result);
+                if (providerCallId) {
+                    removePendingCorrelation(pendingToolSearchCalls, result);
+                }
+            }
+            continue;
+        }
+        const result = getToolResultCorrelationForResult(item);
+        if (result) {
+            results.push(result);
+        }
+    }
+    for (const result of results) {
+        removePendingCorrelation(calls, result);
+    }
+    return calls;
+}
+//# sourceMappingURL=toolResultCorrelation.js.map

package/dist/runner/toolResultCorrelation.js.map

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

package/dist/runner/toolResultCorrelation.mjs

@@ -0,0 +1,130 @@
+import { getToolSearchExecution, getToolSearchMatchKey, getToolSearchProviderCallId, } from "../tooling.mjs";
+const SIMPLE_TOOL_RESULT_TYPE_BY_CALL_TYPE = {
+    function_call: 'function_call_result',
+    computer_call: 'computer_call_result',
+    shell_call: 'shell_call_output',
+    apply_patch_call: 'apply_patch_call_output',
+};
+const SIMPLE_TOOL_RESULT_TYPES = new Set(Object.values(SIMPLE_TOOL_RESULT_TYPE_BY_CALL_TYPE));
+const TOOL_SEARCH_OUTPUT = 'tool_search_output';
+const HOSTED_MCP_APPROVAL_REQUEST = 'mcp_approval_request';
+const HOSTED_MCP_APPROVAL_RESPONSE = 'mcp_approval_response';
+function createCorrelation(resultType, id) {
+    return typeof id === 'string' ? { resultType, id } : undefined;
+}
+export function getSimpleToolResultTypeForCall(type) {
+    return typeof type === 'string'
+        ? SIMPLE_TOOL_RESULT_TYPE_BY_CALL_TYPE[type]
+        : undefined;
+}
+export function isSimpleToolResultType(type) {
+    return typeof type === 'string' && SIMPLE_TOOL_RESULT_TYPES.has(type);
+}
+export function getToolResultCorrelationForCall(item) {
+    if (!item || typeof item !== 'object') {
+        return undefined;
+    }
+    const type = item.type;
+    if (type === 'tool_search_call') {
+        if (getToolSearchExecution(item) === 'server') {
+            return undefined;
+        }
+        return createCorrelation(TOOL_SEARCH_OUTPUT, getToolSearchMatchKey(item));
+    }
+    const callId = item.callId;
+    const resultType = getSimpleToolResultTypeForCall(type);
+    if (resultType) {
+        return createCorrelation(resultType, callId);
+    }
+    if (type !== 'hosted_tool_call') {
+        return undefined;
+    }
+    const hostedItem = item;
+    const providerData = hostedItem.providerData;
+    if (!providerData || typeof providerData !== 'object') {
+        return undefined;
+    }
+    const approvalRequest = providerData;
+    if (hostedItem.name !== HOSTED_MCP_APPROVAL_REQUEST &&
+        approvalRequest.type !== HOSTED_MCP_APPROVAL_REQUEST) {
+        return undefined;
+    }
+    return createCorrelation(HOSTED_MCP_APPROVAL_RESPONSE, approvalRequest.id ?? hostedItem.id);
+}
+export function getToolResultCorrelationForResult(item) {
+    if (!item || typeof item !== 'object') {
+        return undefined;
+    }
+    const type = item.type;
+    if (type === TOOL_SEARCH_OUTPUT) {
+        if (getToolSearchExecution(item) === 'server') {
+            return undefined;
+        }
+        return createCorrelation(TOOL_SEARCH_OUTPUT, getToolSearchProviderCallId(item));
+    }
+    const callId = item.callId;
+    if (isSimpleToolResultType(type)) {
+        return createCorrelation(type, callId);
+    }
+    if (type !== 'hosted_tool_call') {
+        return undefined;
+    }
+    const hostedItem = item;
+    if (hostedItem.name !== HOSTED_MCP_APPROVAL_RESPONSE) {
+        return undefined;
+    }
+    const providerData = hostedItem.providerData;
+    if (!providerData || typeof providerData !== 'object') {
+        return undefined;
+    }
+    return createCorrelation(HOSTED_MCP_APPROVAL_RESPONSE, providerData.approval_request_id);
+}
+export function getToolResultCorrelationKey(correlation) {
+    return JSON.stringify([correlation.resultType, correlation.id]);
+}
+function removePendingCorrelation(pending, correlation) {
+    const key = getToolResultCorrelationKey(correlation);
+    const index = pending.findIndex((candidate) => getToolResultCorrelationKey(candidate) === key);
+    if (index >= 0) {
+        pending.splice(index, 1);
+    }
+}
+export function getUnresolvedToolResultCorrelationsForResponse(items) {
+    const calls = [];
+    const results = [];
+    const pendingToolSearchCalls = [];
+    for (const item of items) {
+        const call = getToolResultCorrelationForCall(item);
+        if (call) {
+            calls.push(call);
+            if (item.type === 'tool_search_call') {
+                pendingToolSearchCalls.push(call);
+            }
+        }
+        if (item.type === TOOL_SEARCH_OUTPUT) {
+            if (getToolSearchExecution(item) === 'server') {
+                continue;
+            }
+            const providerCallId = getToolSearchProviderCallId(item);
+            const result = providerCallId
+                ? createCorrelation(TOOL_SEARCH_OUTPUT, providerCallId)
+                : pendingToolSearchCalls.shift();
+            if (result) {
+                results.push(result);
+                if (providerCallId) {
+                    removePendingCorrelation(pendingToolSearchCalls, result);
+                }
+            }
+            continue;
+        }
+        const result = getToolResultCorrelationForResult(item);
+        if (result) {
+            results.push(result);
+        }
+    }
+    for (const result of results) {
+        removePendingCorrelation(calls, result);
+    }
+    return calls;
+}
+//# sourceMappingURL=toolResultCorrelation.mjs.map

package/dist/runner/toolResultCorrelation.mjs.map

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

package/dist/runner/turnPreparation.js

@@ -85,11 +85,7 @@ async function runInputGuardrailsForTurn(state, runnerGuardrails, isResumingFrom
     }
     if (guardrails.parallel.length > 0) {
         handlers.onParallelStart?.();
-        const promise = (0, guardrails_1.runInputGuardrails)(state, guardrails.parallel);
-        const parallelGuardrailPromise = promise.catch((err) => {
-            handlers.onParallelError?.(err);
-            return [];
-        });
+        const parallelGuardrailPromise = (0, guardrails_1.runInputGuardrails)(state, guardrails.parallel, { onErrorObserved: handlers.onParallelError }).catch(() => []);
         return { parallelGuardrailPromise };
     }
     return {};