Refactor agent model handling and pricing logic

Remove explicit model lists from agents.
Add pricing check for Codex models.
Update agent registration to remove models.

Co-authored-by: frank <frank@anomalyinnovations.com>

Author: cursoragent

bun.lock

@@ -8,14 +8,6 @@ import { Logger } from "../util/logger.js";
 
 const sessionCache = new Map<string, string>();
 
-export const models: string[] = [
-  "claude-sonnet-4-5",
-  "claude-opus-4-5",
-  // "claude-sonnet-4",
-  // "claude-opus-4-1",
-  // "claude-3-5-haiku",
-];
-
 function sessionKey(model: string, cwd: string): string {
   return `${cwd}::${model}`;
 }

src/agents/claude-code.ts

@@ -16,14 +16,6 @@ const DEFAULT_SANDBOX: SandboxMode = "workspace-write";
 const codexClient = new Codex();
 const threadCache = new Map<string, Thread>();
 
-export const models = [
-  "gpt-5-codex",
-  "gpt-5.1-codex",
-  // "gpt-5",
-  // "o3",
-  // "o4-mini"
-] as const;
-
 function sessionKey(model: string, cwd: string): string {
   return `${cwd}::${model}`;
 }
@@ -67,7 +59,7 @@ function getOrCreateThread(model: string, cwd: string): Thread {
   return thread;
 }
 
-const codexAgent: Agent.Definition<(typeof models)[number]> = {
+const codexAgent: Agent.Definition = {
   async run(model, prompt, options) {
     options.logger.log(
       `codex-sdk --model ${model} --sandbox ${DEFAULT_SANDBOX} ${prompt}`,
@@ -82,18 +74,24 @@ const codexAgent: Agent.Definition<(typeof models)[number]> = {
     try {
       const pricingKey = model;
       const pricing = openai.models[pricingKey]?.cost;
+      if (!pricing) {
+        options.logger.error(
+          `No pricing info found for Codex model '${pricingKey}'; reporting $0 cost.`,
+        );
+      }
       const turn = await thread.run(prompt);
       assert(turn.usage, "The agent did not emit the usage information.");
       usage = turn.usage;
       const billableInput =
         (usage.input_tokens ?? 0) - (usage.cached_input_tokens ?? 0);
       const cachedInput = usage.cached_input_tokens ?? 0;
       const output = usage.output_tokens ?? 0;
-      cost =
-        (billableInput * pricing.input +
-          output * pricing.output +
-          cachedInput * pricing.cache_read) /
-        1_000_000;
+      cost = pricing
+        ? (billableInput * pricing.input +
+            output * pricing.output +
+            cachedInput * pricing.cache_read) /
+          1_000_000
+        : 0;
 
       actions.push(...turn.items.map((item) => JSON.stringify(item)));
       logTurnItems(turn.items, options);

src/agents/codex.ts

@@ -46,7 +46,6 @@ export namespace Agent {
   export interface Registration<TModel extends string = string> {
     name: string;
     definition: Definition<TModel>;
-    models: ReadonlyArray<TModel>;
   }
 
   const agents: Record<string, Registration<any>> = {
@@ -60,16 +59,13 @@ export namespace Agent {
     name: string,
     module: {
       default?: Definition<TModel>;
-      models?: ReadonlyArray<TModel>;
     },
   ): Registration<TModel> {
     const definition = module.default;
-    const models = module.models;
 
     assert(definition, `Agent module ${name} is missing a default export.`);
-    assert(models, `Agent module ${name} is missing the exported models list.`);
 
-    return { name, definition, models };
+    return { name, definition };
   }
 
   export function get(name: string): Registration {
@@ -78,13 +74,6 @@ export namespace Agent {
     return agent;
   }
 
-  export function validateModel(agent: Registration, model: string) {
-    if (!agent.models.find((entry) => entry === model))
-      throw new Error(
-        `Model ${model} is not registered for agent ${agent.name}.`,
-      );
-  }
-
   export function list() {
     return Object.values(agents);
   }

src/agents/index.ts

@@ -36,20 +36,6 @@ const opencode = await createOpencode({
 
 const sessionCache = new Map<string, string>();
 
-export const models: string[] = [
-  "opencode/gpt-5-codex",
-  "opencode/gpt-5.1-codex",
-  "opencode/claude-sonnet-4-5",
-  "opencode/claude-opus-4-5",
-  "opencode/glm-4.6",
-  "opencode/glm-4.7-free",
-  "opencode/gemini-3-pro",
-  "opencode/qwen3-coder",
-  "opencode/kimi-k2",
-  "opencode/grok-code",
-  "opencode/alpha-gd4",
-];
-
 function sessionKey(model: string, cwd: string): string {
   return `${cwd}::${model}`;
 }
@@ -90,6 +76,13 @@ const opencodeAgent: Agent.Definition = {
 
     options.logger.log(`Prompting session ${sessionID}...`);
     const [providerID, modelID] = model.split("/");
+    if (!providerID || !modelID) {
+      throw new Error(
+        options.logger.format(
+          `Invalid model '${model}'. Expected 'provider/model'.`,
+        ),
+      );
+    }
     const actions: string[] = [];
     const usage = {
       input: 0,

src/agents/opencode.ts

@@ -47,7 +47,6 @@ export namespace Eval {
     },
   ) {
     const agent = Agent.get(agentName);
-    Agent.validateModel(agent, modelId);
     const task = await Task.get(taskId);
     const cwd = await mkdtemp(join(tmpdir(), "openreval-"));
     $.cwd(cwd);