bopodev-api 0.1.13 → 0.1.15

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2026 BopoDev contributors
+Copyright (c) 2026 Bopo
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bopodev-api",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "license": "MIT",
   "type": "module",
   "files": [
@@ -17,9 +17,9 @@
     "nanoid": "^5.1.5",
     "ws": "^8.19.0",
     "zod": "^4.1.5",
-    "bopodev-contracts": "0.1.13",
-    "bopodev-agent-sdk": "0.1.13",
-    "bopodev-db": "0.1.13"
+    "bopodev-agent-sdk": "0.1.15",
+    "bopodev-contracts": "0.1.15",
+    "bopodev-db": "0.1.15"
   },
   "devDependencies": {
     "@types/cors": "^2.8.19",

package/src/lib/agent-config.ts

@@ -39,10 +39,39 @@ export function requiresRuntimeCwd(providerType: string) {
     providerType === "claude_code" ||
     providerType === "cursor" ||
     providerType === "opencode" ||
+    providerType === "gemini_cli" ||
     providerType === "shell"
   );
 }
 
+export function resolveDefaultRuntimeModelForProvider(providerType: string | undefined) {
+  const normalizedProviderType = providerType?.trim() ?? "";
+  if (normalizedProviderType === "claude_code") {
+    return "claude-sonnet-4-6";
+  }
+  if (normalizedProviderType === "codex") {
+    return "gpt-5.3-codex";
+  }
+  if (normalizedProviderType === "opencode") {
+    return "opencode/big-pickle";
+  }
+  if (normalizedProviderType === "gemini_cli") {
+    return "gemini-2.5-pro";
+  }
+  return undefined;
+}
+
+export function resolveRuntimeModelForProvider(
+  providerType: string | undefined,
+  runtimeModel: string | undefined
+) {
+  const normalizedRuntimeModel = runtimeModel?.trim() || undefined;
+  if (normalizedRuntimeModel) {
+    return normalizedRuntimeModel;
+  }
+  return resolveDefaultRuntimeModelForProvider(providerType);
+}
+
 export function normalizeRuntimeConfig(input: {
   runtimeConfig?: Partial<AgentRuntimeConfig>;
   legacy?: LegacyRuntimeFields;
@@ -116,12 +145,15 @@ export function parseRuntimeConfigFromAgentRow(agent: Record<string, unknown>):
       ? timeoutSecFromColumn
       : (toSeconds(fallback.timeoutMs) ?? 0);
 
+  const providerType = toText(agent.providerType);
+  const runtimeModel = resolveRuntimeModelForProvider(providerType, toText(agent.runtimeModel) ?? fallback.model);
+
   return {
     runtimeCommand: toText(agent.runtimeCommand) ?? fallback.command,
     runtimeArgs,
     runtimeCwd: toText(agent.runtimeCwd) ?? fallback.cwd,
     runtimeEnv,
-    runtimeModel: toText(agent.runtimeModel),
+    runtimeModel,
     runtimeThinkingEffort: parseThinkingEffort(agent.runtimeThinkingEffort),
     bootstrapPrompt: toText(agent.bootstrapPrompt),
     runtimeTimeoutSec: Math.max(0, timeoutSec),
@@ -165,6 +197,7 @@ function parseRuntimeFromStateBlob(raw: unknown) {
       args?: string[];
       cwd?: string;
       env?: Record<string, string>;
+      model?: string;
       timeoutMs?: number;
     };
   }
@@ -175,6 +208,7 @@ function parseRuntimeFromStateBlob(raw: unknown) {
         args?: unknown;
         cwd?: unknown;
         env?: unknown;
+        model?: unknown;
         timeoutMs?: unknown;
       };
     };
@@ -184,6 +218,7 @@ function parseRuntimeFromStateBlob(raw: unknown) {
       args: Array.isArray(runtime.args) ? runtime.args.map((entry) => String(entry)) : undefined,
       cwd: typeof runtime.cwd === "string" ? runtime.cwd : undefined,
       env: toRecord(runtime.env),
+      model: typeof runtime.model === "string" && runtime.model.trim().length > 0 ? runtime.model.trim() : undefined,
       timeoutMs: toNumber(runtime.timeoutMs)
     };
   } catch {

package/src/lib/opencode-model.ts

@@ -1,4 +1,3 @@
-import { getAdapterModels } from "bopodev-agent-sdk";
 import type { NormalizedRuntimeConfig } from "./agent-config";
 
 export async function resolveOpencodeRuntimeModel(
@@ -6,30 +5,7 @@ export async function resolveOpencodeRuntimeModel(
   runtimeConfig: NormalizedRuntimeConfig
 ): Promise<string | undefined> {
   if (providerType !== "opencode") {
-    return runtimeConfig.runtimeModel;
+    return runtimeConfig.runtimeModel?.trim() || undefined;
   }
-  if (runtimeConfig.runtimeModel?.trim()) {
-    return runtimeConfig.runtimeModel.trim();
-  }
-
-  const configured =
-    process.env.BOPO_OPENCODE_MODEL?.trim() ||
-    process.env.OPENCODE_MODEL?.trim() ||
-    undefined;
-  try {
-    const discovered = await getAdapterModels("opencode", {
-      command: runtimeConfig.runtimeCommand,
-      cwd: runtimeConfig.runtimeCwd,
-      env: runtimeConfig.runtimeEnv
-    });
-    if (configured && discovered.some((entry) => entry.id === configured)) {
-      return configured;
-    }
-    if (discovered.length > 0) {
-      return discovered[0]!.id;
-    }
-  } catch {
-    // Fall back to configured env default when discovery is unavailable.
-  }
-  return configured;
+  return runtimeConfig.runtimeModel?.trim() || undefined;
 }

package/src/routes/agents.ts

@@ -22,6 +22,7 @@ import { sendError, sendOk } from "../http";
 import {
   normalizeRuntimeConfig,
   parseRuntimeConfigFromAgentRow,
+  resolveRuntimeModelForProvider,
   requiresRuntimeCwd,
   runtimeConfigToDb,
   runtimeConfigToStateBlobPatch
@@ -70,6 +71,7 @@ const runtimePreflightSchema = z.object({
     "codex",
     "cursor",
     "opencode",
+    "gemini_cli",
     "openai_api",
     "anthropic_api",
     "http",
@@ -122,6 +124,17 @@ function toAgentResponse(agent: Record<string, unknown>) {
   };
 }
 
+function providerRequiresNamedModel(providerType: string) {
+  return providerType !== "http" && providerType !== "shell";
+}
+
+function ensureNamedRuntimeModel(providerType: string, runtimeModel: string | undefined) {
+  if (!providerRequiresNamedModel(providerType)) {
+    return true;
+  }
+  return hasText(runtimeModel);
+}
+
 export function createAgentsRouter(ctx: AppContext) {
   const router = Router();
   router.use(requireCompanyScope);
@@ -159,6 +172,7 @@ export function createAgentsRouter(ctx: AppContext) {
       | "codex"
       | "cursor"
       | "opencode"
+      | "gemini_cli"
       | "openai_api"
       | "anthropic_api"
       | "http"
@@ -265,6 +279,10 @@ export function createAgentsRouter(ctx: AppContext) {
       defaultRuntimeCwd
     });
     runtimeConfig.runtimeModel = await resolveOpencodeRuntimeModel(parsed.data.providerType, runtimeConfig);
+    runtimeConfig.runtimeModel = resolveRuntimeModelForProvider(parsed.data.providerType, runtimeConfig.runtimeModel);
+    if (!ensureNamedRuntimeModel(parsed.data.providerType, runtimeConfig.runtimeModel)) {
+      return sendError(res, "A named runtime model is required for this provider.", 422);
+    }
     if (requiresRuntimeCwd(parsed.data.providerType) && !hasText(runtimeConfig.runtimeCwd)) {
       return sendError(res, "Runtime working directory is required for this runtime provider.", 422);
     }
@@ -397,6 +415,10 @@ export function createAgentsRouter(ctx: AppContext) {
         : {})
     };
     nextRuntime.runtimeModel = await resolveOpencodeRuntimeModel(effectiveProviderType, nextRuntime);
+    nextRuntime.runtimeModel = resolveRuntimeModelForProvider(effectiveProviderType, nextRuntime.runtimeModel);
+    if (!ensureNamedRuntimeModel(effectiveProviderType, nextRuntime.runtimeModel)) {
+      return sendError(res, "A named runtime model is required for this provider.", 422);
+    }
     if (!nextRuntime.runtimeCwd && defaultRuntimeCwd) {
       nextRuntime.runtimeCwd = defaultRuntimeCwd;
     }

package/src/routes/companies.ts

@@ -3,6 +3,7 @@ import { z } from "zod";
 import { createCompany, deleteCompany, listCompanies, updateCompany } from "bopodev-db";
 import type { AppContext } from "../context";
 import { sendError, sendOk } from "../http";
+import { ensureCompanyModelPricingDefaults } from "../services/model-pricing";
 import { ensureCompanyBuiltinPluginDefaults } from "../services/plugin-runtime";
 
 const createCompanySchema = z.object({
@@ -32,6 +33,7 @@ export function createCompaniesRouter(ctx: AppContext) {
     }
     const company = await createCompany(ctx.db, parsed.data);
     await ensureCompanyBuiltinPluginDefaults(ctx.db, company.id);
+    await ensureCompanyModelPricingDefaults(ctx.db, company.id);
     return sendOk(res, company);
   });
 

package/src/routes/observability.ts

@@ -1,4 +1,5 @@
 import { Router } from "express";
+import { z } from "zod";
 import {
   getHeartbeatRun,
   listAgents,
@@ -6,7 +7,9 @@ import {
   listCostEntries,
   listHeartbeatRunMessages,
   listHeartbeatRuns,
-  listPluginRuns
+  listModelPricing,
+  listPluginRuns,
+  upsertModelPricing
 } from "bopodev-db";
 import type { AppContext } from "../context";
 import { sendError, sendOk } from "../http";
@@ -39,6 +42,52 @@ export function createObservabilityRouter(ctx: AppContext) {
     );
   });
 
+  const modelPricingUpdateSchema = z.object({
+    providerType: z.string().min(1),
+    modelId: z.string().min(1),
+    displayName: z.string().min(1).optional(),
+    inputUsdPer1M: z.number().min(0),
+    outputUsdPer1M: z.number().min(0),
+    currency: z.string().min(1).optional()
+  });
+
+  router.get("/models/pricing", async (req, res) => {
+    const rows = await listModelPricing(ctx.db, req.companyId!);
+    return sendOk(
+      res,
+      rows.map((row) => ({
+        companyId: row.companyId,
+        providerType: row.providerType,
+        modelId: row.modelId,
+        displayName: row.displayName,
+        inputUsdPer1M: typeof row.inputUsdPer1M === "number" ? row.inputUsdPer1M : Number(row.inputUsdPer1M ?? 0),
+        outputUsdPer1M: typeof row.outputUsdPer1M === "number" ? row.outputUsdPer1M : Number(row.outputUsdPer1M ?? 0),
+        currency: row.currency,
+        updatedAt: row.updatedAt?.toISOString?.() ?? null,
+        updatedBy: row.updatedBy ?? null
+      }))
+    );
+  });
+
+  router.put("/models/pricing", async (req, res) => {
+    const parsed = modelPricingUpdateSchema.safeParse(req.body);
+    if (!parsed.success) {
+      return sendError(res, parsed.error.message, 422);
+    }
+    const payload = parsed.data;
+    await upsertModelPricing(ctx.db, {
+      companyId: req.companyId!,
+      providerType: payload.providerType,
+      modelId: payload.modelId,
+      displayName: payload.displayName ?? null,
+      inputUsdPer1M: payload.inputUsdPer1M.toFixed(6),
+      outputUsdPer1M: payload.outputUsdPer1M.toFixed(6),
+      currency: payload.currency ?? "USD",
+      updatedBy: req.actor?.id ?? null
+    });
+    return sendOk(res, { ok: true });
+  });
+
   router.get("/heartbeats", async (req, res) => {
     const companyId = req.companyId!;
     const rawLimit = Number(req.query.limit ?? 100);

package/src/scripts/onboard-seed.ts

@@ -17,6 +17,7 @@ import {
 } from "bopodev-db";
 import { normalizeRuntimeConfig, runtimeConfigToDb, runtimeConfigToStateBlobPatch } from "../lib/agent-config";
 import { resolveDefaultRuntimeCwdForCompany } from "../lib/workspace-policy";
+import { ensureCompanyModelPricingDefaults } from "../services/model-pricing";
 
 export interface OnboardSeedSummary {
   companyId: string;
@@ -30,7 +31,7 @@ export interface OnboardSeedSummary {
 const DEFAULT_COMPANY_NAME_ENV = "BOPO_DEFAULT_COMPANY_NAME";
 const DEFAULT_COMPANY_ID_ENV = "BOPO_DEFAULT_COMPANY_ID";
 const DEFAULT_AGENT_PROVIDER_ENV = "BOPO_DEFAULT_AGENT_PROVIDER";
-type AgentProvider = "codex" | "claude_code" | "cursor" | "opencode" | "openai_api" | "anthropic_api" | "shell";
+type AgentProvider = "codex" | "claude_code" | "cursor" | "gemini_cli" | "opencode" | "openai_api" | "anthropic_api" | "shell";
 const CEO_BOOTSTRAP_SUMMARY = "ceo bootstrap heartbeat";
 const STARTUP_PROJECT_NAME = "Leadership Setup";
 const CEO_STARTUP_TASK_TITLE = "Set up CEO operating files and hire founding engineer";
@@ -135,6 +136,7 @@ export async function ensureOnboardingSeed(input: {
         ceoId
       });
     }
+    await ensureCompanyModelPricingDefaults(db, companyId);
 
     return {
       companyId,
@@ -259,6 +261,7 @@ function parseAgentProvider(value: unknown): AgentProvider | null {
     value === "codex" ||
     value === "claude_code" ||
     value === "cursor" ||
+    value === "gemini_cli" ||
     value === "opencode" ||
     value === "openai_api" ||
     value === "anthropic_api" ||

package/src/services/governance-service.ts

@@ -18,6 +18,7 @@ import {
 } from "bopodev-db";
 import {
   normalizeRuntimeConfig,
+  resolveRuntimeModelForProvider,
   requiresRuntimeCwd,
   runtimeConfigToDb,
   runtimeConfigToStateBlobPatch
@@ -195,6 +196,10 @@ async function applyApprovalAction(db: BopoDb, companyId: string, action: string
       defaultRuntimeCwd
     });
     runtimeConfig.runtimeModel = await resolveOpencodeRuntimeModel(parsed.data.providerType, runtimeConfig);
+    runtimeConfig.runtimeModel = resolveRuntimeModelForProvider(parsed.data.providerType, runtimeConfig.runtimeModel);
+    if (providerRequiresNamedModel(parsed.data.providerType) && !hasText(runtimeConfig.runtimeModel)) {
+      throw new GovernanceError("Approval payload for agent hiring must include a named runtime model.");
+    }
     if (requiresRuntimeCwd(parsed.data.providerType) && !hasText(runtimeConfig.runtimeCwd)) {
       throw new GovernanceError("Approval payload for agent hiring is missing runtime working directory.");
     }
@@ -348,6 +353,10 @@ async function applyApprovalAction(db: BopoDb, companyId: string, action: string
   throw new GovernanceError(`Unsupported approval action: ${action}`);
 }
 
+function providerRequiresNamedModel(providerType: string) {
+  return providerType !== "http" && providerType !== "shell";
+}
+
 function parsePayload(payloadJson: string) {
   try {
     const parsed = JSON.parse(payloadJson) as unknown;

package/src/services/heartbeat-service.ts

@@ -32,6 +32,7 @@ import { createHeartbeatRunsRealtimeEvent } from "../realtime/heartbeat-runs";
 import { publishOfficeOccupantForAgent } from "../realtime/office-space";
 import { checkAgentBudget } from "./budget-service";
 import { appendDurableFact, loadAgentMemoryContext, persistHeartbeatMemory } from "./memory-file-service";
+import { calculateModelPricedUsdCost } from "./model-pricing";
 import { runPluginHook } from "./plugin-runtime";
 
 type HeartbeatRunTrigger = "manual" | "scheduler";
@@ -41,6 +42,7 @@ type HeartbeatProviderType =
   | "codex"
   | "cursor"
   | "opencode"
+  | "gemini_cli"
   | "openai_api"
   | "anthropic_api"
   | "http"
@@ -373,6 +375,8 @@ export async function runHeartbeatForAgent(
   let memoryContext: HeartbeatContext["memoryContext"] | undefined;
   let stateParseError: string | null = null;
   let runtimeLaunchSummary: ReturnType<typeof summarizeRuntimeLaunch> | null = null;
+  let primaryIssueId: string | null = null;
+  let primaryProjectId: string | null = null;
   let transcriptSequence = 0;
   let transcriptWriteQueue = Promise.resolve();
   let transcriptLiveCount = 0;
@@ -499,6 +503,8 @@ export async function runHeartbeatForAgent(
     });
     const workItems = await claimIssuesForAgent(db, companyId, agentId, runId);
     issueIds = workItems.map((item) => item.id);
+    primaryIssueId = workItems[0]?.id ?? null;
+    primaryProjectId = workItems[0]?.project_id ?? null;
     await runPluginHook(db, {
       hook: "afterClaim",
       context: {
@@ -767,6 +773,16 @@ export async function runHeartbeatForAgent(
       externalAbortSignal: activeRunAbort.signal
     });
     executionSummary = execution.summary;
+    const normalizedUsage = execution.usage ?? {
+      inputTokens: Math.max(0, execution.tokenInput),
+      cachedInputTokens: 0,
+      outputTokens: Math.max(0, execution.tokenOutput),
+      ...(execution.usdCost > 0 ? { costUsd: execution.usdCost } : {}),
+      ...(execution.summary ? { summary: execution.summary } : {})
+    };
+    const effectiveTokenInput = normalizedUsage.inputTokens + normalizedUsage.cachedInputTokens;
+    const effectiveTokenOutput = normalizedUsage.outputTokens;
+    const effectiveRuntimeUsdCost = normalizedUsage.costUsd ?? (execution.usdCost > 0 ? execution.usdCost : 0);
     const afterAdapterHook = await runPluginHook(db, {
       hook: "afterAdapterExecute",
       context: {
@@ -787,6 +803,29 @@ export async function runHeartbeatForAgent(
     }
     emitCanonicalResultEvent(executionSummary, "completed");
     executionTrace = execution.trace ?? null;
+    const runtimeModelId = resolveRuntimeModelId({
+      runtimeModel: persistedRuntime.runtimeModel,
+      stateBlob: agent.stateBlob
+    });
+    const effectivePricingProviderType = execution.pricingProviderType ?? agent.providerType;
+    const effectivePricingModelId = execution.pricingModelId ?? runtimeModelId;
+    const costDecision = await appendFinishedRunCostEntry({
+      db,
+      companyId,
+      providerType: agent.providerType,
+      runtimeModelId: effectivePricingModelId ?? runtimeModelId,
+      pricingProviderType: effectivePricingProviderType,
+      pricingModelId: effectivePricingModelId,
+      tokenInput: effectiveTokenInput,
+      tokenOutput: effectiveTokenOutput,
+      runtimeUsdCost: effectiveRuntimeUsdCost,
+      failureType: readTraceString(execution.trace, "failureType"),
+      issueId: primaryIssueId,
+      projectId: primaryProjectId,
+      agentId,
+      status: execution.status
+    });
+    const executionUsdCost = costDecision.usdCost;
     const parsedOutcome = ExecutionOutcomeSchema.safeParse(execution.outcome);
     executionOutcome = parsedOutcome.success ? parsedOutcome.data : null;
     const persistedMemory = await persistHeartbeatMemory({
@@ -835,32 +874,20 @@ export async function runHeartbeatForAgent(
       }
     }
 
-    if (execution.tokenInput > 0 || execution.tokenOutput > 0 || execution.usdCost > 0) {
-      await appendCost(db, {
-        companyId,
-        providerType: agent.providerType,
-        tokenInput: execution.tokenInput,
-        tokenOutput: execution.tokenOutput,
-        usdCost: execution.usdCost.toFixed(6),
-        issueId: workItems[0]?.id ?? null,
-        projectId: workItems[0]?.project_id ?? null,
-        agentId
-      });
-    }
-
     if (
       execution.nextState ||
-      execution.usdCost > 0 ||
-      execution.tokenInput > 0 ||
-      execution.tokenOutput > 0 ||
+      executionUsdCost > 0 ||
+      effectiveTokenInput > 0 ||
+      effectiveTokenOutput > 0 ||
       execution.status !== "skipped"
     ) {
       await db
         .update(agents)
         .set({
           stateBlob: JSON.stringify(execution.nextState ?? state),
-          usedBudgetUsd: sql`${agents.usedBudgetUsd} + ${execution.usdCost}`,
-          tokenUsage: sql`${agents.tokenUsage} + ${execution.tokenInput + execution.tokenOutput}`,
+          runtimeModel: effectivePricingModelId ?? persistedRuntime.runtimeModel ?? null,
+          usedBudgetUsd: sql`${agents.usedBudgetUsd} + ${executionUsdCost}`,
+          tokenUsage: sql`${agents.tokenUsage} + ${effectiveTokenInput + effectiveTokenOutput}`,
           updatedAt: new Date()
         })
         .where(and(eq(agents.companyId, companyId), eq(agents.id, agentId)));
@@ -868,9 +895,9 @@ export async function runHeartbeatForAgent(
 
     const shouldAdvanceIssuesToReview = shouldPromoteIssuesToReview({
       summary: execution.summary,
-      tokenInput: execution.tokenInput,
-      tokenOutput: execution.tokenOutput,
-      usdCost: execution.usdCost,
+      tokenInput: effectiveTokenInput,
+      tokenOutput: effectiveTokenOutput,
+      usdCost: executionUsdCost,
       trace: executionTrace,
       outcome: executionOutcome
     });
@@ -914,9 +941,9 @@ export async function runHeartbeatForAgent(
           summary: execution.summary,
           outcome: executionOutcome,
           usage: {
-            tokenInput: execution.tokenInput,
-            tokenOutput: execution.tokenOutput,
-            usdCost: execution.usdCost
+            tokenInput: effectiveTokenInput,
+            tokenOutput: effectiveTokenOutput,
+            usdCost: executionUsdCost
           }
         }
       });
@@ -1047,9 +1074,9 @@ export async function runHeartbeatForAgent(
         outcome: executionOutcome,
         issueIds,
         usage: {
-          tokenInput: execution.tokenInput,
-          tokenOutput: execution.tokenOutput,
-          usdCost: execution.usdCost,
+          tokenInput: effectiveTokenInput,
+          tokenOutput: effectiveTokenOutput,
+          usdCost: executionUsdCost,
           source: readTraceString(execution.trace, "usageSource") ?? "unknown"
         },
         trace: execution.trace ?? null,
@@ -1109,6 +1136,24 @@ export async function runHeartbeatForAgent(
         cwd: runtimeLaunchSummary.cwd ?? null
       };
     }
+    const runtimeModelId = resolveRuntimeModelId({
+      runtimeModel: persistedRuntime.runtimeModel,
+      stateBlob: agent.stateBlob
+    });
+    await appendFinishedRunCostEntry({
+      db,
+      companyId,
+      providerType: agent.providerType,
+      runtimeModelId,
+      pricingProviderType: agent.providerType,
+      pricingModelId: runtimeModelId,
+      tokenInput: 0,
+      tokenOutput: 0,
+      issueId: primaryIssueId,
+      projectId: primaryProjectId,
+      agentId,
+      status: "failed"
+    });
     await db
       .update(heartbeatRuns)
       .set({
@@ -2122,6 +2167,7 @@ function buildHeartbeatRuntimeEnv(input: {
     BOPODEV_RUN_ID: input.heartbeatRunId,
     BOPODEV_FORCE_MANAGED_CODEX_HOME: "false",
     BOPODEV_API_BASE_URL: apiBaseUrl,
+    BOPODEV_API_URL: apiBaseUrl,
     BOPODEV_ACTOR_TYPE: "agent",
     BOPODEV_ACTOR_ID: input.agentId,
     BOPODEV_ACTOR_COMPANIES: input.companyId,
@@ -2135,7 +2181,9 @@ function buildHeartbeatRuntimeEnv(input: {
 }
 
 function resolveControlPlaneApiBaseUrl() {
-  const configured = resolveControlPlaneProcessEnv("API_BASE_URL") ?? process.env.NEXT_PUBLIC_API_URL;
+  // Agent runtimes must call the control-plane API directly; do not inherit
+  // browser-facing NEXT_PUBLIC_API_URL (can point to non-runtime endpoints).
+  const configured = resolveControlPlaneProcessEnv("API_BASE_URL");
   return normalizeControlPlaneApiBaseUrl(configured) ?? "http://127.0.0.1:4020";
 }
 
@@ -2248,7 +2296,8 @@ function shouldRequireControlPlanePreflight(
     providerType === "codex" ||
     providerType === "claude_code" ||
     providerType === "cursor" ||
-    providerType === "opencode"
+    providerType === "opencode" ||
+    providerType === "gemini_cli"
   );
 }
 
@@ -2367,6 +2416,87 @@ function resolveControlPlaneHeaders(runtimeEnv: Record<string, string>):
   return { ok: true, headers: jsonHeadersResult.data };
 }
 
+function resolveRuntimeModelId(input: { runtimeModel?: string; stateBlob?: string | null }) {
+  const runtimeModel = input.runtimeModel?.trim();
+  if (runtimeModel) {
+    return runtimeModel;
+  }
+  if (!input.stateBlob) {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(input.stateBlob) as { runtime?: { model?: unknown } };
+    const modelId = parsed.runtime?.model;
+    return typeof modelId === "string" && modelId.trim().length > 0 ? modelId.trim() : null;
+  } catch {
+    return null;
+  }
+}
+
+async function appendFinishedRunCostEntry(input: {
+  db: BopoDb;
+  companyId: string;
+  providerType: string;
+  runtimeModelId: string | null;
+  pricingProviderType?: string | null;
+  pricingModelId?: string | null;
+  tokenInput: number;
+  tokenOutput: number;
+  runtimeUsdCost?: number;
+  failureType?: string | null;
+  issueId?: string | null;
+  projectId?: string | null;
+  agentId?: string | null;
+  status: "ok" | "failed" | "skipped";
+}) {
+  const pricingDecision = await calculateModelPricedUsdCost({
+    db: input.db,
+    companyId: input.companyId,
+    providerType: input.providerType,
+    pricingProviderType: input.pricingProviderType ?? input.providerType,
+    modelId: input.pricingModelId ?? input.runtimeModelId,
+    tokenInput: input.tokenInput,
+    tokenOutput: input.tokenOutput
+  });
+
+  const shouldPersist = input.status === "ok" || input.status === "failed";
+  const runtimeUsdCost = Math.max(0, input.runtimeUsdCost ?? 0);
+  const pricedUsdCost = Math.max(0, pricingDecision.usdCost);
+  const shouldUseRuntimeUsdCost = pricedUsdCost <= 0 && runtimeUsdCost > 0;
+  const baseUsdCost = shouldUseRuntimeUsdCost ? runtimeUsdCost : pricedUsdCost;
+  const effectiveUsdCost =
+    baseUsdCost > 0
+      ? baseUsdCost
+      : input.status === "failed" && input.failureType !== "spawn_error"
+        ? 0.000001
+        : 0;
+  const effectivePricingSource = pricingDecision.pricingSource;
+  const shouldPersistWithUsage =
+    shouldPersist && (input.tokenInput > 0 || input.tokenOutput > 0 || effectiveUsdCost > 0);
+  if (shouldPersistWithUsage) {
+    await appendCost(input.db, {
+      companyId: input.companyId,
+      providerType: input.providerType,
+      runtimeModelId: input.runtimeModelId,
+      pricingProviderType: pricingDecision.pricingProviderType,
+      pricingModelId: pricingDecision.pricingModelId,
+      pricingSource: effectivePricingSource,
+      tokenInput: input.tokenInput,
+      tokenOutput: input.tokenOutput,
+      usdCost: effectiveUsdCost.toFixed(6),
+      issueId: input.issueId ?? null,
+      projectId: input.projectId ?? null,
+      agentId: input.agentId ?? null
+    });
+  }
+
+  return {
+    ...pricingDecision,
+    pricingSource: effectivePricingSource,
+    usdCost: effectiveUsdCost
+  };
+}
+
 function isHeartbeatDue(cronExpression: string, lastRunAt: Date | null, now: Date) {
   const normalizedNow = truncateToMinute(now);
   if (!matchesCronExpression(cronExpression, normalizedNow)) {

package/src/services/model-pricing.ts

@@ -0,0 +1,217 @@
+import type { BopoDb } from "bopodev-db";
+import { getModelPricing, upsertModelPricing } from "bopodev-db";
+
+type SeedModelPricingRow = {
+  providerType: "openai_api" | "anthropic_api" | "gemini_api";
+  modelId: string;
+  displayName: string;
+  inputUsdPer1M: number;
+  outputUsdPer1M: number;
+};
+
+const OPENAI_MODEL_BASE_PRICES: Array<{
+  modelId: string;
+  displayName: string;
+  inputUsdPer1M: number;
+  outputUsdPer1M: number;
+}> = [
+  { modelId: "gpt-5.2", displayName: "GPT-5.2", inputUsdPer1M: 1.75, outputUsdPer1M: 14 },
+  { modelId: "gpt-5.1", displayName: "GPT-5.1", inputUsdPer1M: 1.25, outputUsdPer1M: 10 },
+  { modelId: "gpt-5", displayName: "GPT-5", inputUsdPer1M: 1.25, outputUsdPer1M: 10 },
+  { modelId: "gpt-5-mini", displayName: "GPT-5 Mini", inputUsdPer1M: 0.25, outputUsdPer1M: 2 },
+  { modelId: "gpt-5-nano", displayName: "GPT-5 Nano", inputUsdPer1M: 0.05, outputUsdPer1M: 0.4 },
+  { modelId: "gpt-5.3-chat-latest", displayName: "GPT-5.3 Chat Latest", inputUsdPer1M: 1.75, outputUsdPer1M: 14 },
+  { modelId: "gpt-5.2-chat-latest", displayName: "GPT-5.2 Chat Latest", inputUsdPer1M: 1.75, outputUsdPer1M: 14 },
+  { modelId: "gpt-5.1-chat-latest", displayName: "GPT-5.1 Chat Latest", inputUsdPer1M: 1.25, outputUsdPer1M: 10 },
+  { modelId: "gpt-5-chat-latest", displayName: "GPT-5 Chat Latest", inputUsdPer1M: 1.25, outputUsdPer1M: 10 },
+  { modelId: "gpt-5.4", displayName: "GPT-5.4", inputUsdPer1M: 1.75, outputUsdPer1M: 14 },
+  { modelId: "gpt-5.3-codex", displayName: "GPT-5.3 Codex", inputUsdPer1M: 1.75, outputUsdPer1M: 14 },
+  { modelId: "gpt-5.3-codex-spark", displayName: "GPT-5.3 Codex Spark", inputUsdPer1M: 1.75, outputUsdPer1M: 14 },
+  { modelId: "gpt-5.2-codex", displayName: "GPT-5.2 Codex", inputUsdPer1M: 1.75, outputUsdPer1M: 14 },
+  { modelId: "gpt-5.1-codex-max", displayName: "GPT-5.1 Codex Max", inputUsdPer1M: 1.25, outputUsdPer1M: 10 },
+  { modelId: "gpt-5.1-codex-mini", displayName: "GPT-5.1 Codex Mini", inputUsdPer1M: 0.25, outputUsdPer1M: 2 },
+  { modelId: "gpt-5.1-codex", displayName: "GPT-5.1 Codex", inputUsdPer1M: 1.25, outputUsdPer1M: 10 },
+  { modelId: "gpt-5-codex", displayName: "GPT-5 Codex", inputUsdPer1M: 1.25, outputUsdPer1M: 10 },
+  { modelId: "gpt-5.2-pro", displayName: "GPT-5.2 Pro", inputUsdPer1M: 21, outputUsdPer1M: 168 },
+  { modelId: "gpt-5-pro", displayName: "GPT-5 Pro", inputUsdPer1M: 15, outputUsdPer1M: 120 },
+  { modelId: "gpt-4.1", displayName: "GPT-4.1", inputUsdPer1M: 2, outputUsdPer1M: 8 },
+  { modelId: "gpt-4.1-mini", displayName: "GPT-4.1 Mini", inputUsdPer1M: 0.4, outputUsdPer1M: 1.6 },
+  { modelId: "gpt-4.1-nano", displayName: "GPT-4.1 Nano", inputUsdPer1M: 0.1, outputUsdPer1M: 0.4 },
+  { modelId: "gpt-4o", displayName: "GPT-4o", inputUsdPer1M: 2.5, outputUsdPer1M: 10 },
+  { modelId: "gpt-4o-2024-05-13", displayName: "GPT-4o 2024-05-13", inputUsdPer1M: 5, outputUsdPer1M: 15 },
+  { modelId: "gpt-4o-mini", displayName: "GPT-4o Mini", inputUsdPer1M: 0.15, outputUsdPer1M: 0.6 },
+  { modelId: "gpt-realtime", displayName: "GPT Realtime", inputUsdPer1M: 4, outputUsdPer1M: 16 },
+  { modelId: "gpt-realtime-1.5", displayName: "GPT Realtime 1.5", inputUsdPer1M: 4, outputUsdPer1M: 16 },
+  { modelId: "gpt-realtime-mini", displayName: "GPT Realtime Mini", inputUsdPer1M: 0.6, outputUsdPer1M: 2.4 },
+  { modelId: "gpt-4o-realtime-preview", displayName: "GPT-4o Realtime Preview", inputUsdPer1M: 5, outputUsdPer1M: 20 },
+  { modelId: "gpt-4o-mini-realtime-preview", displayName: "GPT-4o Mini Realtime Preview", inputUsdPer1M: 0.6, outputUsdPer1M: 2.4 },
+  { modelId: "gpt-audio", displayName: "GPT Audio", inputUsdPer1M: 2.5, outputUsdPer1M: 10 },
+  { modelId: "gpt-audio-1.5", displayName: "GPT Audio 1.5", inputUsdPer1M: 2.5, outputUsdPer1M: 10 },
+  { modelId: "gpt-audio-mini", displayName: "GPT Audio Mini", inputUsdPer1M: 0.6, outputUsdPer1M: 2.4 },
+  { modelId: "gpt-4o-audio-preview", displayName: "GPT-4o Audio Preview", inputUsdPer1M: 2.5, outputUsdPer1M: 10 },
+  { modelId: "gpt-4o-mini-audio-preview", displayName: "GPT-4o Mini Audio Preview", inputUsdPer1M: 0.15, outputUsdPer1M: 0.6 },
+  { modelId: "o1", displayName: "o1", inputUsdPer1M: 15, outputUsdPer1M: 60 },
+  { modelId: "o1-pro", displayName: "o1-pro", inputUsdPer1M: 150, outputUsdPer1M: 600 },
+  { modelId: "o3-pro", displayName: "o3-pro", inputUsdPer1M: 20, outputUsdPer1M: 80 },
+  { modelId: "o3", displayName: "o3", inputUsdPer1M: 2, outputUsdPer1M: 8 },
+  { modelId: "o3-deep-research", displayName: "o3 Deep Research", inputUsdPer1M: 10, outputUsdPer1M: 40 },
+  { modelId: "o4-mini", displayName: "o4-mini", inputUsdPer1M: 1.1, outputUsdPer1M: 4.4 },
+  { modelId: "o4-mini-deep-research", displayName: "o4-mini Deep Research", inputUsdPer1M: 2, outputUsdPer1M: 8 },
+  { modelId: "o3-mini", displayName: "o3-mini", inputUsdPer1M: 1.1, outputUsdPer1M: 4.4 }
+];
+
+const CLAUDE_MODEL_BASE_PRICES: Array<{
+  modelId: string;
+  displayName: string;
+  inputUsdPer1M: number;
+  outputUsdPer1M: number;
+}> = [
+  // Runtime ids currently used in provider model selectors.
+  { modelId: "claude-opus-4-6", displayName: "Claude Opus 4.6", inputUsdPer1M: 5, outputUsdPer1M: 25 },
+  { modelId: "claude-sonnet-4-6", displayName: "Claude Sonnet 4.6", inputUsdPer1M: 3, outputUsdPer1M: 15 },
+  { modelId: "claude-sonnet-4-6-1m", displayName: "Claude Sonnet 4.6 (1M context)", inputUsdPer1M: 6, outputUsdPer1M: 22.5 },
+  { modelId: "claude-opus-4-6-1m", displayName: "Claude Opus 4.6 (1M context)", inputUsdPer1M: 10, outputUsdPer1M: 37.5 },
+  { modelId: "claude-haiku-4-5", displayName: "Claude Haiku 4.5", inputUsdPer1M: 1, outputUsdPer1M: 5 },
+  // Legacy / alternate ids
+  { modelId: "claude-sonnet-4-5-20250929", displayName: "Claude Sonnet 4.5", inputUsdPer1M: 3, outputUsdPer1M: 15 },
+  { modelId: "claude-haiku-4-5-20251001", displayName: "Claude Haiku 4.5", inputUsdPer1M: 1, outputUsdPer1M: 5 },
+  { modelId: "claude-opus-4.6", displayName: "Claude Opus 4.6", inputUsdPer1M: 5, outputUsdPer1M: 25 },
+  { modelId: "claude-opus-4.5", displayName: "Claude Opus 4.5", inputUsdPer1M: 5, outputUsdPer1M: 25 },
+  { modelId: "claude-opus-4.1", displayName: "Claude Opus 4.1", inputUsdPer1M: 15, outputUsdPer1M: 75 },
+  { modelId: "claude-opus-4", displayName: "Claude Opus 4", inputUsdPer1M: 15, outputUsdPer1M: 75 },
+  { modelId: "claude-sonnet-4.6", displayName: "Claude Sonnet 4.6", inputUsdPer1M: 3, outputUsdPer1M: 15 },
+  { modelId: "claude-sonnet-4.5", displayName: "Claude Sonnet 4.5", inputUsdPer1M: 3, outputUsdPer1M: 15 },
+  { modelId: "claude-sonnet-4", displayName: "Claude Sonnet 4", inputUsdPer1M: 3, outputUsdPer1M: 15 },
+  { modelId: "claude-sonnet-3.7", displayName: "Claude Sonnet 3.7", inputUsdPer1M: 3, outputUsdPer1M: 15 },
+  { modelId: "claude-haiku-4.5", displayName: "Claude Haiku 4.5", inputUsdPer1M: 1, outputUsdPer1M: 5 },
+  { modelId: "claude-haiku-3.5", displayName: "Claude Haiku 3.5", inputUsdPer1M: 0.8, outputUsdPer1M: 4 },
+  { modelId: "claude-opus-3", displayName: "Claude Opus 3", inputUsdPer1M: 15, outputUsdPer1M: 75 },
+  { modelId: "claude-haiku-3", displayName: "Claude Haiku 3", inputUsdPer1M: 0.25, outputUsdPer1M: 1.25 }
+];
+
+const GEMINI_MODEL_BASE_PRICES: Array<{
+  modelId: string;
+  displayName: string;
+  inputUsdPer1M: number;
+  outputUsdPer1M: number;
+}> = [
+  { modelId: "gemini-3.1-flash-lite", displayName: "Gemini 3.1 Flash Lite", inputUsdPer1M: 0.25, outputUsdPer1M: 1.5 },
+  { modelId: "gemini-3-flash", displayName: "Gemini 3 Flash", inputUsdPer1M: 0.5, outputUsdPer1M: 3 },
+  { modelId: "gemini-3-pro", displayName: "Gemini 3 Pro", inputUsdPer1M: 2, outputUsdPer1M: 12 },
+  { modelId: "gemini-3-pro-200k", displayName: "Gemini 3 Pro (>200k context)", inputUsdPer1M: 4, outputUsdPer1M: 18 },
+  { modelId: "gemini-2.5-flash-lite", displayName: "Gemini 2.5 Flash Lite", inputUsdPer1M: 0.1, outputUsdPer1M: 0.4 },
+  { modelId: "gemini-2.5-flash", displayName: "Gemini 2.5 Flash", inputUsdPer1M: 0.3, outputUsdPer1M: 2.5 },
+  { modelId: "gemini-2.5-pro", displayName: "Gemini 2.5 Pro", inputUsdPer1M: 1.25, outputUsdPer1M: 10 }
+];
+
+const DEFAULT_MODEL_PRICING_ROWS: SeedModelPricingRow[] = [
+  ...OPENAI_MODEL_BASE_PRICES.map((row) => ({ ...row, providerType: "openai_api" as const })),
+  ...CLAUDE_MODEL_BASE_PRICES.map((row) => ({ ...row, providerType: "anthropic_api" as const })),
+  ...GEMINI_MODEL_BASE_PRICES.map((row) => ({ ...row, providerType: "gemini_api" as const }))
+];
+
+export async function ensureCompanyModelPricingDefaults(db: BopoDb, companyId: string) {
+  for (const row of DEFAULT_MODEL_PRICING_ROWS) {
+    await upsertModelPricing(db, {
+      companyId,
+      providerType: row.providerType,
+      modelId: row.modelId,
+      displayName: row.displayName,
+      inputUsdPer1M: row.inputUsdPer1M.toFixed(6),
+      outputUsdPer1M: row.outputUsdPer1M.toFixed(6),
+      currency: "USD",
+      updatedBy: "system:onboarding-defaults"
+    });
+  }
+}
+
+export async function calculateModelPricedUsdCost(input: {
+  db: BopoDb;
+  companyId: string;
+  providerType: string;
+  pricingProviderType?: string | null;
+  modelId: string | null;
+  tokenInput: number;
+  tokenOutput: number;
+}) {
+  const normalizedProviderType = (input.pricingProviderType ?? input.providerType).trim();
+  const normalizedModelId = input.modelId?.trim() ?? "";
+  const canonicalPricingProviderType = resolveCanonicalPricingProvider(normalizedProviderType);
+  if (!normalizedModelId || !canonicalPricingProviderType) {
+    return {
+      usdCost: 0,
+      pricingSource: "missing" as const,
+      pricingProviderType: canonicalPricingProviderType,
+      pricingModelId: normalizedModelId || null
+    };
+  }
+  const pricing = await getModelPricing(input.db, {
+    companyId: input.companyId,
+    providerType: canonicalPricingProviderType,
+    modelId: normalizedModelId
+  });
+  if (!pricing) {
+    return {
+      usdCost: 0,
+      pricingSource: "missing" as const,
+      pricingProviderType: canonicalPricingProviderType,
+      pricingModelId: normalizedModelId
+    };
+  }
+  const inputUsdPer1M = Number(pricing.inputUsdPer1M ?? 0);
+  const outputUsdPer1M = Number(pricing.outputUsdPer1M ?? 0);
+  if (!Number.isFinite(inputUsdPer1M) || !Number.isFinite(outputUsdPer1M)) {
+    return {
+      usdCost: 0,
+      pricingSource: "missing" as const,
+      pricingProviderType: canonicalPricingProviderType,
+      pricingModelId: normalizedModelId
+    };
+  }
+  const normalizedTokenInput = Math.max(0, input.tokenInput);
+  const normalizedTokenOutput = Math.max(0, input.tokenOutput);
+  if (normalizedTokenInput === 0 && normalizedTokenOutput === 0) {
+    return {
+      usdCost: 0,
+      pricingSource: "missing" as const,
+      pricingProviderType: canonicalPricingProviderType,
+      pricingModelId: normalizedModelId
+    };
+  }
+  const computedUsd =
+    (normalizedTokenInput / 1_000_000) * inputUsdPer1M +
+    (normalizedTokenOutput / 1_000_000) * outputUsdPer1M;
+  return {
+    usdCost: Number.isFinite(computedUsd) ? computedUsd : 0,
+    pricingSource: Number.isFinite(computedUsd) ? ("exact" as const) : ("missing" as const),
+    pricingProviderType: canonicalPricingProviderType,
+    pricingModelId: normalizedModelId
+  };
+}
+
+export function resolveCanonicalPricingProvider(providerType: string | null | undefined) {
+  const normalizedProvider = providerType?.trim() ?? "";
+  if (!normalizedProvider) {
+    return null;
+  }
+  if (
+    normalizedProvider === "openai_api" ||
+    normalizedProvider === "anthropic_api" ||
+    normalizedProvider === "opencode" ||
+    normalizedProvider === "gemini_api"
+  ) {
+    return normalizedProvider;
+  }
+  if (normalizedProvider === "codex" || normalizedProvider === "cursor") {
+    return "openai_api";
+  }
+  if (normalizedProvider === "claude_code") {
+    return "anthropic_api";
+  }
+  if (normalizedProvider === "gemini_cli") {
+    return "gemini_api";
+  }
+  return null;
+}
+
+