feat(sse): honor excluded models in no-auth auto-combo candidate pool (#7622) (#7646)

Validated in local merge-train @ 8f27177d1 (full parity suite green: typecheck+file-size+complexity+cognitive+changelog+unit shards 1&2+vitest)
This commit is contained in:
Diego Rodrigues de Sa e Souza
2026-07-17 22:09:29 -03:00
committed by GitHub
parent f5d705c277
commit 9a71113583
3 changed files with 126 additions and 2 deletions

View File

@@ -0,0 +1 @@
- feat(sse): honor a no-auth provider connection's **Excluded Models** field (`providerSpecificData.excludedModels`) in the auto-combo/fusion candidate pool builder, so an excluded no-auth model (e.g. `minimax-m3-free`) is filtered out upfront instead of only failing over after being picked (#7622).

View File

@@ -20,6 +20,7 @@ import {
import { buildFamilyCandidateFilter, type ModelFamily } from "./modelFamily";
import { getHiddenModelsByProvider } from "@/models";
import { filterPaidOnlyCandidates } from "./paidModelFilter";
import { isModelExcludedByConnection } from "@/domain/connectionModelRules";
/** #4235 Phase B: optional category/tier overlay for `auto/<category>:<tier>` combos.
* #6453: optional `family` overlay for `auto/<family>` combos (e.g. `auto/glm`) —
@@ -138,7 +139,8 @@ function isChatAutoComboNoAuthProvider(providerDef: NoAuthProviderDefinition): b
function getNoAuthCandidates(
excludedProviders: Set<string>,
blockedProviders: Set<string>,
disabledNoAuthProviders: Set<string>
disabledNoAuthProviders: Set<string>,
noAuthProviderSpecificData: Map<string, Record<string, unknown> | null | undefined>
): VirtualAutoComboCandidate[] {
const registry = getProviderRegistry();
const candidates: VirtualAutoComboCandidate[] = [];
@@ -178,9 +180,20 @@ function getNoAuthCandidates(
: null;
const routingPrefix = providerDef.alias || registryAlias || providerId;
// #7622: honor the "Excluded Models" field (`providerSpecificData.excludedModels`)
// already enforced at dispatch time (src/sse/services/auth.ts) for no-auth
// providers' own provider_connections row (#6557), so an excluded model never
// enters the auto-combo/fusion candidate pool in the first place.
const providerSpecificData =
noAuthProviderSpecificData.get(providerId) ??
(typeof providerDef.alias === "string"
? noAuthProviderSpecificData.get(providerDef.alias)
: undefined);
for (const model of registryModels) {
const modelId = typeof model?.id === "string" && model.id.trim().length > 0 ? model.id : null;
if (!modelId) continue;
if (isModelExcludedByConnection(modelId, providerSpecificData)) continue;
candidates.push({
provider: providerId,
connectionId: SYNTHETIC_NOAUTH_CONNECTION_ID,
@@ -261,6 +274,19 @@ export async function createVirtualAutoCombo(
.map((conn) => conn.provider)
);
const hiddenModelsMap = getHiddenModelsByProvider();
// #7622: a no-auth provider's own provider_connections row (#6557) can carry
// `providerSpecificData.excludedModels` regardless of its isActive state (the
// dispatch-time enforcement in auth.ts does not gate on isActive either), so
// gather it from BOTH the active and disabled connection lists.
const noAuthProviderSpecificData = new Map<
string,
Record<string, unknown> | null | undefined
>();
for (const conn of [...connections, ...disabledNoAuthConnections]) {
if (conn.provider in NOAUTH_PROVIDERS) {
noAuthProviderSpecificData.set(conn.provider, conn.providerSpecificData);
}
}
const validConnections = connections.filter(hasUsableConnectionCredential);
@@ -296,7 +322,8 @@ export async function createVirtualAutoCombo(
...getNoAuthCandidates(
new Set(validConnections.map((conn) => conn.provider)),
blockedProviders,
disabledNoAuthProviders
disabledNoAuthProviders,
noAuthProviderSpecificData
)
);

View File

@@ -0,0 +1,96 @@
/**
* #7622 — no-auth provider "Excluded Models" field is stored + enforced at
* dispatch time (src/sse/services/auth.ts) but IGNORED by the auto-combo/fusion
* candidate pool builder (`getNoAuthCandidates()` in
* open-sse/services/autoCombo/virtualFactory.ts). An excluded no-auth model must
* never be advertised/selected in `auto/*` combos in the first place — it should
* only fail over after being picked instead.
*/
import test from "node:test";
import assert from "node:assert/strict";
import fs from "node:fs";
import os from "node:os";
import path from "node:path";
const TEST_DATA_DIR = fs.mkdtempSync(path.join(os.tmpdir(), "omniroute-7622-noauth-exclude-"));
const ORIGINAL_DATA_DIR = process.env.DATA_DIR;
process.env.DATA_DIR = TEST_DATA_DIR;
const core = await import("../../src/lib/db/core.ts");
const providersDb = await import("../../src/lib/db/providers.ts");
const virtualFactory = await import("../../open-sse/services/autoCombo/virtualFactory.ts");
async function resetStorage() {
core.resetDbInstance();
fs.rmSync(TEST_DATA_DIR, { recursive: true, force: true });
fs.mkdirSync(TEST_DATA_DIR, { recursive: true });
}
test.beforeEach(async () => {
await resetStorage();
});
test.after(async () => {
await resetStorage();
fs.rmSync(TEST_DATA_DIR, { recursive: true, force: true });
if (ORIGINAL_DATA_DIR === undefined) {
delete process.env.DATA_DIR;
} else {
process.env.DATA_DIR = ORIGINAL_DATA_DIR;
}
});
test("#7622: a no-auth model excluded via providerSpecificData.excludedModels is ABSENT from the auto-combo candidate pool", async () => {
const conn = await providersDb.createProviderConnection({
provider: "opencode",
authType: "no-auth",
name: "OpenCode Free Account 1",
providerSpecificData: { excludedModels: "mimo-v2.5-free" },
});
assert.ok(conn.id, "connection must be created");
const combo = await virtualFactory.createVirtualAutoCombo(undefined);
const modelStrings = combo.models.map((m: { model: string }) => m.model);
assert.ok(
!modelStrings.some((model: string) => model.endsWith("/mimo-v2.5-free")),
"BUG #7622: the excluded model 'mimo-v2.5-free' must not appear in the auto-combo " +
`candidate pool, but it did. Pool: ${JSON.stringify(modelStrings)}`
);
});
test("#7622: a non-excluded no-auth model from the same connection remains in the auto-combo candidate pool", async () => {
await providersDb.createProviderConnection({
provider: "opencode",
authType: "no-auth",
name: "OpenCode Free Account 1",
providerSpecificData: { excludedModels: "mimo-v2.5-free" },
});
const combo = await virtualFactory.createVirtualAutoCombo(undefined);
const modelStrings = combo.models.map((m: { model: string }) => m.model);
assert.ok(
modelStrings.some((model: string) => model.endsWith("/big-pickle")),
`a non-excluded model ("big-pickle") must remain in the pool. Pool: ${JSON.stringify(modelStrings)}`
);
});
test("#7622 regression guard: with no excludedModels set, all opencode models remain in the pool (baseline unchanged)", async () => {
await providersDb.createProviderConnection({
provider: "opencode",
authType: "no-auth",
name: "OpenCode Free Account 1",
providerSpecificData: { fingerprints: ["11111111111111111111111111111111"] },
});
const combo = await virtualFactory.createVirtualAutoCombo(undefined);
const modelStrings = combo.models.map((m: { model: string }) => m.model);
assert.ok(
modelStrings.some((model: string) => model.endsWith("/mimo-v2.5-free")),
`baseline: no exclusion set, mimo-v2.5-free must still be present. Pool: ${JSON.stringify(modelStrings)}`
);
});