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.
202 lines
5.6 KiB
TypeScript
202 lines
5.6 KiB
TypeScript
import { mkdtemp, rm } from "node:fs/promises";
|
|
import { join } from "node:path";
|
|
import { tmpdir } from "node:os";
|
|
import { afterEach, describe, expect, it, vi } from "vitest";
|
|
import { AppDatabase } from "../../src/main/database";
|
|
import { createBudgetEnforcementService } from "../../src/main/budget-enforcement-service";
|
|
import { createRunDispatch } from "../../src/main/orchestration/run-dispatch";
|
|
import { createTaskRunner } from "../../src/main/orchestration/task-runner";
|
|
|
|
const tempDirs: string[] = [];
|
|
|
|
async function createTempDir(prefix: string) {
|
|
const dir = await mkdtemp(join(tmpdir(), prefix));
|
|
tempDirs.push(dir);
|
|
return dir;
|
|
}
|
|
|
|
afterEach(async () => {
|
|
await Promise.all(tempDirs.splice(0).map((dir) => rm(dir, { recursive: true, force: true })));
|
|
});
|
|
|
|
const logger = {
|
|
debug: vi.fn(),
|
|
info: vi.fn(),
|
|
warn: vi.fn(),
|
|
error: vi.fn(),
|
|
};
|
|
|
|
function createOrchestrationHarness(db: AppDatabase) {
|
|
const budgetService = createBudgetEnforcementService({
|
|
db,
|
|
logger,
|
|
notify: vi.fn(),
|
|
publishDomainChanged: vi.fn(),
|
|
});
|
|
|
|
const deps = {
|
|
db,
|
|
logger,
|
|
publishDomainChanged: vi.fn(),
|
|
emitEvent: vi.fn(),
|
|
notify: vi.fn(),
|
|
createRunToken: () => "test-token",
|
|
getApiPort: () => 3210,
|
|
dispatchAutomation: vi.fn(),
|
|
hasWorkerReady: () => true,
|
|
enqueueWorkerRun: vi.fn(),
|
|
isQuitting: () => false,
|
|
listRuntimeSkillEntries: () => [],
|
|
budgetService,
|
|
checkpointEngine: { shouldPauseHeartbeat: () => false },
|
|
};
|
|
|
|
const runDispatch = createRunDispatch(deps);
|
|
const taskRunner = createTaskRunner(
|
|
deps,
|
|
runDispatch.resolveWorkspace,
|
|
runDispatch.getRunEligibilityFailure,
|
|
runDispatch.dispatchRunToWorker,
|
|
(filter) => db.hasActiveRun(filter),
|
|
);
|
|
|
|
return { deps, taskRunner };
|
|
}
|
|
|
|
describe("connector model enforcement", () => {
|
|
it("blocks queueTaskRun when an agent keeps a disabled explicit model", async () => {
|
|
const profileDir = await createTempDir("agentcompany-model-enforcement-");
|
|
const db = new AppDatabase(profileDir);
|
|
db.init();
|
|
|
|
db.updateConnectorHealth({
|
|
id: "openai-codex",
|
|
status: "ready",
|
|
authState: "authenticated",
|
|
version: "test",
|
|
lastError: null,
|
|
});
|
|
|
|
const companyId = db.saveCompany({
|
|
name: "Runtime Enforcement Co",
|
|
description: "Blocks runs when agent models are disabled",
|
|
status: "active",
|
|
});
|
|
const workspaceId = db.saveWorkspace({
|
|
companyId,
|
|
name: "Primary",
|
|
localPath: profileDir,
|
|
repoUrl: "",
|
|
repoRef: "",
|
|
isPrimary: true,
|
|
});
|
|
const agentId = db.saveAgent({
|
|
companyId,
|
|
name: "CEO",
|
|
role: "CEO",
|
|
title: "Chief Executive Officer",
|
|
status: "idle",
|
|
reportsTo: null,
|
|
connectorId: "openai-codex",
|
|
workspaceId,
|
|
model: "gpt-5.4",
|
|
capabilities: "Lead the company",
|
|
budgetMonthlyUsd: 250,
|
|
});
|
|
const taskId = db.saveTask({
|
|
companyId,
|
|
title: "Run with invalid model",
|
|
description: "This task should be blocked because the agent model is disabled.",
|
|
assigneeAgentId: agentId,
|
|
workspaceId,
|
|
priority: "high",
|
|
status: "todo",
|
|
});
|
|
|
|
db.setDisabledModels(companyId, "openai-codex", [{ id: "gpt-5.4", label: "gpt-5.4" }]);
|
|
|
|
const { taskRunner } = createOrchestrationHarness(db);
|
|
const result = taskRunner.queueTaskRun(taskId, "manual", "board");
|
|
|
|
expect(result.ok).toBe(false);
|
|
if (result.ok) {
|
|
throw new Error("Expected queueTaskRun to reject the disabled model.");
|
|
}
|
|
expect(result.error.code).toBe("CONNECTOR_MODEL_NOT_ALLOWED");
|
|
expect(db.listSnapshot().runs).toHaveLength(0);
|
|
|
|
db.close();
|
|
});
|
|
|
|
it("fails recovered queued runs when the persisted agent model becomes invalid", async () => {
|
|
const profileDir = await createTempDir("agentcompany-model-recovery-");
|
|
const db = new AppDatabase(profileDir);
|
|
db.init();
|
|
|
|
db.updateConnectorHealth({
|
|
id: "openai-codex",
|
|
status: "ready",
|
|
authState: "authenticated",
|
|
version: "test",
|
|
lastError: null,
|
|
});
|
|
|
|
const companyId = db.saveCompany({
|
|
name: "Recovered Run Co",
|
|
description: "Rejects invalid queued runs during recovery",
|
|
status: "active",
|
|
});
|
|
const workspaceId = db.saveWorkspace({
|
|
companyId,
|
|
name: "Primary",
|
|
localPath: profileDir,
|
|
repoUrl: "",
|
|
repoRef: "",
|
|
isPrimary: true,
|
|
});
|
|
const agentId = db.saveAgent({
|
|
companyId,
|
|
name: "CEO",
|
|
role: "CEO",
|
|
title: "Chief Executive Officer",
|
|
status: "idle",
|
|
reportsTo: null,
|
|
connectorId: "openai-codex",
|
|
workspaceId,
|
|
model: "gpt-5.4",
|
|
capabilities: "Lead the company",
|
|
budgetMonthlyUsd: 250,
|
|
});
|
|
const taskId = db.saveTask({
|
|
companyId,
|
|
title: "Recover queued run",
|
|
description: "This queued run should fail on recovery because the model is disabled.",
|
|
assigneeAgentId: agentId,
|
|
workspaceId,
|
|
priority: "high",
|
|
status: "todo",
|
|
});
|
|
|
|
const run = db.createRun({
|
|
companyId,
|
|
taskId,
|
|
agentId,
|
|
workspaceId,
|
|
connectorId: "openai-codex",
|
|
});
|
|
const checkoutSuccess = db.checkoutTask(taskId, run.id);
|
|
expect(checkoutSuccess).toBe(true);
|
|
|
|
db.setDisabledModels(companyId, "openai-codex", [{ id: "gpt-5.4", label: "gpt-5.4" }]);
|
|
|
|
const { taskRunner } = createOrchestrationHarness(db);
|
|
taskRunner.resumeQueuedRuns();
|
|
|
|
const recoveredRun = db.listSnapshot().runs.find((entry) => entry.id === run.id);
|
|
expect(recoveredRun?.status).toBe("failed");
|
|
expect(recoveredRun?.errorMessage).toContain("Connector model is disabled or invalid");
|
|
|
|
db.close();
|
|
});
|
|
});
|