@openai/agents-core 0.3.7 → 0.3.8

package/dist/runner/modelSettings.js

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.selectModel = selectModel;
+exports.maybeResetToolChoice = maybeResetToolChoice;
+exports.adjustModelSettingsForNonGPT5RunnerModel = adjustModelSettingsForNonGPT5RunnerModel;
+const agent_1 = require("../agent.js");
+const defaultModel_1 = require("../defaultModel.js");
+const hasGpt5OnlySettings = (settings) => {
+    const providerData = settings?.providerData;
+    return Boolean(providerData?.reasoning ||
+        providerData?.text?.verbosity ||
+        providerData
+            ?.reasoning_effort);
+};
+/**
+ * Resolves the effective model for the next turn by giving precedence to the agent-specific
+ * configuration when present, otherwise falling back to the runner-level default.
+ */
+function selectModel(agentModel, runConfigModel) {
+    if ((typeof agentModel === 'string' &&
+        agentModel !== agent_1.Agent.DEFAULT_MODEL_PLACEHOLDER) ||
+        agentModel) {
+        return agentModel;
+    }
+    return runConfigModel ?? agentModel ?? agent_1.Agent.DEFAULT_MODEL_PLACEHOLDER;
+}
+/**
+ * Resets the tool choice when the agent is configured to prefer a fresh tool selection after
+ * any tool usage. This prevents the provider from reusing stale tool hints across turns.
+ */
+function maybeResetToolChoice(agent, toolUseTracker, modelSettings) {
+    if (agent.resetToolChoice && toolUseTracker.hasUsedTools(agent)) {
+        return { ...modelSettings, toolChoice: undefined };
+    }
+    return modelSettings;
+}
+/**
+ * When the default model is a GPT-5 variant, agents may carry GPT-5-specific providerData
+ * (e.g., reasoning effort, text verbosity). If a run resolves to a non-GPT-5 model and the
+ * agent relied on the default model (i.e., no explicit model set), these GPT-5-only settings
+ * are incompatible and should be stripped to avoid runtime errors.
+ */
+function adjustModelSettingsForNonGPT5RunnerModel(explictlyModelSet, agentModelSettings, runnerModel, modelSettings, resolvedModelName) {
+    const modelName = resolvedModelName ??
+        (typeof runnerModel === 'string'
+            ? runnerModel
+            : (runnerModel
+                ?.model ?? runnerModel?.name));
+    const isNonGpt5RunnerModel = typeof modelName === 'string'
+        ? !(0, defaultModel_1.gpt5ReasoningSettingsRequired)(modelName)
+        : true;
+    const hasGpt5Defaults = hasGpt5OnlySettings(agentModelSettings) ||
+        hasGpt5OnlySettings(modelSettings);
+    if ((0, defaultModel_1.isGpt5Default)() &&
+        explictlyModelSet &&
+        isNonGpt5RunnerModel &&
+        hasGpt5Defaults) {
+        return stripGpt5OnlySettings(modelSettings);
+    }
+    return modelSettings;
+}
+function stripGpt5OnlySettings(modelSettings) {
+    const copiedProviderData = modelSettings.providerData
+        ? { ...modelSettings.providerData }
+        : undefined;
+    if (copiedProviderData) {
+        if (copiedProviderData.text &&
+            typeof copiedProviderData.text === 'object') {
+            copiedProviderData.text = { ...copiedProviderData.text };
+            delete copiedProviderData.text.verbosity;
+        }
+        delete copiedProviderData.reasoning;
+        delete copiedProviderData.reasoning_effort;
+    }
+    const copiedModelSettings = {
+        ...modelSettings,
+        providerData: copiedProviderData,
+    };
+    if (modelSettings.reasoning) {
+        copiedModelSettings.reasoning = { ...modelSettings.reasoning };
+    }
+    if (modelSettings.text) {
+        copiedModelSettings.text = { ...modelSettings.text };
+    }
+    delete copiedModelSettings.providerData?.reasoning;
+    delete copiedModelSettings.providerData?.text?.verbosity;
+    delete copiedModelSettings.providerData?.reasoning_effort;
+    if (copiedModelSettings.reasoning) {
+        delete copiedModelSettings.reasoning.effort;
+        delete copiedModelSettings.reasoning.summary;
+    }
+    if (copiedModelSettings.text) {
+        delete copiedModelSettings.text.verbosity;
+    }
+    return copiedModelSettings;
+}
+//# sourceMappingURL=modelSettings.js.map

package/dist/runner/modelSettings.js.map

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

package/dist/runner/modelSettings.mjs

@@ -0,0 +1,92 @@
+import { Agent } from "../agent.mjs";
+import { gpt5ReasoningSettingsRequired, isGpt5Default } from "../defaultModel.mjs";
+const hasGpt5OnlySettings = (settings) => {
+    const providerData = settings?.providerData;
+    return Boolean(providerData?.reasoning ||
+        providerData?.text?.verbosity ||
+        providerData
+            ?.reasoning_effort);
+};
+/**
+ * Resolves the effective model for the next turn by giving precedence to the agent-specific
+ * configuration when present, otherwise falling back to the runner-level default.
+ */
+export function selectModel(agentModel, runConfigModel) {
+    if ((typeof agentModel === 'string' &&
+        agentModel !== Agent.DEFAULT_MODEL_PLACEHOLDER) ||
+        agentModel) {
+        return agentModel;
+    }
+    return runConfigModel ?? agentModel ?? Agent.DEFAULT_MODEL_PLACEHOLDER;
+}
+/**
+ * Resets the tool choice when the agent is configured to prefer a fresh tool selection after
+ * any tool usage. This prevents the provider from reusing stale tool hints across turns.
+ */
+export function maybeResetToolChoice(agent, toolUseTracker, modelSettings) {
+    if (agent.resetToolChoice && toolUseTracker.hasUsedTools(agent)) {
+        return { ...modelSettings, toolChoice: undefined };
+    }
+    return modelSettings;
+}
+/**
+ * When the default model is a GPT-5 variant, agents may carry GPT-5-specific providerData
+ * (e.g., reasoning effort, text verbosity). If a run resolves to a non-GPT-5 model and the
+ * agent relied on the default model (i.e., no explicit model set), these GPT-5-only settings
+ * are incompatible and should be stripped to avoid runtime errors.
+ */
+export function adjustModelSettingsForNonGPT5RunnerModel(explictlyModelSet, agentModelSettings, runnerModel, modelSettings, resolvedModelName) {
+    const modelName = resolvedModelName ??
+        (typeof runnerModel === 'string'
+            ? runnerModel
+            : (runnerModel
+                ?.model ?? runnerModel?.name));
+    const isNonGpt5RunnerModel = typeof modelName === 'string'
+        ? !gpt5ReasoningSettingsRequired(modelName)
+        : true;
+    const hasGpt5Defaults = hasGpt5OnlySettings(agentModelSettings) ||
+        hasGpt5OnlySettings(modelSettings);
+    if (isGpt5Default() &&
+        explictlyModelSet &&
+        isNonGpt5RunnerModel &&
+        hasGpt5Defaults) {
+        return stripGpt5OnlySettings(modelSettings);
+    }
+    return modelSettings;
+}
+function stripGpt5OnlySettings(modelSettings) {
+    const copiedProviderData = modelSettings.providerData
+        ? { ...modelSettings.providerData }
+        : undefined;
+    if (copiedProviderData) {
+        if (copiedProviderData.text &&
+            typeof copiedProviderData.text === 'object') {
+            copiedProviderData.text = { ...copiedProviderData.text };
+            delete copiedProviderData.text.verbosity;
+        }
+        delete copiedProviderData.reasoning;
+        delete copiedProviderData.reasoning_effort;
+    }
+    const copiedModelSettings = {
+        ...modelSettings,
+        providerData: copiedProviderData,
+    };
+    if (modelSettings.reasoning) {
+        copiedModelSettings.reasoning = { ...modelSettings.reasoning };
+    }
+    if (modelSettings.text) {
+        copiedModelSettings.text = { ...modelSettings.text };
+    }
+    delete copiedModelSettings.providerData?.reasoning;
+    delete copiedModelSettings.providerData?.text?.verbosity;
+    delete copiedModelSettings.providerData?.reasoning_effort;
+    if (copiedModelSettings.reasoning) {
+        delete copiedModelSettings.reasoning.effort;
+        delete copiedModelSettings.reasoning.summary;
+    }
+    if (copiedModelSettings.text) {
+        delete copiedModelSettings.text.verbosity;
+    }
+    return copiedModelSettings;
+}
+//# sourceMappingURL=modelSettings.mjs.map

package/dist/runner/modelSettings.mjs.map

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

package/dist/runner/runLoop.d.ts

@@ -0,0 +1,32 @@
+import type { Agent, AgentOutputType } from '../agent';
+import type { RunState } from '../runState';
+import type { Runner } from '../run';
+import type { SingleStepResult } from './steps';
+export type InterruptedTurnOutcome = {
+    nextStep: SingleStepResult['nextStep'];
+    action: 'return_interruption' | 'rerun_turn' | 'advance_step';
+};
+export type InterruptedTurnControl = {
+    shouldReturn: boolean;
+    shouldContinue: boolean;
+};
+type ApplyTurnResultOptions<TContext, TAgent extends Agent<TContext, AgentOutputType>> = {
+    state: RunState<TContext, TAgent>;
+    turnResult: SingleStepResult;
+    agent: Agent<TContext, AgentOutputType>;
+    toolsUsed: string[];
+    resetTurnPersistence: boolean;
+    onStepItems?: (turnResult: SingleStepResult) => void;
+};
+export declare function applyTurnResult<TContext, TAgent extends Agent<TContext, AgentOutputType>>(options: ApplyTurnResultOptions<TContext, TAgent>): void;
+export declare function resumeInterruptedTurn<TContext, TAgent extends Agent<TContext, AgentOutputType>>(options: {
+    state: RunState<TContext, TAgent>;
+    runner: Runner;
+    onStepItems?: (turnResult: SingleStepResult) => void;
+}): Promise<InterruptedTurnOutcome>;
+export declare function handleInterruptedOutcome<TContext, TAgent extends Agent<TContext, AgentOutputType>>(options: {
+    state: RunState<TContext, TAgent>;
+    outcome: InterruptedTurnOutcome;
+    setContinuingInterruptedTurn: (value: boolean) => void;
+}): InterruptedTurnControl;
+export {};

package/dist/runner/runLoop.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyTurnResult = applyTurnResult;
+exports.resumeInterruptedTurn = resumeInterruptedTurn;
+exports.handleInterruptedOutcome = handleInterruptedOutcome;
+const turnResolution_1 = require("./turnResolution.js");
+function applyTurnResult(options) {
+    const { state, turnResult, agent, toolsUsed, resetTurnPersistence, onStepItems, } = options;
+    onStepItems?.(turnResult);
+    state._toolUseTracker.addToolUse(agent, toolsUsed);
+    state._originalInput = turnResult.originalInput;
+    state._generatedItems = turnResult.generatedItems;
+    if (resetTurnPersistence &&
+        turnResult.nextStep.type === 'next_step_run_again') {
+        state.resetTurnPersistence();
+    }
+    state._currentStep = turnResult.nextStep;
+}
+async function resumeInterruptedTurn(options) {
+    const { state, runner, onStepItems } = options;
+    const turnResult = await (0, turnResolution_1.resolveInterruptedTurn)(state._currentAgent, state._originalInput, state._generatedItems, state._lastTurnResponse, state._lastProcessedResponse, runner, state);
+    applyTurnResult({
+        state,
+        turnResult,
+        agent: state._currentAgent,
+        toolsUsed: state._lastProcessedResponse?.toolsUsed ?? [],
+        resetTurnPersistence: false,
+        onStepItems,
+    });
+    // Map next-step outcomes to interruption flow control for the outer run loop.
+    // return_interruption: still waiting on approvals. rerun_turn: same turn rerun without increment.
+    // advance_step: proceed without rerunning the same turn.
+    if (turnResult.nextStep.type === 'next_step_interruption') {
+        return { nextStep: turnResult.nextStep, action: 'return_interruption' };
+    }
+    if (turnResult.nextStep.type === 'next_step_run_again') {
+        return { nextStep: turnResult.nextStep, action: 'rerun_turn' };
+    }
+    return { nextStep: turnResult.nextStep, action: 'advance_step' };
+}
+function handleInterruptedOutcome(options) {
+    const { state, outcome, setContinuingInterruptedTurn } = options;
+    switch (outcome.action) {
+        case 'return_interruption':
+            state._currentStep = outcome.nextStep;
+            return { shouldReturn: true, shouldContinue: false };
+        case 'rerun_turn':
+            // Clear the step so the outer loop treats this as a new run-again without incrementing the turn.
+            setContinuingInterruptedTurn(true);
+            state._currentStep = undefined;
+            return { shouldReturn: false, shouldContinue: true };
+        case 'advance_step':
+            setContinuingInterruptedTurn(false);
+            state._currentStep = outcome.nextStep;
+            return { shouldReturn: false, shouldContinue: false };
+        default: {
+            const _exhaustive = outcome.action;
+            throw new Error(`Unhandled interruption outcome: ${_exhaustive}`);
+        }
+    }
+}
+//# sourceMappingURL=runLoop.js.map

package/dist/runner/runLoop.js.map

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

package/dist/runner/runLoop.mjs

@@ -0,0 +1,57 @@
+import { resolveInterruptedTurn } from "./turnResolution.mjs";
+export function applyTurnResult(options) {
+    const { state, turnResult, agent, toolsUsed, resetTurnPersistence, onStepItems, } = options;
+    onStepItems?.(turnResult);
+    state._toolUseTracker.addToolUse(agent, toolsUsed);
+    state._originalInput = turnResult.originalInput;
+    state._generatedItems = turnResult.generatedItems;
+    if (resetTurnPersistence &&
+        turnResult.nextStep.type === 'next_step_run_again') {
+        state.resetTurnPersistence();
+    }
+    state._currentStep = turnResult.nextStep;
+}
+export async function resumeInterruptedTurn(options) {
+    const { state, runner, onStepItems } = options;
+    const turnResult = await resolveInterruptedTurn(state._currentAgent, state._originalInput, state._generatedItems, state._lastTurnResponse, state._lastProcessedResponse, runner, state);
+    applyTurnResult({
+        state,
+        turnResult,
+        agent: state._currentAgent,
+        toolsUsed: state._lastProcessedResponse?.toolsUsed ?? [],
+        resetTurnPersistence: false,
+        onStepItems,
+    });
+    // Map next-step outcomes to interruption flow control for the outer run loop.
+    // return_interruption: still waiting on approvals. rerun_turn: same turn rerun without increment.
+    // advance_step: proceed without rerunning the same turn.
+    if (turnResult.nextStep.type === 'next_step_interruption') {
+        return { nextStep: turnResult.nextStep, action: 'return_interruption' };
+    }
+    if (turnResult.nextStep.type === 'next_step_run_again') {
+        return { nextStep: turnResult.nextStep, action: 'rerun_turn' };
+    }
+    return { nextStep: turnResult.nextStep, action: 'advance_step' };
+}
+export function handleInterruptedOutcome(options) {
+    const { state, outcome, setContinuingInterruptedTurn } = options;
+    switch (outcome.action) {
+        case 'return_interruption':
+            state._currentStep = outcome.nextStep;
+            return { shouldReturn: true, shouldContinue: false };
+        case 'rerun_turn':
+            // Clear the step so the outer loop treats this as a new run-again without incrementing the turn.
+            setContinuingInterruptedTurn(true);
+            state._currentStep = undefined;
+            return { shouldReturn: false, shouldContinue: true };
+        case 'advance_step':
+            setContinuingInterruptedTurn(false);
+            state._currentStep = outcome.nextStep;
+            return { shouldReturn: false, shouldContinue: false };
+        default: {
+            const _exhaustive = outcome.action;
+            throw new Error(`Unhandled interruption outcome: ${_exhaustive}`);
+        }
+    }
+}
+//# sourceMappingURL=runLoop.mjs.map

package/dist/runner/runLoop.mjs.map

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

package/dist/runner/sessionPersistence.d.ts

@@ -0,0 +1,26 @@
+import { type Session, type SessionInputCallback } from '../memory/session';
+import { RunResult, StreamedRunResult } from '../result';
+import { AgentInputItem } from '../types';
+export type PreparedInputWithSessionResult = {
+    preparedInput: string | AgentInputItem[];
+    sessionItems?: AgentInputItem[];
+};
+export type SessionPersistenceTracker = {
+    setPreparedItems: (items?: AgentInputItem[]) => void;
+    recordTurnItems: (sourceItems: (AgentInputItem | undefined)[], filteredItems?: AgentInputItem[]) => void;
+    getItemsForPersistence: () => AgentInputItem[] | undefined;
+    buildPersistInputOnce: (serverManagesConversation: boolean) => (() => Promise<void>) | undefined;
+};
+export declare function createSessionPersistenceTracker(options: {
+    session?: Session;
+    hasCallModelInputFilter: boolean;
+    persistInput?: typeof saveStreamInputToSession;
+    resumingFromState?: boolean;
+}): SessionPersistenceTracker | undefined;
+export declare function saveToSession(session: Session | undefined, sessionInputItems: AgentInputItem[] | undefined, result: RunResult<any, any>): Promise<void>;
+export declare function saveStreamInputToSession(session: Session | undefined, sessionInputItems: AgentInputItem[] | undefined): Promise<void>;
+export declare function saveStreamResultToSession(session: Session | undefined, result: StreamedRunResult<any, any>): Promise<void>;
+export declare function prepareInputItemsWithSession(input: string | AgentInputItem[], session?: Session, sessionInputCallback?: SessionInputCallback, options?: {
+    includeHistoryInPreparedInput?: boolean;
+    preserveDroppedNewItems?: boolean;
+}): Promise<PreparedInputWithSessionResult>;