allow all openrouter models

Author: charleslien

backend/src/llm-apis/vercel-ai-sdk/ai-sdk.ts

@@ -6,9 +6,7 @@ import {
   Model,
   OpenAIModel,
   openaiModels,
-  openrouterModels,
   type GeminiModel,
-  type openrouterModel,
 } from '@codebuff/common/constants'
 import {
   endsAgentStepParam,
@@ -17,11 +15,13 @@ import {
   toolNameParam,
 } from '@codebuff/common/constants/tools'
 import { Message } from '@codebuff/common/types/message'
+import { buildArray } from '@codebuff/common/util/array'
 import { errorToObject } from '@codebuff/common/util/object'
 import { withTimeout } from '@codebuff/common/util/promise'
 import { generateCompactId } from '@codebuff/common/util/string'
 import { OpenRouterUsageAccounting } from '@codebuff/internal/openrouter-ai-sdk'
 import {
+  APICallError,
   CoreAssistantMessage,
   CoreMessage,
   CoreUserMessage,
@@ -56,11 +56,8 @@ const modelToAiSDKModel = (model: Model): LanguageModelV1 => {
   if (Object.values(openaiModels).includes(model as OpenAIModel)) {
     return openai.languageModel(model)
   }
-  // All Claude models go through OpenRouter
-  if (Object.values(openrouterModels).includes(model as openrouterModel)) {
-    return openRouterLanguageModel(model)
-  }
-  throw new Error('Unknown model: ' + model)
+  // All other models go through OpenRouter
+  return openRouterLanguageModel(model)
 }
 
 // TODO: Add retries & fallbacks: likely by allowing this to instead of "model"
@@ -128,21 +125,20 @@ export const promptAiSdkStream = async function* (
         },
         'Error from AI SDK'
       )
-      if (process.env.ENVIRONMENT !== 'prod') {
-        throw chunk.error instanceof Error
-          ? new Error(
-              `Error from AI SDK (${options.model}): ${chunk.error.message}`,
-              {
-                cause: chunk.error,
-              }
-            )
-          : new Error(
-              `Error from AI SDK (${options.model}): ${
-                typeof chunk.error === 'string'
-                  ? chunk.error
-                  : JSON.stringify(chunk.error)
-              }`
-            )
+      if (process.env.NEXT_PUBLIC_CB_ENVIRONMENT !== 'prod') {
+        const errorBody = APICallError.isInstance(chunk.error)
+          ? chunk.error.responseBody
+          : undefined
+        const mainErrorMessage =
+          chunk.error instanceof Error
+            ? chunk.error.message
+            : typeof chunk.error === 'string'
+              ? chunk.error
+              : JSON.stringify(chunk.error)
+        const errorMessage = `Error from AI SDK (model ${options.model}): ${buildArray([mainErrorMessage, errorBody]).join('\n')}`
+        throw new Error(errorMessage, {
+          cause: chunk.error,
+        })
       }
     }
     if (chunk.type === 'reasoning') {

backend/src/run-agent-step.ts

@@ -1,6 +1,9 @@
 import { AgentResponseTrace, insertTrace } from '@codebuff/bigquery'
 import { trackEvent } from '@codebuff/common/analytics'
-import { ASYNC_AGENTS_ENABLED, models } from '@codebuff/common/constants'
+import {
+  ASYNC_AGENTS_ENABLED,
+  supportsCacheControl,
+} from '@codebuff/common/constants'
 import { AnalyticsEvent } from '@codebuff/common/constants/analytics-events'
 import {
   getToolCallString,
@@ -362,7 +365,7 @@ export const runAgentStep = async (
   const agentMessages = getCoreMessagesSubset(
     agentMessagesUntruncated,
     systemTokens,
-    agentTemplate.model !== models.openrouter_grok_4
+    supportsCacheControl(agentTemplate.model)
   )
 
   const debugPromptCaching = false

backend/src/tools/stream-parser.ts

@@ -179,7 +179,7 @@ export async function processStreamWithTools<T extends string>(options: {
         if (!agentTemplate.toolNames.includes(toolCall.toolName)) {
           toolResults.push({
             toolName,
-            toolCallId: generateCompactId(),
+            toolCallId: toolCall.toolCallId,
             result: `Tool \`${toolName}\` is not currently available. Make sure to only use tools listed in the system instructions.`,
           })
           return

common/src/constants.ts

@@ -286,7 +286,22 @@ export const providerModelNames = {
   ),
 }
 
-export type Model = (typeof models)[keyof typeof models]
+export type Model = (typeof models)[keyof typeof models] | (string & {})
+
+const modelsGeneric = models satisfies Record<string, string> as Record<
+  string,
+  string | undefined
+>
+const nonCacheableModels = [
+  models.openrouter_grok_4,
+] satisfies string[] as string[]
+export function supportsCacheControl(model: Model): boolean {
+  if (modelsGeneric[model] === undefined) {
+    // Default to no cache control for unknown models
+    return false
+  }
+  return !nonCacheableModels.includes(model)
+}
 
 export const TEST_USER_ID = 'test-user-id'
 

common/src/types/dynamic-agent-template.ts

@@ -42,7 +42,7 @@ export const DynamicAgentTemplateSchema = z.object({
   // Required fields for new agents
   name: z.string(),
   purpose: z.string(),
-  model: z.enum(filteredModels as [string, ...string[]]),
+  model: z.string(),
   outputMode: z
     .enum(['last_message', 'report', 'all_messages'])
     .default('last_message'),

common/src/types/session-state.ts

@@ -39,7 +39,7 @@ export const AgentStateSchema: z.ZodType<{
 }> = z.lazy(() =>
   z.object({
     agentId: z.string(),
-    agentType: agentTemplateTypeSchema.nullable(),
+    agentType: z.string().nullable(),
     agentContext: z.record(z.string(), subgoalSchema),
     subagents: AgentStateSchema.array(),
     messageHistory: CodebuffMessageSchema.array(),