bopodev-api 0.1.26 → 0.1.28

package/src/services/heartbeat-service.ts

@@ -1,9 +1,8 @@
-import { mkdir } from "node:fs/promises";
+import { mkdir, stat } from "node:fs/promises";
 import { isAbsolute, join, relative, resolve } from "node:path";
-import { and, desc, eq, inArray, sql } from "drizzle-orm";
 import { nanoid } from "nanoid";
 import { resolveAdapter } from "bopodev-agent-sdk";
-import type { AgentState, HeartbeatContext } from "bopodev-agent-sdk";
+import type { AdapterExecutionResult, AgentState, HeartbeatContext } from "bopodev-agent-sdk";
 import {
   type AgentFinalRunOutput,
   ControlPlaneHeadersJsonSchema,
@@ -19,18 +18,24 @@ import {
 import type { BopoDb } from "bopodev-db";
 import {
   addIssueComment,
+  and,
   approvalRequests,
   agents,
   appendActivity,
   appendHeartbeatRunMessages,
+  auditEvents,
   companies,
   createApprovalRequest,
+  desc,
+  eq,
   goals,
   heartbeatRuns,
+  inArray,
   issueComments,
   issueAttachments,
   issues,
-  projects
+  projects,
+  sql
 } from "bopodev-db";
 import { appendAuditEvent, appendCost } from "bopodev-db";
 import { parseRuntimeConfigFromAgentRow } from "../lib/agent-config";
@@ -41,9 +46,15 @@ import {
   resolveCompanyWorkspaceRootPath,
   resolveProjectWorkspacePath
 } from "../lib/instance-paths";
-import { assertRuntimeCwdForCompany, getProjectWorkspaceContextMap, hasText, resolveAgentFallbackWorkspace } from "../lib/workspace-policy";
+import { resolveRunArtifactAbsolutePath } from "../lib/run-artifact-paths";
+import {
+  assertRuntimeCwdForCompany,
+  getProjectWorkspaceContextMap,
+  hasText,
+  resolveAgentFallbackWorkspace
+} from "../lib/workspace-policy";
 import type { RealtimeHub } from "../realtime/hub";
-import { createHeartbeatRunsRealtimeEvent } from "../realtime/heartbeat-runs";
+import { createHeartbeatRunsRealtimeEvent, loadHeartbeatRunsRealtimeSnapshot } from "../realtime/heartbeat-runs";
 import { publishAttentionSnapshot } from "../realtime/attention";
 import { publishOfficeOccupantForAgent } from "../realtime/office-space";
 import { appendProjectBudgetUsage, checkAgentBudget, checkProjectBudget } from "./budget-service";
@@ -152,7 +163,7 @@ export async function claimIssuesForAgent(
     RETURNING i.id, i.project_id, i.parent_issue_id, i.title, i.body, i.status, i.priority, i.labels_json, i.tags_json;
   `);
 
-  return (result.rows ?? []) as Array<{
+  return result as unknown as Array<{
     id: string;
     project_id: string;
     parent_issue_id: string | null;
@@ -707,6 +718,8 @@ export async function runHeartbeatForAgent(
 
   let issueIds: string[] = [];
   let claimedIssueIds: string[] = [];
+  /** After transcript flush: remove DB row + audit noise for idle heartbeats with no issues. */
+  let discardIdleNoWorkRunAfterFlush = false;
   let executionWorkItemsForBudget: Array<{ issueId: string; projectId: string }> = [];
   let state: AgentState & {
     runtime?: {
@@ -892,6 +905,7 @@ export async function runHeartbeatForAgent(
       failClosed: false
     });
     const isCommentOrderWake = options?.wakeContext?.reason === "issue_comment_recipient";
+    const heartbeatIdlePolicy = resolveHeartbeatIdlePolicy();
     const workItems = isCommentOrderWake ? [] : await claimIssuesForAgent(db, companyId, agentId, runId);
     const wakeWorkItems = await loadWakeContextWorkItems(db, companyId, options?.wakeContext?.issueIds);
     const contextWorkItems = resolveExecutionWorkItems(workItems, wakeWorkItems, options?.wakeContext);
@@ -970,6 +984,7 @@ export async function runHeartbeatForAgent(
       contextWorkItems,
       mergedRuntime
     );
+    await mkdir(join(resolveAgentFallbackWorkspace(companyId, agent.id), "operating"), { recursive: true });
     state = {
       ...state,
       runtime: workspaceResolution.runtime
@@ -1005,6 +1020,10 @@ export async function runHeartbeatForAgent(
       ...context,
       memoryContext
     };
+    const isIdleNoWork = contextWorkItems.length === 0 && !isCommentOrderWake;
+    if (heartbeatIdlePolicy === "micro_prompt" && isIdleNoWork) {
+      context = { ...context, idleMicroPrompt: true };
+    }
     if (workspaceResolution.warnings.length > 0) {
       await appendAuditEvent(db, {
         companyId,
@@ -1170,19 +1189,34 @@ export async function runHeartbeatForAgent(
       };
     }
 
-    const execution = await executeAdapterWithWatchdog({
-      execute: (abortSignal) =>
-        adapter.execute({
-          ...context,
-          runtime: {
-            ...(context.runtime ?? {}),
-            abortSignal
+    const execution: AdapterExecutionResult =
+      heartbeatIdlePolicy === "skip_adapter" && isIdleNoWork
+        ? {
+            status: "ok",
+            summary:
+              "Idle heartbeat: no assigned work items; adapter not invoked (BOPO_HEARTBEAT_IDLE_POLICY=skip_adapter).",
+            tokenInput: 0,
+            tokenOutput: 0,
+            usdCost: 0,
+            usage: {
+              inputTokens: 0,
+              cachedInputTokens: 0,
+              outputTokens: 0
+            }
           }
-        }),
-      providerType: agent.providerType as HeartbeatProviderType,
-      runtime: workspaceResolution.runtime,
-      externalAbortSignal: activeRunAbort.signal
-    });
+        : await executeAdapterWithWatchdog({
+            execute: (abortSignal) =>
+              adapter.execute({
+                ...context,
+                runtime: {
+                  ...(context.runtime ?? {}),
+                  abortSignal
+                }
+              }),
+            providerType: agent.providerType as HeartbeatProviderType,
+            runtime: workspaceResolution.runtime,
+            externalAbortSignal: activeRunAbort.signal
+          });
     const usageLimitHint = execution.dispositionHint?.kind === "provider_usage_limited" ? execution.dispositionHint : null;
     if (usageLimitHint) {
       providerUsageLimitDisposition = {
@@ -1454,6 +1488,7 @@ export async function runHeartbeatForAgent(
       cost: runCost,
       runtimeCwd: workspaceResolution.runtime.cwd
     });
+    await verifyRunArtifactsOnDisk(companyId, runReport.artifacts);
     emitCanonicalResultEvent(runReport.resultSummary, runReport.finalStatus);
     const runListMessage = buildRunListMessageFromReport(runReport);
     await db
@@ -1688,6 +1723,11 @@ export async function runHeartbeatForAgent(
         }
       }
     });
+    discardIdleNoWorkRunAfterFlush =
+      issueIds.length === 0 &&
+      !isCommentOrderWake &&
+      (terminalPresentation.completionReason === "no_assigned_work" ||
+        (isIdleNoWork && heartbeatIdlePolicy === "skip_adapter" && persistedRunStatus === "completed"));
   } catch (error) {
     const classified = classifyHeartbeatError(error);
     executionSummary =
@@ -1823,6 +1863,7 @@ export async function runHeartbeatForAgent(
       errorType: classified.type,
       errorMessage: classified.message
     });
+    await verifyRunArtifactsOnDisk(companyId, runReport.artifacts);
     const runListMessage = buildRunListMessageFromReport(runReport);
     await db
       .update(heartbeatRuns)
@@ -1922,6 +1963,17 @@ export async function runHeartbeatForAgent(
     }
   } finally {
     await transcriptWriteQueue;
+    if (discardIdleNoWorkRunAfterFlush) {
+      try {
+        await purgeIdleNoWorkHeartbeatRun(db, companyId, runId);
+        if (options?.realtimeHub) {
+          options.realtimeHub.publish(await loadHeartbeatRunsRealtimeSnapshot(db, companyId));
+        }
+      } catch (purgeError) {
+        // eslint-disable-next-line no-console
+        console.error("[heartbeat] failed to purge idle no-work run", runId, purgeError);
+      }
+    }
     unregisterActiveHeartbeatRun(runId);
     try {
       await releaseClaimedIssues(db, companyId, claimedIssueIds);
@@ -1955,6 +2007,15 @@ export async function runHeartbeatForAgent(
   return runId;
 }
 
+async function purgeIdleNoWorkHeartbeatRun(db: BopoDb, companyId: string, runId: string) {
+  await db
+    .delete(auditEvents)
+    .where(
+      and(eq(auditEvents.companyId, companyId), eq(auditEvents.entityType, "heartbeat_run"), eq(auditEvents.entityId, runId))
+    );
+  await db.delete(heartbeatRuns).where(and(eq(heartbeatRuns.companyId, companyId), eq(heartbeatRuns.id, runId)));
+}
+
 async function insertStartedRunAtomic(
   db: BopoDb,
   input: { id: string; companyId: string; agentId: string; message: string }
@@ -1965,7 +2026,7 @@ async function insertStartedRunAtomic(
     ON CONFLICT DO NOTHING
     RETURNING id
   `);
-  return (result.rows ?? []).length > 0;
+  return result.length > 0;
 }
 
 async function recoverStaleHeartbeatRuns(
@@ -2109,7 +2170,7 @@ async function listLatestRunByAgent(db: BopoDb, companyId: string) {
     GROUP BY agent_id
   `);
   const latestRunByAgent = new Map<string, Date>();
-  for (const row of result.rows ?? []) {
+  for (const row of result as Array<Record<string, unknown>>) {
     const agentId = typeof row.agent_id === "string" ? row.agent_id : null;
     if (!agentId) {
       continue;
@@ -2357,6 +2418,7 @@ async function buildHeartbeatContext(
       fileSizeBytes: number;
       relativePath: string;
       absolutePath: string;
+      downloadPath: string;
     }>
   >();
   for (const row of attachmentRows) {
@@ -2372,7 +2434,8 @@ async function buildHeartbeatContext(
       mimeType: row.mimeType,
       fileSizeBytes: row.fileSizeBytes,
       relativePath: row.relativePath,
-      absolutePath
+      absolutePath,
+      downloadPath: `/issues/${row.issueId}/attachments/${row.id}/download`
     });
     attachmentsByIssue.set(row.issueId, existing);
   }
@@ -2400,12 +2463,14 @@ async function buildHeartbeatContext(
     .filter((goal) => goal.status === "active" && goal.level === "agent")
     .map((goal) => goal.title);
   const isCommentOrderWake = input.wakeContext?.reason === "issue_comment_recipient";
+  const promptMode = resolveHeartbeatPromptMode();
 
   return {
     companyId,
     agentId: input.agentId,
     providerType: input.providerType,
     heartbeatRunId: input.heartbeatRunId,
+    promptMode,
     company: {
       name: company?.name ?? "Unknown company",
       mission: company?.mission ?? null
@@ -3054,6 +3119,26 @@ function buildRunArtifacts(input: {
   });
 }
 
+async function verifyRunArtifactsOnDisk(companyId: string, artifacts: RunArtifact[]) {
+  for (const artifact of artifacts) {
+    const resolved = resolveRunArtifactAbsolutePath(companyId, {
+      path: artifact.path,
+      relativePath: artifact.relativePath ?? undefined,
+      absolutePath: artifact.absolutePath ?? undefined
+    });
+    if (!resolved) {
+      artifact.verifiedOnDisk = false;
+      continue;
+    }
+    try {
+      const stats = await stat(resolved);
+      artifact.verifiedOnDisk = stats.isFile();
+    } catch {
+      artifact.verifiedOnDisk = false;
+    }
+  }
+}
+
 function toNormalizedWorkspaceRelativePath(inputPath: string | null | undefined) {
   const trimmed = inputPath?.trim();
   if (!trimmed) {
@@ -3094,11 +3179,9 @@ function normalizeAgentOperatingArtifactRelativePath(pathValue: string | null, c
     if (!parsed) {
       return null;
     }
-    const embeddedCompanyId = parsed[1]?.trim() || companyId;
     const agentId = parsed[2];
     const suffix = parsed[3] ?? "";
-    const effectiveCompanyId = embeddedCompanyId;
-    return `workspace/${effectiveCompanyId}/agents/${agentId}/operating${suffix}`;
+    return `workspace/${companyId}/agents/${agentId}/operating${suffix}`;
   }
   const directMatch = normalized.match(/^agents\/([^/]+)\/operating(\/.*)?$/);
   if (directMatch) {
@@ -3323,6 +3406,9 @@ function formatRunArtifactMarkdownLink(
   if (!label) {
     return "`artifact`";
   }
+  if (artifact.verifiedOnDisk === false) {
+    return `\`${label}\` (not found under company workspace at run completion)`;
+  }
   if (!href) {
     return `\`${label}\``;
   }
@@ -4291,6 +4377,24 @@ function clearResumeState(
   };
 }
 
+function resolveHeartbeatPromptMode(): "full" | "compact" {
+  const raw = process.env.BOPO_HEARTBEAT_PROMPT_MODE?.trim().toLowerCase();
+  return raw === "compact" ? "compact" : "full";
+}
+
+type HeartbeatIdlePolicy = "full" | "skip_adapter" | "micro_prompt";
+
+function resolveHeartbeatIdlePolicy(): HeartbeatIdlePolicy {
+  const raw = process.env.BOPO_HEARTBEAT_IDLE_POLICY?.trim().toLowerCase();
+  if (raw === "skip_adapter") {
+    return "skip_adapter";
+  }
+  if (raw === "micro_prompt") {
+    return "micro_prompt";
+  }
+  return "full";
+}
+
 function resolveControlPlaneEnv(runtimeEnv: Record<string, string>, suffix: string) {
   const next = runtimeEnv[`BOPODEV_${suffix}`];
   return hasText(next) ? (next as string) : "";
@@ -4307,8 +4411,13 @@ function buildHeartbeatRuntimeEnv(input: {
   canHireAgents: boolean;
   wakeContext?: HeartbeatWakeContext;
 }) {
+  const companyWorkspaceRoot = resolveCompanyWorkspaceRootPath(input.companyId);
+  const agentHome = resolveAgentFallbackWorkspace(input.companyId, input.agentId);
+  const agentOperatingDir = join(agentHome, "operating");
   const apiBaseUrl = resolveControlPlaneApiBaseUrl();
-  const actorPermissions = ["issues:write", ...(input.canHireAgents ? ["agents:write"] : [])].join(",");
+  // agents:write is required for PUT /agents/:self (bootstrapPrompt, runtimeConfig). Route handlers
+  // still forbid agents from updating other agents' rows and from POST /agents unless canHireAgents.
+  const actorPermissions = ["issues:write", "agents:write"].join(",");
   const actorHeaders = JSON.stringify({
     "x-company-id": input.companyId,
     "x-actor-type": "agent",
@@ -4322,7 +4431,12 @@ function buildHeartbeatRuntimeEnv(input: {
   return {
     BOPODEV_AGENT_ID: input.agentId,
     BOPODEV_COMPANY_ID: input.companyId,
+    BOPODEV_COMPANY_WORKSPACE_ROOT: companyWorkspaceRoot,
+    BOPODEV_AGENT_HOME: agentHome,
+    BOPODEV_AGENT_OPERATING_DIR: agentOperatingDir,
     BOPODEV_RUN_ID: input.heartbeatRunId,
+    BOPODEV_HEARTBEAT_PROMPT_MODE: resolveHeartbeatPromptMode(),
+    BOPODEV_HEARTBEAT_IDLE_POLICY: resolveHeartbeatIdlePolicy(),
     BOPODEV_FORCE_MANAGED_CODEX_HOME: "false",
     BOPODEV_API_BASE_URL: apiBaseUrl,
     BOPODEV_API_URL: apiBaseUrl,

package/src/services/model-pricing.ts

@@ -1,129 +1,6 @@
 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"
-    });
-  }
-}
+import type { CanonicalPricingProvider } from "../pricing";
+import { getModelPricingCatalogRow } from "../pricing";
 
 export async function calculateModelPricedUsdCost(input: {
   db: BopoDb;
@@ -145,8 +22,7 @@ export async function calculateModelPricedUsdCost(input: {
       pricingModelId: normalizedModelId || null
     };
   }
-  const pricing = await getModelPricing(input.db, {
-    companyId: input.companyId,
+  const pricing = getModelPricingCatalogRow({
     providerType: canonicalPricingProviderType,
     modelId: normalizedModelId
   });
@@ -189,7 +65,7 @@ export async function calculateModelPricedUsdCost(input: {
   };
 }
 
-export function resolveCanonicalPricingProvider(providerType: string | null | undefined) {
+export function resolveCanonicalPricingProvider(providerType: string | null | undefined): CanonicalPricingProvider | null {
   const normalizedProvider = providerType?.trim() ?? "";
   if (!normalizedProvider) {
     return null;

package/src/worker/scheduler.ts

@@ -4,6 +4,10 @@ import { runHeartbeatSweep } from "../services/heartbeat-service";
 import { runHeartbeatQueueSweep } from "../services/heartbeat-queue-service";
 import { runIssueCommentDispatchSweep } from "../services/comment-recipient-dispatch-service";
 
+export type HeartbeatSchedulerHandle = {
+  stop: () => Promise<void>;
+};
+
 export function createHeartbeatScheduler(db: BopoDb, companyId: string, realtimeHub?: RealtimeHub) {
   const heartbeatIntervalMs = Number(process.env.BOPO_HEARTBEAT_SWEEP_MS ?? 60_000);
   const queueIntervalMs = Number(process.env.BOPO_HEARTBEAT_QUEUE_SWEEP_MS ?? 2_000);
@@ -11,18 +15,22 @@ export function createHeartbeatScheduler(db: BopoDb, companyId: string, realtime
   let heartbeatRunning = false;
   let queueRunning = false;
   let commentDispatchRunning = false;
+  let heartbeatPromise: Promise<unknown> | null = null;
+  let queuePromise: Promise<unknown> | null = null;
+  let commentDispatchPromise: Promise<unknown> | null = null;
   const heartbeatTimer = setInterval(() => {
     if (heartbeatRunning) {
       return;
     }
     heartbeatRunning = true;
-    void runHeartbeatSweep(db, companyId, { realtimeHub })
+    heartbeatPromise = runHeartbeatSweep(db, companyId, { realtimeHub })
       .catch((error) => {
         // eslint-disable-next-line no-console
         console.error("[scheduler] heartbeat sweep failed", error);
       })
       .finally(() => {
         heartbeatRunning = false;
+        heartbeatPromise = null;
       });
   }, heartbeatIntervalMs);
   const queueTimer = setInterval(() => {
@@ -30,13 +38,14 @@ export function createHeartbeatScheduler(db: BopoDb, companyId: string, realtime
       return;
     }
     queueRunning = true;
-    void runHeartbeatQueueSweep(db, companyId, { realtimeHub })
+    queuePromise = runHeartbeatQueueSweep(db, companyId, { realtimeHub })
       .catch((error) => {
         // eslint-disable-next-line no-console
         console.error("[scheduler] queue sweep failed", error);
       })
       .finally(() => {
         queueRunning = false;
+        queuePromise = null;
       });
   }, queueIntervalMs);
   const commentDispatchTimer = setInterval(() => {
@@ -44,18 +53,25 @@ export function createHeartbeatScheduler(db: BopoDb, companyId: string, realtime
       return;
     }
     commentDispatchRunning = true;
-    void runIssueCommentDispatchSweep(db, companyId, { realtimeHub })
+    commentDispatchPromise = runIssueCommentDispatchSweep(db, companyId, { realtimeHub })
       .catch((error) => {
         // eslint-disable-next-line no-console
         console.error("[scheduler] comment dispatch sweep failed", error);
       })
       .finally(() => {
         commentDispatchRunning = false;
+        commentDispatchPromise = null;
       });
   }, commentDispatchIntervalMs);
-  return () => {
+  const stop = async () => {
     clearInterval(heartbeatTimer);
     clearInterval(queueTimer);
     clearInterval(commentDispatchTimer);
+    await Promise.allSettled(
+      [heartbeatPromise, queuePromise, commentDispatchPromise].filter(
+        (promise): promise is Promise<unknown> => promise !== null
+      )
+    );
   };
+  return { stop } satisfies HeartbeatSchedulerHandle;
 }