mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-08-08 08:12:20 +03:00
* chore(release): open v3.8.34 development cycle * chore(quality): release-green pre-flight validator + nightly signal (C+D) (#4622) C — scripts/quality/validate-release-green.mjs (npm run check:release-green): reproduces the release-equivalent validation (typecheck, eslint, db-rules, public-creds, full unit, vitest, ratchets, optional --with-build package-artifact) against the current working tree and classifies each red as HARD (real defect, exit 1) vs DRIFT (ratchet — reported, never affects exit / never blocks). Pure helpers exported + orchestration behind a direct-run guard; unit-tested. D — .github/workflows/nightly-release-green.yml: runs C on the active release branch nightly (and on workflow_dispatch) and opens/updates a single tracking issue on HARD failures. Never a required check, never touches a contributor PR. Closes the gap where the full gate (ci.yml) only ran on the release PR, so reds accrued silently on release/** and surfaced in 40-min layers at release time. Non-blocking by construction; drift is the maintainer's to rebaseline at release. Co-authored-by: Diego Rodrigues de Sa e Souza <diego.souza@cdwasolutions.com.br> * fix(providers): show revealed connection API keys (#4583) Integrated into release/v3.8.34 * fix(resilience): respect upstream retry hint toggle (#4585) Integrated into release/v3.8.34 * feat(settings): expose stream recovery feature flags (#4586) Integrated into release/v3.8.34 * fix(logs): make active request stale sweep configurable (#4599) Integrated into release/v3.8.34 * fix(plugin): auto-prefix providerId with 'opencode-' for OC 1.17.8+ native gate (#4527) Integrated into release/v3.8.34 (supersedes #4445) * fix(models): treat unknown output caps as unset (#4584) Integrated into release/v3.8.34 * fix(executors): strip temperature for GitHub Copilot gpt-5.4 family (#4564) Integrated into release/v3.8.34 (rebuilt onto tip) * fix(oauth): update Qwen OAuth URLs from chat.qwen.ai to qwen.ai (#4561) Integrated into release/v3.8.34 (rebuilt onto tip) * fix(api/settings): prevent cached /api/settings responses (port from 9router#951) (#4566) Integrated into release/v3.8.34 (rebuilt onto tip) * feat(audio): MiniMax T2A v2 TTS dispatch in audioSpeech (port #1043) (#4553) Integrated into release/v3.8.34 (rebuilt onto tip) * fix(dashboard): surface manual config CTA when Open Claw CLI auto-detect fails (#4562) Integrated into release/v3.8.34 (rebuilt onto tip) * feat(providers): optional model ID for custom API-key validation (#4555) Integrated into release/v3.8.34 (rebuilt onto tip) * fix(cli): align data dir and env loading with runtime (#4607) Integrated into release/v3.8.34 (rebuilt onto tip) * fix(quota): expose Bailian quota windows (#4610) Integrated into release/v3.8.34 (rebuilt onto tip) * fix: retain provider cooldowns for configured max window (#4588) Integrated into release/v3.8.34 (rebuilt — bundled commits stripped) * fix: reject invalid provider cooldown bounds (#4589) Integrated into release/v3.8.34 (rebuilt — bundled commits stripped) * fix: preserve production combo metrics on shadow eviction (#4590) Integrated into release/v3.8.34 (rebuilt — bundled commits stripped) * fix(stream): estimate input tokens when upstream reports prompt_tokens=0 (#4615) Integrated into release/v3.8.34 (rebuilt onto tip) * fix(catalog): shorten no-thinking gateway prefix to no-think/ (#4525) Integrated into release/v3.8.34 (rebuilt — kept only the prefix rename, dropped stale-base reverts) * fix(relay): apply IP rate limit to bifrost sidecar (#4593) Integrated into release/v3.8.34 (rebuilt onto tip; merge before #4612) * fix(bifrost): finalize SSE relay usage after stream (#4612) Integrated into release/v3.8.34 (rebuilt + reconciled with #4593) * feat(compression): per-request `x-omniroute-compression` header (Phase 3) (#4645) * docs(compression): Phase 3 per-request header design spec Approved brainstorming output for the x-omniroute-compression header: header-first precedence, name-first combo matching (Decision A), explicit value bypasses auto-trigger (Decision B), DerivedPlan.source, and the X-OmniRoute-Compression response header. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * docs(compression): Phase 3 per-request header implementation plan 4-task TDD plan (resolver header-first + source, parser, chatCore wiring + response header, docs/file-size) with full code and exact commands. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(compression): header-first resolver + plan source (Phase 3 core) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(compression): resolveCompressionHeader parser (Phase 3) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(compression): wire x-omniroute-compression header + response header (Phase 3) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * refactor(compression): extract plan-resolution leaf (planResolution.ts) under size cap (Phase 3) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * docs(compression): document x-omniroute-compression header (Phase 3) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(compression): harden named-combo map + trim engine: header id (Phase 3 review) Addresses gemini-code-assist review on #4645: - Extract buildNamedComboLookup (pure) so a blank/whitespace/null combo name contributes only its id key (no '' key, no throw that disables all combos). - Trim the engine:<id> header value so 'engine: rtk' resolves. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Diego Rodrigues de Sa e Souza <diego.souza@cdwasolutions.com.br> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * fix: exclude exhausted connections from auto scoring (#4592) Integrated into release/v3.8.34 (rebuilt + opt-in gate fix) * fix(dashboard): memoize compatible provider groups (#4613) Integrated into release/v3.8.34 (rebuilt + test added) * fix(dashboard): isolate quota widget refresh clock (#4611) Integrated into release/v3.8.34 (rebuilt + jsdom test) * fix(dashboard): gate topology side effects behind widget visibility (#4606) Integrated into release/v3.8.34 (rebuilt + jsdom test) * fix(dashboard): keep play_arrow spinning on provider Test All buttons (#4563) Integrated into release/v3.8.34 (rebuilt onto tip; UI-cosmetic per owner) * fix(db): schedule retention cleanup + fix cleanup table/column names (extracted from #4428) (#4691) Integrated into release/v3.8.34 (cleanup core extracted from #4428, credit @oyi77) * fix(telemetry): back off live-WS event forwarding when the sidecar is unreachable (#4604) (#4687) Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * fix(api): serve GET /v1/models/{model} as JSON, not the HTML dashboard (#4674) (#4677) Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * feat(opencode): add go deepseek reasoning variants (#4647) Integrated into release/v3.8.34 * fix(executors): robust deepseek-web tool-call parsing and agentic context retention (#4644) Integrated into release/v3.8.34 * fix(cli): authenticate `omniroute logs` and honor active context (#4638) Integrated into release/v3.8.34 (authored by Rahul Sharma, AI co-author trailer stripped per project policy) * fix(proxy): apply pipelining:0 + connections cap to the direct dispatcher (#4580) (#4684) Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * fix(executors): Firecrawl web_fetch 500 with include_metadata=true (#4692) Integrated into release/v3.8.34 * fix(routing): include all noAuth models in auto-combos + add reka-flash + best-free template (#4621) Integrated into release/v3.8.34 (dead getFirstRegistryModelId dropped, rebuilt onto tip) * fix(dashboard): gate home topology live-WS networking (#4596) (#4618) Integrated into release/v3.8.34 (adapted onto #4606's extracted topology section: default-hidden flip + enabled gate on useLiveDashboard) * fix(cli): align `omniroute` env loading with the runtime data dir (#4597) (#4619) Integrated into release/v3.8.34 (data-dir.mjs refactor reconciled with #4607; loadEnvFile aligned to getDefaultDataDir) * chore(quality): reconcile file-size baseline for #4644 (deepseek-web.ts 1117->1125) (#4695) file-size reconcile for #4644 * Support quota scraping for OpenCode Go and Ollama Cloud (#4642) Integrated into release/v3.8.34 (Ollama Cloud + OpenCode Go dashboard quota scraping; rebuilt onto tip, gates green: typecheck/public-creds/file-size/lint/docs-sync + 31 tests) * feat(executors): land M365 Copilot pure framing + connection helpers (#4042) (#4696) Land M365 pure modules ahead of draft #4400 * deps: bump production + development groups; migrate js-yaml to v5 ESM (#4697) Incorporates Dependabot #4667 + #4668 + js-yaml v5 ESM migration into release/v3.8.34 * fix: noAuth provider validation + kimi executor routing (#4699) Integrated into release/v3.8.34 (noAuth in NOAUTH_PROVIDERS dynamic check + remove misrouted kimi web alias; 9 tests) * refactor(imageGeneration): extract 8 provider families to co-located files (#4609) Integrated into release/v3.8.34 (extraction completed: added missing imports/exports per module, main imports handlers locally; 145 image-gen tests pass, typecheck/cycles/file-size green) * chore(release): v3.8.34 — finalize changelog, rebaseline drift, fix release-green reds - Finalize CHANGELOG [3.8.34] (43 bullets, full contributor attribution) + seed i18n mirrors - Rebaseline inherited cycle drift surfaced by release-green pre-flight: eslint warnings 3900->3907, cognitive-complexity 797->801 (release-finalize touches no prod code; all drift is from this cycle's contributor merges) - fix(providers): keep reka-flash-3 as the Reka provider default. #4621 inserted reka-flash at the head of the model list, silently changing the default from reka-flash-3 (the free-tier model) to reka-flash; reorder so reka-flash-3 stays default, reka-flash retained. - test: align provider-models-config / provider-models-route / web-cookie-providers-new with #4621 (reka-flash now in the Reka catalog) and #4699 (the `kimi` API-key provider correctly falls through to DefaultExecutor instead of KimiWebExecutor) - chore(quality): allowlist the COMPRESSION_GUIDE doc name in check-fabricated-docs (false-positive env-var match; docs/compression/COMPRESSION_GUIDE.md exists) * fix(release-green): resolve release-PR full-CI reds for v3.8.34 Surfaced only on the release PR (these gates don't run on PR->release fast-gates): - fix(quota): complete HTML-comment sanitization in opencodeOllamaUsage SSR reset-time parsing — strip any <!--...--> generically instead of the two literal React hydration markers, so no partial "<!--" can survive (CodeQL js/incomplete-multi-character- sanitization, HIGH, introduced by #4642). Regression test added. - test(codex): correct the Codex-fingerprint body key order assertion to match the canonical bodyFieldOrder (prompt_cache_key precedes include); #4584 flipped the two and integration tests don't run on fast-gates so it never executed until the release PR. - chore(quality): rebaseline inherited cycle drift surfaced by full CI — zizmorFindings 152->155 (+3 unpinned-uses in nightly-release-green.yml from #4622, same @vN convention as ci.yml) and openapiCoverage.pct 38.4->37.8 (-0.6, contributor routes added faster than openapi docs). Release-finalize touches no prod routes. * fix(release-green): complete CodeQL sanitization + rebaseline complexity drift - fix(quota): handle unterminated HTML comments in opencodeOllamaUsage SSR reset-time parsing — the `(?:-->|$)` arm consumes a trailing "<!--" with no closing "-->", so no partial "<!--" can survive (CodeQL js/incomplete-multi-character-sanitization persisted with the plain <!--...--> form because an unclosed comment could still leave "<!--"). - chore(quality): rebaseline cyclomatic complexity 1915->1916 (+1) — inherited v3.8.34 cycle drift (contributor feature branches); check:complexity does not run on PR->release fast-gates so it surfaced only on the release PR. Release-finalize adds 0 complexity (measured 1916 with/without the regex tweak). dead-code/cognitive/type-coverage/ compression-budget/codeql ratchets all pass. --------- Co-authored-by: Diego Rodrigues de Sa e Souza <diego.souza@cdwasolutions.com.br> Co-authored-by: Randi <55005611+rdself@users.noreply.github.com> Co-authored-by: Hernan Javier Ardila Sanchez <hjasgr@gmail.com> Co-authored-by: KooshaPari <42529354+KooshaPari@users.noreply.github.com> Co-authored-by: Abhishek Divekar <adivekar@utexas.edu> Co-authored-by: Rahul sharma <sharmaR0810@gmail.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> Co-authored-by: Ronald Estacion <DevEstacion@users.noreply.github.com> Co-authored-by: Igor <60442260+BugsBag@users.noreply.github.com> Co-authored-by: Oonishi <275808243+ponkcore@users.noreply.github.com> Co-authored-by: Paijo <14921983+oyi77@users.noreply.github.com> Co-authored-by: Jan Leon <Jan.gaschler@gmail.com>
705 lines
20 KiB
TypeScript
705 lines
20 KiB
TypeScript
import test, { after } from "node:test";
|
|
import assert from "node:assert/strict";
|
|
import { randomUUID } from "node:crypto";
|
|
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-combo-strategies-"));
|
|
const ORIGINAL_DATA_DIR = process.env.DATA_DIR;
|
|
const ORIGINAL_FETCH = globalThis.fetch;
|
|
process.env.DATA_DIR = TEST_DATA_DIR;
|
|
|
|
const dbCore = await import("../../src/lib/db/core.ts");
|
|
const { handleComboChat } = await import("../../open-sse/services/combo.ts");
|
|
const { invalidateCodexQuotaCache, registerCodexConnection, registerCodexQuotaFetcher } =
|
|
await import("../../open-sse/services/codexQuotaFetcher.ts");
|
|
const { registerQuotaFetcher } = await import("../../open-sse/services/quotaPreflight.ts");
|
|
const combosDb = await import("../../src/lib/db/combos.ts");
|
|
const providersDb = await import("../../src/lib/db/providers.ts");
|
|
const { recordComboRequest } = await import("../../open-sse/services/comboMetrics.ts");
|
|
const { saveModelsDevCapabilities } = await import("../../src/lib/modelsDevSync.ts");
|
|
|
|
after(() => {
|
|
dbCore.resetDbInstance();
|
|
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;
|
|
}
|
|
globalThis.fetch = ORIGINAL_FETCH;
|
|
});
|
|
|
|
const reqBodyNullContext = {
|
|
model: "comboTest",
|
|
messages: [{ role: "user", content: null }], // hit toTextContent (!string, !array)
|
|
stream: false,
|
|
};
|
|
|
|
const reqBodyTextArray = {
|
|
model: "comboTest",
|
|
messages: [{ role: "user", content: [{ text: "hi array" }, { image: "url" }, null] }],
|
|
stream: false,
|
|
};
|
|
|
|
function capability(limitContext: number) {
|
|
return {
|
|
tool_call: true,
|
|
reasoning: null,
|
|
attachment: null,
|
|
structured_output: null,
|
|
temperature: null,
|
|
modalities_input: "[]",
|
|
modalities_output: "[]",
|
|
knowledge_cutoff: null,
|
|
release_date: null,
|
|
last_updated: null,
|
|
status: null,
|
|
family: null,
|
|
open_weights: null,
|
|
limit_context: limitContext,
|
|
limit_input: null,
|
|
limit_output: null,
|
|
interleaved_field: null,
|
|
};
|
|
}
|
|
|
|
function okResponse(model: string) {
|
|
return Response.json({ choices: [{ message: { role: "assistant", content: model } }] });
|
|
}
|
|
|
|
function makeLog() {
|
|
return {
|
|
info() {},
|
|
warn() {},
|
|
debug() {},
|
|
error() {},
|
|
};
|
|
}
|
|
|
|
async function selectedModelFor(combo: Record<string, unknown>, body: Record<string, unknown>) {
|
|
const calls: string[] = [];
|
|
const response = await handleComboChat({
|
|
body,
|
|
combo,
|
|
allCombos: [combo],
|
|
isModelAvailable: undefined,
|
|
relayOptions: undefined,
|
|
signal: undefined,
|
|
settings: {},
|
|
log: makeLog(),
|
|
handleSingleModel: async (_body: unknown, modelStr: string) => {
|
|
calls.push(modelStr);
|
|
return okResponse(modelStr);
|
|
},
|
|
});
|
|
|
|
assert.equal(response.status, 200);
|
|
assert.equal(calls.length > 0, true);
|
|
return calls[0];
|
|
}
|
|
|
|
function codexQuota({
|
|
used5h,
|
|
reset5hSeconds,
|
|
used7d,
|
|
reset7dSeconds,
|
|
}: {
|
|
used5h: number;
|
|
reset5hSeconds: number;
|
|
used7d: number;
|
|
reset7dSeconds: number;
|
|
}) {
|
|
return {
|
|
rate_limit: {
|
|
primary_window: {
|
|
used_percent: used5h,
|
|
reset_after_seconds: reset5hSeconds,
|
|
},
|
|
secondary_window: {
|
|
used_percent: used7d,
|
|
reset_after_seconds: reset7dSeconds,
|
|
},
|
|
},
|
|
};
|
|
}
|
|
|
|
function installCodexQuotaMock(quotasByToken: Record<string, unknown>) {
|
|
const previousFetch = globalThis.fetch;
|
|
globalThis.fetch = async (_input: RequestInfo | URL, init?: RequestInit) => {
|
|
const headers = init?.headers as Record<string, string> | undefined;
|
|
const authorization = headers?.Authorization || headers?.authorization || "";
|
|
const token = authorization.replace(/^Bearer\s+/i, "");
|
|
const quota = quotasByToken[token];
|
|
if (!quota) return Response.json({ error: "missing quota" }, { status: 404 });
|
|
return Response.json(quota);
|
|
};
|
|
return () => {
|
|
globalThis.fetch = previousFetch;
|
|
};
|
|
}
|
|
|
|
function resetAwareCombo(
|
|
name: string,
|
|
connections: Array<{ id: string; token: string }>,
|
|
config: Record<string, unknown> = {}
|
|
) {
|
|
registerCodexQuotaFetcher();
|
|
|
|
for (const connection of connections) {
|
|
invalidateCodexQuotaCache(connection.id);
|
|
registerCodexConnection(connection.id, { accessToken: connection.token });
|
|
}
|
|
|
|
return {
|
|
name,
|
|
strategy: "reset-aware",
|
|
config,
|
|
models: connections.map((connection, index) => ({
|
|
kind: "model",
|
|
provider: "codex",
|
|
providerId: "codex",
|
|
model: "gpt-5",
|
|
connectionId: connection.id,
|
|
id: `${name}-${index}`,
|
|
})),
|
|
};
|
|
}
|
|
|
|
async function selectedConnectionFor(
|
|
combo: Record<string, unknown>,
|
|
options: { apiKeyAllowedConnections?: string[] | null } = {}
|
|
) {
|
|
const calls: Array<string | null> = [];
|
|
const response = await handleComboChat({
|
|
body: reqBodyTextArray,
|
|
combo,
|
|
allCombos: [combo],
|
|
isModelAvailable: undefined,
|
|
relayOptions: undefined,
|
|
signal: undefined,
|
|
settings: {},
|
|
log: makeLog(),
|
|
apiKeyAllowedConnections: options.apiKeyAllowedConnections,
|
|
handleSingleModel: async (
|
|
_body: unknown,
|
|
modelStr: string,
|
|
target?: { connectionId?: string | null; allowedConnectionIds?: string[] | null }
|
|
) => {
|
|
calls.push(target?.connectionId ?? null);
|
|
return okResponse(modelStr);
|
|
},
|
|
});
|
|
|
|
assert.equal(response.status, 200);
|
|
assert.equal(calls.length > 0, true);
|
|
return calls[0];
|
|
}
|
|
|
|
test("least-used strategy prefers the model with fewer recorded combo requests", async () => {
|
|
const name = `least-used-${randomUUID()}`;
|
|
const busyModel = "openai/gpt-4";
|
|
const idleModel = "openai/gpt-3.5-turbo";
|
|
const combo = await combosDb.createCombo({
|
|
name,
|
|
strategy: "least-used",
|
|
models: [busyModel, idleModel],
|
|
});
|
|
|
|
recordComboRequest(name, busyModel, {
|
|
success: true,
|
|
latencyMs: 10,
|
|
strategy: "least-used",
|
|
});
|
|
|
|
assert.equal(await selectedModelFor(combo, reqBodyTextArray), idleModel);
|
|
});
|
|
|
|
test("context-optimized strategy prefers the largest context window", async () => {
|
|
saveModelsDevCapabilities({
|
|
"test-context": {
|
|
small: capability(8_000),
|
|
large: capability(64_000),
|
|
},
|
|
});
|
|
|
|
const combo = await combosDb.createCombo({
|
|
name: `context-optimized-${randomUUID()}`,
|
|
strategy: "context-optimized",
|
|
models: ["test-context/small", "test-context/large", "unknown/unknown"],
|
|
});
|
|
|
|
assert.equal(await selectedModelFor(combo, reqBodyNullContext), "test-context/large");
|
|
});
|
|
|
|
test("auto strategy handles null and empty prompt edge cases without throwing", async () => {
|
|
const combo = await combosDb.createCombo({
|
|
name: `auto-${randomUUID()}`,
|
|
strategy: "auto",
|
|
config: { auto: { explorationRate: 0 } },
|
|
models: ["openai/gpt-4"],
|
|
});
|
|
|
|
assert.equal(
|
|
await selectedModelFor(combo, {
|
|
model: combo.name,
|
|
messages: [{ role: "user", content: null }],
|
|
}),
|
|
"openai/gpt-4"
|
|
);
|
|
assert.equal(await selectedModelFor(combo, { model: combo.name, messages: [] }), "openai/gpt-4");
|
|
});
|
|
|
|
test("reset-aware strategy prefers lower weekly remaining quota when reset is much sooner", async (t) => {
|
|
const soon = { id: `soon-${randomUUID()}`, token: `token-soon-${randomUUID()}` };
|
|
const later = { id: `later-${randomUUID()}`, token: `token-later-${randomUUID()}` };
|
|
t.after(
|
|
installCodexQuotaMock({
|
|
[soon.token]: codexQuota({
|
|
used5h: 10,
|
|
reset5hSeconds: 3600,
|
|
used7d: 40,
|
|
reset7dSeconds: 24 * 3600,
|
|
}),
|
|
[later.token]: codexQuota({
|
|
used5h: 10,
|
|
reset5hSeconds: 3600,
|
|
used7d: 20,
|
|
reset7dSeconds: 5 * 24 * 3600,
|
|
}),
|
|
})
|
|
);
|
|
|
|
const combo = resetAwareCombo(`reset-aware-soon-${randomUUID()}`, [soon, later]);
|
|
|
|
assert.equal(await selectedConnectionFor(combo), soon.id);
|
|
});
|
|
|
|
test("reset-aware strategy aggressively spends quota that resets soon", async (t) => {
|
|
const team = { id: `team-${randomUUID()}`, token: `token-team-${randomUUID()}` };
|
|
const fullLater = { id: `full-${randomUUID()}`, token: `token-full-${randomUUID()}` };
|
|
const soonLow = { id: `soon-low-${randomUUID()}`, token: `token-soon-low-${randomUUID()}` };
|
|
const soonLower = {
|
|
id: `soon-lower-${randomUUID()}`,
|
|
token: `token-soon-lower-${randomUUID()}`,
|
|
};
|
|
t.after(
|
|
installCodexQuotaMock({
|
|
[team.token]: codexQuota({
|
|
used5h: 29,
|
|
reset5hSeconds: 2.5 * 3600,
|
|
used7d: 40,
|
|
reset7dSeconds: 2.25 * 24 * 3600,
|
|
}),
|
|
[fullLater.token]: codexQuota({
|
|
used5h: 1,
|
|
reset5hSeconds: 5 * 3600,
|
|
used7d: 0,
|
|
reset7dSeconds: 7 * 24 * 3600,
|
|
}),
|
|
[soonLow.token]: codexQuota({
|
|
used5h: 1,
|
|
reset5hSeconds: 5 * 3600,
|
|
used7d: 86,
|
|
reset7dSeconds: 1.5 * 3600,
|
|
}),
|
|
[soonLower.token]: codexQuota({
|
|
used5h: 1,
|
|
reset5hSeconds: 5 * 3600,
|
|
used7d: 84,
|
|
reset7dSeconds: 1.5 * 3600,
|
|
}),
|
|
})
|
|
);
|
|
|
|
const combo = resetAwareCombo(`reset-aware-pressure-${randomUUID()}`, [
|
|
team,
|
|
fullLater,
|
|
soonLow,
|
|
soonLower,
|
|
]);
|
|
const selections = [await selectedConnectionFor(combo), await selectedConnectionFor(combo)];
|
|
|
|
assert.deepEqual(new Set(selections), new Set([soonLow.id, soonLower.id]));
|
|
});
|
|
|
|
test("reset-aware strategy prioritizes soon-reset weekly quota over empty later accounts", async (t) => {
|
|
const fullerSoon = {
|
|
id: `fuller-soon-${randomUUID()}`,
|
|
token: `token-fuller-soon-${randomUUID()}`,
|
|
};
|
|
const emptyLater = {
|
|
id: `empty-later-${randomUUID()}`,
|
|
token: `token-empty-later-${randomUUID()}`,
|
|
};
|
|
t.after(
|
|
installCodexQuotaMock({
|
|
[fullerSoon.token]: codexQuota({
|
|
used5h: 25,
|
|
reset5hSeconds: 2 * 3600,
|
|
used7d: 70,
|
|
reset7dSeconds: 2 * 3600,
|
|
}),
|
|
[emptyLater.token]: codexQuota({
|
|
used5h: 1,
|
|
reset5hSeconds: 5 * 3600,
|
|
used7d: 0,
|
|
reset7dSeconds: 7 * 24 * 3600,
|
|
}),
|
|
})
|
|
);
|
|
|
|
const combo = resetAwareCombo(`reset-aware-weekly-pressure-${randomUUID()}`, [
|
|
emptyLater,
|
|
fullerSoon,
|
|
]);
|
|
|
|
assert.equal(await selectedConnectionFor(combo), fullerSoon.id);
|
|
});
|
|
|
|
test("reset-aware strategy keeps 5h reset pressure softer than weekly pressure", async (t) => {
|
|
const fullerSoon = {
|
|
id: `session-fuller-soon-${randomUUID()}`,
|
|
token: `token-session-fuller-soon-${randomUUID()}`,
|
|
};
|
|
const emptyLater = {
|
|
id: `session-empty-later-${randomUUID()}`,
|
|
token: `token-session-empty-later-${randomUUID()}`,
|
|
};
|
|
t.after(
|
|
installCodexQuotaMock({
|
|
[fullerSoon.token]: codexQuota({
|
|
used5h: 70,
|
|
reset5hSeconds: 2 * 3600,
|
|
used7d: 1,
|
|
reset7dSeconds: 7 * 24 * 3600,
|
|
}),
|
|
[emptyLater.token]: codexQuota({
|
|
used5h: 0,
|
|
reset5hSeconds: 5 * 3600,
|
|
used7d: 0,
|
|
reset7dSeconds: 7 * 24 * 3600,
|
|
}),
|
|
})
|
|
);
|
|
|
|
const combo = resetAwareCombo(`reset-aware-session-pressure-${randomUUID()}`, [
|
|
fullerSoon,
|
|
emptyLater,
|
|
]);
|
|
|
|
assert.equal(await selectedConnectionFor(combo), emptyLater.id);
|
|
});
|
|
|
|
test("reset-aware strategy avoids accounts near 5h exhaustion", async (t) => {
|
|
const exhausted5h = {
|
|
id: `exhausted-${randomUUID()}`,
|
|
token: `token-exhausted-${randomUUID()}`,
|
|
};
|
|
const healthy5h = {
|
|
id: `healthy-${randomUUID()}`,
|
|
token: `token-healthy-${randomUUID()}`,
|
|
};
|
|
t.after(
|
|
installCodexQuotaMock({
|
|
[exhausted5h.token]: codexQuota({
|
|
used5h: 98,
|
|
reset5hSeconds: 20 * 60,
|
|
used7d: 5,
|
|
reset7dSeconds: 24 * 3600,
|
|
}),
|
|
[healthy5h.token]: codexQuota({
|
|
used5h: 20,
|
|
reset5hSeconds: 4 * 3600,
|
|
used7d: 50,
|
|
reset7dSeconds: 4 * 24 * 3600,
|
|
}),
|
|
})
|
|
);
|
|
|
|
const combo = resetAwareCombo(`reset-aware-guard-${randomUUID()}`, [exhausted5h, healthy5h]);
|
|
|
|
assert.equal(await selectedConnectionFor(combo), healthy5h.id);
|
|
});
|
|
|
|
test("reset-aware strategy rotates similar scores with round-robin tie breaking", async () => {
|
|
const provider = `tie-provider-${randomUUID()}`;
|
|
const first = `first-${randomUUID()}`;
|
|
const second = `second-${randomUUID()}`;
|
|
const quota = {
|
|
used: 50,
|
|
total: 100,
|
|
percentUsed: 0.5,
|
|
resetAt: "2099-01-01T00:00:00.000Z",
|
|
};
|
|
|
|
registerQuotaFetcher(provider, async () => quota);
|
|
|
|
const combo = {
|
|
name: `reset-aware-rr-${randomUUID()}`,
|
|
strategy: "reset-aware",
|
|
config: { resetAwareTieBandPercent: 100 },
|
|
models: [first, second].map((connectionId, index) => ({
|
|
kind: "model",
|
|
provider,
|
|
providerId: provider,
|
|
model: "balanced-model",
|
|
connectionId,
|
|
id: `tie-${index}`,
|
|
})),
|
|
};
|
|
|
|
const selections = [
|
|
await selectedConnectionFor(combo),
|
|
await selectedConnectionFor(combo),
|
|
await selectedConnectionFor(combo),
|
|
];
|
|
|
|
assert.equal(selections.includes(first), true);
|
|
assert.equal(selections.includes(second), true);
|
|
});
|
|
|
|
test("reset-aware strategy uses registered quota fetchers for non-Codex providers", async () => {
|
|
const provider = `quota-provider-${randomUUID()}`;
|
|
const soon = `soon-${randomUUID()}`;
|
|
const later = `later-${randomUUID()}`;
|
|
const resetAtSoon = new Date(Date.now() + 24 * 3600 * 1000).toISOString();
|
|
const resetAtLater = new Date(Date.now() + 5 * 24 * 3600 * 1000).toISOString();
|
|
|
|
registerQuotaFetcher(provider, async (connectionId) => {
|
|
if (connectionId === soon) {
|
|
return { used: 40, total: 100, percentUsed: 0.4, resetAt: resetAtSoon };
|
|
}
|
|
if (connectionId === later) {
|
|
return { used: 20, total: 100, percentUsed: 0.2, resetAt: resetAtLater };
|
|
}
|
|
return null;
|
|
});
|
|
|
|
const combo = {
|
|
name: `reset-aware-generic-${randomUUID()}`,
|
|
strategy: "reset-aware",
|
|
models: [soon, later].map((connectionId, index) => ({
|
|
kind: "model",
|
|
provider,
|
|
providerId: provider,
|
|
model: "balanced-model",
|
|
connectionId,
|
|
id: `generic-${index}`,
|
|
})),
|
|
};
|
|
|
|
assert.equal(await selectedConnectionFor(combo), soon);
|
|
});
|
|
|
|
test("reset-aware strategy deduplicates quota fetches for repeated connection targets", async () => {
|
|
const provider = `dedupe-provider-${randomUUID()}`;
|
|
const connectionId = `shared-${randomUUID()}`;
|
|
let fetchCount = 0;
|
|
|
|
registerQuotaFetcher(provider, async (id) => {
|
|
fetchCount++;
|
|
assert.equal(id, connectionId);
|
|
return {
|
|
used: 20,
|
|
total: 100,
|
|
percentUsed: 0.2,
|
|
resetAt: new Date(Date.now() + 24 * 3600 * 1000).toISOString(),
|
|
};
|
|
});
|
|
|
|
const combo = {
|
|
name: `reset-aware-dedupe-${randomUUID()}`,
|
|
strategy: "reset-aware",
|
|
models: ["model-a", "model-b"].map((model, index) => ({
|
|
kind: "model",
|
|
provider,
|
|
providerId: provider,
|
|
model,
|
|
connectionId,
|
|
id: `dedupe-${index}`,
|
|
})),
|
|
};
|
|
|
|
assert.equal(await selectedConnectionFor(combo), connectionId);
|
|
assert.equal(fetchCount, 1);
|
|
});
|
|
|
|
test("reset-aware quota SWR serves stale ordering while refreshing in background", async () => {
|
|
const provider = `swr-provider-${randomUUID()}`;
|
|
const cachedFirst = `cached-first-${randomUUID()}`;
|
|
const cachedSecond = `cached-second-${randomUUID()}`;
|
|
const fetchCounts = new Map<string, number>();
|
|
|
|
registerQuotaFetcher(provider, async (connectionId) => {
|
|
fetchCounts.set(connectionId, (fetchCounts.get(connectionId) || 0) + 1);
|
|
if (connectionId === cachedFirst) {
|
|
return {
|
|
used: 40,
|
|
total: 100,
|
|
percentUsed: 0.4,
|
|
resetAt: new Date(Date.now() + 24 * 3600 * 1000).toISOString(),
|
|
};
|
|
}
|
|
return {
|
|
used: 20,
|
|
total: 100,
|
|
percentUsed: 0.2,
|
|
resetAt: new Date(Date.now() + 5 * 24 * 3600 * 1000).toISOString(),
|
|
};
|
|
});
|
|
|
|
const combo = {
|
|
name: `reset-aware-swr-${randomUUID()}`,
|
|
strategy: "reset-aware",
|
|
config: {
|
|
resetAwareQuotaCacheTtlMs: 1,
|
|
resetAwareQuotaCacheMaxStaleMs: 60_000,
|
|
},
|
|
models: [cachedFirst, cachedSecond].map((connectionId, index) => ({
|
|
kind: "model",
|
|
provider,
|
|
providerId: provider,
|
|
model: "balanced-model",
|
|
connectionId,
|
|
id: `swr-${index}`,
|
|
})),
|
|
};
|
|
|
|
assert.equal(await selectedConnectionFor(combo), cachedFirst);
|
|
await new Promise((resolve) => setTimeout(resolve, 5));
|
|
assert.equal(await selectedConnectionFor(combo), cachedFirst);
|
|
|
|
assert.equal(fetchCounts.get(cachedFirst), 2);
|
|
assert.equal(fetchCounts.get(cachedSecond), 2);
|
|
});
|
|
|
|
test("reset-aware strategy respects API-key allowed connections during expansion", async () => {
|
|
const provider = `limited-provider-${randomUUID()}`;
|
|
const disallowed = await providersDb.createProviderConnection({
|
|
provider,
|
|
authType: "apikey",
|
|
name: `disallowed-${randomUUID()}`,
|
|
apiKey: "sk-disallowed",
|
|
isActive: true,
|
|
});
|
|
const allowed = await providersDb.createProviderConnection({
|
|
provider,
|
|
authType: "apikey",
|
|
name: `allowed-${randomUUID()}`,
|
|
apiKey: "sk-allowed",
|
|
isActive: true,
|
|
});
|
|
const allowedId = String(allowed.id);
|
|
const disallowedId = String(disallowed.id);
|
|
const fetchedConnectionIds: string[] = [];
|
|
|
|
registerQuotaFetcher(provider, async (connectionId) => {
|
|
fetchedConnectionIds.push(connectionId);
|
|
return {
|
|
used: connectionId === disallowedId ? 60 : 20,
|
|
total: 100,
|
|
percentUsed: connectionId === disallowedId ? 0.6 : 0.2,
|
|
resetAt: new Date(Date.now() + 24 * 3600 * 1000).toISOString(),
|
|
};
|
|
});
|
|
|
|
const combo = {
|
|
name: `reset-aware-api-key-${randomUUID()}`,
|
|
strategy: "reset-aware",
|
|
models: [
|
|
{
|
|
kind: "model",
|
|
provider,
|
|
providerId: provider,
|
|
model: "balanced-model",
|
|
id: "limited-provider-step",
|
|
},
|
|
],
|
|
};
|
|
|
|
assert.equal(
|
|
await selectedConnectionFor(combo, { apiKeyAllowedConnections: [allowedId] }),
|
|
allowedId
|
|
);
|
|
assert.deepEqual(fetchedConnectionIds, [allowedId]);
|
|
});
|
|
|
|
test("reset-aware strategy parses numeric reset timestamps from quota telemetry", async () => {
|
|
const provider = `timestamp-provider-${randomUUID()}`;
|
|
const soon = `timestamp-soon-${randomUUID()}`;
|
|
const later = `timestamp-later-${randomUUID()}`;
|
|
const soonResetSeconds = Math.floor((Date.now() + 24 * 3600 * 1000) / 1000);
|
|
const laterResetMs = Date.now() + 5 * 24 * 3600 * 1000;
|
|
|
|
registerQuotaFetcher(provider, async (connectionId) => ({
|
|
used: connectionId === soon ? 40 : 20,
|
|
total: 100,
|
|
percentUsed: connectionId === soon ? 0.4 : 0.2,
|
|
resetAt: connectionId === soon ? soonResetSeconds : laterResetMs,
|
|
}));
|
|
|
|
const combo = {
|
|
name: `reset-aware-timestamps-${randomUUID()}`,
|
|
strategy: "reset-aware",
|
|
models: [soon, later].map((connectionId, index) => ({
|
|
kind: "model",
|
|
provider,
|
|
providerId: provider,
|
|
model: "balanced-model",
|
|
connectionId,
|
|
id: `timestamp-${index}`,
|
|
})),
|
|
};
|
|
|
|
assert.equal(await selectedConnectionFor(combo), soon);
|
|
});
|
|
|
|
test("reset-aware strategy scores provider-specific weekly windows when available", async () => {
|
|
const provider = `weekly-provider-${randomUUID()}`;
|
|
const soon = `weekly-soon-${randomUUID()}`;
|
|
const later = `weekly-later-${randomUUID()}`;
|
|
const resetAtSoon = new Date(Date.now() + 24 * 3600 * 1000).toISOString();
|
|
const resetAtLater = new Date(Date.now() + 5 * 24 * 3600 * 1000).toISOString();
|
|
|
|
registerQuotaFetcher(provider, async (connectionId) => {
|
|
if (connectionId === soon) {
|
|
return {
|
|
used: 40,
|
|
total: 100,
|
|
percentUsed: 0.4,
|
|
resetAt: resetAtSoon,
|
|
window5h: { percentUsed: 0.1, resetAt: resetAtSoon },
|
|
windowWeekly: { percentUsed: 0.4, resetAt: resetAtSoon },
|
|
};
|
|
}
|
|
if (connectionId === later) {
|
|
return {
|
|
used: 20,
|
|
total: 100,
|
|
percentUsed: 0.2,
|
|
resetAt: resetAtLater,
|
|
window5h: { percentUsed: 0.1, resetAt: resetAtSoon },
|
|
windowWeekly: { percentUsed: 0.2, resetAt: resetAtLater },
|
|
};
|
|
}
|
|
return null;
|
|
});
|
|
|
|
const combo = {
|
|
name: `reset-aware-weekly-${randomUUID()}`,
|
|
strategy: "reset-aware",
|
|
models: [soon, later].map((connectionId, index) => ({
|
|
kind: "model",
|
|
provider,
|
|
providerId: provider,
|
|
model: "balanced-model",
|
|
connectionId,
|
|
id: `weekly-${index}`,
|
|
})),
|
|
};
|
|
|
|
assert.equal(await selectedConnectionFor(combo), soon);
|
|
});
|