Passing the whole ClientOptions into CUA

Author: Michal Wysocki

lib/agent/AgentProvider.ts

@@ -7,6 +7,7 @@ import {
   UnsupportedModelError,
   UnsupportedModelProviderError,
 } from "@/types/stagehandErrors";
+import { ClientOptions } from "@/types/model";
 
 // Map model names to their provider types
 const modelToAgentProviderMap: Record<string, AgentType> = {
@@ -32,7 +33,7 @@ export class AgentProvider {
 
   getClient(
     modelName: string,
-    clientOptions?: Record<string, unknown>,
+    clientOptions?: ClientOptions & Record<string, unknown>,
     userProvidedInstructions?: string,
   ): AgentClient {
     const type = AgentProvider.getAgentProvider(modelName);

lib/agent/AnthropicCUAClient.ts

@@ -1,4 +1,6 @@
-import Anthropic from "@anthropic-ai/sdk";
+import Anthropic, {
+  type ClientOptions as AnthropicClientOptions,
+} from "@anthropic-ai/sdk";
 import { LogLine } from "@/types/log";
 import {
   AgentAction,
@@ -35,7 +37,7 @@ export class AnthropicCUAClient extends AgentClient {
     type: AgentType,
     modelName: string,
     userProvidedInstructions?: string,
-    clientOptions?: Record<string, unknown>,
+    clientOptions?: AnthropicClientOptions & Record<string, unknown>,
   ) {
     super(type, modelName, userProvidedInstructions);
 
@@ -53,13 +55,7 @@ export class AnthropicCUAClient extends AgentClient {
     }
 
     // Store client options for reference
-    this.clientOptions = {
-      apiKey: this.apiKey,
-    };
-
-    if (this.baseURL) {
-      this.clientOptions.baseUrl = this.baseURL;
-    }
+    this.clientOptions = clientOptions;
 
     // Initialize the Anthropic client
     this.client = new Anthropic(this.clientOptions);

lib/agent/OpenAICUAClient.ts

@@ -1,4 +1,4 @@
-import OpenAI from "openai";
+import OpenAI, { type ClientOptions as OpenAIClientOptions } from "openai";
 import { LogLine } from "../../types/log";
 import {
   AgentAction,
@@ -34,7 +34,7 @@ export class OpenAICUAClient extends AgentClient {
     type: AgentType,
     modelName: string,
     userProvidedInstructions?: string,
-    clientOptions?: Record<string, unknown>,
+    clientOptions?: OpenAIClientOptions & Record<string, unknown>,
   ) {
     super(type, modelName, userProvidedInstructions);
 
@@ -54,9 +54,7 @@ export class OpenAICUAClient extends AgentClient {
     }
 
     // Store client options for reference
-    this.clientOptions = {
-      apiKey: this.apiKey,
-    };
+    this.clientOptions = clientOptions;
 
     if (this.baseURL) {
       this.clientOptions.baseURL = this.baseURL;

types/agent.ts

@@ -1,4 +1,5 @@
 import { LogLine } from "./log";
+import { ClientOptions } from "@/types/model";
 
 export interface AgentAction {
   type: string;
@@ -44,7 +45,7 @@ export interface AgentExecutionOptions {
 
 export interface AgentHandlerOptions {
   modelName: string;
-  clientOptions?: Record<string, unknown>;
+  clientOptions?: ClientOptions & Record<string, unknown>;
   userProvidedInstructions?: string;
   agentType: AgentType;
 }

types/stagehand.ts

@@ -255,7 +255,7 @@ export interface AgentConfig {
   /**
    * Additional options to pass to the agent client
    */
-  options?: Record<string, unknown>;
+  options?: ClientOptions & Record<string, unknown>;
 }
 
 export enum StagehandFunctionName {