refactor(db): tighten pool-isolation follow-ups

Assert each frozen-schema mutation throws, rank BM25 by query terms instead of
copying each tool's vocabulary, gate the reporting usage cache on
isPrimaryPoolClient like the auth caches, and trim comments.

Author: waleedlatif1

apps/sim/lib/auth/database-context.ts

@@ -1,15 +1,11 @@
 import { AsyncLocalStorage } from 'node:async_hooks'
-import { type db, dbFor } from '@sim/db'
+import { dbFor } from '@sim/db'
 import type { DbOrTx } from '@/lib/db/types'
 
 const authDatabase = new AsyncLocalStorage<DbOrTx>()
 
-/**
- * The auth pool's root client. Session, adapter, and API-key lookups gate every
- * authenticated request, so they keep their own connections when slow work
- * saturates the process pool.
- */
-export function getAuthPool(): typeof db {
+/** The auth pool's root client (see `DB_POOL_PROFILES.auth`). */
+export function getAuthPool() {
   return dbFor('auth')
 }
 

apps/sim/lib/billing/core/reporting-usage-cache.integration.ts

@@ -23,7 +23,15 @@ const { transaction, summedPeriods } = vi.hoisted(() => ({
 const databaseUrl = readTestDatabaseUrl()
 const redisUrl = readTestRedisUrl()
 
-vi.mock('@sim/db', () => ({ db: { transaction }, dbFor: () => ({ transaction }), dbReplica: {} }))
+vi.mock('@sim/db', () => {
+  const db = { transaction }
+  return {
+    db,
+    dbFor: () => ({ transaction }),
+    dbReplica: {},
+    isPrimaryPoolClient: (executor: object) => executor === db,
+  }
+})
 vi.mock('@/lib/core/config/redis', () => redisConfigMock)
 vi.mock('@/lib/billing/core/usage-log', async (importOriginal) => {
   const actual = await importOriginal<typeof import('@/lib/billing/core/usage-log')>()

apps/sim/lib/billing/core/reporting-usage-cache.ts

@@ -1,4 +1,4 @@
-import { db } from '@sim/db'
+import { db, isPrimaryPoolClient } from '@sim/db'
 import { createLogger } from '@sim/logger'
 import { getErrorMessage } from '@sim/utils/errors'
 import { generateShortId } from '@sim/utils/id'
@@ -417,7 +417,7 @@ export function readSoftGateUsageCost(
   period: UsageQueryPeriod,
   executor: DbClient = db
 ): Promise<number> {
-  if (isReportingPeriod(period) && executor === db) {
+  if (isReportingPeriod(period) && isPrimaryPoolClient(executor)) {
     return readCachedReportingUsageCost(entity, period)
   }
   return getBillingPeriodUsageCost(entity, period, undefined, executor)

apps/sim/lib/mothership/chat/payload.test.ts

@@ -292,11 +292,13 @@ describe('buildIntegrationToolSchemas', () => {
     })
     const first = await buildIntegrationToolSchemas('user-mutating')
     first.push({ name: 'mcp-private-tool', description: '', input_schema: {} })
-    try {
+    expect(() => {
       ;(first[0].input_schema.properties as Record<string, unknown>).recipients = { type: 'number' }
-      ;(first[0].input_schema.required as string[]).push('forged')
+    }).toThrow(TypeError)
+    expect(() => (first[0].input_schema.required as string[]).push('forged')).toThrow(TypeError)
+    expect(() => {
       first[0].description = 'forged'
-    } catch {}
+    }).toThrow(TypeError)
 
     const second = await buildIntegrationToolSchemas('user-reading')
     expect(second.map((tool) => tool.name)).toEqual([

apps/sim/lib/mothership/chat/payload.ts

@@ -138,8 +138,9 @@ type IntegrationToolSchemaVariantOptions = Required<
 /**
  * Every exposed integration tool's schema for one surface and mode, by tool id.
  *
- * Depends only on the tool registry and deployment config, never on the viewer, so it is
- * built once per process and shared: the entries are frozen and must not be mutated.
+ * Depends only on the tool registry and deployment config (`isHosted`, OAuth availability),
+ * fixed for the process's life, never on the viewer, so it is built once per process and
+ * shared: the entries are frozen and must not be mutated.
  * Viewer gating (block visibility, permission groups, the deployment allowlist) picks
  * which entries a request returns. Tools whose description gains the free-plan email
  * tagline also get a tagged copy in `withEmailTagline`, sharing the same input schema.

apps/sim/lib/mothership/integrations/application/catalog.ts

@@ -135,8 +135,10 @@ function rankByBm25(tools: ToolSchema[], queryTerms: string[]): number[] {
   const documents = tools.map((tool) => {
     const stats = getOperationTermStats(tool)
     const frequencies = new Map<string, number>()
-    for (const [term, frequency] of stats.frequencies)
-      if (query.has(term)) frequencies.set(term, frequency)
+    for (const term of query) {
+      const frequency = stats.frequencies.get(term)
+      if (frequency) frequencies.set(term, frequency)
+    }
     return { length: stats.length, frequencies }
   })
   const averageLength =

apps/sim/lib/workflows/deployment-status.ts

@@ -20,11 +20,8 @@ import type { WorkflowState } from '@/stores/workflows/workflow/types'
  * draft, so that the server and the client answered the same question
  * differently for the same workflow.
  *
- * Every read — the active version row, the normalized draft, its variables and
- * the credential rows the block migrations consult — runs in one REPEATABLE READ
- * transaction so both operands come from the same snapshot. The diff does not:
- * it is pure CPU over values already read, and running it after commit returns
- * the pooled connection instead of holding it idle in transaction.
+ * All reads share one REPEATABLE READ snapshot; the CPU-only diff runs after
+ * commit so the connection is not held idle in transaction.
  */
 export async function checkNeedsRedeployment(workflowId: string): Promise<boolean> {
   const snapshot = await db.transaction(async (tx) => {

packages/testing/src/mocks/database.mock.ts

@@ -477,10 +477,7 @@ function resolveDbUrl(
  */
 export const databaseMockFns = {
   mockResolveDbUrl: vi.fn(resolveDbUrl),
-  /**
-   * Recognizes only the shared instance by default; a test that needs a distinct
-   * sub-pool client marks it as a primary root client here.
-   */
+  /** Recognizes only the shared instance unless a test marks its own client. */
   mockIsPrimaryPoolClient,
   mockEnsureRowCountTriggers: vi.fn(async (): Promise<void> => {}),
   mockVerifyRowCountTriggers: vi.fn(async () => ({