Merge main into throw-exceptions-in-tools

Author: bhouston

.changeset/openai-models.md

@@ -0,0 +1,6 @@
+---
+'mycoder': minor
+'mycoder-agent': minor
+---
+
+Add support for OpenAI models (o3 mini and GPT-4o) via Vercel AI SDK

packages/agent/src/core/toolAgent/config.ts

@@ -1,6 +1,34 @@
 import { execSync } from 'child_process';
 
 import { anthropic } from '@ai-sdk/anthropic';
+import { openai } from '@ai-sdk/openai';
+
+/**
+ * Available model providers
+ */
+export type ModelProvider = 'anthropic' | 'openai';
+
+/**
+ * Available models by provider
+ */
+export const AVAILABLE_MODELS = {
+  anthropic: ['claude-3-7-sonnet-20250219', 'claude-3-opus-20240229'],
+  openai: ['gpt-4o-2024-05-13', 'o3-mini-2024-07-18'],
+};
+
+/**
+ * Get the model instance based on provider and model name
+ */
+export function getModel(provider: ModelProvider, modelName: string) {
+  switch (provider) {
+    case 'anthropic':
+      return anthropic(modelName);
+    case 'openai':
+      return openai(modelName);
+    default:
+      throw new Error(`Unknown model provider: ${provider}`);
+  }
+}
 
 import { ToolContext } from '../types';
 

packages/agent/src/index.ts

@@ -26,6 +26,7 @@ export * from './tools/interaction/userPrompt.js';
 export * from './core/executeToolCall.js';
 export * from './core/types.js';
 export * from './core/toolAgent.js';
+export * from './core/toolAgent/config.js';
 
 // Utils
 export * from './tools/getTools.js';

packages/agent/src/tools/interaction/subAgent.ts

@@ -1,8 +1,8 @@
-import { anthropic } from '@ai-sdk/anthropic';
 import { z } from 'zod';
 import { zodToJsonSchema } from 'zod-to-json-schema';
 
 import { getDefaultSystemPrompt } from '../../core/toolAgent/index.js';
+import { getModel } from '../../core/toolAgent/config.js';
 import { toolAgent } from '../../core/toolAgent.js';
 import { Tool, ToolContext } from '../../core/types.js';
 import { getTools } from '../getTools.js';
@@ -51,7 +51,7 @@ type ReturnType = z.infer<typeof returnSchema>;
 // Sub-agent specific configuration
 const subAgentConfig = {
   maxIterations: 50,
-  model: anthropic('claude-3-7-sonnet-20250219'),
+  model: getModel('anthropic', 'claude-3-7-sonnet-20250219'),
   maxTokens: 4096,
   temperature: 0.7,
   getSystemPrompt: (context: ToolContext) => {

packages/cli/src/commands/$default.ts

@@ -11,6 +11,9 @@ import {
   LogLevel,
   subAgentTool,
   errorToString,
+  getModel,
+  AVAILABLE_MODELS,
+  DEFAULT_CONFIG,
 } from 'mycoder-agent';
 import { TokenTracker } from 'mycoder-agent/dist/core/tokens.js';
 
@@ -87,10 +90,33 @@ export const command: CommandModule<SharedOptions, DefaultArgs> = {
     );
 
     try {
-      // Early API key check
-      if (!process.env.ANTHROPIC_API_KEY) {
+      // Get configuration for model provider and name
+      const userConfig = getConfig();
+      const userModelProvider = argv.modelProvider || userConfig.modelProvider;
+      const userModelName = argv.modelName || userConfig.modelName;
+
+      // Early API key check based on model provider
+      if (userModelProvider === 'anthropic' && !process.env.ANTHROPIC_API_KEY) {
         logger.error(getAnthropicApiKeyError());
         throw new Error('Anthropic API key not found');
+      } else if (
+        userModelProvider === 'openai' &&
+        !process.env.OPENAI_API_KEY
+      ) {
+        logger.error(
+          'No OpenAI API key found. Please set the OPENAI_API_KEY environment variable.',
+          'You can get an API key from https://platform.openai.com/api-keys',
+        );
+        throw new Error('OpenAI API key not found');
+      }
+
+      // Validate model name
+      if (!AVAILABLE_MODELS[userModelProvider].includes(userModelName)) {
+        logger.error(
+          `Invalid model name: ${userModelName} for provider ${userModelProvider}`,
+          `Available models for ${userModelProvider}: ${AVAILABLE_MODELS[userModelProvider].join(', ')}`,
+        );
+        throw new Error(`Invalid model name: ${userModelName}`);
       }
 
       let prompt: string | undefined;
@@ -136,7 +162,16 @@ export const command: CommandModule<SharedOptions, DefaultArgs> = {
       });
       const config = await getConfig();
 
-      const result = await toolAgent(prompt, tools, undefined, {
+      // Create a config with the selected model
+      const agentConfig = {
+        ...DEFAULT_CONFIG,
+        model: getModel(
+          userModelProvider as 'anthropic' | 'openai',
+          userModelName,
+        ),
+      };
+
+      const result = await toolAgent(prompt, tools, agentConfig, {
         logger,
         headless: argv.headless ?? config.headless,
         userSession: argv.userSession ?? config.userSession,

packages/cli/src/options.ts

@@ -7,6 +7,8 @@ export type SharedOptions = {
   readonly userSession?: boolean;
   readonly pageFilter?: 'simple' | 'none' | 'readability';
   readonly sentryDsn?: string;
+  readonly modelProvider?: string;
+  readonly modelName?: string;
 };
 
 export const sharedOptions = {
@@ -17,6 +19,15 @@ export const sharedOptions = {
     default: 'info',
     choices: ['debug', 'verbose', 'info', 'warn', 'error'],
   } as const,
+  modelProvider: {
+    type: 'string',
+    description: 'AI model provider to use',
+    choices: ['anthropic', 'openai'],
+  } as const,
+  modelName: {
+    type: 'string',
+    description: 'AI model name to use',
+  } as const,
   interactive: {
     type: 'boolean',
     alias: 'i',

packages/cli/src/settings/config.ts

@@ -12,6 +12,8 @@ const defaultConfig = {
   headless: true,
   userSession: false,
   pageFilter: 'none' as 'simple' | 'none' | 'readability',
+  modelProvider: 'anthropic',
+  modelName: 'claude-3-7-sonnet-20250219',
 };
 
 export type Config = typeof defaultConfig;

packages/cli/tests/settings/config.test.ts

@@ -41,6 +41,8 @@ describe('Config', () => {
         headless: true,
         userSession: false,
         pageFilter: 'none',
+        modelProvider: 'anthropic',
+        modelName: 'claude-3-7-sonnet-20250219',
       });
       expect(fs.existsSync).toHaveBeenCalledWith(mockConfigFile);
     });
@@ -70,6 +72,8 @@ describe('Config', () => {
         headless: true,
         userSession: false,
         pageFilter: 'none',
+        modelProvider: 'anthropic',
+        modelName: 'claude-3-7-sonnet-20250219',
       });
     });
   });