diff --git a/packages/server/src/server/agent/providers/codex-agent.ts b/packages/server/src/server/agent/providers/codex-agent.ts
index 2b914d5d3..405fa94c5 100644
--- a/packages/server/src/server/agent/providers/codex-agent.ts
+++ b/packages/server/src/server/agent/providers/codex-agent.ts
@@ -498,10 +498,12 @@ export class CodexAgentClient implements AgentClient {
       mcpBearerToken,
       developerInstructions ?? ""
     );
-    const env = {
-      ...process.env,
-      ...(this.baseOptions.env ?? {}),
-    };
+    const env = Object.fromEntries(
+      Object.entries({
+        ...process.env,
+        ...(this.baseOptions.env ?? {}),
+      }).filter((entry): entry is [string, string] => entry[1] !== undefined)
+    );
 
     return {
       codex: new Codex({
diff --git a/packages/server/src/server/index.ts b/packages/server/src/server/index.ts
index dfb65c2fd..212ba5655 100644
--- a/packages/server/src/server/index.ts
+++ b/packages/server/src/server/index.ts
@@ -215,7 +215,8 @@ async function main() {
         const callerAgentId =
           typeof callerAgentIdRaw === "string"
             ? callerAgentIdRaw
-            : Array.isArray(callerAgentIdRaw)
+            : Array.isArray(callerAgentIdRaw) &&
+                typeof callerAgentIdRaw[0] === "string"
               ? callerAgentIdRaw[0]
               : undefined;
         transport = await createAgentMcpTransport(callerAgentId);