refactor(model-pool): scope disabled-models by company; cascade on delete (v42)

The per-connector "enabled/disabled model" settings lived under a
global key in the settings key-value table
(`disabled_models:${connectorId}`). No company dimension. Deleting a
company left the pool choices behind, and creating a new company
silently inherited them — the visible symptom was "onboarding's team-
model configuration survives company deletion and pollutes the next
company's CEO model list."

Root fix, not a cleanup hook: the storage becomes a real relational
table with `(company_id, connector_id)` primary key and an
`ON DELETE CASCADE` FK from `companies`. Company deletion wipes pool
config by construction; no cleanup step in `deleteCompany()` can
drift.

Schema (migration v42):
- CREATE TABLE connector_model_pool_settings (company_id, connector_id,
  disabled_models_json, updated_at), PK (company_id, connector_id),
  FK companies(id) ON DELETE CASCADE.
- Drop every `settings.disabled_models:*` key — these were the bug's
  residue; there is no right company to attribute them to, so the
  migration clears them. Users re-select on next onboarding.

API surgery — every reader/writer now takes companyId:
- db.getDisabledModels(companyId, connectorId)
- db.setDisabledModels(companyId, connectorId, models)
- db.hasModelPoolSettings(companyId, connectorId)
- connector-model-policy: getConnectorModelPolicy(deps, companyId,
  connectorId); validateConnectorModelSelection(deps, companyId,
  connectorId, model)
- model-dispatch: listEnabledModels(companyId, deps);
  pickModelForAgent resolves companyId from agent.companyId
- orchestration heartbeat/task-runner/turn-context/run-dispatch pass
  the agent's or run's companyId through to the policy deps
- IPC schema: connectorDisabledModelsSchema gains companyId; new
  connectorModelPoolQuerySchema pairs companyId+connectorId for reads

Onboarding becomes commit-on-launch:
- useConnectorModelSelection no longer persists via IPC during
  onboarding. Toggles mutate local state; it exposes `poolSelections`
  to the wizard.
- bootstrapOnboardingSchema gains connectorPoolSelections. The
  onboarding service saves the company first, then persists each
  per-connector disabled list scoped to the new company id — CEO
  model validation runs against the company's freshly-persisted pool,
  not some stale global.
- IPC setConnectorDisabledModels now requires companyId; the only
  consumer was onboarding, which no longer calls it at all.
- Main-side listConnectorModels returns the raw provider catalog
  (no pool filtering), since that IPC is used from onboarding where
  no company exists yet; pool filtering happens at dispatch time.

saveConnector IPC drops the per-company pool validation — connector
config is a global hint, company-scoped enforcement belongs at run
dispatch where the company is known.

Tests: 603/603 green. Typecheck clean. Integration tests rewritten
to set the pool via connectorPoolSelections on bootstrap input, not
a pre-bootstrap global setDisabledModels call.

src/main/connector-model-policy.ts

@@ -4,7 +4,7 @@ import { resolveModels } from "./model-resolver";
 
 interface ConnectorModelPolicyDeps {
   getConnector: (id: ConnectorId) => { id: ConnectorId; label?: string | null; model: string | null };
-  getDisabledModels: (connectorId: string) => Array<{ id: string; label: string }>;
+  getDisabledModels: (companyId: string, connectorId: string) => Array<{ id: string; label: string }>;
 }
 
 export interface ConnectorModelPolicyResult {
@@ -39,11 +39,12 @@ function listProviderModels(provider: string): Array<{ id: string; label: string
 
 export function getConnectorModelPolicy(
   deps: ConnectorModelPolicyDeps,
+  companyId: string,
   connectorId: ConnectorId,
 ): ConnectorModelPolicyResult {
   const connector = deps.getConnector(connectorId);
   const definition = getConnectorDefinition(connectorId);
-  const disabledModels = new Set(deps.getDisabledModels(connectorId).map((model) => model.id));
+  const disabledModels = new Set(deps.getDisabledModels(companyId, connectorId).map((model) => model.id));
 
   const catalog = listProviderModels(definition.provider);
   const enabledModels = uniqueModels(catalog).filter((model) => !disabledModels.has(model.id));
@@ -58,10 +59,11 @@ export function getConnectorModelPolicy(
 
 export function validateConnectorModelSelection(
   deps: ConnectorModelPolicyDeps,
+  companyId: string,
   connectorId: ConnectorId,
   model: string | null | undefined,
 ): { ok: true; effectiveModel: string | null } | { ok: false; error: string } {
-  const policy = getConnectorModelPolicy(deps, connectorId);
+  const policy = getConnectorModelPolicy(deps, companyId, connectorId);
   const selectedModel = model?.trim() || null;
 
   if (policy.enabledModels.length === 0) {

src/main/database-base.ts

@@ -263,9 +263,9 @@ export class AppDatabaseBase {
   getLogRetentionDays() { return this.settings.getLogRetentionDays(); }
   purgeExpiredRunLogs() { return this.settings.purgeExpiredRunLogs(); }
   canOpenPath(targetPath: string) { return this.settings.canOpenPath(targetPath); }
-  getDisabledModels(connectorId: string) { return this.settings.getDisabledModels(connectorId); }
-  setDisabledModels(connectorId: string, models: Array<{ id: string; label: string }>) { this.settings.setDisabledModels(connectorId, models); }
-  hasModelPoolSettings(connectorId: string) { return this.settings.hasModelPoolSettings(connectorId); }
+  getDisabledModels(companyId: string, connectorId: string) { return this.settings.getDisabledModels(companyId, connectorId); }
+  setDisabledModels(companyId: string, connectorId: string, models: Array<{ id: string; label: string }>) { this.settings.setDisabledModels(companyId, connectorId, models); }
+  hasModelPoolSettings(companyId: string, connectorId: string) { return this.settings.hasModelPoolSettings(companyId, connectorId); }
   getLastBudgetResetMonth(companyId: string) { return this.settings.getLastBudgetResetMonth(companyId); }
   setLastBudgetResetMonth(companyId: string, month: string) { this.settings.setLastBudgetResetMonth(companyId, month); }
 

src/main/database/migrations/v42-v42.ts

@@ -0,0 +1,64 @@
+import log from "electron-log/main.js";
+import type { Migration, MigrationDeps } from "./types";
+import { tableExists } from "./types";
+
+/**
+ * Company-scope the connector model-pool settings.
+ *
+ * "Model pool" is the per-connector list of models a user has
+ * enabled/disabled during onboarding (Settings → Model pool). The
+ * original storage put it in the key-value `settings` table under
+ * `disabled_models:${connectorId}` — global, not tied to any
+ * company. That meant deleting a company left the pool config behind,
+ * and creating a new company inherited the previous company's
+ * enabled/disabled choices.
+ *
+ * This migration moves the data to a real relational table with a
+ * cascade FK. Company deletion now naturally wipes the settings —
+ * no manual cleanup in `deleteCompany()`, no risk of drift.
+ *
+ * Existing global entries cannot be assigned to a single company
+ * (the constraint they were written under had none), so the
+ * migration drops them. Users re-select their model pool on the
+ * next onboarding wake. Acceptable: this data is a one-click UI
+ * preference, not business-critical state, and the bug report was
+ * literally "these carry over wrongly — clear them."
+ */
+export function createMigrationsV42V42(deps: MigrationDeps): Migration[] {
+  const { db } = deps;
+  return [
+    {
+      version: 42,
+      name: "scope_connector_model_pool_by_company",
+      fn: () => {
+        if (!tableExists(db, "connector_model_pool_settings")) {
+          db.exec(`
+            CREATE TABLE connector_model_pool_settings (
+              company_id TEXT NOT NULL,
+              connector_id TEXT NOT NULL,
+              disabled_models_json TEXT NOT NULL DEFAULT '[]',
+              updated_at TEXT NOT NULL,
+              PRIMARY KEY (company_id, connector_id),
+              FOREIGN KEY (company_id) REFERENCES companies(id) ON DELETE CASCADE
+            );
+            CREATE INDEX IF NOT EXISTS idx_connector_model_pool_company
+              ON connector_model_pool_settings(company_id);
+          `);
+          log.info("[migration v42] created connector_model_pool_settings");
+        }
+
+        // Purge stale global keys. Prefix scan is enough — both the
+        // key format (`disabled_models:<connectorId>`) and the
+        // semantics (one per connector) mean dropping them all is the
+        // correct reset.
+        const deleted = db
+          .prepare("DELETE FROM settings WHERE key LIKE 'disabled_models:%'")
+          .run();
+        const changes = Number(deleted.changes);
+        if (changes > 0) {
+          log.info(`[migration v42] dropped ${changes} legacy disabled_models:* key(s) from settings`);
+        }
+      },
+    },
+  ];
+}

src/main/database/schema.ts

@@ -6,6 +6,7 @@ import { createMigrationsV35V37 } from "./migrations/v35-v37";
 import { createMigrationsV38V39 } from "./migrations/v38-v39";
 import { createMigrationsV40V40 } from "./migrations/v40-v40";
 import { createMigrationsV41V41 } from "./migrations/v41-v41";
+import { createMigrationsV42V42 } from "./migrations/v42-v42";
 import {
   columnExists,
   nowIso,
@@ -178,6 +179,7 @@ export function runMigrations(
     ...createMigrationsV38V39(deps),
     ...createMigrationsV40V40(deps),
     ...createMigrationsV41V41(deps),
+    ...createMigrationsV42V42(deps),
   ];
 
   for (const migration of migrations) {

src/main/database/settings.ts

@@ -77,22 +77,56 @@ export function buildSettingsMethods(
       return Number.isFinite(parsed) && parsed >= 1 ? parsed : 90;
     },
 
-    getDisabledModels(connectorId: string): Array<{ id: string; label: string }> {
-      const raw = getSetting(`disabled_models:${connectorId}`);
-      if (!raw) return [];
+    /**
+     * Per-(company, connector) disabled model list.
+     *
+     * Pre-v42 the key-value `settings` table stored one global entry
+     * per connector (`disabled_models:${connectorId}`). That let the
+     * setting leak across companies — deleting a company did not
+     * clear the pool config, and new companies inherited the old
+     * selections. v42 moved the data to `connector_model_pool_settings`
+     * with `company_id` in the primary key and `ON DELETE CASCADE`
+     * from companies, so company removal wipes pool config by
+     * construction.
+     */
+    getDisabledModels(companyId: string, connectorId: string): Array<{ id: string; label: string }> {
+      const row = getDb()
+        .prepare(
+          "SELECT disabled_models_json AS json FROM connector_model_pool_settings WHERE company_id = ? AND connector_id = ?",
+        )
+        .get(companyId, connectorId) as { json: string } | undefined;
+      if (!row) return [];
       try {
-        return JSON.parse(raw);
+        return JSON.parse(row.json);
       } catch {
-        return raw.split(",").filter(Boolean).map((id) => ({ id, label: id }));
+        return [];
       }
     },
 
-    setDisabledModels(connectorId: string, models: Array<{ id: string; label: string }>) {
-      setSetting(`disabled_models:${connectorId}`, JSON.stringify(models));
+    setDisabledModels(
+      companyId: string,
+      connectorId: string,
+      models: Array<{ id: string; label: string }>,
+    ) {
+      const ts = new Date().toISOString();
+      getDb()
+        .prepare(
+          `INSERT INTO connector_model_pool_settings (company_id, connector_id, disabled_models_json, updated_at)
+           VALUES (?, ?, ?, ?)
+           ON CONFLICT(company_id, connector_id) DO UPDATE SET
+             disabled_models_json = excluded.disabled_models_json,
+             updated_at = excluded.updated_at`,
+        )
+        .run(companyId, connectorId, JSON.stringify(models), ts);
     },
 
-    hasModelPoolSettings(connectorId: string): boolean {
-      return getSetting(`disabled_models:${connectorId}`) !== null;
+    hasModelPoolSettings(companyId: string, connectorId: string): boolean {
+      const row = getDb()
+        .prepare(
+          "SELECT 1 AS found FROM connector_model_pool_settings WHERE company_id = ? AND connector_id = ? LIMIT 1",
+        )
+        .get(companyId, connectorId) as { found: number } | undefined;
+      return !!row;
     },
 
     getLastBudgetResetMonth(companyId: string): string | null {

src/main/ipc-core-admin-handlers.ts

@@ -7,7 +7,7 @@ import {
   deleteEntitySchema,
   openTerminalCommandSchema,
 } from "@shared/contracts";
-import { validateConnectorConfigurationModel, validateConnectorModelSelection } from "./connector-model-policy";
+import { validateConnectorConfigurationModel } from "./connector-model-policy";
 import { reconcileExecutionModeChange } from "./execution-mode-reconciler";
 import { fail, ok, type RegisterCoreHandlersDependencies } from "./ipc-core-common";
 
@@ -94,10 +94,9 @@ export function registerCoreAdminHandlers({
     if (!connectorConfigValidation.ok) {
       return fail("CONNECTOR_MODEL_NOT_ALLOWED", connectorConfigValidation.error);
     }
-    const modelSelection = validateConnectorModelSelection(db, parsed.id, parsed.model ?? null);
-    if (!modelSelection.ok) {
-      return fail("CONNECTOR_MODEL_NOT_ALLOWED", modelSelection.error);
-    }
+    // The per-company disabled-models pool is not consulted here —
+    // connector config is a global hint, and pool enforcement
+    // happens at run dispatch time where the company is known.
     db.saveConnector({
       ...parsed,
       command: existingConnector.command,
@@ -133,7 +132,7 @@ export function registerCoreAdminHandlers({
 
   registerHandle(IPC_CHANNELS.setConnectorDisabledModels, async (_event, payload) => {
     const parsed = connectorDisabledModelsSchema.parse(payload);
-    db.setDisabledModels(parsed.connectorId, parsed.disabledModels);
+    db.setDisabledModels(parsed.companyId, parsed.connectorId, parsed.disabledModels);
     publishDomainChanged();
     return ok(true);
   });

src/main/ipc-core-agent-graph-handlers.ts

@@ -94,7 +94,7 @@ export function registerCoreAgentGraphHandlers({
     if (connectorIssue) {
       return fail("CONNECTOR_NOT_READY", connectorIssue);
     }
-    const modelSelection = validateConnectorModelSelection(db, parsed.connectorId, parsed.model ?? null);
+    const modelSelection = validateConnectorModelSelection(db, parsed.companyId, parsed.connectorId, parsed.model ?? null);
     if (!modelSelection.ok) {
       return fail("CONNECTOR_MODEL_NOT_ALLOWED", modelSelection.error);
     }
@@ -180,7 +180,7 @@ export function registerCoreAgentGraphHandlers({
     if (routingError) {
       return fail("INVALID_HIRE_ROUTING", routingError);
     }
-    const modelSelection = validateConnectorModelSelection(db, parsed.connectorId, parsed.model ?? null);
+    const modelSelection = validateConnectorModelSelection(db, parsed.companyId, parsed.connectorId, parsed.model ?? null);
     if (!modelSelection.ok) {
       return fail("CONNECTOR_MODEL_NOT_ALLOWED", modelSelection.error);
     }

src/main/ipc-core-read-handlers.ts

@@ -4,6 +4,7 @@ import { z } from "zod";
 import {
   IPC_CHANNELS,
   connectorInputSchema,
+  connectorModelPoolQuerySchema,
   entityGetterSchema,
   metricsQuerySchema,
   settingsSchema,
@@ -105,12 +106,12 @@ export function registerCoreReadHandlers({
     }
   });
 
-  registerHandle(IPC_CHANNELS.getConnectorDisabledModels, (_event, connectorId) => {
+  registerHandle(IPC_CHANNELS.getConnectorDisabledModels, (_event, payload) => {
     try {
-      const parsed = connectorInputSchema.shape.id.parse(connectorId);
-      return ok(db.getDisabledModels(parsed));
+      const parsed = connectorModelPoolQuerySchema.parse(payload);
+      return ok(db.getDisabledModels(parsed.companyId, parsed.connectorId));
     } catch (err) {
-      logger.warn(`[ipc] getConnectorDisabledModels failed for connector ${String(connectorId)}:`, err instanceof Error ? err.message : String(err));
+      logger.warn(`[ipc] getConnectorDisabledModels failed:`, err instanceof Error ? err.message : String(err));
       return ok([]);
     }
   });

src/main/main-runtime-support.ts

@@ -3,7 +3,6 @@ import type { AgentApiServer } from "./api-server";
 import { initializeAgentTokenSigningKey } from "./agent-auth";
 import { bootstrapApplication } from "./bootstrap-application";
 import { openGenericTerminal as openGenericTerminalImpl } from "./connector-auth-service";
-import { getConnectorModelPolicy } from "./connector-model-policy";
 import type { ConnectorId } from "@shared/types";
 import type { AppDatabase } from "./database";
 import { seedDefaultAutomationRules as seedDefaultAutomationRulesImpl } from "./default-automation-rules";
@@ -154,8 +153,15 @@ export function createMainRuntimeSupport(state: MainRuntimeState) {
       },
       notify: (options) => requireIpcSupport().notify(options),
       listConnectorModels: async (connectorId) => {
-        const policy = getConnectorModelPolicy(requireDb(), connectorId as ConnectorId);
-        return policy.enabledModels;
+        // This IPC returns the raw provider catalog (pi-ai + curated
+        // Fireworks additions). Pool / disabled-model filtering is a
+        // company-scoped concern and happens in the renderer once the
+        // user has selected a company; the onboarding path uses this
+        // catalog directly because no company exists yet.
+        const { getConnectorDefinition } = await import("./connectors");
+        const { resolveModels } = await import("./model-resolver");
+        const definition = getConnectorDefinition(connectorId as ConnectorId);
+        return resolveModels(definition.provider).map((m) => ({ id: m.id, label: m.name }));
       },
       logger: log,
     });

src/main/model-dispatch.ts

@@ -48,7 +48,7 @@ export interface AgentAssignment {
 
 export interface PickModelDeps {
   getConnector: (id: ConnectorId) => ConnectorRecord;
-  getDisabledModels: (connectorId: string) => Array<{ id: string; label: string }>;
+  getDisabledModels: (companyId: string, connectorId: string) => Array<{ id: string; label: string }>;
   /**
    * Thin projection of the CEO for fallback. Returns `null` when the
    * company has no CEO yet (pre-bootstrap). The picker only needs enough
@@ -85,7 +85,7 @@ const TIER_RANK: Record<TaskTier, number> = {
  * model list. Returns a flat list of (provider, connectorId, modelId) triples
  * — the concrete universe the picker chooses from.
  */
-export function listEnabledModels(deps: PickModelDeps): EnabledModel[] {
+export function listEnabledModels(companyId: string, deps: PickModelDeps): EnabledModel[] {
   const result: EnabledModel[] = [];
   for (const connector of deps.readConnectors()) {
     if (getConnectorExecutionReadinessIssue(connector)) continue;
@@ -96,7 +96,7 @@ export function listEnabledModels(deps: PickModelDeps): EnabledModel[] {
       log.warn(`[model-dispatch] Skipping unknown connector ${connector.id}:`, err instanceof Error ? err.message : String(err));
       continue;
     }
-    const policy = getConnectorModelPolicy(deps, connector.id as ConnectorId);
+    const policy = getConnectorModelPolicy(deps, companyId, connector.id as ConnectorId);
     for (const model of policy.enabledModels) {
       result.push({
         provider: definition.provider,
@@ -167,7 +167,7 @@ export function pickModelForAgent(
     return { connectorId: agent.connectorId, modelId: agent.model ?? null };
   }
 
-  const enabled = listEnabledModels(deps);
+  const enabled = listEnabledModels(agent.companyId, deps);
 
   // Single-model install: there's nothing to pick from. Use it.
   if (enabled.length === 1) {

src/main/onboarding-service.ts

@@ -24,6 +24,10 @@ interface BootstrapInput {
   goalDescription: string;
   connectorId?: ConnectorId;
   connectorModel?: string;
+  connectorPoolSelections?: Array<{
+    connectorId: ConnectorId;
+    disabledModels: Array<{ id: string; label: string }>;
+  }>;
 }
 
 interface OnboardingDependencies {
@@ -215,10 +219,6 @@ export function createOnboardingService({
   function bootstrapOnboarding(input: BootstrapInput): OnboardingBootstrapSummary {
     const connectors = db.listSnapshot({ companyId: null }).connectors;
     const selectedConnectorId = resolveOnboardingConnector(connectors, input.connectorId);
-    const modelSelection = validateConnectorModelSelection(db, selectedConnectorId, input.connectorModel ?? null);
-    if (!modelSelection.ok) {
-      throw new Error(modelSelection.error);
-    }
 
     const companyId = db.saveCompany({
       name: input.companyName.trim(),
@@ -228,6 +228,23 @@ export function createOnboardingService({
       reviewDeliverables: input.reviewDeliverables,
       executionMode: input.executionMode ?? "ai_ceo",
     });
+
+    // Persist the user's per-connector disabled-model selections
+    // against the freshly-created company id. Onboarding is entirely
+    // pre-commit; the pool settings arrive in the input payload and
+    // land in the DB only once a company exists to scope them.
+    for (const pool of input.connectorPoolSelections ?? []) {
+      db.setDisabledModels(companyId, pool.connectorId, pool.disabledModels);
+    }
+
+    // Validate the CEO model selection against the now-persisted pool
+    // scoped to this new company. Must run AFTER the pool is stored,
+    // otherwise the validator sees an empty pool and accepts anything.
+    const modelSelection = validateConnectorModelSelection(db, companyId, selectedConnectorId, input.connectorModel ?? null);
+    if (!modelSelection.ok) {
+      throw new Error(modelSelection.error);
+    }
+
     const workspaceId = createDefaultWorkspace(companyId, input.workspacePath);
 
     const goalTitle = input.goalTitle.trim();

src/main/orchestration/heartbeat.ts

@@ -44,7 +44,7 @@ export function createHeartbeat(
     }
     const assignment = pickModelForAgent(agent, {
       getConnector: (id) => db.getConnector(id),
-      getDisabledModels: (id) => db.getDisabledModels(id),
+      getDisabledModels: (id) => db.getDisabledModels(agent.companyId, id),
       getCeoAssignment: (cid) => {
         const ceo = db.getCeoForCompany(cid);
         if (!ceo) return null;

src/main/orchestration/run-dispatch.ts

@@ -47,7 +47,7 @@ export function createRunDispatch(deps: OrchestrationDependencies) {
       logger.info(`[run] Agent ${agent.name} connector ${connector.id} blocked: ${issue}`);
       return "CONNECTOR_NOT_READY";
     }
-    const modelSelection = validateConnectorModelSelection(db, connector.id, agent.model ?? null);
+    const modelSelection = validateConnectorModelSelection(db, agent.companyId, connector.id, agent.model ?? null);
     if (!modelSelection.ok) {
       logger.info(`[run] Agent ${agent.name} connector model blocked: ${modelSelection.error}`);
       return "CONNECTOR_MODEL_NOT_ALLOWED";

src/main/orchestration/task-runner.ts

@@ -49,7 +49,7 @@ export function createTaskRunner(
     }
     const assignment = pickModelForAgent(agent, {
       getConnector: (id) => db.getConnector(id),
-      getDisabledModels: (id) => db.getDisabledModels(id),
+      getDisabledModels: (id) => db.getDisabledModels(agent.companyId, id),
       getCeoAssignment: (cid) => {
         const ceo = db.getCeoForCompany(cid);
         if (!ceo) return null;

src/main/orchestration/turn-context.ts

@@ -132,9 +132,10 @@ function resolveSkills(
 
 function resolveEnabledConnectorModels(
   db: AppDatabase,
+  companyId: string,
   connector: { id: string; model: string | null },
 ): string[] {
-  return getConnectorModelPolicy(db, connector.id as ConnectorId).enabledModels.map((model) => model.id);
+  return getConnectorModelPolicy(db, companyId, connector.id as ConnectorId).enabledModels.map((model) => model.id);
 }
 
 function resolveSession(
@@ -261,16 +262,17 @@ function filterPendingApprovals(
 
 function buildConnectorCatalog(
   db: AppDatabase,
+  companyId: string,
   connectors: RunDispatchParams["snapshot"]["connectors"],
 ) {
   return connectors
     .filter((c) => c.status === "ready")
-    .filter((c) => db.hasModelPoolSettings(c.id))
+    .filter((c) => db.hasModelPoolSettings(companyId, c.id))
     .map((c) => ({
       id: c.id,
       label: c.label,
       status: c.status,
-      enabledModels: resolveEnabledConnectorModels(db, c),
+      enabledModels: resolveEnabledConnectorModels(db, companyId, c),
     }))
     .filter((c) => c.enabledModels.length > 0);
 }
@@ -325,7 +327,7 @@ export function buildRunPayload(params: RunDispatchParams, deps: TurnContextDeps
     relevantKnowledge: filterRelevantKnowledge(snapshot.knowledgeBase, companyId),
     activeSprint: snapshot.sprints.find((sprint) => sprint.companyId === companyId && sprint.status === "active") ?? null,
     recentDocuments: filterRecentDocuments(snapshot.documents, companyId, agent.id),
-    allConnectors: buildConnectorCatalog(db, snapshot.connectors),
+    allConnectors: buildConnectorCatalog(db, companyId, snapshot.connectors),
     sessionHandoff,
     skills,
     companySkillCatalog: db.listCompanySkills(companyId).map((skill) => ({
@@ -341,7 +343,7 @@ export function buildRunPayload(params: RunDispatchParams, deps: TurnContextDeps
 
   const thinkingEffort = extractThinkingEffort(agent.metadataJson, deps.logger, agent.id);
   const modelForRun = params.resolvedModel !== undefined ? params.resolvedModel : agent.model;
-  const modelSelection = validateConnectorModelSelection(db, connector.id, modelForRun);
+  const modelSelection = validateConnectorModelSelection(db, companyId, connector.id, modelForRun);
   if (!modelSelection.ok) {
     throw new Error(modelSelection.error);
   }