@openai/agents-core 0.3.5 → 0.3.7

package/dist/tool.mjs

@@ -6,18 +6,135 @@ import { ModelBehaviorError, UserError } from "./errors.mjs";
 import logger from "./logger.mjs";
 import { getCurrentSpan } from "./tracing/index.mjs";
 import { toSmartString } from "./utils/smartString.mjs";
+function isComputerProvider(candidate) {
+    return (!!candidate &&
+        typeof candidate === 'object' &&
+        typeof candidate.create === 'function');
+}
 /**
- * Exposes a computer to the agent as a tool to be called
+ * Exposes a computer to the agent as a tool to be called.
  *
  * @param options Additional configuration for the computer tool like specifying the location of your agent
  * @returns a computer tool definition
  */
 export function computerTool(options) {
-    return {
+    if (!options.computer) {
+        throw new UserError('computerTool requires a computer instance or an initializer function.');
+    }
+    const tool = {
         type: 'computer',
         name: options.name ?? 'computer_use_preview',
         computer: options.computer,
     };
+    if (typeof options.computer === 'function' ||
+        isComputerProvider(options.computer)) {
+        computerInitializerMap.set(tool, options.computer);
+    }
+    return tool;
+}
+// Keeps per-tool cache of computer instances keyed by RunContext so each run gets its own instance.
+const computerCache = new WeakMap();
+// Tracks the initializer so we do not overwrite the callable on the tool when we memoize the resolved instance.
+const computerInitializerMap = new WeakMap();
+// Allows cleanup routines to find all resolved computer instances for a given run context.
+const computersByRunContext = new WeakMap();
+function getComputerInitializer(tool) {
+    const initializer = computerInitializerMap.get(tool);
+    if (initializer) {
+        return initializer;
+    }
+    if (typeof tool.computer === 'function' ||
+        isComputerProvider(tool.computer)) {
+        return tool.computer;
+    }
+    return undefined;
+}
+function trackResolvedComputer(tool, runContext, resolved) {
+    let resolvedByRun = computersByRunContext.get(runContext);
+    if (!resolvedByRun) {
+        resolvedByRun = new Map();
+        computersByRunContext.set(runContext, resolvedByRun);
+    }
+    resolvedByRun.set(tool, resolved);
+}
+/**
+ * Returns a computer instance for the provided run context. Caches per run to avoid sharing across runs.
+ * @internal
+ */
+export async function resolveComputer(args) {
+    const { tool, runContext } = args;
+    // Cache instances per RunContext so a single Computer is not shared across simultaneous runs.
+    const toolKey = tool;
+    let perContext = computerCache.get(toolKey);
+    if (!perContext) {
+        perContext = new WeakMap();
+        computerCache.set(toolKey, perContext);
+    }
+    const cached = perContext.get(runContext);
+    if (cached) {
+        trackResolvedComputer(tool, runContext, cached);
+        return cached.computer;
+    }
+    const initializerConfig = getComputerInitializer(tool);
+    const lifecycle = initializerConfig && isComputerProvider(initializerConfig)
+        ? initializerConfig
+        : isComputerProvider(tool.computer)
+            ? tool.computer
+            : undefined;
+    const initializer = typeof initializerConfig === 'function'
+        ? initializerConfig
+        : (lifecycle?.create ??
+            (typeof tool.computer === 'function'
+                ? tool.computer
+                : undefined));
+    const disposer = lifecycle?.dispose;
+    const computer = initializer && typeof initializer === 'function'
+        ? await initializer({ runContext })
+        : tool.computer;
+    if (!computer) {
+        throw new UserError('The computer tool did not provide a computer instance.');
+    }
+    const resolved = {
+        computer,
+        dispose: disposer,
+    };
+    perContext.set(runContext, resolved);
+    trackResolvedComputer(tool, runContext, resolved);
+    tool.computer = computer;
+    return computer;
+}
+/**
+ * Disposes any computer instances created for the provided run context.
+ * @internal
+ */
+export async function disposeResolvedComputers({ runContext, }) {
+    const resolvedByRun = computersByRunContext.get(runContext);
+    if (!resolvedByRun) {
+        return;
+    }
+    computersByRunContext.delete(runContext);
+    const disposers = [];
+    for (const [tool, resolved] of resolvedByRun.entries()) {
+        const perContext = computerCache.get(tool);
+        perContext?.delete(runContext);
+        const storedInitializer = getComputerInitializer(tool);
+        if (storedInitializer) {
+            tool.computer = storedInitializer;
+        }
+        if (resolved.dispose) {
+            disposers.push(async () => {
+                await resolved.dispose?.({ runContext, computer: resolved.computer });
+            });
+        }
+    }
+    for (const dispose of disposers) {
+        try {
+            await dispose();
+        }
+        catch (error) {
+            logger.warn(`Failed to dispose computer for run context: ${error}`);
+        }
+    }
 }
 export function shellTool(options) {
     const needsApproval = typeof options.needsApproval === 'function'

package/dist/tool.mjs.map

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

package/dist/tracing/context.js

@@ -115,6 +115,7 @@ function setCurrentSpan(span) {
         context.span.previousSpan = context.previousSpan;
         context.previousSpan = context.span;
     }
+    span.previousSpan = context.span ?? context.previousSpan;
     context.span = span;
     getContextAsyncLocalStorage().enterWith(context);
 }

package/dist/tracing/context.js.map

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

package/dist/tracing/context.mjs

@@ -104,6 +104,7 @@ export function setCurrentSpan(span) {
         context.span.previousSpan = context.previousSpan;
         context.previousSpan = context.span;
     }
+    span.previousSpan = context.span ?? context.previousSpan;
     context.span = span;
     getContextAsyncLocalStorage().enterWith(context);
 }

package/dist/tracing/context.mjs.map

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

package/dist/tracing/createSpans.d.ts

@@ -125,7 +125,7 @@ export declare function createTranscriptionSpan(options: CreateArgs<Transcriptio
     data: {
         input: {
             data: string;
-            format: 'pcm' | string;
+            format: 'pcm' | (string & {});
         };
     };
 }, parent?: Span<any> | Trace): Span<TranscriptionSpanData>;
@@ -133,7 +133,7 @@ export declare const withTranscriptionSpan: <TOutput>(fn: (span: Span<Transcript
     data: {
         input: {
             data: string;
-            format: "pcm" | string;
+            format: "pcm" | (string & {});
         };
     };
 }, parent?: Trace | Span<any> | undefined) => Promise<TOutput>;
@@ -144,7 +144,7 @@ export declare function createSpeechSpan(options: CreateArgs<SpeechSpanData> & {
     data: {
         output: {
             data: string;
-            format: 'pcm' | string;
+            format: 'pcm' | (string & {});
         };
     };
 }, parent?: Span<any> | Trace): Span<SpeechSpanData>;
@@ -152,7 +152,7 @@ export declare const withSpeechSpan: <TOutput>(fn: (span: Span<SpeechSpanData>)
     data: {
         output: {
             data: string;
-            format: "pcm" | string;
+            format: "pcm" | (string & {});
         };
     };
 }, parent?: Trace | Span<any> | undefined) => Promise<TOutput>;

package/dist/tracing/spans.d.ts

@@ -52,7 +52,7 @@ export type TranscriptionSpanData = SpanDataBase & {
     type: 'transcription';
     input: {
         data: string;
-        format: 'pcm' | string;
+        format: 'pcm' | (string & {});
     };
     output?: string;
     model?: string;
@@ -63,7 +63,7 @@ export type SpeechSpanData = SpanDataBase & {
     input?: string;
     output: {
         data: string;
-        format: 'pcm' | string;
+        format: 'pcm' | (string & {});
     };
     model?: string;
     model_config?: Record<string, any>;

package/dist/types/aliases.d.ts

@@ -1,4 +1,4 @@
-import { UserMessageItem, AssistantMessageItem, SystemMessageItem, HostedToolCallItem, FunctionCallItem, ComputerUseCallItem, ShellCallItem, FunctionCallResultItem, ComputerCallResultItem, ShellCallResultItem, ApplyPatchCallItem, ApplyPatchCallResultItem, ReasoningItem, UnknownItem } from './protocol';
+import { UserMessageItem, AssistantMessageItem, SystemMessageItem, HostedToolCallItem, FunctionCallItem, ComputerUseCallItem, ShellCallItem, FunctionCallResultItem, ComputerCallResultItem, ShellCallResultItem, ApplyPatchCallItem, ApplyPatchCallResultItem, ReasoningItem, CompactionItem, UnknownItem } from './protocol';
 /**
  * Context that is being passed around as part of the session is unknown
  */
@@ -10,8 +10,8 @@ export type TextOutput = 'text';
 /**
  * Agent output items
  */
-export type AgentOutputItem = UserMessageItem | AssistantMessageItem | SystemMessageItem | HostedToolCallItem | FunctionCallItem | ComputerUseCallItem | ShellCallItem | ApplyPatchCallItem | FunctionCallResultItem | ComputerCallResultItem | ShellCallResultItem | ApplyPatchCallResultItem | ReasoningItem | UnknownItem;
+export type AgentOutputItem = UserMessageItem | AssistantMessageItem | SystemMessageItem | HostedToolCallItem | FunctionCallItem | ComputerUseCallItem | ShellCallItem | ApplyPatchCallItem | FunctionCallResultItem | ComputerCallResultItem | ShellCallResultItem | ApplyPatchCallResultItem | ReasoningItem | CompactionItem | UnknownItem;
 /**
  * Agent input
  */
-export type AgentInputItem = UserMessageItem | AssistantMessageItem | SystemMessageItem | HostedToolCallItem | FunctionCallItem | ComputerUseCallItem | ShellCallItem | ApplyPatchCallItem | FunctionCallResultItem | ComputerCallResultItem | ShellCallResultItem | ApplyPatchCallResultItem | ReasoningItem | UnknownItem;
+export type AgentInputItem = UserMessageItem | AssistantMessageItem | SystemMessageItem | HostedToolCallItem | FunctionCallItem | ComputerUseCallItem | ShellCallItem | ApplyPatchCallItem | FunctionCallResultItem | ComputerCallResultItem | ShellCallResultItem | ApplyPatchCallResultItem | ReasoningItem | CompactionItem | UnknownItem;