@openai/agents-core 0.4.1 → 0.4.3

package/dist/mcpServers.mjs

@@ -0,0 +1,467 @@
+import { getLogger } from "./logger.mjs";
+const DEFAULT_CONNECT_TIMEOUT_MS = 10_000;
+const DEFAULT_CLOSE_TIMEOUT_MS = 10_000;
+const logger = getLogger('openai-agents:mcp-servers');
+class ServerWorker {
+    server;
+    connectTimeoutMs;
+    closeTimeoutMs;
+    queue = [];
+    draining = false;
+    done = false;
+    closing = null;
+    closeResult = null;
+    constructor(server, connectTimeoutMs, closeTimeoutMs) {
+        this.server = server;
+        this.connectTimeoutMs = connectTimeoutMs;
+        this.closeTimeoutMs = closeTimeoutMs;
+    }
+    get isDone() {
+        return this.done;
+    }
+    connect() {
+        return this.submit('connect', this.connectTimeoutMs);
+    }
+    close() {
+        return this.submit('close', this.closeTimeoutMs);
+    }
+    submit(action, timeoutMs) {
+        if (this.done) {
+            return Promise.reject(createClosedError(this.server));
+        }
+        if (this.closeResult || this.closing) {
+            if (action === 'close' && this.closeResult) {
+                return this.closeResult;
+            }
+            return Promise.reject(createClosingError(this.server));
+        }
+        let resolveCommand;
+        let rejectCommand;
+        const promise = new Promise((resolve, reject) => {
+            resolveCommand = resolve;
+            rejectCommand = reject;
+        });
+        const command = {
+            action,
+            timeoutMs,
+            resolve: resolveCommand,
+            reject: rejectCommand,
+        };
+        if (action === 'close') {
+            this.closeResult = promise;
+        }
+        this.queue.push(command);
+        void this.drain();
+        return promise;
+    }
+    async drain() {
+        if (this.draining) {
+            return;
+        }
+        this.draining = true;
+        while (this.queue.length > 0) {
+            const command = this.queue.shift();
+            if (!command) {
+                continue;
+            }
+            const shouldExit = command.action === 'close';
+            let closeError = null;
+            try {
+                if (command.action === 'connect') {
+                    await runWithTimeout(() => this.server.connect(), command.timeoutMs, createTimeoutError('connect', this.server, command.timeoutMs));
+                }
+                else {
+                    const closeTask = this.server.close();
+                    this.closing = closeTask
+                        .then(() => undefined, () => undefined)
+                        .finally(() => {
+                        this.closing = null;
+                    });
+                    await runWithTimeoutTask(closeTask, command.timeoutMs, createTimeoutError('close', this.server, command.timeoutMs));
+                }
+                command.resolve();
+            }
+            catch (error) {
+                const err = toError(error);
+                command.reject(err);
+                if (shouldExit) {
+                    closeError = err;
+                }
+            }
+            if (shouldExit) {
+                const pendingError = closeError ?? createClosedError(this.server);
+                while (this.queue.length > 0) {
+                    const pending = this.queue.shift();
+                    if (pending) {
+                        pending.reject(pendingError);
+                    }
+                }
+                this.closeResult = null;
+                if (!closeError) {
+                    this.done = true;
+                }
+                break;
+            }
+        }
+        this.draining = false;
+    }
+}
+/**
+ * Manages MCP server lifecycle and exposes only connected servers.
+ */
+export class MCPServers {
+    allServers;
+    activeServers;
+    failedServers = [];
+    failedServerSet = new Set();
+    errorsByServer = new Map();
+    suppressedAbortFailures = new Set();
+    workers = new Map();
+    connectTimeoutMs;
+    closeTimeoutMs;
+    dropFailed;
+    strict;
+    suppressAbortError;
+    connectInParallel;
+    static {
+        const asyncDispose = Symbol.asyncDispose;
+        if (asyncDispose) {
+            Object.defineProperty(this.prototype, asyncDispose, {
+                value: function () {
+                    return this.close();
+                },
+                configurable: true,
+            });
+        }
+    }
+    constructor(servers, options) {
+        this.allServers = [...servers];
+        this.activeServers = [...servers];
+        this.connectTimeoutMs =
+            options?.connectTimeoutMs === undefined
+                ? DEFAULT_CONNECT_TIMEOUT_MS
+                : options.connectTimeoutMs;
+        this.closeTimeoutMs =
+            options?.closeTimeoutMs === undefined
+                ? DEFAULT_CLOSE_TIMEOUT_MS
+                : options.closeTimeoutMs;
+        this.dropFailed = options?.dropFailed ?? true;
+        this.strict = options?.strict ?? false;
+        this.suppressAbortError = options?.suppressAbortError ?? true;
+        this.connectInParallel = options?.connectInParallel ?? false;
+    }
+    static async open(servers, options) {
+        const session = new MCPServers(servers, options);
+        logger.debug(`Opening MCPServers with ${session.allServers.length} server(s).`);
+        await session.connectAll();
+        return session;
+    }
+    get all() {
+        return [...this.allServers];
+    }
+    get active() {
+        return [...this.activeServers];
+    }
+    get failed() {
+        return [...this.failedServers];
+    }
+    get errors() {
+        return new Map(this.errorsByServer);
+    }
+    async reconnect(options = {}) {
+        const failedOnly = options.failedOnly ?? true;
+        let serversToRetry;
+        if (failedOnly) {
+            serversToRetry = uniqueServers(this.failedServers);
+        }
+        else {
+            serversToRetry = [...this.allServers];
+            this.failedServers = [];
+            this.failedServerSet = new Set();
+            this.errorsByServer = new Map();
+            this.suppressedAbortFailures = new Set();
+        }
+        logger.debug(`Reconnecting MCP servers (failedOnly=${failedOnly}) with ${serversToRetry.length} target(s).`);
+        if (this.connectInParallel) {
+            await this.connectAllParallel(serversToRetry);
+        }
+        else {
+            for (const server of serversToRetry) {
+                await this.attemptConnect(server);
+            }
+        }
+        this.refreshActiveServers();
+        return this.active;
+    }
+    async close() {
+        await this.closeAll();
+    }
+    async connectAll() {
+        this.failedServers = [];
+        this.failedServerSet = new Set();
+        this.errorsByServer = new Map();
+        this.suppressedAbortFailures = new Set();
+        const serversToConnect = [...this.allServers];
+        let connectedServers = [];
+        logger.debug(`Connecting ${serversToConnect.length} MCP server(s).`);
+        try {
+            if (this.connectInParallel) {
+                await this.connectAllParallel(serversToConnect);
+            }
+            else {
+                for (const server of serversToConnect) {
+                    await this.attemptConnect(server);
+                    if (!this.failedServerSet.has(server)) {
+                        connectedServers.push(server);
+                    }
+                }
+            }
+        }
+        catch (error) {
+            if (this.connectInParallel) {
+                connectedServers = serversToConnect.filter((server) => !this.failedServerSet.has(server));
+            }
+            const serversToCleanup = uniqueServers([
+                ...connectedServers,
+                ...this.failedServers,
+            ]);
+            await this.closeServers(serversToCleanup);
+            this.activeServers = [];
+            throw error;
+        }
+        this.refreshActiveServers();
+        return this.active;
+    }
+    async closeAll() {
+        for (const server of [...this.allServers].reverse()) {
+            await this.closeServer(server);
+        }
+    }
+    async attemptConnect(server) {
+        const raiseOnError = this.strict;
+        try {
+            logger.debug(`Connecting MCP server '${server.name}'.`);
+            await this.runConnect(server);
+            logger.debug(`Connected MCP server '${server.name}'.`);
+            if (this.failedServerSet.has(server)) {
+                this.removeFailedServer(server);
+                this.errorsByServer.delete(server);
+            }
+        }
+        catch (error) {
+            const err = toError(error);
+            if (isAbortError(err)) {
+                this.recordFailure(server, err, 'connect');
+                if (!this.suppressAbortError) {
+                    this.suppressedAbortFailures.delete(server);
+                    throw err;
+                }
+                this.suppressedAbortFailures.add(server);
+                return;
+            }
+            this.suppressedAbortFailures.delete(server);
+            this.recordFailure(server, err, 'connect');
+            if (raiseOnError) {
+                throw err;
+            }
+        }
+    }
+    refreshActiveServers() {
+        if (this.dropFailed) {
+            const failed = new Set(this.failedServerSet);
+            this.activeServers = this.allServers.filter((server) => !failed.has(server));
+        }
+        else {
+            this.activeServers = [...this.allServers];
+        }
+        logger.debug(`Active MCP servers: ${this.activeServers.length}; failed: ${this.failedServers.length}.`);
+    }
+    recordFailure(server, error, phase) {
+        logger.error(`Failed to ${phase} MCP server '${server.name}':`, error);
+        if (!this.failedServerSet.has(server)) {
+            this.failedServers.push(server);
+            this.failedServerSet.add(server);
+        }
+        this.errorsByServer.set(server, error);
+    }
+    async runConnect(server) {
+        if (this.connectInParallel) {
+            const worker = this.getWorker(server);
+            await worker.connect();
+            return;
+        }
+        await runWithTimeout(() => server.connect(), this.connectTimeoutMs, createTimeoutError('connect', server, this.connectTimeoutMs));
+    }
+    async closeServer(server) {
+        try {
+            logger.debug(`Closing MCP server '${server.name}'.`);
+            await this.runClose(server);
+            logger.debug(`Closed MCP server '${server.name}'.`);
+        }
+        catch (error) {
+            const err = toError(error);
+            if (isAbortError(err)) {
+                if (!this.suppressAbortError) {
+                    throw err;
+                }
+                logger.debug(`Close cancelled for MCP server '${server.name}': ${err}`);
+                this.errorsByServer.set(server, err);
+                return;
+            }
+            logger.error(`Failed to close MCP server '${server.name}':`, err);
+            this.errorsByServer.set(server, err);
+        }
+    }
+    async runClose(server) {
+        if (this.connectInParallel && this.workers.has(server)) {
+            const worker = this.workers.get(server);
+            if (worker) {
+                await worker.close();
+                if (worker.isDone) {
+                    this.workers.delete(server);
+                }
+                return;
+            }
+        }
+        await runWithTimeout(() => server.close(), this.closeTimeoutMs, createTimeoutError('close', server, this.closeTimeoutMs));
+    }
+    async closeServers(servers) {
+        for (const server of [...servers].reverse()) {
+            await this.closeServer(server);
+        }
+    }
+    async connectAllParallel(servers) {
+        const results = await Promise.allSettled(servers.map((server) => this.attemptConnect(server)));
+        const rejection = results.find((result) => result.status === 'rejected');
+        if (rejection) {
+            throw rejection.reason;
+        }
+        if (this.strict && this.failedServers.length > 0) {
+            const firstFailure = this.failedServers.find((server) => !this.suppressedAbortFailures.has(server));
+            if (firstFailure) {
+                const error = this.errorsByServer.get(firstFailure);
+                if (error) {
+                    throw error;
+                }
+                throw new Error(`Failed to connect MCP server '${firstFailure.name}'.`);
+            }
+        }
+    }
+    getWorker(server) {
+        const worker = this.workers.get(server);
+        if (!worker || worker.isDone) {
+            const next = new ServerWorker(server, this.connectTimeoutMs, this.closeTimeoutMs);
+            this.workers.set(server, next);
+            return next;
+        }
+        return worker;
+    }
+    removeFailedServer(server) {
+        if (this.failedServerSet.has(server)) {
+            this.failedServerSet.delete(server);
+        }
+        this.suppressedAbortFailures.delete(server);
+        this.failedServers = this.failedServers.filter((failedServer) => failedServer !== server);
+    }
+}
+/**
+ * Connect to multiple MCP servers and return a managed MCPServers instance.
+ */
+export async function connectMcpServers(servers, options) {
+    return MCPServers.open(servers, options);
+}
+function createTimeoutError(action, server, timeoutMs) {
+    if (timeoutMs === null) {
+        return new Error(`MCP server ${action} timed out.`);
+    }
+    const error = new Error(`MCP server ${action} timed out after ${timeoutMs}ms for '${server.name}'.`);
+    error.name = 'TimeoutError';
+    return error;
+}
+function createClosedError(server) {
+    const error = new Error(`MCP server '${server.name}' is closed.`);
+    error.name = 'ClosedError';
+    return error;
+}
+function createClosingError(server) {
+    const error = new Error(`MCP server '${server.name}' is closing.`);
+    error.name = 'ClosingError';
+    return error;
+}
+async function runWithTimeout(fn, timeoutMs, timeoutError) {
+    if (timeoutMs === null) {
+        await fn();
+        return;
+    }
+    let timer;
+    let timedOut = false;
+    const task = fn();
+    const timeoutPromise = new Promise((_, reject) => {
+        timer = setTimeout(() => {
+            timedOut = true;
+            reject(timeoutError);
+        }, timeoutMs);
+    });
+    try {
+        await Promise.race([task, timeoutPromise]);
+    }
+    finally {
+        if (timer) {
+            clearTimeout(timer);
+        }
+        if (timedOut) {
+            task.catch(() => undefined);
+        }
+    }
+}
+async function runWithTimeoutTask(task, timeoutMs, timeoutError) {
+    if (timeoutMs === null) {
+        await task;
+        return;
+    }
+    let timer;
+    let timedOut = false;
+    const timeoutPromise = new Promise((_, reject) => {
+        timer = setTimeout(() => {
+            timedOut = true;
+            reject(timeoutError);
+        }, timeoutMs);
+    });
+    try {
+        await Promise.race([task, timeoutPromise]);
+    }
+    finally {
+        if (timer) {
+            clearTimeout(timer);
+        }
+        if (timedOut) {
+            task.catch(() => undefined);
+        }
+    }
+}
+function toError(error) {
+    if (error instanceof Error) {
+        return error;
+    }
+    return new Error(String(error));
+}
+function isAbortError(error) {
+    const code = error.code;
+    return (error.name === 'AbortError' ||
+        error.name === 'CanceledError' ||
+        error.name === 'CancelledError' ||
+        code === 'ABORT_ERR' ||
+        code === 'ERR_ABORTED');
+}
+function uniqueServers(servers) {
+    const seen = new Set();
+    const unique = [];
+    for (const server of servers) {
+        if (!seen.has(server)) {
+            seen.add(server);
+            unique.push(server);
+        }
+    }
+    return unique;
+}
+//# sourceMappingURL=mcpServers.mjs.map

package/dist/mcpServers.mjs.map

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

package/dist/metadata.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.METADATA = void 0;
 exports.METADATA = {
     "name": "@openai/agents-core",
-    "version": "0.4.1",
+    "version": "0.4.3",
     "versions": {
-        "@openai/agents-core": "0.4.1",
+        "@openai/agents-core": "0.4.3",
         "openai": "^6"
     }
 };

package/dist/metadata.mjs

@@ -1,9 +1,9 @@
 // This file is automatically generated
 export const METADATA = {
     "name": "@openai/agents-core",
-    "version": "0.4.1",
+    "version": "0.4.3",
     "versions": {
-        "@openai/agents-core": "0.4.1",
+        "@openai/agents-core": "0.4.3",
         "openai": "^6"
     }
 };

package/dist/result.d.ts

@@ -105,6 +105,11 @@ declare class RunResultBase<TContext, TAgent extends Agent<TContext, any>> imple
      * The last agent that was run
      */
     get lastAgent(): TAgent | undefined;
+    /**
+     * The agent that should handle the next turn.
+     * This is an alias for the last agent that completed a turn.
+     */
+    get activeAgent(): TAgent | undefined;
     /**
      * Guardrail results for the input messages.
      */

package/dist/result.js

@@ -8,6 +8,13 @@ const _shims_1 = require("@openai/agents-core/_shims");
 const items_1 = require("./runner/items.js");
 const logger_1 = __importDefault(require("./logger.js"));
 const protocol_1 = require("./types/protocol.js");
+function createAbortHandlerRef() {
+    const ref = {};
+    const handler = () => {
+        ref.current?.();
+    };
+    return { ref, handler };
+}
 function combineAbortSignals(...signals) {
     const active = signals.filter(Boolean);
     if (active.length === 0) {
@@ -99,6 +106,13 @@ class RunResultBase {
     get lastAgent() {
         return this.state._currentAgent;
     }
+    /**
+     * The agent that should handle the next turn.
+     * This is an alias for the last agent that completed a turn.
+     */
+    get activeAgent() {
+        return this.lastAgent;
+    }
     /**
      * Guardrail results for the input messages.
      */
@@ -173,6 +187,7 @@ class StreamedRunResult extends RunResultBase {
     maxTurns;
     #error = null;
     #combinedSignal;
+    #abortSignalSnapshot;
     #abortController;
     #readableController;
     #readableStream;
@@ -181,10 +196,13 @@ class StreamedRunResult extends RunResultBase {
     #completedPromiseReject;
     #cancelled = false;
     #streamLoopPromise;
+    #abortHandler;
+    #abortHandlerRef;
     constructor(result = {}) {
         super(result.state);
         this.#abortController = new AbortController();
         this.#combinedSignal = combineAbortSignals(result.signal, this.#abortController.signal);
+        this.#abortSignalSnapshot = this.#combinedSignal;
         this.#readableStream = new _shims_1.ReadableStream({
             start: (controller) => {
                 this.#readableController = controller;
@@ -200,23 +218,13 @@ class StreamedRunResult extends RunResultBase {
             this.#completedPromiseReject = reject;
         });
         if (this.#combinedSignal) {
-            const handleAbort = () => {
-                if (this.#cancelled) {
-                    return;
-                }
-                this.#cancelled = true;
-                const controller = this.#readableController;
-                this.#readableController = undefined;
-                if (controller) {
-                    try {
-                        controller.close();
-                    }
-                    catch (err) {
-                        logger_1.default.debug(`Failed to close readable stream on abort: ${err}`);
-                    }
-                }
-                this.#completedPromiseResolve?.();
+            // Create the handler outside this scope so it cannot capture the run via lexical this.
+            const { ref: abortRef, handler: handleAbort } = createAbortHandlerRef();
+            abortRef.current = () => {
+                this.#handleAbort();
             };
+            this.#abortHandler = handleAbort;
+            this.#abortHandlerRef = abortRef;
             if (this.#combinedSignal.aborted) {
                 handleAbort();
             }
@@ -246,6 +254,7 @@ class StreamedRunResult extends RunResultBase {
             this.#readableController = undefined;
             this.#completedPromiseResolve?.();
         }
+        this.#detachAbortHandler();
     }
     /**
      * @internal
@@ -261,6 +270,7 @@ class StreamedRunResult extends RunResultBase {
         this.#completedPromise.catch((e) => {
             logger_1.default.debug(`Resulted in an error: ${e}`);
         });
+        this.#detachAbortHandler();
     }
     /**
      * Returns true if the stream has been cancelled.
@@ -327,7 +337,42 @@ class StreamedRunResult extends RunResultBase {
      * Returns the abort signal that should be used to cancel the streaming run.
      */
     _getAbortSignal() {
-        return this.#combinedSignal;
+        return this.#abortSignalSnapshot ?? this.#combinedSignal;
+    }
+    #handleAbort() {
+        if (this.#cancelled) {
+            this.#detachAbortHandler();
+            return;
+        }
+        this.#cancelled = true;
+        const controller = this.#readableController;
+        this.#readableController = undefined;
+        if (controller) {
+            try {
+                controller.close();
+            }
+            catch (err) {
+                logger_1.default.debug(`Failed to close readable stream on abort: ${err}`);
+            }
+        }
+        this.#completedPromiseResolve?.();
+        this.#detachAbortHandler();
+    }
+    #detachAbortHandler() {
+        // Clear the indirection first so a retained signal cannot keep this run alive.
+        if (this.#abortHandlerRef) {
+            this.#abortHandlerRef.current = undefined;
+        }
+        if (this.#combinedSignal && this.#abortHandler) {
+            try {
+                this.#combinedSignal.removeEventListener('abort', this.#abortHandler);
+            }
+            catch (err) {
+                logger_1.default.debug(`Failed to remove abort listener: ${err}`);
+            }
+        }
+        this.#abortHandler = undefined;
+        this.#abortHandlerRef = undefined;
     }
 }
 exports.StreamedRunResult = StreamedRunResult;