Merge branch 'main' into refactor/restructure-mcp-tools-fetching

Author: xierenyuan

.changeset/big-horses-itch.md

@@ -0,0 +1,7 @@
+---
+'@openai/agents-extensions': patch
+---
+
+fix: the aisdk extension should grab output when toolCalls is a blank array
+
+When the output of a provider includes an empty tool calls array, we'd mistakenly skip over the text result. This patch checks for that condition.

.changeset/free-jokes-walk.md

@@ -0,0 +1,7 @@
+---
+'@openai/agents-core': patch
+---
+
+fix: prevent crash when importing in cloudflare workers
+
+An export was missed in https://github.com/openai/openai-agents-js/pull/290 for the workerd shim, this prevents the crash when importing there. Long term we should just add an implementation for cloudflare workers (and I suspect the node implementation might just work)

packages/agents-core/src/shims/shims-workerd.ts

@@ -54,7 +54,11 @@ export function isTracingLoopRunningByDefault(): boolean {
 /**
  * Right now Cloudflare Workers does not support MCP
  */
-export { MCPServerStdio, MCPServerStreamableHttp } from './mcp-server/browser';
+export {
+  MCPServerStdio,
+  MCPServerStreamableHttp,
+  MCPServerSSE,
+} from './mcp-server/browser';
 
 export { clearTimeout, setTimeout } from 'node:timers';
 

packages/agents-extensions/src/aiSdk.ts

@@ -463,7 +463,10 @@ export class AiSdkModel implements Model {
         // Putting a text message here will let the agent loop to complete,
         // so adding this item only when the tool calls are empty.
         // Note that the same support is not available for streaming mode.
-        if (!result.toolCalls && result.text) {
+        if (
+          (!result.toolCalls || result.toolCalls.length === 0) &&
+          result.text
+        ) {
           output.push({
             type: 'message',
             content: [{ type: 'output_text', text: result.text }],