Cleanup & fix model strings

Author: jahooma

common/src/constants/claude-oauth.ts

@@ -19,6 +19,17 @@ export const CLAUDE_OAUTH_TOKEN_ENV_VAR = 'CODEBUFF_CLAUDE_OAUTH_TOKEN'
 // Required Anthropic API version header
 export const ANTHROPIC_API_VERSION = '2023-06-01'
 
+/**
+ * Beta headers required for Claude OAuth access to Claude 4+ models.
+ * These must be included in the anthropic-beta header when making requests.
+ */
+export const CLAUDE_OAUTH_BETA_HEADERS = [
+  'oauth-2025-04-20',
+  'claude-code-20250219',
+  'interleaved-thinking-2025-05-14',
+  'fine-grained-tool-streaming-2025-05-14',
+] as const
+
 /**
  * System prompt prefix required by Anthropic to allow OAuth access to Claude 4+ models.
  * This must be prepended to the system prompt when using Claude OAuth with Claude 4+ models.
@@ -32,25 +43,47 @@ export const CLAUDE_CODE_SYSTEM_PROMPT_PREFIX = "You are Claude Code, Anthropic'
  * while Anthropic uses versioned IDs like "claude-3-5-haiku-20241022".
  */
 export const OPENROUTER_TO_ANTHROPIC_MODEL_MAP: Record<string, string> = {
-  // Claude 3.x models
+  // Claude 3.x Haiku models
   'anthropic/claude-3.5-haiku-20241022': 'claude-3-5-haiku-20241022',
   'anthropic/claude-3.5-haiku': 'claude-3-5-haiku-20241022',
   'anthropic/claude-3-5-haiku': 'claude-3-5-haiku-20241022',
+  'anthropic/claude-3-5-haiku-20241022': 'claude-3-5-haiku-20241022',
   'anthropic/claude-3-haiku': 'claude-3-haiku-20240307',
-  'anthropic/claude-3-opus': 'claude-3-opus-20240229',
   'claude-3.5-haiku': 'claude-3-5-haiku-20241022',
   'claude-3-5-haiku': 'claude-3-5-haiku-20241022',
   'claude-3-haiku': 'claude-3-haiku-20240307',
+
+  // Claude 3.x Sonnet models
+  'anthropic/claude-3.5-sonnet': 'claude-3-5-sonnet-20241022',
+  'anthropic/claude-3-5-sonnet': 'claude-3-5-sonnet-20241022',
+  'anthropic/claude-3-5-sonnet-20241022': 'claude-3-5-sonnet-20241022',
+  'anthropic/claude-3-5-sonnet-20240620': 'claude-3-5-sonnet-20240620',
+  'anthropic/claude-3-sonnet': 'claude-3-sonnet-20240229',
+  'claude-3.5-sonnet': 'claude-3-5-sonnet-20241022',
+  'claude-3-5-sonnet': 'claude-3-5-sonnet-20241022',
+  'claude-3-sonnet': 'claude-3-sonnet-20240229',
+
+  // Claude 3.x Opus models
+  'anthropic/claude-3-opus': 'claude-3-opus-20240229',
+  'anthropic/claude-3-opus-20240229': 'claude-3-opus-20240229',
   'claude-3-opus': 'claude-3-opus-20240229',
 
-  // Claude 4.x models
+  // Claude 4.x Haiku models
+  'anthropic/claude-haiku-4.5': 'claude-haiku-4-5-20251001',
+  'anthropic/claude-haiku-4': 'claude-haiku-4-20250514',
+  'claude-haiku-4.5': 'claude-haiku-4-5-20251001',
+  'claude-haiku-4': 'claude-haiku-4-20250514',
+
+  // Claude 4.x Sonnet models
   'anthropic/claude-sonnet-4.5': 'claude-sonnet-4-5-20250929',
   'anthropic/claude-sonnet-4': 'claude-sonnet-4-20250514',
+  'claude-sonnet-4.5': 'claude-sonnet-4-5-20250929',
+  'claude-sonnet-4': 'claude-sonnet-4-20250514',
+
+  // Claude 4.x Opus models
   'anthropic/claude-opus-4.5': 'claude-opus-4-5-20251101',
   'anthropic/claude-opus-4.1': 'claude-opus-4-1-20250805',
   'anthropic/claude-opus-4': 'claude-opus-4-1-20250805',
-  'claude-sonnet-4.5': 'claude-sonnet-4-5-20250929',
-  'claude-sonnet-4': 'claude-sonnet-4-20250514',
   'claude-opus-4.5': 'claude-opus-4-5-20251101',
   'claude-opus-4.1': 'claude-opus-4-1-20250805',
   'claude-opus-4': 'claude-opus-4-1-20250805',

sdk/src/impl/llm.ts

@@ -1,5 +1,3 @@
-import path from 'path'
-
 import { getByokOpenrouterApiKeyFromEnv } from '../env'
 import { BYOK_OPENROUTER_HEADER } from '@codebuff/common/constants/byok'
 import { models, PROFIT_MARGIN } from '@codebuff/common/old-constants'

sdk/src/impl/model-provider.ts

@@ -12,6 +12,7 @@ import { createAnthropic } from '@ai-sdk/anthropic'
 import { BYOK_OPENROUTER_HEADER } from '@codebuff/common/constants/byok'
 import {
   CLAUDE_CODE_SYSTEM_PROMPT_PREFIX,
+  CLAUDE_OAUTH_BETA_HEADERS,
   isClaudeModel,
   toAnthropicModelId,
 } from '@codebuff/common/constants/claude-oauth'
@@ -121,13 +122,7 @@ function createAnthropicOAuthModel(
       .map((b) => b.trim())
       .filter(Boolean)
     const mergedBetas = [
-      ...new Set([
-        'oauth-2025-04-20',
-        'claude-code-20250219',
-        'interleaved-thinking-2025-05-14',
-        'fine-grained-tool-streaming-2025-05-14',
-        ...betaList,
-      ]),
+      ...new Set([...CLAUDE_OAUTH_BETA_HEADERS, ...betaList]),
     ].join(',')
     headers.set('anthropic-beta', mergedBetas)