From b016b7083c1f6d36ee150478510dc4bdfd0c0fb8 Mon Sep 17 00:00:00 2001
From: Rahul Devikar <rahuldevikar@gmail.com>
Date: Wed, 28 Jan 2026 09:27:39 -0800
Subject: [PATCH 1/4] Update Nodejs Open AI Package version

---
 nodejs/openai/sample-agent/package.json | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/nodejs/openai/sample-agent/package.json b/nodejs/openai/sample-agent/package.json
index 54c778f0..4e3070f1 100644
--- a/nodejs/openai/sample-agent/package.json
+++ b/nodejs/openai/sample-agent/package.json
@@ -24,7 +24,7 @@
     "@microsoft/agents-a365-tooling": "^0.1.0-preview.30",
     "@microsoft/agents-a365-tooling-extensions-openai": "^0.1.0-preview.30",
     "@microsoft/agents-a365-observability-extensions-openai": "^0.1.0-preview.30",
-    "@openai/agents": "0.1.11",
+    "@openai/agents": "^0.1.11",
     "dotenv": "^17.2.2",
     "express": "^5.1.0"
   },
@@ -37,10 +37,4 @@
     "ts-node": "^10.9.2",
     "typescript": "^5.9.2"
   }
-  ,
-  "pnpm": {
-    "overrides": {
-      "@openai/agents-core": "0.1.11"
-    }
-  }
 }

From 2b49e0cf49c59052a1ab998c1fb57b1cc9b1441b Mon Sep 17 00:00:00 2001
From: Rahul Devikar <rahuldevikar@gmail.com>
Date: Wed, 28 Jan 2026 09:44:00 -0800
Subject: [PATCH 2/4] Fix: Add npm overrides to resolve @openai/agents-core
 version conflict

---
 nodejs/openai/sample-agent/package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nodejs/openai/sample-agent/package.json b/nodejs/openai/sample-agent/package.json
index 4e3070f1..1338fbb1 100644
--- a/nodejs/openai/sample-agent/package.json
+++ b/nodejs/openai/sample-agent/package.json
@@ -36,5 +36,8 @@
     "rimraf": "^5.0.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.2"
+  },
+  "overrides": {
+    "@openai/agents-core": "$@openai/agents"
   }
 }

From d9a5f6d67701d6043a3804ea5a0a6f0e1e365aee Mon Sep 17 00:00:00 2001
From: Rahul Devikar <rahuldevikar@gmail.com>
Date: Wed, 28 Jan 2026 09:56:31 -0800
Subject: [PATCH 3/4] Fix: Load dotenv at top of all entry files to ensure env
 vars available before package imports

---
 nodejs/openai/sample-agent/src/client.ts | 5 +++++
 nodejs/openai/sample-agent/src/index.ts  | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/nodejs/openai/sample-agent/src/client.ts b/nodejs/openai/sample-agent/src/client.ts
index 56e05908..afd23b81 100644
--- a/nodejs/openai/sample-agent/src/client.ts
+++ b/nodejs/openai/sample-agent/src/client.ts
@@ -1,6 +1,11 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+// IMPORTANT: Load environment variables FIRST before any other imports
+// This ensures AZURE_OPENAI_* and other config is available when packages initialize
+import { configDotenv } from 'dotenv';
+configDotenv();
+
 import { Agent, run } from '@openai/agents';
 import { Authorization, TurnContext } from '@microsoft/agents-hosting';
 
diff --git a/nodejs/openai/sample-agent/src/index.ts b/nodejs/openai/sample-agent/src/index.ts
index 9977ff36..cbf77dae 100644
--- a/nodejs/openai/sample-agent/src/index.ts
+++ b/nodejs/openai/sample-agent/src/index.ts
@@ -1,7 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-// Note: dotenv is loaded in agent.ts before AgentApplication is instantiated
+// IMPORTANT: Load environment variables FIRST before any other imports
+// This ensures all config is available when packages initialize at import time
+import { configDotenv } from 'dotenv';
+configDotenv();
 
 import { AuthConfiguration, authorizeJWT, CloudAdapter, loadAuthConfigFromEnv, Request } from '@microsoft/agents-hosting';
 import express, { Response } from 'express'

From 00f9c265fbfc1f3d7f14dda59e42917bcf6dd0ef Mon Sep 17 00:00:00 2001
From: Rahul Devikar <rahuldevikar@gmail.com>
Date: Wed, 28 Jan 2026 10:22:20 -0800
Subject: [PATCH 4/4] Fix: Add openai as direct dep and extend overrides to
 deduplicate all openai packages

---
 nodejs/openai/sample-agent/package.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nodejs/openai/sample-agent/package.json b/nodejs/openai/sample-agent/package.json
index 1338fbb1..a07a3777 100644
--- a/nodejs/openai/sample-agent/package.json
+++ b/nodejs/openai/sample-agent/package.json
@@ -25,6 +25,7 @@
     "@microsoft/agents-a365-tooling-extensions-openai": "^0.1.0-preview.30",
     "@microsoft/agents-a365-observability-extensions-openai": "^0.1.0-preview.30",
     "@openai/agents": "^0.1.11",
+    "openai": "^4.77.0",
     "dotenv": "^17.2.2",
     "express": "^5.1.0"
   },
@@ -38,6 +39,8 @@
     "typescript": "^5.9.2"
   },
   "overrides": {
-    "@openai/agents-core": "$@openai/agents"
+    "@openai/agents-core": "$@openai/agents",
+    "@openai/agents-openai": "$@openai/agents",
+    "openai": "$openai"
   }
 }