mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-08-09 00:32:13 +03:00
Compare commits
10 Commits
feat/9533-
...
fix/9626-p
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f5d0399739 | ||
|
|
d0047ee615 | ||
|
|
064a19b2d1 | ||
|
|
492f9ddc4a | ||
|
|
e7d9055314 | ||
|
|
2ed487583b | ||
|
|
a6b3b4f57a | ||
|
|
cf31b795b7 | ||
|
|
6b706f6b5e | ||
|
|
8706e717a5 |
1
changelog.d/fixes/8906-quota-pool-combo-cleanup.md
Normal file
1
changelog.d/fixes/8906-quota-pool-combo-cleanup.md
Normal file
@@ -0,0 +1 @@
|
||||
- **fix(quota):** Deleting a quota pool now removes its scoped managed combos without racing in-flight pool mutations ([#8906](https://github.com/diegosouzapw/OmniRoute/pull/8906)) — thanks @xiaoyaner0201
|
||||
1
changelog.d/fixes/9140-fix.plan.md
Normal file
1
changelog.d/fixes/9140-fix.plan.md
Normal file
@@ -0,0 +1 @@
|
||||
- fix(vscode): allow built-in auto-routing models in VS Code model filter (#9140)
|
||||
1
changelog.d/fixes/9142-fix.plan.md
Normal file
1
changelog.d/fixes/9142-fix.plan.md
Normal file
@@ -0,0 +1 @@
|
||||
- fix(background): detect Anthropic top-level system prompts for background task detection (#9142)
|
||||
1
changelog.d/fixes/9160-fix.plan.md
Normal file
1
changelog.d/fixes/9160-fix.plan.md
Normal file
@@ -0,0 +1 @@
|
||||
- fix(model-discovery): ingest capabilities.effort_tiers for synced models (#9160)
|
||||
@@ -0,0 +1 @@
|
||||
- fix(translator): buffer and normalize upstream tool-call argument deltas so optional null values are stripped before reaching the client (#9168)
|
||||
1
changelog.d/fixes/9177-fix.plan.md
Normal file
1
changelog.d/fixes/9177-fix.plan.md
Normal file
@@ -0,0 +1 @@
|
||||
- fix(translator): avoid double-normalizing tool names in Gemini-to-Claude response path (#9177)
|
||||
1
changelog.d/fixes/9305-fix.plan.md
Normal file
1
changelog.d/fixes/9305-fix.plan.md
Normal file
@@ -0,0 +1 @@
|
||||
- fix(sse): broaden OMNIROUTE_SSE_COMMENTS to accept 'false','0','no' and gate metadata comment emission (#9305)
|
||||
@@ -1 +0,0 @@
|
||||
- **fix(ratelimit):** added queue-wait timeout tests and updateFromResponseBody sequencing tests for the existing RATE_LIMIT_QUEUE_TIMEOUT feature in withRateLimit (#9533)
|
||||
1
changelog.d/fixes/9626-playground-errors.md
Normal file
1
changelog.d/fixes/9626-playground-errors.md
Normal file
@@ -0,0 +1 @@
|
||||
- fix(playground): surface provider model loading errors and offer retry (#9626)
|
||||
@@ -408,7 +408,8 @@
|
||||
"src/lib/tokenHealthCheck.ts": 1053,
|
||||
"open-sse/executors/default.ts": 1042,
|
||||
"open-sse/executors/kiro.ts": 1069,
|
||||
"open-sse/translator/request/openai-to-kiro.ts": 1057
|
||||
"open-sse/translator/request/openai-to-kiro.ts": 1057,
|
||||
"open-sse/utils/sseHeartbeat.ts": 149
|
||||
},
|
||||
"_rebaseline_2026_07_27_v3849_train2": "Merge-train 2 (7 PRs) — owner-approved 2026-07-27. Single entry: chatCore.ts 4955->5006 (#8595, Responses multi-turn image compaction before the context hard-reject). Genuine irreducible growth at the existing compaction chokepoint in handleChatCore — the PR adds a last-resort retry against the concrete budget plus the estimateFinalInputTokens helper, both wired at the pre-existing call site rather than a new branch. Covered by tests/unit/8560-responses-image-compaction.test.ts (4 tests).",
|
||||
"_rebaseline_2026_07_27_v3849_train3": "Merge-train 3 (13 PRs) — owner-approved 2026-07-27. Both entries are genuine irreducible growth at existing chokepoints, not new branches: src/lib/db/apiKeys.ts 1518->1529 (#8805 cx/* ≡ codex/* API-key model permissions); open-sse/handlers/chatCore.ts 5006->5020 (#8806 real response payload into plugin onResponse hooks). Covered by tests/unit/db-apiKeys-crud.test.ts (4 new cases) and the two plugin-hook test files updated in #8806 respectively.",
|
||||
@@ -432,5 +433,131 @@
|
||||
"_rebaseline_2026_08_06_v3850_inherited_drift_reconcile": "Reconciliacao 2026-08-06 do drift ACUMULADO da release/v3.8.50 apos o lote de merges de 08-05/06: 13 arquivos acima do frozen no tip puro 8180b49ce1 (medidos pelo proprio gate). O modo PR base-relative (#8522) deixa PRs inocentes passarem, e os rebaselines individuais dos PRs se perderam nas resolucoes sucessivas de conflito deste hot-file — o drift so aparece no modo absoluto (nightly/local). Crescimentos funcionais dos PRs mergeados: #9024 topology click-nav src/app/(dashboard)/dashboard/HomePageClient.tsx; #9324 OpenRouter enrich src/app/(dashboard)/dashboard/providers/page.tsx; #9329 quota card ordering src/app/(dashboard)/dashboard/usage/components/ProviderLimits/index.tsx; #9193 context-window suffixes src/sse/handlers/chat.ts; #9332 nested Claude server tool ids open-sse/executors/base.ts; #9228 strip orphaned tool outputs open-sse/executors/codex.ts; #9236 nvidia tool-name normalize open-sse/executors/default.ts; #9314 nested tool_call validation open-sse/executors/kiro.ts; #9260 caller identity REST hops open-sse/mcp-server/server.ts; #8934 cache breakpoints tests tests/unit/chatcore-translation-paths.test.ts; #9193 suffix tests tests/unit/combo-routing-engine.test.ts; #9196 reasoning-on-tool-finish tests tests/unit/sse-auth.test.ts; #9163 GPT-5.6 Max reasoning tests tests/unit/translator-openai-to-kiro.test.ts. default.ts e kiro.ts entram no frozen (estavam sem entrada, acima do cap 1000). Atualizacao pos-medicao (a base avancou durante o ciclo do PR): src/sse/handlers/chat.ts 1857->1877 (#9184 affinity EOF evict) e open-sse/executors/default.ts 1027->1042 (#9005 Kimi K3 tool-name backfill).",
|
||||
"_rebaseline_2026_08_06b_v3850_sweepreds_drift": "Segunda reconciliacao de 2026-08-06 (/sweep-reds sobre o tip puro 2ddbbc61a6): 3 arquivos voltaram a passar do frozen apos os merges do mesmo dia, com atribuicao 1:1 por commit. (1) src/app/(dashboard)/dashboard/providers/page.tsx 1928->1944 e (2) open-sse/executors/base.ts 1635->1640, ambos do #9515 (feat(radar): flag-gated signed free-model catalog overlay, commit e7f6b1d130) — o overlay do Radar entra por wiring nos chokepoints ja existentes (a resolucao/verificacao do catalogo assinado mora fora destes dois arquivos); +16 e +5 linhas liquidas nao sao extraiveis sem inventar um leaf por callsite. (3) open-sse/services/accountFallback.ts 1966->1972 do #8704 (commit c4527f97bd), +6 linhas de dados em CREDITS_EXHAUSTED_SIGNALS ('has been exhausted', fixes #8631). src/sse/handlers/chat.ts 1880>1877 tambem estava violando e NAO entra aqui de proposito: e drenado por encolhimento na PR #9598, sem rebaseline. Crescimento proprio DESTA PR: src/lib/db/migrationRunner.ts 1077->1084 (+7) — o guard retroativo em isSchemaAlreadyApplied para os arquivos renumerados 137/138, exigido pela propria mensagem de erro de colisao do runner (ambas as migracoes sao ALTER TABLE ADD COLUMN puro, nao idempotente). Dois `case` + dois `return hasColumn(...)` + 3 linhas de comentario dentro do switch existente; nao extraivel.",
|
||||
"_rebaseline_2026_08_06c_v3850_sweepreds_pr2": "Segunda PR do /sweep-reds (fix/release-v3.8.50-basereds-0806b): tests/unit/provider-models-route.test.ts 1784->1787 (medido pelo gate, que conta split(\"\\n\").length) (+2 apos compressao de comentarios) — alinhamento de contrato forcado por dois merges do dia: #9106 tornou gemini-3.1-pro-high user-callable (a entry do alias entra na lista esperada do teste de discovery-retry, +1 linha de dado + 1 de comentario) e ff012ff420 adicionou onboardUser como bootstrap hop (exclusao no mock, ja comprimida a 1 linha). Nao ha o que encolher sem apagar o comentario que explica o porque.",
|
||||
"_rebaseline_2026_08_07_v3850_sweepreds_pr2_toolnamemap": "tests/unit/translator-openai-to-gemini.test.ts 1616->1619 (+3). O frozen estava EXATAMENTE no tamanho da base, entao qualquer linha nova viola. #9568 (c9a3361e5a) fez buildChangedToolNameMap emitir entradas IDENTIDADE (o Gemini minusculiza nomes de tool nas respostas, entao o tradutor de resposta precisa da chave para mapear de volta), o que passou a incluir `_toolNameMap` no envelope Antigravity de qualquer request com tools. As 3 linhas sao: a chave nova na lista esperada de Object.keys, 1 comentario explicando POR QUE ela aparece (sem ele o proximo leitor tenta remove-la de novo) e 1 assert do CONTEUDO do map — presenca de chave sozinha nao provaria a entrada identidade, que e justamente o comportamento novo. Nao ha o que extrair: e alinhamento de contrato dentro de um teste existente."
|
||||
"_rebaseline_2026_08_07_v3850_sweepreds_pr2_toolnamemap": "tests/unit/translator-openai-to-gemini.test.ts 1616->1619 (+3). O frozen estava EXATAMENTE no tamanho da base, entao qualquer linha nova viola. #9568 (c9a3361e5a) fez buildChangedToolNameMap emitir entradas IDENTIDADE (o Gemini minusculiza nomes de tool nas respostas, entao o tradutor de resposta precisa da chave para mapear de volta), o que passou a incluir `_toolNameMap` no envelope Antigravity de qualquer request com tools. As 3 linhas sao: a chave nova na lista esperada de Object.keys, 1 comentario explicando POR QUE ela aparece (sem ele o proximo leitor tenta remove-la de novo) e 1 assert do CONTEUDO do map — presenca de chave sozinha nao provaria a entrada identidade, que e justamente o comportamento novo. Nao ha o que extrair: e alinhamento de contrato dentro de um teste existente.",
|
||||
"_rebaseline_2026_06_22_4644_deepseek_web_tools": "PR #4644 (BugsBag/robust deepseek-web tool-call parsing): open-sse/executors/deepseek-web.ts 1117->1125 (+8). The new agentic tool-call path emits surrounding text + reasoning before tool_calls and swaps to the dedicated deepseekWebTools.ts parser; the +8 lines are cohesive wiring at the existing transformSSE chokepoint (the parser itself lives in the new deepseekWebTools.ts file, already under cap). The PR's own fast-gate (PR->release) does not run check:file-size, so this surfaced only at release reconcile. Covered by tests/unit/deepseek-web-tools-variants.test.ts + deepseek-web-tools-execute.test.ts.",
|
||||
"_rebaseline_2026_06_23_4712_deepseek_web_tool_results": "PR for #4712 (deepseek-web drops role:tool): open-sse/executors/deepseek-web.ts 1125->1148 (+23). messagesToPrompt() now folds role:\\\"tool\\\" results into the single-prompt transcript (recovering the tool name from the preceding assistant tool_calls by tool_call_id) instead of silently dropping them; the lines are cohesive wiring inside the existing function. Covered by tests/unit/deepseek-web-tool-result-prompt-4712.test.ts.",
|
||||
"_rebaseline_2026_06_24_headroom_strategy": "Headroom-aware connection selection (dario technique): combo.ts 3168->3180 (+12 = a new `else if (strategy === \\\"headroom\\\")` dispatch branch in handleComboChat that delegates to orderTargetsByHeadroom + its log line, plus the import). The actual logic lives OUT of the god-file: the pure ranker rankByHeadroom/computeHeadroom is the new leaf open-sse/services/combo/headroomRanking.ts (91 LOC, <cap) and the async orderer orderTargetsByHeadroom is appended to the existing open-sse/services/combo/quotaStrategies.ts (<cap) next to its sibling reset-aware/reset-window orderers (reuses their connection-expansion machinery). headroom = 1 - max(util_5h, util_7d) from getSaturation (src/lib/quota/saturationSignals.ts), prefers the connection with the most free capacity. Only the dispatch wiring is irreducible at the existing combo strategy chokepoint (mirrors the reset-aware/reset-window/context-optimized branches); not extractable without hiding the call site. fill-first stays default; all existing strategies untouched. Covered by tests/unit/combo-headroom-ranking.test.ts (pure helper) + tests/unit/combo-headroom-strategy.test.ts (orderer, saturation injected). Structural shrink of combo.ts tracked in #3501.",
|
||||
"_rebaseline_2026_06_24_quota_share_strategy": "Dedicated quota-share strategy (Phase 3 #9): combo.ts 3180->3190 (+10 = one new `else if (strategy === \\\"quota-share\\\")` dispatch branch in handleComboChat that delegates 100% to selectQuotaShareTarget + its log line, plus the import). All the new logic lives OUT of the god-file in two new leaves under open-sse/services/combo/: quotaShareInflight.ts (in-flight counter with TTL/lease, ~150 LOC <cap) and quotaShareStrategy.ts (per-model bucket gating via isBucketSaturated + DRR proportional to weight + P2C over in-flight, ~240 LOC <cap). Only the dispatch wiring is irreducible at the existing combo strategy chokepoint (mirrors the headroom/reset-aware/reset-window/context-optimized branches); not extractable without hiding the call site. ZERO existing strategy cases were modified — only this branch was added, and the qtSd/ combos switched from fill-first to quota-share in src/lib/quota/quotaCombos.ts. Covered by tests/unit/quota-share-strategy.test.ts (gating, DRR fairness, P2C in-flight, fail-open, activation). Structural shrink of combo.ts tracked in #3501.",
|
||||
"_rebaseline_2026_06_24_task_aware_routing": "Task-aware routing strategy (port PR #2045, OmniRoute #4945): combo.ts 3190->3225 (+35) = one new `else if (strategy === \\\"task-aware\\\")` dispatch branch delegating 100% to selectTaskAwareTarget + its imports/log lines. All scoring/classification logic lives OUT of the god-file in the new leaf open-sse/services/taskAwareRouting.ts (553 LOC <cap). Only the dispatch wiring is irreducible at the existing combo strategy chokepoint (mirrors quota-share/headroom/reset-aware branches). ZERO existing strategy cases modified. Covered by tests/unit/combo-task-aware.test.ts (35 tests). Structural shrink of combo.ts tracked in #3501.",
|
||||
"_rebaseline_2026_06_26_fidelity_gate_extraction": "Milestone-B fidelity-gate wiring residual: bodyToText+gateAdvance extracted to fidelityGateStep.ts (889->854, -35), but the StackOptions.fidelityGate field, the `const fidelityGate` reads at the two stacked-loop dispatch chokepoints, and the import of FidelityGateConfig are irreducible wiring that cannot leave strategySelector without an architectural refactor of the pre-existing stacked pipeline. Net: 889->854 (+6 vs the pre-Milestone-B frozen 848). Covered by tests/unit/compression/*.test.ts (940 pass).",
|
||||
"_rebaseline_2026_06_27_5193_5203_antigravity_oauthmodal": "Antigravity remote-login own growth: OAuthModal.tsx 960->969 (gate units). #5193 (+~4: remote paste instruction shown for all remote incl. Google + its rationale comment) and #5203 (+~5: handleManualSubmit credential-blob branch + button guard; submit logic extracted to oauthBlobSubmit.ts to minimize). Frozen set to the SUM so either merge order passes. Cohesive at the existing manual-submit chokepoint.",
|
||||
"_rebaseline_2026_06_27_5193_antigravity_basered": "Base-red (pre-existing release drift, fast-gate PR->release skips check:file-size): accountFallback.ts 1773->1777 and src/app/api/providers/[id]/test/route.ts 924->940 were already over their frozen caps on release/v3.8.39 independent of any antigravity change. Owner chose to rebaseline (keep the documented issue-reference comments #1846/#1449/#347 etc.) rather than accept the contributor comment-stripping in #5200/#5198. Reverted #5200 to restore the comments; bumped these two frozen caps to the actual base sizes. No logic change.",
|
||||
"_rebaseline_2026_06_28_5237_impersonation_ua_refresh": "PR #5237 (refresh impersonation UAs): grok-web.ts 1871->1873 (+2), muse-spark-web.ts 1284->1302 (+18), perplexity-web.ts 1013->1032 (+19). Net semantic change in each file is a single User-Agent constant (Chrome 147->149 for grok/muse; perplexity kept at Firefox 148 to stay matched with the firefox_148 TLS profile — the contributor's 152 bump was reverted to avoid a UA-vs-JA3 mismatch, #2459). The growth is Prettier reflow that lint-staged unavoidably applies to these grandfathered long-line files the moment they are touched; not extractable. src/sse/services/auth.ts 2336->2401 in the same reconcile is #5222's antigravity-LRU-retry growth that merged via --admin without a baseline bump.",
|
||||
"_rebaseline_2026_06_28_5243_risk_gate_prepass": "PR #5243 (compression risk-gate pre-pass) own growth: open-sse/services/compression/strategySelector.ts 854->899 (+45). The three exported entry points (applyCompression/applyStackedCompression/applyStackedCompressionAsync) become thin wrappers over pure-extracted private bodies (runCompression/runStackedCompression/runStackedCompressionAsync) so the risk-gate mask->run->restore wrapper sits strictly OUTSIDE the per-step loop — a single universal integration point. The wrapper logic itself (resolveRiskGate/withRiskGate) lives in the new riskGate/strategyWrap.ts (<cap); the residual growth is the duplicated thin-wrapper signatures + the extracted bodies' dispatch boundary, guarded by a byte-identical parity test (riskGateIntegration). Default off (DEFAULT_COMPRESSION_CONFIG unchanged). Not extractable without hiding the dispatch boundary, mirroring prior compression rebaselines. Structural shrink tracked in #3501.",
|
||||
"_rebaseline_2026_06_28_5275_correlation_id_extract": "Extraction of the safe CorrelationId subset of #5275 (hartmark) — request correlation id stored in call_logs (migration 109) and returned via the X-Correlation-Id response header, WITHOUT the combo/resilience or build/lazy-loading changes (those stay in #5275). Own growth: callLogs.ts 975->985 (correlation_id column on CallLogSummaryRow + read/map), usageHistory.ts 983->988 (correlationId metadata normalize), chat.ts 1575->1632 (withCorrelationId response wiring + combo-failure log carrying correlationId), chatHelpers.ts new 811 (withCorrelationId helper + reqId threading; was 791<cap pre-feature). Cohesive request/logging chokepoint wiring; structural shrink of chat.ts tracked in #3501.",
|
||||
"_rebaseline_2026_06_29_4038_cas_guard": "PR (#4038) own growth: tokenRefresh.ts 2103->2181 (+78 = the compare-and-swap guard on the refresh persist — runWithCasGuard/getActiveCasGuard AsyncLocalStorage pair mirroring runWithOnPersist, casGuardShouldSkipPersist that rereads the row right before persisting and skips the write when a concurrent writer already rotated the refresh_token past the one presented, plus getCasGuardStats counters). Fixes the sibling-rotation-revert → token-family-revocation storm. Gated behind an active guard (opt-in; no guard => byte-identical). Wiring lives at the two persist chokepoints inside getAccessToken; the comparison reuses wasRefreshTokenRotated from refreshSerializer. Not extractable without splitting the refresh hot path.",
|
||||
"_rebaseline_2026_06_29_5286_memoization": "PR #5286 own growth: strategySelector.ts 899->960 (+61 = the opt-in result-memoization branches in applyCompression/applyCompressionAsync — principal+determinism gate, makeMemoKey lookup/store with model+supportsVision folded into the key, recompute-with-memo-off). Default off (memoizeCompressionResults), so zero behavior change. The memo helpers live in the leaf resultMemo.ts (<cap); the chokepoint wiring here is not extractable. Structural shrink of this hot-path file tracked in #3501.",
|
||||
"_rebaseline_2026_07_01_v3843_release_5609": "Rebaseline v3.8.43 (PR #5609 release reconciliation). DRIFT dos 109 commits do ciclo: 8 god-files existentes cresceram (ApiManagerPageClient 2983->3017, combos/page 4594->4608, AddApiKeyModal 868->869, providerPageHelpers 974->996, chat.ts 1635->1647, auth.ts 2401->2403, batchProcessor 828->915, combo.ts 3368->3387) + 2 novos acima do cap (huggingchat.ts 813, tests web-cookie-providers-new 827) + 4 test files cresceram. Modularizacao deferida (blast-radius mid-release); congelado no estado atual p/ o proximo ciclo ratchetar daqui.",
|
||||
"_rebaseline_2026_07_02_5816_qoder": "PR #5816 (@AgentKiller45, qoder PAT via qodercli): qoderCli.ts 666->989, new-above-cap frozen (owner-approved baseline freeze). The growth is the legitimate PAT job-token exchange + quota parsing CLI transport (the pure-JS Cosy path 500'd on every PAT request); extracting the spawn/parse helpers now would just add indirection to a contributor PR mid-merge. Test frozen also raised for this PR's coverage growth: providers-page-utils.test.ts 1052->1092. Additionally clears an inherited base-red from the already-merged #5933 (codex json_schema->text.format): translator-openai-responses-req.test.ts 1097->1172 (+75 regression tests, no offending branch left). All remain frozen (cannot grow further); release captain's rebaseline-at-release supersedes.",
|
||||
"_rebaseline_2026_07_09_6126_clinepass_dual_auth": "PR #6126 (@hajilok, dual-auth ClinePass) own growth: tokenRefresh.ts 2181->2182 (+1 = a single `case \\\"clinepass\\\":` fallthrough label added to the existing `case \\\"cline\\\":` in _getAccessTokenInternal's provider switch, so clinepass token refresh dispatches to the already-shared refreshClineToken() instead of silently falling through to the generic OAuth refresh). Irreducible 1-line switch-case wiring at the existing chokepoint; the header-building logic for the same feature was extracted to a new leaf src/shared/utils/clineAuth.ts::buildClinepassHeaders() (well under cap) to avoid growing open-sse/executors/default.ts. Covered by tests/unit/clinepass-provider.test.ts.",
|
||||
"_rebaseline_2026_07_09_6363_kiro_external_idp": "PR #6363 (@artickc, Kiro external IdP) own growth: tokenRefresh.ts 2182->2249 (+67 = the external_idp refresh branch inside refreshKiroToken — standard public-client OAuth2 refresh_token grant against the org IdP tokenEndpoint via buildExternalIdpRefreshParams/isExternalIdpAuthMethod from the new leaf open-sse/services/kiroExternalIdp.ts, with invalid_grant/invalid_client -> unrecoverable_refresh_error mapping). Cohesive addition at the existing refreshKiroToken chokepoint. Covered by tests/unit/kiro-external-idp.test.ts.",
|
||||
"_rebaseline_2026_07_09_6587_kiro_api_key_auth": "PR #6587 (@strangersp) own growth for Kiro long-lived API-key auth, merged onto v3.8.47 tip: openai-to-kiro.ts 890->912 (+22, auth-header selection for API-key-vs-OAuth-token connections), providerLimits.ts 998->1000 (+2, API-key auth-type branch), translator-openai-to-kiro.test.ts 1234->1257 (+23), providers-page-utils.test.ts 1109->1107 (net -2 after merging with parallel release drift; connectionMatchesProviderCard api_key coverage added), provider-validation-specialty.test.ts 2856->2980 (+124 net after merge with parallel release drift; this PR also removed the file's `@typescript-eslint/no-explicit-any` eslint-suppression entry by fixing all `any` usages, adding typed replacements). Cohesive additive feature growth, well tested; not extractable without splitting the existing chokepoints mid-merge.",
|
||||
"_rebaseline_2026_07_09_6678_routing_strategy_9router": "#6678 (SeaXen) — 9router-parity Routing Strategy settings card + per-provider/combo sticky-round-robin override. Own growth: ProviderDetailPageClient.tsx 784->786 (single ProviderAccountRoutingCard mount + import), auth.ts 2448->2458 (providerStrategies override resolution: fallbackStrategy/stickyRoundRobinLimit per-provider cascade in getProviderCredentials). Both additive, zero unrelated refactor; new UI/logic lives in new files (ProviderAccountRoutingCard.tsx, RoutingStrategyCard.tsx, rrState.ts::resolveComboStickyRoundRobinLimit). chat.ts value below reflects the current release tip (grown by other concurrent PRs, e.g. #6640), not this PR own change.",
|
||||
"_rebaseline_2026_07_10_6318_omp_letta": "PR #6318 (@hamsa0x7, omp+letta CLI integrations) own growth: cliTools.ts (+53 = 2 registry entries incl. omp docsUrl) and cliRuntime.ts (+18 = runtime-detection wiring for the 2 new tools). Cohesive registry/wiring growth at the existing chokepoints; scope reduced from the original 5 tools (pi/codewhale/jcode shipped separately).",
|
||||
"_rebaseline_2026_07_10_gcf_v3_2_decode": "PR #6838 own growth: new vendored file open-sse/services/compression/engines/headroom/gcf/decode_generic.ts frozen at 880 (> 800 cap). It is the vendored GCF generic-profile decoder (spec v3.2 nested flattening plus the prototype-pollution / hasOwnProperty hardening added in this PR's Gemini review). Kept as one file faithful to upstream gcf-typescript so re-vendoring stays a clean copy rather than a re-split each cycle (sibling generic.ts/scalar.ts stay < cap; extraction would also fragment the file's frozen eslint no-explicit-any suppressions). Round-trip + prototype-pollution regression coverage in tests/unit/compression/headroom-smartcrusher.test.ts. Frozen: only shrinks from here.",
|
||||
"_rebaseline_2026_07_12_v3847_mergeprs_tail": "v3.8.47 /merge-prs tail (owner-approved): src/lib/localDb.ts NEW>800 (799->805, +6 re-exports countFreeProxies + recordFreeProxySyncErrors/clearFreeProxySyncErrors/getFreeProxySyncErrors + FreeProxySyncErrors type for #6909 free-pool relay-repair; re-export-only per Hard Rule #2, not extractable).",
|
||||
"_rebaseline_2026_07_15_7070_combos_memo": "PR #7070 (perf/p1-memo) own growth: src/app/(dashboard)/dashboard/combos/page.tsx 4655->4656 (+1 = React.memo wrapping of ComboCard). Covered by tests/unit/ui/combos-page-smoke.test.tsx.",
|
||||
"_rebaseline_2026_07_18_7399_xai_oauth_modal": "PR #7399 (xAI OAuth PKCE) own growth: OAuthModal.tsx 993->998 (+5 = provider entry + PKCE flow branch wiring at the existing provider-switch chokepoint; the provider logic itself lives in src/lib/oauth/providers/xai-oauth.ts, new leaf). Third irreducible wiring bump on this modal (969->989->993->998); structural shrink tracked in #3501.",
|
||||
"_rebaseline_2026_07_19_6636_codex_session_json": "#6636 own growth: OAuthModal.tsx 998->1030 (gate units, split(\\\"\\\\n\\\").length incl. trailing newline; +32 = session-JSON paste branch for handleManualSubmit plus a shared submitCodexAccessToken() helper extracted from the pre-existing bare-JWT branch, mirroring the #5203 oauthBlobSubmit.ts extraction precedent; the normalizer logic itself lives in the new src/lib/oauth/utils/codexSessionImport.ts leaf module, not here). Fourth irreducible wiring bump on this modal (969->989->993->998->1030); structural shrink tracked in #3501.",
|
||||
"_rebaseline_2026_07_19_7546_ghe_copilot_modal": "PR #7546 (GHE Copilot OAuth provider) own growth: OAuthModal.tsx 1030->1056 (gate units). Adds a gheUrl input state, routes ghe-copilot through the existing device-code branch, and threads gheUrl into the device-code request/poll extraData at the existing provider-switch chokepoints (+~24 lines, cohesive with the same pattern as #7399/#6636). The standalone GHE enterprise-URL config step JSX (originally +31 lines inline) was extracted to the new src/shared/components/oauthModal/GheConfigStep.tsx leaf component to minimize the bump; what remains is the irreducible provider-branch wiring. Fifth bump on this modal (969->989->993->998->1030->1056); structural shrink tracked in #3501.",
|
||||
"_rebaseline_2026_07_19_7787_ic2_localdb_reexports": "PR #7787 (IC2 raw connections cache + lazy-decrypt) own growth: localDb.ts 805->807 (gate units, +2). localDb.ts is the re-export-only layer (hard rule #2 — no logic); the PR adds 4 new db/readCache re-exports (touchConnectionLastUsed, getCachedRawProviderConnections, getCachedProviderConnectionById, getCachedProviderNodes) required by existing barrel importers. Irreducible for a re-export list; frozen so it can only shrink.",
|
||||
"_rebaseline_2026_07_20_7779_routingcombo_thread": "PR #7779 own growth: chatHelpers.ts 876->877 (+1, thread routingComboId into executeChatWithBreaker for compression-combo assignment). Frozen so it can only shrink.",
|
||||
"_rebaseline_2026_07_20_7819_autocandidateoverrides_reexport": "PR for #7819 (Level 1+2: read-only auto/* candidate transparency + per-API-key exclusions) own growth: localDb.ts 807->808 (+1). Adds a single `export * from \\\"./db/autoCandidateOverrides\\\"` barrel re-export (hard rule #2 — no logic) for the new DB module backing per-apiKey candidate exclusions. Irreducible for a re-export list; frozen so it can only shrink.",
|
||||
"_rebaseline_2026_07_21_8027_grok_cli_auth_json_paste": "PR #8027 (RaviTharuma, fix(grok-cli) #7610) own growth: OAuthModal.tsx 1080->1100 (gate units). Requires the full ~/.grok/auth.json (with refresh_token) on the paste-import path instead of a bare JWT, at the existing paste-token chokepoint (renamed tab label, updated instructions/placeholder, textarea for the auth.json blob, inline error surface). The validation logic itself (parseGrokCliPasteToken, previously an inline ~75-line function) was extracted to the new src/lib/oauth/utils/grokCliAuthJson.ts leaf module — mirroring the #6636/#7546 extraction precedent — so only the irreducible UI wiring remains here. Sixth bump on this modal (969->989->993->998->1030->1056->1100); structural shrink tracked in #3501.",
|
||||
"_rebaseline_2026_07_21_8034_compression_exclusions_sidebar": "#8034 (compression exclusions dashboard tab) own growth: sections.ts 796->806 (+10, one new COMPRESSION_CONTEXT_GROUP sidebar item linking /dashboard/compression/exclusions). The file was already 796/800 before this PR (organic growth from prior sidebar entries), so a single new nav item pushed it 6 lines over cap. Freezing at 806 (cannot grow further); the sidebar item array is data, not extractable logic.",
|
||||
"_rebaseline_2026_07_22_7936_namespace_roundtrip": "#7936 (@RCrushMe, Responses-Chat namespace round-trip identity seam) own growth: open-sse/translator/response/openai-responses.ts 1092->1125 (+33) and open-sse/utils/stream.ts 2814->2869 (+55) — threading the namespace-identity seam through the Responses↔Chat translation + stream paths so tool-call namespaces survive the round-trip. Cohesive translation/stream wiring at existing chokepoints, frozen at new size.",
|
||||
"_rebaseline_2026_07_22_8010_codex_responses_engine": "PR #8010 (@JxnLexn) own growth: open-sse/mcp-server/schemas/tools.ts 1497->1505 (+8 = threading the new \\\"codex-responses\\\" literal into the compressionConfigureInput strategy/autoTriggerMode Zod enums and setCompressionEngineInput engine enum, mirroring the existing rtk/omniglyph enum entries; no new tool). open-sse/services/compression/strategySelector.ts 1043->1054 (+11 = one new `if (mode === \\\"codex-responses\\\")` dispatch branch in runCompression that delegates 100% to the new codexResponsesEngine.apply, mirroring the existing rtk single-mode dispatch, plus threading config.codexResponsesConfig.preserveToolNames into the shared adaptBodyForCompression call at the 3 existing call sites). src/lib/db/compression.ts (untracked, new-file cap 800) 794->845 (+51 = normalizeCodexResponsesConfig, mirroring the existing normalizeRtkConfig normalizer, plus registering \\\"codex-responses\\\" in the COMPRESSION_MODES/STACKED_PIPELINE_ENGINE_IDS/SINGLE_MODE_ENGINE sets and the getCompressionSettings load/save switch) — added to the baseline at its current size. All three are cohesive dispatch/normalizer wiring at existing chokepoints (mirroring the prior compression-mode rebaselines #6534/#6556), not extractable without hiding the mode-dispatch boundary. Covered by tests/unit/compression/codex-responses.test.ts (6) + omniglyph-registries.test.ts/types.test.ts (22, updated for the new mode).",
|
||||
"_rebaseline_2026_07_22_8034_compression_exclusions_persistence": "#8034 (compression exclusions) own growth: src/lib/db/compression.ts 845->850 (+5 = threading the new compressionExclusions field through the existing getCompressionSettings/saveCompressionSettings load/save switch over the shared key_value compression namespace — no new table, no raw SQL). Mirrors the prior compression-field rebaselines (#8010 codex-responses normalizer at the same chokepoint); the load/save switch is a single dispatch boundary, not extractable without hiding it. Covered by the PR's 8 node:test + 3 vitest cases.",
|
||||
"_rebaseline_2026_07_22_8050_model_lockout_exact_family": "#8050 (@AndrianBalanescu) own growth: accountFallback.ts 1864->1892 (+28) — exact-vs-family model-lockout scoping (getModelLockKey/isModelLocked/clearModelLock/getModelLockoutInfo) so an Antigravity 404 for one bare model no longer hijacks the whole family cooldown. Cohesive lockout logic; frozen at new size.",
|
||||
"_rebaseline_2026_07_22_8081_reasoning_placeholder_guard": "#8081 (@Dingding-leo) own growth: openai-responses.ts 1125->1137 (+12) restructuring the reasoning-placeholder guard so it skips only the empty content block and still emits finish_reason/tool_calls in the same chunk. Cohesive translator wiring; frozen at new size.",
|
||||
"_rebaseline_2026_07_22_8210_openrouter_midstream_error": "PR #8210 (hartmark, fix/openrouter-midstream-error-surfacing) own growth: open-sse/translator/response/openai-responses.ts 1137->1163 (+26) measured on the merged tip (release 1137 + this PR own growth). Adds a single new branch inside openaiToOpenAIResponsesResponse() that detects an OpenRouter-style mid-stream aggregator error (HTTP 200 SSE chunk with empty choices + a top-level error object) and surfaces it as state.upstreamError instead of silently falling through to the no-op/awaitingTrailingUsage path, which previously masked the failure as a false empty-success completion and skipped combo fallback. Irreducible call-site addition at the existing chunk-dispatch chokepoint (mirrors the Gemini-to-OpenAI translator's #4177 precedent for the same class of upstream error surfacing). Note: this baseline entry does NOT cover the separate pre-existing +11 drift already on the release tip from #8081/#8162 (1125->1136, unrelated reasoning-placeholder-stripping fix merged after this PR branched) — that drift belongs to the maintainer's rebaseline, not this PR.",
|
||||
"_rebaseline_2026_07_22_8211_gemini_malformed_tool_choice": "PR #8211 (hartmark, fix/gemini-malformed-function-call-tool-choice) own growth: open-sse/translator/response/gemini-to-openai.ts 771->821 (+50, entirely this PR's diff — no other commit touched this file between the PR's merge-base and the release tip). Adds MALFORMED_FUNCTION_CALL/UNEXPECTED_TOOL_CALL handling inside geminiToOpenAIResponse(): synthesizes a `malformed_tool_call` tool_calls entry so finish_reason normalizes to the standard \\\"tool_calls\\\" instead of an unrecognized raw enum value that OpenAI-compatible clients (e.g. OpenClaw) silently ignore, and always synthesizes (rather than skipping when a real tool call already exists) so a malformed attempt alongside a real one in the same turn is not silently discarded. Irreducible cohesive addition at the existing candidate/finishReason translation chokepoint (mirrors the 9router#2462 raw-finish-reason precedent immediately below it in the same function). Covered by the PR's own tests/unit test additions for both the malformed-only and malformed-plus-real-call cases.",
|
||||
"_rebaseline_2026_07_22_8213_chat_abandoned_target_abort": "PR #8213 (hartmark, fix/gemini-tpm-quota-cooldown-wait) own growth: src/sse/handlers/chat.ts 1794->1860 (+66, measured against the PR's own merge-base — the release tip separately carries an unrelated -5 net shrink from #8013's antigravity callable-catalog alignment, which this PR's branch does not include and this entry does not cover). Adds resolveDispatchClientRawRequest(): merges a per-target modelAbortSignal into clientRawRequest.signal (via mergeAbortSignals) so a combo target abandoned by comboTargetTimeoutMs actually observes its own abort and reaches its cleanup path, instead of hanging forever inside withRateLimit/acquireAccountSemaphore and leaking a permanent 'pending' dashboard entry (live incident, log id 1784418258231-14961a). Also wires combo-exhausted rejection logging to capture request body + attempted models via the new rejectedRequestUsage helper. Irreducible additions at the existing chat dispatch chokepoint. Covered by the PR's own combo-config + integration test additions.",
|
||||
"_rebaseline_2026_07_22_8213_combo_cooldown_wait_recording": "PR #8213 (hartmark, fix/gemini-tpm-quota-cooldown-wait) own growth: open-sse/services/combo.ts 3548->3604 (+56, entirely this PR's diff — no other commit touched this file between the PR's merge-base and the release tip). Fixes combo cooldown-wait state recording so a bogus 503 is no longer crystallized when the cooldown-wait vars reset every setTry, adds an OpenAI-format SSE error frame path for combo-exhausted rejections (capturing request body + attempted models), and gives an abandoned per-target dispatch its own timeout instead of leaking a permanent 'pending' dashboard entry. Irreducible additions at the existing handleComboChat dispatch/retry chokepoint (mirrors the prior quota-share/headroom/task-aware strategy-branch precedents already frozen in this file). Covered by the PR's own combo-config + Gemini TPM-ceiling benchmark test additions.",
|
||||
"_rebaseline_2026_07_22_8213_gemini_tpm_quota_cooldown_wait": "PR #8213 (hartmark, fix/gemini-tpm-quota-cooldown-wait) own growth: open-sse/services/accountFallback.ts 1857->1932 on the merged tip (release 1892 incl #8050 +35, plus this PR own growth +40); measured against the PR own merge-base was 1857->1898 (+41 — the release tip separately carries an unrelated +34 from #8050's antigravity 404 model-not-found lockout scoping, which this PR's branch does not include and this entry does not cover). Own growth is the Gemini TPM-ceiling classification + cooldown-wait wiring feeding into the combo cooldown-wait state machine (rate-limit wedge recovery) introduced by this PR's commit series. Irreducible additions at the existing account-fallback/model-lockout chokepoint. Covered by the PR's own gemini-rate-limit-tracker and TPM-ceiling benchmark test additions.",
|
||||
"_rebaseline_2026_07_22_8213_health_unblock_model_cooldowns": "PR #8213 (hartmark, fix/gemini-tpm-quota-cooldown-wait) own growth: src/app/(dashboard)/dashboard/health/page.tsx 1094->1165 (+71, entirely this PR's diff — no other commit touched this file between the PR's merge-base and the release tip). Adds handleUnblockAll/handleUnblockOne dashboard actions (DELETE /api/resilience/model-cooldowns) so an operator can manually clear a Gemini TPM-wedge model lockout surfaced by this PR's cooldown-wait fixes, instead of waiting out the ceiling. Irreducible UI wiring at the existing health-page action chokepoint. Covered by the PR's own dashboard/resilience test additions.",
|
||||
"_rebaseline_2026_07_22_8213_requestloggerdetail_unblock_ui": "PR #8213 (hartmark, fix/gemini-tpm-quota-cooldown-wait) own growth: src/shared/components/RequestLoggerDetail.tsx 799->941 (+142, entirely this PR's diff — no other commit touched this file between the PR's merge-base and the release tip; crosses the general 800-line new-file cap so is frozen here for the first time). Adds a collapsible section header (open/expand-less toggle) plus per-log-entry unblock (`unblocking`/`cleared` state, isCombo503 detection) so the request-logger detail panel surfaces the same Gemini TPM cooldown-wait / model-lockout unblock action introduced by this PR at the individual-request level (mirrors the health-page bulk unblock action added in the same PR). Covered by the PR's own dashboard/resilience test additions.",
|
||||
"_rebaseline_2026_07_22_fusion_8013_8098_antigravity": "Fusion of #8013 (backryun, catalog/IDE-CLI-split rewrite) + #8098 (nguyenha935, protocol-fidelity/fail-closed/credits/tool-cloaking): open-sse/services/usage/antigravity.ts NEW 802 (>cap 800, +2 — #8098 credits/tier usage service on #8013's profile-aware headers). Test growth (models-catalog-route 1605->1608, provider-models-route 1752->1757 from #8013 Gemini 3.6 catalog) tracked in testFrozen.",
|
||||
"_rebaseline_2026_07_23_8127_grok_weekly_quota": "#8127 (@apoapostolov) own growth: src/sse/handlers/chat.ts 1861->1865 (+4) — weekly quota tracking for grok-web wires a quota-fetch hook at the existing dispatch chokepoint. Thin wiring mirroring adjacent provider-quota branches; not extractable. Covered by tests/unit/grok-quota-fetcher.test.ts.",
|
||||
"_rebaseline_2026_07_23_8143_empty_catch_logging": "#8143 (@chirag127) own growth: open-sse/utils/stream.ts 2869->2887 (+18) — replacing empty catch blocks in the SSE stream subsystem with console.debug logging (Rule #6 silent-swallow fix, issues #8138-#8142). Cohesive logging additions at the existing catch chokepoints, not extractable; frozen at new size. Covered by tests/unit/stream-handler-catch-logging-8143.test.ts.",
|
||||
"_rebaseline_2026_07_23_8219_cache_ttl_settings_sidebar": "#8219 (@oyi77) own growth: sections.ts 806->813 (+7) — configurable model-catalog cache-TTL settings adds a new sidebar nav entry + its visibility wiring. Sidebar item array is data, not extractable logic; frozen at new size.",
|
||||
"_rebaseline_2026_07_23_8247_8248_model_unhealthy": "#8247+#8248 own growth: accountFallback.ts 1940->1941 (+1, irreducible import statement only — the substantive #8248 DEGRADED-pattern classifier was extracted into open-sse/config/errorConfig.ts, which has ample headroom, instead of growing this frozen file; #8247's fix is a single existing-line condition change, net zero lines). Scoping the credits-exhausted 403/429 branch to isCompatibleProvider() (per-model-quota openai/anthropic-compatible-* nicknames) so it stays model-scoped instead of terminalling the whole connection, and classifying NVIDIA NIM 'Function ... DEGRADED' 400 bodies as model-access-denied instead of a raw passthrough 400. Covered by tests/unit/8247-accountfallback-model-unhealthy.test.ts and tests/unit/8248-accountfallback-nvidia-degraded.test.ts.",
|
||||
"_rebaseline_2026_07_23_8252_combo_400_advance": "#8252 (@RaviTharuma) own growth: accountFallback.ts 1932->1940 (+8) + combo.ts 3604->3630 (+26) — advance combo on model-scoped 400s wrapped as invalid/Bad-Request. Irreducible wiring at existing account-fallback + combo dispatch chokepoints. Covered by combo-model-scoped-400-advance.test.ts.",
|
||||
"_rebaseline_2026_07_23_8266_alibaba_media": "#8266 (@backryun) own growth: imageRegistry.ts 821->979 (+158) — Alibaba-family media models (Qwen image/video, Bailian, Wan) added to the image/video registry. Registry model data, not extractable logic; frozen at new size.",
|
||||
"_rebaseline_2026_07_24_8388_compression_detail_persist": "#8388 (compression engine DETAIL settings — Headroom/session-dedup/CCR — dropped on save) own growth: src/lib/db/compression.ts 866->872 (+6 = irreducible call-site wiring at the existing getCompressionSettings/updateCompressionSettings chokepoint: one import line, one `...buildDetailConfigDefaults()` spread in the seed config, and one `case \\\"sessionDedup\\\": case \\\"ccr\\\": applyDetailConfigUpdate(config, key, parsed); break;` load-switch case, mirroring the existing headroom/#8056 case immediately above it). The actual normalizer logic (normalizeSessionDedupConfig/normalizeCcrConfig, matching SESSION_DEDUP_SCHEMA/CCR_SCHEMA bounds) was EXTRACTED into a new leaf src/lib/db/compressionDetailNormalizers.ts (well under cap) so this frozen file only carries the minimal dispatch wiring. Covered by tests/unit/8388-compression-detail-persist.test.ts (schema-accept + full DB save->reload round-trip for both new sub-objects, plus a no-regression assertion on the existing headroom round-trip).",
|
||||
"_rebaseline_2026_07_24_responses_toolcalls_log_summary": "hartmark, fix/responses-tool-calls-log-summary own growth: open-sse/translator/response/openai-responses.ts 1163->1174 (+11). closeToolCall() now also writes the completed tool call into the shared state.toolCalls Map (already populated by the openai-to-claude / claude-to-openai / gemini-to-openai response translators) so stream.ts's completion-log summary builder (which reads state.toolCalls, not this translator's own funcCallIds/funcNames/funcArgsBuf bookkeeping) reports finish_reason \\\"tool_calls\\\" and message.tool_calls for openai->openai-responses translated streams instead of always logging \\\"stop\\\" with no tool_calls — the actual client-facing SSE events were already correct; only the persisted call-log summary was wrong. Irreducible call-site addition at the existing tool-call-close chokepoint. Covered by the new regression test in tests/unit/translator-resp-openai-responses.test.ts.",
|
||||
"_rebaseline_2026_07_25_8476_combo_input_bound_homogeneous_scope": "PR #8476 (herjarsa, fix/8375-8459-combo-image-fixes, #8375) own growth: open-sse/services/combo.ts 3642->3679 (+37 net: +29 the PR's own isInputBoundFailure short-circuit for deterministic context_length_exceeded/context_window_exceeded failures, +8 a /green-prs pre-merge fix scoping that short-circuit to homogeneous remainders only — the shipped code fired unconditionally on ANY target, regressing the intentional heterogeneous-combo fallback #6637/isContextOverflow400 protects, exactly as flagged by this PR's own review evidence but never actually implemented in the branch). The fix compares orderedTargets[i+1..] modelStr against the failing target's modelStr at the existing executeTarget dispatch chokepoint (mirrors the sameProviderNext precedent a few lines below) — irreducible call-site wiring, not extractable without hiding the dispatch boundary. Covered by tests/unit/combo-input-bound-failure-8375.test.ts (homogeneous pool still short-circuits) and the new tests/unit/combo-input-bound-heterogeneous-8375.test.ts (heterogeneous combo now correctly falls through to the larger-context target).",
|
||||
"_rebaseline_2026_07_25_adobe_firefly_reference_images": "Follow-up to #8006: storage upload + referenceBlobs for image/video and /v1/images/edits dispatch. adobeFireflyClient.ts 1958->2317 (+upload helpers, extract sources, resolve blob ids). Note: 2317 not 2316 — check-file-size.mjs counts LOC via split(\\\"\\\\n\\\").length (counts the trailing-newline empty element), which is 1 higher than `wc -l` on a file ending in \\\\n; the PR's original entry (2316) was measured with wc -l and undercounted by 1 against the actual gate.",
|
||||
"_rebaseline_pr1043_minimax_tts": "Upstream port decolua/9router#1043 (toanalien) own growth: audioSpeech.ts 965->1061 (+96). Adds MiniMax T2A v2 TTS dispatch (handleMinimaxSpeech + hexToBytes helper) — provider entry was already in audioRegistry (format: minimax-tts) but no handler existed, falling through to the OpenAI-compatible default that fails (T2A has custom shape + hex-encoded audio + base_resp envelope). New branch sits next to the other inline provider branches (xiaomi-mimo, coqui, tortoise, aws-polly) — extracting would just create indirection. Covered by tests/unit/minimax-tts-1043.test.ts (3 tests, GREEN: success, base_resp error, invalid-hex).",
|
||||
"_rebaseline_pr4592_exclude_exhausted_auto": "Reconcile #4592 already-merged growth: combo.ts 2991->3036 (+45, terminal-status quota-cutoff exclusion in buildAutoCandidates + opt-in gate). Fast-gate PR->release does not run check:file-size.",
|
||||
"open-sse/executors/antigravity.ts": "1528",
|
||||
"open-sse/executors/base.ts": "1640",
|
||||
"open-sse/executors/chatgpt-web.ts": "3241",
|
||||
"open-sse/executors/codex.ts": "1562",
|
||||
"open-sse/executors/cursor.ts": "1563",
|
||||
"open-sse/executors/deepseek-web.ts": "1148",
|
||||
"open-sse/executors/grok-web.ts": "1044",
|
||||
"open-sse/executors/muse-spark-web.ts": "1405",
|
||||
"open-sse/handlers/chatCore.ts": "5034",
|
||||
"open-sse/handlers/imageGeneration.ts": "3101",
|
||||
"open-sse/handlers/responseSanitizer.ts": "1128",
|
||||
"open-sse/handlers/search.ts": "1536",
|
||||
"open-sse/handlers/videoGeneration.ts": "1063",
|
||||
"open-sse/mcp-server/schemas/tools.ts": "1553",
|
||||
"open-sse/mcp-server/server.ts": "1448",
|
||||
"open-sse/mcp-server/tools/advancedTools.ts": "1120",
|
||||
"open-sse/services/accountFallback.ts": "1978",
|
||||
"open-sse/services/adobeFireflyClient.ts": "2385",
|
||||
"open-sse/services/claudeCodeCompatible.ts": "1202",
|
||||
"open-sse/services/combo.ts": "3648",
|
||||
"open-sse/services/compression/strategySelector.ts": "1060",
|
||||
"open-sse/services/rateLimitManager.ts": "1167",
|
||||
"open-sse/translator/response/openai-responses.ts": "1204",
|
||||
"open-sse/utils/cursorAgentProtobuf.ts": "1505",
|
||||
"open-sse/utils/stream.ts": "2889",
|
||||
"src/app/(dashboard)/dashboard/HomePageClient.tsx": "1388",
|
||||
"src/app/(dashboard)/dashboard/analytics/ComboHealthTab.tsx": "1031",
|
||||
"src/app/(dashboard)/dashboard/api-manager/ApiManagerPageClient.tsx": "3117",
|
||||
"src/app/(dashboard)/dashboard/cache/media/MediaPageClient.tsx": "1067",
|
||||
"src/app/(dashboard)/dashboard/combos/page.tsx": "4703",
|
||||
"src/app/(dashboard)/dashboard/costs/CostOverviewTab.tsx": "1283",
|
||||
"src/app/(dashboard)/dashboard/costs/quota-share/components/PoolWizard.tsx": "1022",
|
||||
"src/app/(dashboard)/dashboard/endpoint/EndpointPageClient.tsx": "2615",
|
||||
"src/app/(dashboard)/dashboard/health/page.tsx": "1165",
|
||||
"src/app/(dashboard)/dashboard/providers/[id]/components/modals/EditConnectionModal.tsx": "1324",
|
||||
"src/app/(dashboard)/dashboard/providers/page.tsx": "1944",
|
||||
"src/app/(dashboard)/dashboard/runtime/RuntimePageClient.tsx": "1201",
|
||||
"src/app/(dashboard)/dashboard/settings/components/PricingTab.tsx": "1019",
|
||||
"src/app/(dashboard)/dashboard/settings/components/ProxyRegistryManager.tsx": "1470",
|
||||
"src/app/(dashboard)/dashboard/settings/components/ResilienceTab.tsx": "1123",
|
||||
"src/app/(dashboard)/dashboard/settings/components/RoutingTab.tsx": "1629",
|
||||
"src/app/(dashboard)/dashboard/settings/components/SystemStorageTab.tsx": "1573",
|
||||
"src/app/(dashboard)/dashboard/usage/components/BudgetTab.tsx": "1028",
|
||||
"src/app/(dashboard)/dashboard/usage/components/EvalsTab.tsx": "2148",
|
||||
"src/app/(dashboard)/dashboard/usage/components/ProviderLimits/index.tsx": "1119",
|
||||
"src/app/api/providers/[id]/models/route.ts": "2361",
|
||||
"src/app/api/v1/models/catalog.ts": "1590",
|
||||
"src/lib/tokenHealthCheck.ts": "1053",
|
||||
"src/lib/db/apiKeys.ts": "1529",
|
||||
"src/lib/db/core.ts": "1639",
|
||||
"src/lib/db/migrationRunner.ts": "1094",
|
||||
"src/lib/db/models.ts": "1097",
|
||||
"src/lib/db/providers.ts": "1034",
|
||||
"src/lib/memory/retrieval.ts": "1073",
|
||||
"src/lib/tailscaleTunnel.ts": "1202",
|
||||
"src/lib/usage/providerLimits.ts": "1013",
|
||||
"src/shared/components/OAuthModal.tsx": "1134",
|
||||
"src/shared/components/RequestLoggerV2.tsx": "1629",
|
||||
"src/shared/components/analytics/charts.tsx": "1035",
|
||||
"src/shared/services/cliRuntime.ts": "1122",
|
||||
"src/sse/handlers/chat.ts": "1904",
|
||||
"src/sse/services/auth.ts": "2508",
|
||||
"tests/unit/account-fallback-service.test.ts": "1572",
|
||||
"tests/unit/provider-validation-specialty.test.ts": "2985",
|
||||
"open-sse/executors/hyperagent.ts": "1026",
|
||||
"open-sse/executors/default.ts": "1042",
|
||||
"open-sse/executors/kiro.ts": "1069",
|
||||
"open-sse/translator/request/openai-to-kiro.ts": "1057",
|
||||
"open-sse/utils/sseHeartbeat.ts": "142",
|
||||
"_rebaseline_2026_08_04_9305_sse_comments": "#9305 fix: broadened sseCommentsEnabled()"
|
||||
}
|
||||
|
||||
@@ -8,9 +8,32 @@ export const gemini_webProvider: RegistryEntry = {
|
||||
baseUrl: "https://gemini.google.com/app",
|
||||
authType: "apikey",
|
||||
authHeader: "cookie",
|
||||
// #9356: `supportsReasoning: false` is a live-behavior statement, not a guess
|
||||
// about the underlying Gemini model. The executor drives the gemini.google.com
|
||||
// web UI by typing a prompt, so it has no thinking-budget control to set and
|
||||
// never surfaces `reasoning_content` — agent routers reading /v1/models must
|
||||
// not select these for reasoning work. `toolCalling: false` is the matching
|
||||
// statement for native function calling; the prompt-emulation shim (#7286)
|
||||
// stays available and is advertised separately as `toolCalling: "emulated"`
|
||||
// on the provider constant (src/shared/constants/providers/web-cookie.ts).
|
||||
models: [
|
||||
{ id: "gemini-3.1-pro", name: "Gemini 3.1 Pro", toolCalling: false },
|
||||
{ id: "gemini-3.5-flash", name: "Gemini 3.5 Flash", toolCalling: false },
|
||||
{ id: "gemini-3.1-flash-lite", name: "Gemini 3.1 Flash-Lite", toolCalling: false },
|
||||
{
|
||||
id: "gemini-3.1-pro",
|
||||
name: "Gemini 3.1 Pro",
|
||||
toolCalling: false,
|
||||
supportsReasoning: false,
|
||||
},
|
||||
{
|
||||
id: "gemini-3.5-flash",
|
||||
name: "Gemini 3.5 Flash",
|
||||
toolCalling: false,
|
||||
supportsReasoning: false,
|
||||
},
|
||||
{
|
||||
id: "gemini-3.1-flash-lite",
|
||||
name: "Gemini 3.1 Flash-Lite",
|
||||
toolCalling: false,
|
||||
supportsReasoning: false,
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
@@ -14,9 +14,13 @@
|
||||
*/
|
||||
|
||||
import { BaseExecutor, type ExecuteInput } from "./base.ts";
|
||||
import { sanitizeErrorMessage } from "../utils/error.ts";
|
||||
import { buildErrorBody, sanitizeErrorMessage } from "../utils/error.ts";
|
||||
import { prepareToolMessages } from "../translator/webTools.ts";
|
||||
import { buildToolModeResponse } from "./chatgptWebTools.ts";
|
||||
import {
|
||||
checkGeminiWebUnsupportedControls,
|
||||
GEMINI_WEB_UNSUPPORTED_CONTROL_CODE,
|
||||
} from "./gemini-web/capabilities.ts";
|
||||
|
||||
// ─── Constants ──────────────────────────────────────────────────────────────
|
||||
|
||||
@@ -406,6 +410,33 @@ export class GeminiWebExecutor extends BaseExecutor {
|
||||
const { model, body, stream, credentials, signal, log, onCredentialsRefreshed } = input;
|
||||
const requestBody = body as GeminiRequestBody;
|
||||
|
||||
// #9356: fail fast on controls this provider cannot honor (reasoning_effort
|
||||
// above "minimal", forced tool_choice). Runs before the credential check and
|
||||
// before Playwright launches — the request is unservable no matter which
|
||||
// cookie is used, and answering 200 with ordinary prose made agents believe
|
||||
// their reasoning/tool requirements had been met. See ./gemini-web/capabilities.ts.
|
||||
const violation = checkGeminiWebUnsupportedControls(body as Record<string, unknown>);
|
||||
if (violation) {
|
||||
log?.warn?.(
|
||||
"GEMINI-WEB",
|
||||
`Rejected request: "${violation.param}" is not supported by this provider`
|
||||
);
|
||||
return {
|
||||
response: new Response(
|
||||
JSON.stringify(
|
||||
buildErrorBody(400, violation.message, null, {
|
||||
type: "invalid_request_error",
|
||||
code: GEMINI_WEB_UNSUPPORTED_CONTROL_CODE,
|
||||
})
|
||||
),
|
||||
{ status: 400, headers: { "Content-Type": "application/json" } }
|
||||
),
|
||||
url: GEMINI_URL,
|
||||
headers: {},
|
||||
transformedBody: body,
|
||||
};
|
||||
}
|
||||
|
||||
const cookie = resolveGeminiWebCookie(credentials);
|
||||
if (!cookie) {
|
||||
return {
|
||||
|
||||
121
open-sse/executors/gemini-web/capabilities.ts
Normal file
121
open-sse/executors/gemini-web/capabilities.ts
Normal file
@@ -0,0 +1,121 @@
|
||||
/**
|
||||
* Request-contract guards for the Gemini Web executor (#9356).
|
||||
*
|
||||
* gemini-web is not an API client. It launches Playwright, types ONE flat
|
||||
* prompt string into the gemini.google.com `.ql-editor` contenteditable,
|
||||
* presses Enter, and captures the first `StreamGenerate` response off the page
|
||||
* (see ../gemini-web.ts). There is no JSON request body on the wire, which
|
||||
* makes two OpenAI controls structurally impossible to honor:
|
||||
*
|
||||
* • `reasoning_effort` — no field exists to carry a thinking budget. Unlike
|
||||
* deepseek-web or perplexity-web, which post a real payload and can flip a
|
||||
* `thinking_enabled` flag or swap the model preference, there is nothing
|
||||
* here to set.
|
||||
* • forced `tool_choice` — the tools support gemini-web does have is the
|
||||
* prompt-emulation shim (`translator/webTools.ts`, #7286): it ASKS the
|
||||
* model, in prose, to answer with `<tool>{...}</tool>` and parses whatever
|
||||
* comes back. That is best-effort by construction. "required" / "any" /
|
||||
* a named function is a GUARANTEE, and a prompt cannot make one.
|
||||
*
|
||||
* Before this module both were accepted and quietly ignored, so an agent got a
|
||||
* 200 with `finish_reason: "stop"`, no `reasoning_content`, and `tool_calls: []`
|
||||
* and concluded its requirements had been met (#9356). Failing the request is
|
||||
* the honest answer: the caller can drop the control, or route to a model that
|
||||
* actually implements it.
|
||||
*
|
||||
* Deliberately NOT rejected — these are already satisfied or already work:
|
||||
* • `reasoning_effort: "none" | "minimal"` — asking for as little reasoning as
|
||||
* possible is something a non-thinking provider trivially complies with.
|
||||
* • `tool_choice: "auto" | "none"` and plain `tools[]` — the #7286 emulation
|
||||
* path, which several shipped combos depend on (#5240, #8488). Untouched.
|
||||
*
|
||||
* Pure and dependency-free so the whole contract is unit-testable without a
|
||||
* browser.
|
||||
*/
|
||||
|
||||
/** `error.code` on every compatibility rejection raised here. */
|
||||
export const GEMINI_WEB_UNSUPPORTED_CONTROL_CODE = "unsupported_control_for_provider";
|
||||
|
||||
/** Effort levels a non-thinking provider already complies with. */
|
||||
const SATISFIED_EFFORT_LEVELS = new Set(["none", "minimal"]);
|
||||
|
||||
/** `tool_choice` strings that demand a tool call rather than merely offering one. */
|
||||
const FORCING_TOOL_CHOICE_STRINGS = new Set(["required", "any"]);
|
||||
|
||||
/** `tool_choice: { type }` values that pin the model to a specific/any tool. */
|
||||
const FORCING_TOOL_CHOICE_TYPES = new Set(["function", "tool", "any"]);
|
||||
|
||||
export interface GeminiWebCapabilityViolation {
|
||||
/** Which request field could not be honored. */
|
||||
param: "reasoning_effort" | "tool_choice";
|
||||
/** Client-facing explanation — already safe to put in a response body. */
|
||||
message: string;
|
||||
}
|
||||
|
||||
function normalizeString(value: unknown): string | null {
|
||||
return typeof value === "string" && value.trim().length > 0 ? value.trim().toLowerCase() : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* True when `tool_choice` demands a tool call. Covers the OpenAI strings
|
||||
* ("required"), the Anthropic-flavored ones the translators also emit ("any"),
|
||||
* and the object forms that name a function or force any tool. "auto" / "none"
|
||||
* and every unrecognized shape are treated as non-forcing — this guard only
|
||||
* blocks contracts it is certain gemini-web cannot keep.
|
||||
*/
|
||||
export function isForcingToolChoice(toolChoice: unknown): boolean {
|
||||
const asString = normalizeString(toolChoice);
|
||||
if (asString) return FORCING_TOOL_CHOICE_STRINGS.has(asString);
|
||||
|
||||
if (toolChoice && typeof toolChoice === "object" && !Array.isArray(toolChoice)) {
|
||||
const type = normalizeString((toolChoice as Record<string, unknown>).type);
|
||||
return type !== null && FORCING_TOOL_CHOICE_TYPES.has(type);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/** True when `reasoning_effort` asks for MORE thinking than "none at all". */
|
||||
export function requestsThinkingBudget(reasoningEffort: unknown): boolean {
|
||||
const effort = normalizeString(reasoningEffort);
|
||||
if (effort === null) return false;
|
||||
return !SATISFIED_EFFORT_LEVELS.has(effort);
|
||||
}
|
||||
|
||||
/**
|
||||
* Inspect an OpenAI-shaped request body for controls gemini-web cannot honor.
|
||||
* Returns the first violation found, or `null` when the request is servable.
|
||||
*
|
||||
* `reasoning_effort` is checked before `tool_choice` only for determinism; a
|
||||
* request carrying both is rejected either way.
|
||||
*/
|
||||
export function checkGeminiWebUnsupportedControls(
|
||||
body: Record<string, unknown> | null | undefined
|
||||
): GeminiWebCapabilityViolation | null {
|
||||
if (!body || typeof body !== "object") return null;
|
||||
|
||||
if (requestsThinkingBudget(body.reasoning_effort)) {
|
||||
return {
|
||||
param: "reasoning_effort",
|
||||
message:
|
||||
'Model provider "gemini-web" does not support "reasoning_effort". It drives the ' +
|
||||
"gemini.google.com web UI through a typed prompt and has no thinking-budget control " +
|
||||
'to set, so any effort above "minimal" would be silently ignored. Remove ' +
|
||||
'"reasoning_effort" (or send "none"/"minimal") or route to a reasoning-capable model.',
|
||||
};
|
||||
}
|
||||
|
||||
if (isForcingToolChoice(body.tool_choice)) {
|
||||
return {
|
||||
param: "tool_choice",
|
||||
message:
|
||||
'Model provider "gemini-web" cannot guarantee a forced tool call. Its tool support is ' +
|
||||
"prompt-emulated — the model is asked to emit a tool block and may answer with prose " +
|
||||
'instead — so "tool_choice" values that require one ("required", "any", or a named ' +
|
||||
'function) cannot be honored. Use "auto" to keep best-effort tool calling, or route to ' +
|
||||
"a model with native function calling.",
|
||||
};
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
@@ -190,15 +190,31 @@ export function getBackgroundTaskReason(
|
||||
const messages = toMessageArray(typedBody.messages ?? typedBody.input ?? []);
|
||||
if (!Array.isArray(messages) || messages.length === 0) return null;
|
||||
|
||||
// Find system message
|
||||
// Derive system content from messages array (OpenAI format) or top-level
|
||||
// system field (Anthropic format).
|
||||
const systemMsg = messages.find(
|
||||
(message: BackgroundMessage) => message.role === "system" || message.role === "developer"
|
||||
);
|
||||
if (!systemMsg) return null;
|
||||
|
||||
const systemContent =
|
||||
typeof systemMsg.content === "string" ? systemMsg.content.toLowerCase() : "";
|
||||
|
||||
let systemContent = "";
|
||||
if (systemMsg && typeof systemMsg.content === "string") {
|
||||
systemContent = systemMsg.content.toLowerCase();
|
||||
} else if (!systemMsg) {
|
||||
// Anthropic top-level system field: string or array of text blocks
|
||||
const raw = (typedBody as Record<string, unknown>).system;
|
||||
if (typeof raw === "string") {
|
||||
systemContent = raw.toLowerCase();
|
||||
} else if (Array.isArray(raw)) {
|
||||
systemContent = raw
|
||||
.map((part) =>
|
||||
part && typeof (part as { text?: unknown }).text === "string"
|
||||
? (part as { text: string }).text
|
||||
: ""
|
||||
)
|
||||
.filter(Boolean)
|
||||
.join(" ")
|
||||
.toLowerCase();
|
||||
}
|
||||
}
|
||||
if (!systemContent) return null;
|
||||
|
||||
// Check against detection patterns
|
||||
|
||||
@@ -112,7 +112,7 @@ export function geminiToClaudeResponse(chunk, state) {
|
||||
// When the toolNameMap provides a match (e.g., lowercase "bash" → "Bash"),
|
||||
// use it directly without passing through normalizeToolName(), which would
|
||||
// reverse TitleCase back to lowercase via REVERSE_MAP (#9568).
|
||||
const restoredToolName = mappedName || normalizeToolName(rawToolName);
|
||||
const restoredToolName = mappedName ?? normalizeToolName(rawToolName);
|
||||
const idx = state.contentBlockIndex++;
|
||||
const toolId = fc.id || `toolu_${Date.now()}_${idx}`;
|
||||
|
||||
|
||||
@@ -874,6 +874,7 @@ function openaiResponsesToOpenAIResponseStream(chunk, state) {
|
||||
if (state.currentToolCallId) state.toolCallIdsSeen.add(state.currentToolCallId);
|
||||
|
||||
const toolName = normalizeToolName(item.name);
|
||||
state.currentToolName = toolName; // track for schema lookup at done time
|
||||
if (!toolName) {
|
||||
// Some Responses providers briefly emit placeholder/empty tool names.
|
||||
// Defer emission until output_item.done in case the final name is populated there.
|
||||
@@ -919,26 +920,9 @@ function openaiResponsesToOpenAIResponseStream(chunk, state) {
|
||||
state.currentToolCallArgsBuffer = (state.currentToolCallArgsBuffer || "") + argsDelta;
|
||||
if (state.currentToolCallDeferred) return null;
|
||||
|
||||
return {
|
||||
id: state.chatId,
|
||||
object: "chat.completion.chunk",
|
||||
created: state.created,
|
||||
model: state.model || "gpt-4",
|
||||
choices: [
|
||||
{
|
||||
index: 0,
|
||||
delta: {
|
||||
tool_calls: [
|
||||
{
|
||||
index: state.toolCallIndex,
|
||||
function: { arguments: argsDelta },
|
||||
},
|
||||
],
|
||||
},
|
||||
finish_reason: null,
|
||||
},
|
||||
],
|
||||
};
|
||||
// #9168: buffer arguments until output_item.done for schema-aware null normalization
|
||||
// Previously emitted raw null values for optional enum fields (e.g. isolation: null).
|
||||
return null;
|
||||
}
|
||||
|
||||
// Function call done — emit args chunk from item.arguments when no deltas were received,
|
||||
@@ -1011,6 +995,35 @@ function openaiResponsesToOpenAIResponseStream(chunk, state) {
|
||||
if (item.arguments != null && !buffered) {
|
||||
const argsToEmit = stripEmptyOptionalToolArgs(item.arguments, toolName, toolSchema);
|
||||
|
||||
const argsStr = typeof argsToEmit === "string" ? argsToEmit : JSON.stringify(argsToEmit);
|
||||
if (argsStr) {
|
||||
return {
|
||||
id: state.chatId,
|
||||
object: "chat.completion.chunk",
|
||||
created: state.created,
|
||||
model: state.model || "gpt-4",
|
||||
choices: [
|
||||
{
|
||||
index: 0,
|
||||
delta: {
|
||||
tool_calls: [
|
||||
{
|
||||
index: currentIndex,
|
||||
function: { arguments: argsStr },
|
||||
},
|
||||
],
|
||||
},
|
||||
finish_reason: null,
|
||||
},
|
||||
],
|
||||
};
|
||||
}
|
||||
} else if (buffered) {
|
||||
// #9168: deltas were buffered — normalize against the original client schema
|
||||
// and emit the cleaned arguments once, stripping optional null values that
|
||||
// would otherwise reach the client raw.
|
||||
const argsToEmit = stripEmptyOptionalToolArgs(buffered, toolName, toolSchema);
|
||||
|
||||
const argsStr = typeof argsToEmit === "string" ? argsToEmit : JSON.stringify(argsToEmit);
|
||||
if (argsStr) {
|
||||
return {
|
||||
|
||||
@@ -79,7 +79,8 @@ export function sseCommentsEnabled(): boolean {
|
||||
if (typeof process === "undefined") return true;
|
||||
const v = process.env.OMNIROUTE_SSE_COMMENTS;
|
||||
if (v === undefined || v === "") return true;
|
||||
return v.trim().toLowerCase() !== "off";
|
||||
const normalized = v.trim().toLowerCase();
|
||||
return normalized !== "off" && normalized !== "false" && normalized !== "0" && normalized !== "no";
|
||||
}
|
||||
|
||||
export function createSseHeartbeatTransform({
|
||||
|
||||
@@ -25,6 +25,7 @@ import {
|
||||
} from "./streamHelpers.ts";
|
||||
import { calculateCost } from "@/lib/usage/costCalculator";
|
||||
import { buildOmniRouteSseMetadataComment } from "@/domain/omnirouteResponseMeta";
|
||||
import { sseCommentsEnabled } from "./sseHeartbeat.ts";
|
||||
import {
|
||||
createStructuredSSECollector,
|
||||
buildStreamSummaryFromEvents,
|
||||
@@ -1001,6 +1002,11 @@ export function createSSEStream(options: StreamOptions = {}) {
|
||||
controller: TransformStreamDefaultController,
|
||||
finalUsage: UsageTokenRecord | Record<string, unknown> | null | undefined
|
||||
) => {
|
||||
// Skip SSE metadata comment lines when OMNIROUTE_SSE_COMMENTS is disabled
|
||||
// (e.g., "off", "false", "0", "no"). Strict OpenAI-compatible clients that
|
||||
// JSON.parse every SSE line will crash on `: x-omniroute-*` comment lines.
|
||||
if (!sseCommentsEnabled()) return;
|
||||
|
||||
const costUsd = finalUsage ? await calculateCost(provider, model, finalUsage) : 0;
|
||||
const comment = buildOmniRouteSseMetadataComment({
|
||||
provider,
|
||||
|
||||
@@ -134,7 +134,7 @@ export function LlmChatCard({
|
||||
}: Props) {
|
||||
const t = useTranslations("miniPlayground");
|
||||
const { keys } = useApiKey();
|
||||
const { models } = useProviderModels(providerId);
|
||||
const { models, loading, error, retry } = useProviderModels(providerId);
|
||||
|
||||
const [internalSelectedKey, setInternalSelectedKey] = useState<string>("");
|
||||
const [internalModel, setInternalModel] = useState<string>(initialModel ?? "");
|
||||
@@ -392,15 +392,31 @@ export function LlmChatCard({
|
||||
<select
|
||||
value={model || firstModel}
|
||||
onChange={(e) => setModel(e.target.value)}
|
||||
className="min-w-0 flex-1 rounded-md border border-border bg-bg-subtle text-xs px-2 py-1 text-text-main focus:outline-none focus:ring-1 focus:ring-primary"
|
||||
disabled={loading}
|
||||
className="min-w-0 flex-1 rounded-md border border-border bg-bg-subtle text-xs px-2 py-1 text-text-main focus:outline-none focus:ring-1 focus:ring-primary disabled:opacity-60"
|
||||
>
|
||||
{modelOptions.length === 0 && <option value="">{initialModel || "—"}</option>}
|
||||
{modelOptions.length === 0 && !loading && <option value="">{initialModel || "—"}</option>}
|
||||
{loading && <option value="">{t("loading") ?? "Loading…"}</option>}
|
||||
{modelOptions.map((m) => (
|
||||
<option key={m.id} value={m.id}>
|
||||
{m.id}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
{error && (
|
||||
<span className="text-xs text-red-500 flex items-center gap-1" role="alert">
|
||||
<span className="truncate max-w-[180px]" title={String(error)}>
|
||||
{String(error)}
|
||||
</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={retry}
|
||||
className="shrink-0 text-xs text-primary hover:text-primary-strong underline"
|
||||
>
|
||||
{t("retry") ?? "Retry"}
|
||||
</button>
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
{/* Key select */}
|
||||
{keys.length > 0 && (
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
"use client";
|
||||
|
||||
import { useState, useEffect } from "react";
|
||||
import { useState, useEffect, useCallback, useRef } from "react";
|
||||
|
||||
export interface ProviderModel {
|
||||
id: string;
|
||||
@@ -18,6 +18,8 @@ interface UseProviderModelsResult {
|
||||
models: ProviderModel[];
|
||||
loading: boolean;
|
||||
error: string | null;
|
||||
/** Re-runs the model fetch for the current provider. Useful for a Retry action. */
|
||||
retry: () => void;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -32,15 +34,14 @@ export function useProviderModels(providerId: string): UseProviderModelsResult {
|
||||
const [models, setModels] = useState<ProviderModel[]>([]);
|
||||
const [loading, setLoading] = useState<boolean>(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
// Cancels any in-flight load (component unmount or a retry superseding the
|
||||
// previous request) so a stale response never overwrites a newer one.
|
||||
const cleanupRef = useRef<(() => void) | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
if (!providerId) {
|
||||
setLoading(false);
|
||||
return;
|
||||
}
|
||||
|
||||
const load = useCallback(() => {
|
||||
cleanupRef.current?.();
|
||||
let cancelled = false;
|
||||
const load = async () => {
|
||||
const run = async () => {
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
try {
|
||||
@@ -109,11 +110,33 @@ export function useProviderModels(providerId: string): UseProviderModelsResult {
|
||||
if (!cancelled) setLoading(false);
|
||||
}
|
||||
};
|
||||
void load();
|
||||
return () => {
|
||||
void run();
|
||||
const cleanup = () => {
|
||||
cancelled = true;
|
||||
};
|
||||
cleanupRef.current = cleanup;
|
||||
return cleanup;
|
||||
}, [providerId]);
|
||||
|
||||
return { models, loading, error };
|
||||
useEffect(() => {
|
||||
if (!providerId) {
|
||||
setLoading(false);
|
||||
return;
|
||||
}
|
||||
return load();
|
||||
}, [providerId, load]);
|
||||
|
||||
// Release the current in-flight cleanup on unmount so no state updates leak.
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
cleanupRef.current?.();
|
||||
};
|
||||
}, []);
|
||||
|
||||
const retry = useCallback(() => {
|
||||
if (!providerId) return;
|
||||
load();
|
||||
}, [providerId, load]);
|
||||
|
||||
return { models, loading, error, retry };
|
||||
}
|
||||
|
||||
@@ -73,9 +73,7 @@ export async function PATCH(request: Request, { params }: RouteParams): Promise<
|
||||
// helpers. Without the pre-update removal, a group/provider switch would leave
|
||||
// orphan qtSd/ combos a quota key still sees. Guarded + non-fatal.
|
||||
const combosNeedResync =
|
||||
body !== null &&
|
||||
typeof body === "object" &&
|
||||
("connectionIds" in body || "groupId" in body);
|
||||
body !== null && typeof body === "object" && ("connectionIds" in body || "groupId" in body);
|
||||
if (combosNeedResync) {
|
||||
try {
|
||||
const { removeQuotaCombosForPool } = await import("@/lib/quota/quotaCombos");
|
||||
@@ -106,7 +104,7 @@ export async function PATCH(request: Request, { params }: RouteParams): Promise<
|
||||
id,
|
||||
prevApiKeyIds,
|
||||
nextApiKeyIds,
|
||||
parsed.data.exclusive ?? false,
|
||||
parsed.data.exclusive ?? false
|
||||
);
|
||||
}
|
||||
|
||||
@@ -132,7 +130,7 @@ export async function DELETE(request: Request, { params }: RouteParams): Promise
|
||||
|
||||
try {
|
||||
const { id } = await params;
|
||||
const existed = deletePool(id);
|
||||
const existed = await deletePool(id);
|
||||
if (!existed) {
|
||||
return NextResponse.json(buildErrorBody(404, "Pool not found"), { status: 404 });
|
||||
}
|
||||
|
||||
@@ -13,6 +13,9 @@
|
||||
// happen once.
|
||||
|
||||
export type UsableChatModelCandidate = {
|
||||
id?: string;
|
||||
root?: string;
|
||||
name?: string;
|
||||
owned_by?: string;
|
||||
parent?: string | null;
|
||||
type?: string;
|
||||
@@ -44,9 +47,19 @@ function excludesTextOutputModality(model: UsableChatModelCandidate) {
|
||||
);
|
||||
}
|
||||
|
||||
function isBuiltinAutoModel(model: UsableChatModelCandidate): boolean {
|
||||
const id = model.id || model.root || model.name || "";
|
||||
const normalized = id.trim().toLowerCase();
|
||||
return normalized === "auto" || normalized.startsWith("auto/");
|
||||
}
|
||||
|
||||
export function isUsableChatModel(model: UsableChatModelCandidate) {
|
||||
if (typeof model.owned_by === "string" && model.owned_by.trim().toLowerCase() === "combo") {
|
||||
return false;
|
||||
// Allow built-in auto-routing models (e.g. auto, auto/best-coding)
|
||||
// while still excluding operator-created combos.
|
||||
if (!isBuiltinAutoModel(model)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if (typeof model.parent === "string" && model.parent.length > 0) return false;
|
||||
if (typeof model.type === "string" && model.type !== "chat") return false;
|
||||
|
||||
@@ -11,8 +11,32 @@
|
||||
import { getDbInstance } from "./core";
|
||||
// Phase B2: auto-mint/prune quotaShared-* combos when pool allocations change.
|
||||
// Imported lazily (dynamic import in the hook) to avoid circular-dependency
|
||||
// risk between db/ and quota/ modules. The import is fire-and-forget; combo
|
||||
// failures never break pool CRUD.
|
||||
// risk between db/ and quota/ modules. Sync hooks are fire-and-forget; deletion
|
||||
// awaits its guarded cleanup while metadata is available. Combo failures never
|
||||
// break pool CRUD.
|
||||
const quotaComboMaintenance = new Map<string, Promise<unknown>>();
|
||||
const deletingPools = new Set<string>();
|
||||
|
||||
/** Reset module-level state for test isolation. Call in test.after() hooks. */
|
||||
export function resetQuotaPoolsModuleState(): void {
|
||||
deletingPools.clear();
|
||||
quotaComboMaintenance.clear();
|
||||
}
|
||||
|
||||
function serializeQuotaComboMaintenance<T>(
|
||||
poolId: string,
|
||||
operation: () => Promise<T>
|
||||
): Promise<T> {
|
||||
const previous = quotaComboMaintenance.get(poolId);
|
||||
const current = previous ? previous.catch(() => undefined).then(operation) : operation();
|
||||
quotaComboMaintenance.set(poolId, current);
|
||||
const cleanup = () => {
|
||||
if (quotaComboMaintenance.get(poolId) === current) quotaComboMaintenance.delete(poolId);
|
||||
};
|
||||
void current.then(cleanup, cleanup);
|
||||
return current;
|
||||
}
|
||||
|
||||
async function syncQuotaCombosGuarded(poolId: string): Promise<void> {
|
||||
try {
|
||||
const { syncQuotaCombos } = await import("@/lib/quota/quotaCombos");
|
||||
@@ -400,7 +424,7 @@ export function createPool(input: PoolCreate): QuotaPool {
|
||||
);
|
||||
|
||||
// Phase B2: fire-and-forget combo sync; failures are logged but never thrown.
|
||||
void syncQuotaCombosGuarded(id);
|
||||
void serializeQuotaComboMaintenance(id, () => syncQuotaCombosGuarded(id));
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -412,6 +436,8 @@ export function createPool(input: PoolCreate): QuotaPool {
|
||||
* connection_id (primary) is synced to connectionIds[0].
|
||||
*/
|
||||
export function updatePool(id: string, input: PoolUpdate): QuotaPool | null {
|
||||
if (deletingPools.has(id)) return null;
|
||||
|
||||
const database = getDb();
|
||||
const existing = database
|
||||
.prepare<PoolRow>(
|
||||
@@ -475,7 +501,7 @@ export function updatePool(id: string, input: PoolUpdate): QuotaPool | null {
|
||||
const result = rowToPool(existing, getAllocations(id));
|
||||
|
||||
// Phase B2: fire-and-forget combo sync; failures are logged but never thrown.
|
||||
void syncQuotaCombosGuarded(id);
|
||||
void serializeQuotaComboMaintenance(id, () => syncQuotaCombosGuarded(id));
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -485,28 +511,38 @@ export function updatePool(id: string, input: PoolUpdate): QuotaPool | null {
|
||||
* Also removes join rows in quota_pool_connections.
|
||||
* Returns true if a row was deleted, false if not found.
|
||||
*/
|
||||
export function deletePool(id: string): boolean {
|
||||
// Phase B2: remove quota combos BEFORE deleting the pool row so that
|
||||
// removeQuotaCombosForPool can still resolve the pool name → slug.
|
||||
void removeQuotaCombosGuarded(id);
|
||||
export async function deletePool(id: string): Promise<boolean> {
|
||||
if (deletingPools.has(id)) return false;
|
||||
const exists = getDb().prepare<{ id: string }>("SELECT id FROM quota_pools WHERE id = ?").get(id);
|
||||
if (!exists) return false;
|
||||
deletingPools.add(id);
|
||||
|
||||
const database = getDb();
|
||||
const doDelete = database.transaction(() => {
|
||||
database.prepare("DELETE FROM quota_pool_connections WHERE pool_id = ?").run(id);
|
||||
// Prune this pool id from every key's allowed_quotas JSON array.
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE api_keys SET allowed_quotas = COALESCE(
|
||||
const deletion = serializeQuotaComboMaintenance(id, async () => {
|
||||
// Phase B2: remove quota combos BEFORE deleting the pool row so that
|
||||
// removeQuotaCombosForPool can still resolve the pool name → slug.
|
||||
await removeQuotaCombosGuarded(id);
|
||||
|
||||
const database = getDb();
|
||||
const doDelete = database.transaction(() => {
|
||||
database.prepare("DELETE FROM quota_pool_connections WHERE pool_id = ?").run(id);
|
||||
// Prune this pool id from every key's allowed_quotas JSON array.
|
||||
database
|
||||
.prepare(
|
||||
`UPDATE api_keys SET allowed_quotas = COALESCE(
|
||||
(SELECT json_group_array(value) FROM json_each(api_keys.allowed_quotas) WHERE value != ?),
|
||||
'[]')
|
||||
WHERE allowed_quotas IS NOT NULL AND allowed_quotas != '[]'
|
||||
AND EXISTS (SELECT 1 FROM json_each(api_keys.allowed_quotas) WHERE value = ?)`
|
||||
)
|
||||
.run(id, id);
|
||||
return database.prepare("DELETE FROM quota_pools WHERE id = ?").run(id);
|
||||
)
|
||||
.run(id, id);
|
||||
return database.prepare("DELETE FROM quota_pools WHERE id = ?").run(id);
|
||||
});
|
||||
const result = doDelete();
|
||||
return result.changes > 0;
|
||||
});
|
||||
const result = doDelete();
|
||||
return result.changes > 0;
|
||||
const clearDeleting = () => deletingPools.delete(id);
|
||||
void deletion.then(clearDeleting, clearDeleting);
|
||||
return deletion;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -546,6 +582,8 @@ export function deletePool(id: string): boolean {
|
||||
* Runs atomically: all pool writes are inside a single SQLite transaction.
|
||||
*/
|
||||
export function upsertAllocations(poolId: string, allocations: PoolAllocation[]): void {
|
||||
if (deletingPools.has(poolId)) return;
|
||||
|
||||
const database = getDb();
|
||||
|
||||
// Normalize: when all weights are 0, distribute equally so the pool is usable
|
||||
@@ -602,7 +640,7 @@ export function upsertAllocations(poolId: string, allocations: PoolAllocation[])
|
||||
|
||||
// Phase B2: fire-and-forget combo sync for the target pool only; failures are
|
||||
// logged but never thrown. Sibling pools' combos are synced on their own lifecycle.
|
||||
void syncQuotaCombosGuarded(poolId);
|
||||
void serializeQuotaComboMaintenance(poolId, () => syncQuotaCombosGuarded(poolId));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -112,7 +112,8 @@ function parseEffortList(rawList: unknown): string[] | undefined {
|
||||
.map((entry) => {
|
||||
const entryParsed = effortEntrySchema.safeParse(entry);
|
||||
if (!entryParsed.success) return null;
|
||||
const raw = typeof entryParsed.data === "string" ? entryParsed.data : entryParsed.data.effort;
|
||||
const raw =
|
||||
typeof entryParsed.data === "string" ? entryParsed.data : entryParsed.data.effort;
|
||||
return raw.length > 0 ? normalizeSupportedEffort(raw) : null;
|
||||
})
|
||||
.filter((effort): effort is string => effort !== null)
|
||||
@@ -144,6 +145,16 @@ export function detectSupportedThinkingEfforts(record: JsonRecord): string[] | u
|
||||
}
|
||||
}
|
||||
|
||||
// #9160: fall back to `capabilities.effort_tiers` before the legacy fields.
|
||||
// OmniRoute's own catalog surfaces effort tiers inside `capabilities.effort_tiers`,
|
||||
// which the existing `parseEffortList` already handles (string arrays).
|
||||
const capabilitiesRecord = asRecord(record.capabilities);
|
||||
const capabilitiesParsed = effortListSchema.safeParse(capabilitiesRecord.effort_tiers);
|
||||
if (capabilitiesParsed.success) {
|
||||
const fromCapabilities = parseEffortList(capabilitiesRecord.effort_tiers);
|
||||
if (fromCapabilities) return fromCapabilities;
|
||||
}
|
||||
|
||||
// #8347: fall back to `supported_reasoning_levels`, then `thinking.levels` — in that
|
||||
// order, per the regression guard for #7694 (the flat field and `reasoning.supported_efforts`
|
||||
// both take precedence over these two and are handled above / by the caller).
|
||||
|
||||
@@ -152,7 +152,10 @@ export async function syncQuotaCombos(poolId: string): Promise<void> {
|
||||
for (const connId of pool.connectionIds) {
|
||||
let connection: Record<string, unknown> | null = null;
|
||||
try {
|
||||
connection = (await getCachedProviderConnectionById(connId)) as Record<string, unknown> | null;
|
||||
connection = (await getCachedProviderConnectionById(connId)) as Record<
|
||||
string,
|
||||
unknown
|
||||
> | null;
|
||||
} catch {
|
||||
// Connection lookup failure — skip this connection.
|
||||
continue;
|
||||
@@ -202,6 +205,10 @@ export async function syncQuotaCombos(poolId: string): Promise<void> {
|
||||
}));
|
||||
try {
|
||||
const existing = await getComboByName(comboName);
|
||||
// A pool may be deleted while this fire-and-forget sync is awaiting combo
|
||||
// lookups. Re-check immediately before the synchronous DB upsert so stale
|
||||
// create/update work cannot recreate managed combos after delete cleanup.
|
||||
if (!getPool(poolId)) return;
|
||||
const payload = {
|
||||
name: comboName,
|
||||
models: steps,
|
||||
|
||||
427
tests/integration/quota-pool-delete-combo-cleanup.test.ts
Normal file
427
tests/integration/quota-pool-delete-combo-cleanup.test.ts
Normal file
@@ -0,0 +1,427 @@
|
||||
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";
|
||||
import { makeManagementSessionRequest } from "../helpers/managementSession.ts";
|
||||
|
||||
const TEST_DATA_DIR = fs.mkdtempSync(
|
||||
path.join(os.tmpdir(), "omniroute-quota-pool-delete-combo-cleanup-")
|
||||
);
|
||||
process.env.DATA_DIR = TEST_DATA_DIR;
|
||||
process.env.API_KEY_SECRET = "test-quota-pool-delete-combo-cleanup-secret";
|
||||
|
||||
const core = await import("../../src/lib/db/core.ts");
|
||||
const apiKeysDb = await import("../../src/lib/db/apiKeys.ts");
|
||||
const combosDb = await import("../../src/lib/db/combos.ts");
|
||||
const groupsDb = await import("../../src/lib/db/quotaGroups.ts");
|
||||
const poolsDb = await import("../../src/lib/db/quotaPools.ts");
|
||||
const providersDb = await import("../../src/lib/db/providers.ts");
|
||||
const compliance = await import("../../src/lib/compliance/index.ts");
|
||||
const poolIdRoute = await import("../../src/app/api/quota/pools/[id]/route.ts");
|
||||
const { removeQuotaCombosForPool, syncQuotaCombos } =
|
||||
await import("../../src/lib/quota/quotaCombos.ts");
|
||||
const { parseQuotaModelName, quotaGroupSlug } =
|
||||
await import("../../src/lib/quota/quotaModelNaming.ts");
|
||||
|
||||
type Combo = Awaited<ReturnType<typeof combosDb.getCombos>>[number];
|
||||
|
||||
type Db = {
|
||||
prepare: (sql: string) => {
|
||||
all: (...params: unknown[]) => unknown[];
|
||||
get: (...params: unknown[]) => unknown;
|
||||
};
|
||||
};
|
||||
|
||||
function resetDb() {
|
||||
core.resetDbInstance();
|
||||
apiKeysDb.resetApiKeyState();
|
||||
fs.rmSync(TEST_DATA_DIR, { recursive: true, force: true });
|
||||
fs.mkdirSync(TEST_DATA_DIR, { recursive: true });
|
||||
}
|
||||
|
||||
function quotaNamesFor(combos: Combo[], groupName: string, provider: string): string[] {
|
||||
const groupSlug = quotaGroupSlug(groupName);
|
||||
return combos
|
||||
.map((combo) => (typeof combo.name === "string" ? combo.name : ""))
|
||||
.filter((name) => {
|
||||
const parsed = parseQuotaModelName(name);
|
||||
return parsed?.groupSlug === groupSlug && parsed.provider === provider;
|
||||
})
|
||||
.sort();
|
||||
}
|
||||
|
||||
async function createConnection(provider: "openrouter" | "baidu", name: string) {
|
||||
const connection = await providersDb.createProviderConnection({
|
||||
provider,
|
||||
authType: "apikey",
|
||||
name,
|
||||
apiKey: `test-only-${name}`,
|
||||
});
|
||||
const id = (connection as Record<string, unknown>).id;
|
||||
assert.equal(typeof id, "string", `${provider} connection should have an id`);
|
||||
return id as string;
|
||||
}
|
||||
|
||||
async function deletePoolThroughRoute(poolId: string): Promise<Response> {
|
||||
const request = await makeManagementSessionRequest(`http://localhost/api/quota/pools/${poolId}`, {
|
||||
method: "DELETE",
|
||||
});
|
||||
return poolIdRoute.DELETE(request, { params: Promise.resolve({ id: poolId }) });
|
||||
}
|
||||
|
||||
function getAllowedQuotas(apiKeyId: string): string[] {
|
||||
const db = core.getDbInstance() as unknown as Db;
|
||||
const row = db.prepare("SELECT allowed_quotas FROM api_keys WHERE id = ?").get(apiKeyId) as {
|
||||
allowed_quotas: string;
|
||||
};
|
||||
return JSON.parse(row.allowed_quotas) as string[];
|
||||
}
|
||||
|
||||
function countRows(sql: string, id: string): number {
|
||||
const db = core.getDbInstance() as unknown as Db;
|
||||
const row = db.prepare(sql).get(id) as { count: number };
|
||||
return row.count;
|
||||
}
|
||||
|
||||
function nextImmediate(): Promise<void> {
|
||||
return new Promise((resolve) => setImmediate(resolve));
|
||||
}
|
||||
|
||||
test.beforeEach(() => {
|
||||
resetDb();
|
||||
compliance.initAuditLog();
|
||||
});
|
||||
|
||||
test.after(() => {
|
||||
core.resetDbInstance();
|
||||
fs.rmSync(TEST_DATA_DIR, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
test("DELETE pool waits for scoped quota-combo cleanup before returning 204", async () => {
|
||||
const targetGroup = groupsDb.createGroup("Delete Target Group");
|
||||
const otherGroup = groupsDb.createGroup("Delete Other Group");
|
||||
const targetConnectionId = await createConnection("openrouter", "delete-target-openrouter");
|
||||
const sameGroupConnectionId = await createConnection("baidu", "delete-control-baidu");
|
||||
const otherGroupConnectionId = await createConnection("openrouter", "delete-control-openrouter");
|
||||
const apiKey = await apiKeysDb.createApiKey("Delete Pool Key", "delete-pool-machine");
|
||||
|
||||
const targetPool = poolsDb.createPool({
|
||||
connectionId: targetConnectionId,
|
||||
name: "Delete Target Pool",
|
||||
groupId: targetGroup.id,
|
||||
allocations: [{ apiKeyId: apiKey.id, weight: 100, policy: "hard" }],
|
||||
});
|
||||
const sameGroupPool = poolsDb.createPool({
|
||||
connectionId: sameGroupConnectionId,
|
||||
name: "Same Group Different Provider",
|
||||
groupId: targetGroup.id,
|
||||
});
|
||||
const otherGroupPool = poolsDb.createPool({
|
||||
connectionId: otherGroupConnectionId,
|
||||
name: "Different Group Same Provider",
|
||||
groupId: otherGroup.id,
|
||||
});
|
||||
await apiKeysDb.updateApiKeyPermissions(apiKey.id, {
|
||||
allowedQuotas: [targetPool.id, otherGroupPool.id],
|
||||
});
|
||||
|
||||
await syncQuotaCombos(targetPool.id);
|
||||
await syncQuotaCombos(sameGroupPool.id);
|
||||
await syncQuotaCombos(otherGroupPool.id);
|
||||
await nextImmediate();
|
||||
await nextImmediate();
|
||||
const ordinaryCombo = await combosDb.createCombo({
|
||||
name: "ordinary-delete-control",
|
||||
models: [{ kind: "model", model: "openrouter/control-model", weight: 100 }],
|
||||
strategy: "priority",
|
||||
});
|
||||
|
||||
const before = await combosDb.getCombos();
|
||||
const targetNames = quotaNamesFor(before, targetGroup.name, "openrouter");
|
||||
const sameGroupControlNames = quotaNamesFor(before, targetGroup.name, "baidu");
|
||||
const otherGroupControlNames = quotaNamesFor(before, otherGroup.name, "openrouter");
|
||||
assert.ok(targetNames.length > 0, "target openrouter quota combos must exist before DELETE");
|
||||
assert.ok(sameGroupControlNames.length > 0, "same-group baidu control combos must exist");
|
||||
assert.ok(otherGroupControlNames.length > 0, "other-group openrouter control combos must exist");
|
||||
assert.ok(
|
||||
await combosDb.getComboByName(ordinaryCombo.name as string),
|
||||
"ordinary combo must exist"
|
||||
);
|
||||
assert.ok(poolsDb.getPool(targetPool.id), "target pool row must exist before DELETE");
|
||||
assert.equal(
|
||||
countRows(
|
||||
"SELECT count(*) AS count FROM quota_pool_connections WHERE pool_id = ?",
|
||||
targetPool.id
|
||||
),
|
||||
1
|
||||
);
|
||||
assert.equal(
|
||||
countRows("SELECT count(*) AS count FROM quota_allocations WHERE pool_id = ?", targetPool.id),
|
||||
1
|
||||
);
|
||||
assert.deepEqual(getAllowedQuotas(apiKey.id), [targetPool.id, otherGroupPool.id]);
|
||||
|
||||
const response = await deletePoolThroughRoute(targetPool.id);
|
||||
|
||||
assert.equal(response.status, 204);
|
||||
const after = await combosDb.getCombos();
|
||||
assert.deepEqual(
|
||||
quotaNamesFor(after, targetGroup.name, "openrouter"),
|
||||
[],
|
||||
"DELETE must not return while target group+provider quota combos remain"
|
||||
);
|
||||
assert.deepEqual(
|
||||
quotaNamesFor(after, targetGroup.name, "baidu"),
|
||||
sameGroupControlNames,
|
||||
"same-group combos for another provider must remain byte/name-identical"
|
||||
);
|
||||
assert.deepEqual(
|
||||
quotaNamesFor(after, otherGroup.name, "openrouter"),
|
||||
otherGroupControlNames,
|
||||
"same-provider combos for another group must remain byte/name-identical"
|
||||
);
|
||||
assert.deepEqual(
|
||||
await combosDb.getComboByName(ordinaryCombo.name as string),
|
||||
ordinaryCombo,
|
||||
"ordinary user combo must remain unchanged"
|
||||
);
|
||||
assert.equal(poolsDb.getPool(targetPool.id), null);
|
||||
assert.equal(
|
||||
countRows(
|
||||
"SELECT count(*) AS count FROM quota_pool_connections WHERE pool_id = ?",
|
||||
targetPool.id
|
||||
),
|
||||
0
|
||||
);
|
||||
assert.equal(
|
||||
countRows("SELECT count(*) AS count FROM quota_allocations WHERE pool_id = ?", targetPool.id),
|
||||
0
|
||||
);
|
||||
assert.deepEqual(getAllowedQuotas(apiKey.id), [otherGroupPool.id]);
|
||||
const auditEvents = compliance.getAuditLog({ action: "quota.pool.deleted", limit: 10 });
|
||||
assert.ok(
|
||||
auditEvents.some(
|
||||
(event) =>
|
||||
typeof event === "object" &&
|
||||
event !== null &&
|
||||
(event as Record<string, unknown>).target === targetPool.id
|
||||
),
|
||||
"successful DELETE must record quota.pool.deleted audit event"
|
||||
);
|
||||
});
|
||||
|
||||
test("DELETE prevents an in-flight create sync from recreating quota combos", async () => {
|
||||
const group = groupsDb.createGroup("Immediate Create Delete Group");
|
||||
const connectionId = await createConnection("openrouter", "immediate-create-delete");
|
||||
const pool = poolsDb.createPool({
|
||||
connectionId,
|
||||
name: "Immediate Create Delete Pool",
|
||||
groupId: group.id,
|
||||
});
|
||||
|
||||
const deleted = await poolsDb.deletePool(pool.id);
|
||||
await nextImmediate();
|
||||
await nextImmediate();
|
||||
|
||||
assert.equal(deleted, true);
|
||||
assert.equal(poolsDb.getPool(pool.id), null);
|
||||
assert.deepEqual(
|
||||
quotaNamesFor(await combosDb.getCombos(), group.name, "openrouter"),
|
||||
[],
|
||||
"a create sync already in flight must not mint quota combos after pool deletion"
|
||||
);
|
||||
});
|
||||
|
||||
test("DELETE prevents an in-flight update sync from recreating quota combos", async () => {
|
||||
const group = groupsDb.createGroup("Immediate Update Delete Group");
|
||||
const connectionId = await createConnection("openrouter", "immediate-update-delete");
|
||||
const pool = poolsDb.createPool({
|
||||
connectionId,
|
||||
name: "Immediate Update Delete Pool",
|
||||
groupId: group.id,
|
||||
});
|
||||
await syncQuotaCombos(pool.id);
|
||||
await nextImmediate();
|
||||
await nextImmediate();
|
||||
await removeQuotaCombosForPool(pool.id);
|
||||
assert.deepEqual(quotaNamesFor(await combosDb.getCombos(), group.name, "openrouter"), []);
|
||||
|
||||
assert.ok(poolsDb.updatePool(pool.id, { name: "Updated Then Deleted Pool" }));
|
||||
const deleted = await poolsDb.deletePool(pool.id);
|
||||
await nextImmediate();
|
||||
await nextImmediate();
|
||||
|
||||
assert.equal(deleted, true);
|
||||
assert.equal(poolsDb.getPool(pool.id), null);
|
||||
assert.deepEqual(
|
||||
quotaNamesFor(await combosDb.getCombos(), group.name, "openrouter"),
|
||||
[],
|
||||
"an update sync already in flight must not recreate quota combos after pool deletion"
|
||||
);
|
||||
});
|
||||
|
||||
test("DELETE rejects a synchronous pool update once deletion has started", async () => {
|
||||
const oldGroup = groupsDb.createGroup("Deleting Pool Old Group");
|
||||
const newGroup = groupsDb.createGroup("Deleting Pool New Group");
|
||||
const connectionId = await createConnection("openrouter", "delete-update-race");
|
||||
const pool = poolsDb.createPool({
|
||||
connectionId,
|
||||
name: "Delete Update Race Pool",
|
||||
groupId: oldGroup.id,
|
||||
});
|
||||
await syncQuotaCombos(pool.id);
|
||||
await nextImmediate();
|
||||
await nextImmediate();
|
||||
assert.ok(quotaNamesFor(await combosDb.getCombos(), oldGroup.name, "openrouter").length > 0);
|
||||
|
||||
const deleting = poolsDb.deletePool(pool.id);
|
||||
const updated = poolsDb.updatePool(pool.id, { groupId: newGroup.id });
|
||||
const deleted = await deleting;
|
||||
await nextImmediate();
|
||||
await nextImmediate();
|
||||
|
||||
assert.equal(updated, null, "a pool must become immutable as soon as deletion starts");
|
||||
assert.equal(deleted, true);
|
||||
assert.equal(poolsDb.getPool(pool.id), null);
|
||||
assert.deepEqual(quotaNamesFor(await combosDb.getCombos(), oldGroup.name, "openrouter"), []);
|
||||
assert.deepEqual(quotaNamesFor(await combosDb.getCombos(), newGroup.name, "openrouter"), []);
|
||||
});
|
||||
|
||||
test("DELETE makes a synchronous allocation upsert a no-op once deletion has started", async () => {
|
||||
const group = groupsDb.createGroup("Deleting Pool Allocation Group");
|
||||
const targetConnectionId = await createConnection("openrouter", "delete-allocation-target");
|
||||
const siblingConnectionId = await createConnection("baidu", "delete-allocation-sibling");
|
||||
const targetPool = poolsDb.createPool({
|
||||
connectionId: targetConnectionId,
|
||||
name: "Delete Allocation Target",
|
||||
groupId: group.id,
|
||||
});
|
||||
const siblingPool = poolsDb.createPool({
|
||||
connectionId: siblingConnectionId,
|
||||
name: "Delete Allocation Sibling",
|
||||
groupId: group.id,
|
||||
});
|
||||
const apiKey = await apiKeysDb.createApiKey("Delete Allocation Key", "delete-allocation-key");
|
||||
await nextImmediate();
|
||||
await nextImmediate();
|
||||
|
||||
const deleting = poolsDb.deletePool(targetPool.id);
|
||||
poolsDb.upsertAllocations(targetPool.id, [{ apiKeyId: apiKey.id, weight: 100, policy: "hard" }]);
|
||||
const deleted = await deleting;
|
||||
|
||||
assert.equal(deleted, true);
|
||||
assert.equal(poolsDb.getPool(targetPool.id), null);
|
||||
assert.deepEqual(
|
||||
poolsDb.getPool(siblingPool.id)?.allocations,
|
||||
[],
|
||||
"an allocation upsert on a deleting pool must not mutate sibling pools"
|
||||
);
|
||||
});
|
||||
|
||||
test("concurrent DELETE calls report one deletion and one missing pool", async () => {
|
||||
const group = groupsDb.createGroup("Concurrent Delete Group");
|
||||
const connectionId = await createConnection("openrouter", "concurrent-delete");
|
||||
const pool = poolsDb.createPool({
|
||||
connectionId,
|
||||
name: "Concurrent Delete Pool",
|
||||
groupId: group.id,
|
||||
});
|
||||
|
||||
const results = await Promise.all([poolsDb.deletePool(pool.id), poolsDb.deletePool(pool.id)]);
|
||||
|
||||
assert.deepEqual(results, [true, false]);
|
||||
assert.equal(poolsDb.getPool(pool.id), null);
|
||||
assert.deepEqual(quotaNamesFor(await combosDb.getCombos(), group.name, "openrouter"), []);
|
||||
});
|
||||
|
||||
test("DELETE nonexistent pool returns sanitized 404 without changing combos", async () => {
|
||||
const missingPoolId = "pool-that-never-existed";
|
||||
const group = groupsDb.createGroup("Missing Pool Control Group");
|
||||
const connectionId = await createConnection("baidu", "missing-pool-control-baidu");
|
||||
const pool = poolsDb.createPool({
|
||||
connectionId,
|
||||
name: "Missing Pool Control",
|
||||
groupId: group.id,
|
||||
});
|
||||
const apiKey = await apiKeysDb.createApiKey("Missing Pool Key", "missing-pool-key");
|
||||
await apiKeysDb.updateApiKeyPermissions(apiKey.id, {
|
||||
allowedQuotas: [missingPoolId, pool.id],
|
||||
});
|
||||
await syncQuotaCombos(pool.id);
|
||||
await nextImmediate();
|
||||
await nextImmediate();
|
||||
await combosDb.createCombo({
|
||||
name: "ordinary-missing-delete-control",
|
||||
models: [{ kind: "model", model: "baidu/control-model", weight: 100 }],
|
||||
strategy: "priority",
|
||||
});
|
||||
const before = await combosDb.getCombos();
|
||||
assert.ok(quotaNamesFor(before, group.name, "baidu").length > 0);
|
||||
|
||||
const response = await deletePoolThroughRoute(missingPoolId);
|
||||
const body = await response.json();
|
||||
|
||||
assert.equal(response.status, 404);
|
||||
assert.equal(body.error?.message, "Pool not found");
|
||||
assert.doesNotMatch(JSON.stringify(body), /\s+at\s+\//, "404 must not expose a stack trace");
|
||||
assert.deepEqual(await combosDb.getCombos(), before);
|
||||
assert.deepEqual(
|
||||
getAllowedQuotas(apiKey.id),
|
||||
[missingPoolId, pool.id],
|
||||
"a missing-pool DELETE must not mutate API key permissions"
|
||||
);
|
||||
assert.ok(poolsDb.getPool(pool.id), "unrelated pool must remain");
|
||||
});
|
||||
|
||||
test("DELETE keeps relational cleanup non-fatal when quota-combo listing fails", async () => {
|
||||
const group = groupsDb.createGroup("Cleanup Failure Group");
|
||||
const connectionId = await createConnection("openrouter", "cleanup-failure-openrouter");
|
||||
const apiKey = await apiKeysDb.createApiKey("Cleanup Failure Key", "cleanup-failure-machine");
|
||||
const pool = poolsDb.createPool({
|
||||
connectionId,
|
||||
name: "Cleanup Failure Pool",
|
||||
groupId: group.id,
|
||||
allocations: [{ apiKeyId: apiKey.id, weight: 100, policy: "hard" }],
|
||||
});
|
||||
await apiKeysDb.updateApiKeyPermissions(apiKey.id, { allowedQuotas: [pool.id] });
|
||||
await syncQuotaCombos(pool.id);
|
||||
await nextImmediate();
|
||||
await nextImmediate();
|
||||
assert.ok(quotaNamesFor(await combosDb.getCombos(), group.name, "openrouter").length > 0);
|
||||
|
||||
const db = core.getDbInstance();
|
||||
const originalPrepare = db.prepare.bind(db);
|
||||
const unhandled: unknown[] = [];
|
||||
const onUnhandled = (reason: unknown) => unhandled.push(reason);
|
||||
process.on("unhandledRejection", onUnhandled);
|
||||
db.prepare = ((sql: string) => {
|
||||
if (sql.startsWith("SELECT data, sort_order, context_cache_protection FROM combos ORDER BY")) {
|
||||
throw new Error("forced quota combo listing failure");
|
||||
}
|
||||
return originalPrepare(sql);
|
||||
}) as typeof db.prepare;
|
||||
|
||||
let response: Response;
|
||||
try {
|
||||
response = await deletePoolThroughRoute(pool.id);
|
||||
await nextImmediate();
|
||||
await nextImmediate();
|
||||
} finally {
|
||||
db.prepare = originalPrepare as typeof db.prepare;
|
||||
process.off("unhandledRejection", onUnhandled);
|
||||
}
|
||||
|
||||
assert.equal(response!.status, 204);
|
||||
assert.deepEqual(unhandled, [], "guarded combo failure must not produce unhandledRejection");
|
||||
assert.equal(poolsDb.getPool(pool.id), null);
|
||||
assert.equal(
|
||||
countRows("SELECT count(*) AS count FROM quota_pool_connections WHERE pool_id = ?", pool.id),
|
||||
0
|
||||
);
|
||||
assert.equal(
|
||||
countRows("SELECT count(*) AS count FROM quota_allocations WHERE pool_id = ?", pool.id),
|
||||
0
|
||||
);
|
||||
assert.deepEqual(getAllowedQuotas(apiKey.id), []);
|
||||
});
|
||||
@@ -137,15 +137,15 @@ test("updatePool returns null for unknown id", () => {
|
||||
assert.equal(result, null);
|
||||
});
|
||||
|
||||
test("deletePool removes pool and returns true", () => {
|
||||
test("deletePool removes pool and returns true", async () => {
|
||||
const pool = poolsDb.createPool({ connectionId: "c6", name: "Deletable" });
|
||||
const deleted = poolsDb.deletePool(pool.id);
|
||||
const deleted = await poolsDb.deletePool(pool.id);
|
||||
assert.equal(deleted, true);
|
||||
assert.equal(poolsDb.getPool(pool.id), null);
|
||||
});
|
||||
|
||||
test("deletePool returns false for unknown id", () => {
|
||||
const result = poolsDb.deletePool("ghost-pool");
|
||||
test("deletePool returns false for unknown id", async () => {
|
||||
const result = await poolsDb.deletePool("ghost-pool");
|
||||
assert.equal(result, false);
|
||||
});
|
||||
|
||||
@@ -190,14 +190,14 @@ test("upsertAllocations with empty array removes all allocations", () => {
|
||||
// FK CASCADE: delete pool → allocations gone
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
test("deletePool cascades to allocations", () => {
|
||||
test("deletePool cascades to allocations", async () => {
|
||||
const pool = poolsDb.createPool({
|
||||
connectionId: "c9",
|
||||
name: "With Allocs",
|
||||
allocations: [{ apiKeyId: "k-cascade", weight: 100, policy: "hard" }],
|
||||
});
|
||||
|
||||
poolsDb.deletePool(pool.id);
|
||||
await poolsDb.deletePool(pool.id);
|
||||
|
||||
// After pool is deleted, listAllocationsForApiKey should find nothing for k-cascade
|
||||
const remaining = poolsDb.listAllocationsForApiKey("k-cascade");
|
||||
|
||||
258
tests/unit/gemini-web-capabilities-9356.test.ts
Normal file
258
tests/unit/gemini-web-capabilities-9356.test.ts
Normal file
@@ -0,0 +1,258 @@
|
||||
// Capability enforcement for the Gemini Web executor (#9356).
|
||||
//
|
||||
// Reported: gemini-web silently ACCEPTS `reasoning_effort` and
|
||||
// `tool_choice: "required"` and answers with ordinary prose — HTTP 200, no
|
||||
// `reasoning_content`, `tool_calls: []`, `finish_reason: "stop"`. An
|
||||
// AgentChakra/OpenClaw agent then believes its reasoning and tool requirements
|
||||
// were honored when they were not.
|
||||
//
|
||||
// Why neither can be implemented for THIS provider: gemini-web is not an API
|
||||
// client. It launches Playwright, types a single flat prompt string into the
|
||||
// gemini.google.com `.ql-editor` contenteditable, presses Enter, and captures
|
||||
// the first `StreamGenerate` response off the page. There is no request payload
|
||||
// to carry a thinking budget, and no function-calling channel to force — the
|
||||
// tools support it does have is the prompt-emulation shim (`webTools.ts`, #7286),
|
||||
// which ASKS the model to emit `<tool>{...}</tool>` and cannot GUARANTEE it.
|
||||
//
|
||||
// So this suite pins the issue's option (b) for both controls: reject the
|
||||
// requests we cannot honor, and keep honoring the ones we can. The line drawn:
|
||||
//
|
||||
// reasoning_effort none | minimal → allowed (gemini-web not thinking
|
||||
// IS compliance with "spend little")
|
||||
// low | medium | high… → 400, a positive request to think
|
||||
// tool_choice absent | auto | none → allowed (emulation path, #7286)
|
||||
// required | any | {fn} → 400, a guarantee we cannot make
|
||||
//
|
||||
// The guard must run BEFORE Playwright launches, so every executor assertion
|
||||
// here completes without a browser.
|
||||
|
||||
import test from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
|
||||
const { GeminiWebExecutor } = await import("../../open-sse/executors/gemini-web.ts");
|
||||
const { checkGeminiWebUnsupportedControls, GEMINI_WEB_UNSUPPORTED_CONTROL_CODE } =
|
||||
await import("../../open-sse/executors/gemini-web/capabilities.ts");
|
||||
const { gemini_webProvider } =
|
||||
await import("../../open-sse/config/providers/registry/gemini/web/index.ts");
|
||||
const { supportsReasoning, supportsToolCalling } =
|
||||
await import("../../src/lib/modelCapabilities.ts");
|
||||
const { providerSupportsEmulatedToolCalling } =
|
||||
await import("../../open-sse/services/combo/comboStructure.ts");
|
||||
|
||||
const GET_WEATHER_TOOL = {
|
||||
type: "function",
|
||||
function: {
|
||||
name: "get_weather",
|
||||
description: "Get the current weather for a city",
|
||||
parameters: { type: "object", properties: { city: { type: "string" } }, required: ["city"] },
|
||||
},
|
||||
};
|
||||
|
||||
interface ErrorBodyLike {
|
||||
error: { message: string; type: string; code: string };
|
||||
}
|
||||
|
||||
/**
|
||||
* Run the executor with valid-looking credentials. Every case in this suite is
|
||||
* expected to short-circuit on the capability guard, so Playwright is never
|
||||
* reached — a test that hangs here means the guard did not fire.
|
||||
*/
|
||||
async function run(body: Record<string, unknown>) {
|
||||
return new GeminiWebExecutor().execute({
|
||||
model: "gemini-3.6-flash",
|
||||
body: { messages: [{ role: "user", content: "hi" }], stream: false, ...body },
|
||||
stream: false,
|
||||
credentials: { apiKey: "__Secure-1PSID=test-cookie" },
|
||||
signal: AbortSignal.timeout(10_000),
|
||||
log: null,
|
||||
});
|
||||
}
|
||||
|
||||
// ─── Pure checker: reasoning_effort ─────────────────────────────────────────
|
||||
|
||||
test("#9356 reasoning_effort low/medium/high/xhigh are rejected as unsupported", () => {
|
||||
for (const effort of ["low", "medium", "high", "xhigh"]) {
|
||||
const violation = checkGeminiWebUnsupportedControls({ reasoning_effort: effort });
|
||||
assert.equal(
|
||||
violation?.param,
|
||||
"reasoning_effort",
|
||||
`reasoning_effort="${effort}" asks gemini-web to think harder, which a typed browser ` +
|
||||
`prompt cannot express — it must be rejected, not silently dropped`
|
||||
);
|
||||
assert.match(violation!.message, /reasoning_effort/);
|
||||
}
|
||||
});
|
||||
|
||||
test("#9356 reasoning_effort none/minimal and absent stay allowed", () => {
|
||||
assert.equal(checkGeminiWebUnsupportedControls({}), null);
|
||||
assert.equal(checkGeminiWebUnsupportedControls({ reasoning_effort: null }), null);
|
||||
assert.equal(checkGeminiWebUnsupportedControls({ reasoning_effort: "none" }), null);
|
||||
assert.equal(
|
||||
checkGeminiWebUnsupportedControls({ reasoning_effort: "minimal" }),
|
||||
null,
|
||||
'"minimal" means spend as little reasoning as possible — a non-thinking provider ' +
|
||||
"already satisfies it, so rejecting it would be gratuitous"
|
||||
);
|
||||
assert.equal(checkGeminiWebUnsupportedControls({ reasoning_effort: " NONE " }), null);
|
||||
});
|
||||
|
||||
// ─── Pure checker: tool_choice ──────────────────────────────────────────────
|
||||
|
||||
test("#9356 tool_choice required/any is rejected as unsupported", () => {
|
||||
for (const choice of ["required", "any"]) {
|
||||
const violation = checkGeminiWebUnsupportedControls({
|
||||
tools: [GET_WEATHER_TOOL],
|
||||
tool_choice: choice,
|
||||
});
|
||||
assert.equal(
|
||||
violation?.param,
|
||||
"tool_choice",
|
||||
`tool_choice="${choice}" is a guarantee the prompt-emulation shim cannot make`
|
||||
);
|
||||
assert.match(violation!.message, /tool_choice/);
|
||||
}
|
||||
});
|
||||
|
||||
test("#9356 a forced-function tool_choice object is rejected as unsupported", () => {
|
||||
const violation = checkGeminiWebUnsupportedControls({
|
||||
tools: [GET_WEATHER_TOOL],
|
||||
tool_choice: { type: "function", function: { name: "get_weather" } },
|
||||
});
|
||||
assert.equal(violation?.param, "tool_choice");
|
||||
|
||||
// Anthropic-style forcing, which the translators also emit.
|
||||
assert.equal(
|
||||
checkGeminiWebUnsupportedControls({
|
||||
tools: [GET_WEATHER_TOOL],
|
||||
tool_choice: { type: "any" },
|
||||
})?.param,
|
||||
"tool_choice"
|
||||
);
|
||||
});
|
||||
|
||||
test("#9356 tool_choice auto/none and absent keep the #7286 emulation path open", () => {
|
||||
assert.equal(checkGeminiWebUnsupportedControls({ tools: [GET_WEATHER_TOOL] }), null);
|
||||
assert.equal(
|
||||
checkGeminiWebUnsupportedControls({ tools: [GET_WEATHER_TOOL], tool_choice: "auto" }),
|
||||
null
|
||||
);
|
||||
assert.equal(
|
||||
checkGeminiWebUnsupportedControls({ tools: [GET_WEATHER_TOOL], tool_choice: "none" }),
|
||||
null
|
||||
);
|
||||
});
|
||||
|
||||
test("#9356 forcing is rejected on its own terms, even with no tools[] array", () => {
|
||||
// An agent that sets tool_choice without tools is already malformed, but the
|
||||
// point stands: never report success for a forcing contract we ignore.
|
||||
assert.equal(
|
||||
checkGeminiWebUnsupportedControls({ tool_choice: "required" })?.param,
|
||||
"tool_choice"
|
||||
);
|
||||
});
|
||||
|
||||
// ─── Executor wiring ────────────────────────────────────────────────────────
|
||||
|
||||
test("#9356 executor returns 400 for reasoning_effort=high before launching a browser", async () => {
|
||||
const result = await run({ reasoning_effort: "high" });
|
||||
|
||||
assert.equal(result.response.status, 400);
|
||||
const body = (await result.response.json()) as ErrorBodyLike;
|
||||
assert.equal(body.error.code, GEMINI_WEB_UNSUPPORTED_CONTROL_CODE);
|
||||
assert.match(body.error.message, /reasoning_effort/);
|
||||
assert.equal(
|
||||
body.error.message.includes("at /"),
|
||||
false,
|
||||
"error bodies must stay sanitized — no stack traces"
|
||||
);
|
||||
});
|
||||
|
||||
test("#9356 executor returns 400 for tool_choice=required before launching a browser", async () => {
|
||||
const result = await run({ tools: [GET_WEATHER_TOOL], tool_choice: "required" });
|
||||
|
||||
assert.equal(result.response.status, 400);
|
||||
const body = (await result.response.json()) as ErrorBodyLike;
|
||||
assert.equal(body.error.code, GEMINI_WEB_UNSUPPORTED_CONTROL_CODE);
|
||||
assert.match(body.error.message, /tool_choice/);
|
||||
});
|
||||
|
||||
test("#9356 the capability guard runs ahead of the credential check", async () => {
|
||||
// A request that is BOTH uncredentialed and incompatible must report the
|
||||
// incompatibility: adding a cookie would not make it work.
|
||||
const result = await new GeminiWebExecutor().execute({
|
||||
model: "gemini-3.6-flash",
|
||||
body: { messages: [{ role: "user", content: "hi" }], reasoning_effort: "high" },
|
||||
stream: false,
|
||||
credentials: {},
|
||||
signal: AbortSignal.timeout(10_000),
|
||||
log: null,
|
||||
});
|
||||
|
||||
assert.equal(result.response.status, 400);
|
||||
const body = (await result.response.json()) as ErrorBodyLike;
|
||||
assert.equal(body.error.code, GEMINI_WEB_UNSUPPORTED_CONTROL_CODE);
|
||||
});
|
||||
|
||||
test("#9356 a supported request still falls through the guard untouched", async () => {
|
||||
// tool_choice:"auto" + tools[] is the #7286 emulation contract. It must NOT
|
||||
// be blocked — reaching the (missing) credential check proves the guard let
|
||||
// it pass, without needing a browser to prove it.
|
||||
const result = await new GeminiWebExecutor().execute({
|
||||
model: "gemini-3.6-flash",
|
||||
body: {
|
||||
messages: [{ role: "user", content: "hi" }],
|
||||
tools: [GET_WEATHER_TOOL],
|
||||
tool_choice: "auto",
|
||||
},
|
||||
stream: false,
|
||||
credentials: {},
|
||||
signal: AbortSignal.timeout(10_000),
|
||||
log: null,
|
||||
});
|
||||
|
||||
assert.equal(result.response.status, 401, "should reach the cookie check, not the guard");
|
||||
});
|
||||
|
||||
// ─── Catalog metadata ───────────────────────────────────────────────────────
|
||||
|
||||
test("#9356 registry advertises no native tool calling and no reasoning for gemini-web", () => {
|
||||
assert.ok(gemini_webProvider.models.length > 0);
|
||||
for (const model of gemini_webProvider.models) {
|
||||
assert.equal(
|
||||
model.toolCalling,
|
||||
false,
|
||||
`${model.id} must not advertise native tool calling — /v1/models feeds agent routers`
|
||||
);
|
||||
assert.equal(
|
||||
model.supportsReasoning,
|
||||
false,
|
||||
`${model.id} must advertise reasoning:false so agent routers stop selecting it for ` +
|
||||
"reasoning work (the executor has no thinking control to drive)"
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
test("#9356 resolved capabilities — not just the raw registry — report no reasoning/tools", () => {
|
||||
// The registry literal is only the input; `getResolvedModelCapabilities` is what
|
||||
// the catalog, the combo compatibility filter and the thinking-budget translator
|
||||
// actually read. Assert the resolved view so a downstream default cannot quietly
|
||||
// re-advertise a capability the executor does not have.
|
||||
for (const model of gemini_webProvider.models) {
|
||||
const input = { provider: "gemini-web", model: model.id };
|
||||
assert.equal(supportsReasoning(input), false, `${model.id} resolved reasoning must be false`);
|
||||
assert.equal(
|
||||
supportsToolCalling(input),
|
||||
false,
|
||||
`${model.id} resolved NATIVE tool calling must be false — prompt emulation is advertised ` +
|
||||
'separately as toolCalling:"emulated" on the provider constant'
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
test("#9356 the provider still advertises emulated tool calling, so #7286 combos keep routing", () => {
|
||||
// Guard against over-correcting: dropping the emulation advertisement here would
|
||||
// make filterTargetsByRequestCompatibility fail these targets closed and break
|
||||
// emulation-only combos (#5240 / #8488).
|
||||
assert.equal(providerSupportsEmulatedToolCalling("gemini-web"), true);
|
||||
assert.equal(providerSupportsEmulatedToolCalling("gweb"), true);
|
||||
});
|
||||
@@ -57,9 +57,7 @@ test.after(async () => {
|
||||
// ── D1.1: Migration file ────────────────────────────────────────────────────
|
||||
|
||||
test("migration 086 file exists and contains quota_pool_connections DDL", () => {
|
||||
const migrationPath = path.resolve(
|
||||
"src/lib/db/migrations/087_quota_pool_connections.sql"
|
||||
);
|
||||
const migrationPath = path.resolve("src/lib/db/migrations/087_quota_pool_connections.sql");
|
||||
assert.ok(fs.existsSync(migrationPath), `migration file not found: ${migrationPath}`);
|
||||
|
||||
const sql = fs.readFileSync(migrationPath, "utf8");
|
||||
@@ -153,14 +151,14 @@ test("updatePool without connectionIds leaves join rows untouched", () => {
|
||||
|
||||
// ── D1.4: deletePool removes join rows ────────────────────────────────────
|
||||
|
||||
test("deletePool removes quota_pool_connections rows", () => {
|
||||
test("deletePool removes quota_pool_connections rows", async () => {
|
||||
const pool = poolsDb.createPool({
|
||||
connectionId: "del-a",
|
||||
name: "To Delete",
|
||||
connectionIds: ["del-a", "del-b"],
|
||||
});
|
||||
|
||||
const deleted = poolsDb.deletePool(pool.id);
|
||||
const deleted = await poolsDb.deletePool(pool.id);
|
||||
assert.equal(deleted, true, "deletePool should return true");
|
||||
|
||||
// Pool should be gone.
|
||||
|
||||
@@ -23,8 +23,7 @@ import path from "node:path";
|
||||
// ── DB harness (same pattern as quota-exclusivity-reconcile.test.ts) ─────────
|
||||
const TEST_DATA_DIR = fs.mkdtempSync(path.join(os.tmpdir(), "omniroute-pool-delete-prune-"));
|
||||
process.env.DATA_DIR = TEST_DATA_DIR;
|
||||
process.env.API_KEY_SECRET =
|
||||
process.env.API_KEY_SECRET || "delete-prune-test-secret-32chars!!";
|
||||
process.env.API_KEY_SECRET = process.env.API_KEY_SECRET || "delete-prune-test-secret-32chars!!";
|
||||
|
||||
const core = await import("../../src/lib/db/core.ts");
|
||||
const poolsDb = await import("../../src/lib/db/quotaPools.ts");
|
||||
@@ -62,9 +61,8 @@ test.after(async () => {
|
||||
// ── Helper: get allowed_quotas for a key by id from DB ───────────────────────
|
||||
function getAllowedQuotasById(keyId: string): string[] {
|
||||
const db = core.getDbInstance();
|
||||
const row = (db as any)
|
||||
.prepare("SELECT allowed_quotas FROM api_keys WHERE id = ?")
|
||||
.get(keyId) as { allowed_quotas: string } | undefined;
|
||||
const row = (db as any).prepare("SELECT allowed_quotas FROM api_keys WHERE id = ?").get(keyId) as
|
||||
{ allowed_quotas: string } | undefined;
|
||||
if (!row) return [];
|
||||
try {
|
||||
const parsed = JSON.parse(row.allowed_quotas ?? "[]");
|
||||
@@ -85,7 +83,7 @@ test("deletePool prunes its id from api_key allowed_quotas", async () => {
|
||||
const before = getAllowedQuotasById(keyObj.id);
|
||||
assert.ok(before.includes(pool.id), `pool.id should be in allowed_quotas before delete`);
|
||||
|
||||
poolsDb.deletePool(pool.id);
|
||||
await poolsDb.deletePool(pool.id);
|
||||
|
||||
const after = getAllowedQuotasById(keyObj.id);
|
||||
assert.ok(!after.includes(pool.id), `pool.id should NOT be in allowed_quotas after delete`);
|
||||
@@ -103,7 +101,7 @@ test("deletePool preserves unrelated pool ids in allowed_quotas", async () => {
|
||||
allowedQuotas: [poolToDelete.id, otherPool.id, unrelatedId],
|
||||
});
|
||||
|
||||
poolsDb.deletePool(poolToDelete.id);
|
||||
await poolsDb.deletePool(poolToDelete.id);
|
||||
|
||||
const after = getAllowedQuotasById(keyObj.id);
|
||||
assert.ok(!after.includes(poolToDelete.id), "deleted pool id should be removed");
|
||||
@@ -121,7 +119,7 @@ test("deletePool does not modify keys that don't reference the deleted pool", as
|
||||
// This key only references otherPool, not poolToDelete
|
||||
await apiKeysDb.updateApiKeyPermissions(keyObj.id, { allowedQuotas: [otherPool.id] });
|
||||
|
||||
poolsDb.deletePool(poolToDelete.id);
|
||||
await poolsDb.deletePool(poolToDelete.id);
|
||||
|
||||
const after = getAllowedQuotasById(keyObj.id);
|
||||
assert.deepEqual(after, [otherPool.id], "key referencing only other pool should be unchanged");
|
||||
@@ -134,7 +132,7 @@ test("deletePool: key with empty allowed_quotas stays empty", async () => {
|
||||
const keyObj = await apiKeysDb.createApiKey("Prune Key 4", "machine-prune-4");
|
||||
// Don't set allowedQuotas — default is []
|
||||
|
||||
poolsDb.deletePool(pool.id);
|
||||
await poolsDb.deletePool(pool.id);
|
||||
|
||||
const after = getAllowedQuotasById(keyObj.id);
|
||||
assert.deepEqual(after, [], "empty allowed_quotas should remain empty after delete");
|
||||
@@ -156,7 +154,7 @@ test("deletePool prunes pool id from ALL keys that reference it", async () => {
|
||||
await apiKeysDb.updateApiKeyPermissions(k.id, { allowedQuotas: [pool.id, otherPoolId] });
|
||||
}
|
||||
|
||||
poolsDb.deletePool(pool.id);
|
||||
await poolsDb.deletePool(pool.id);
|
||||
|
||||
for (const k of keys) {
|
||||
const after = getAllowedQuotasById(k.id);
|
||||
@@ -167,23 +165,31 @@ test("deletePool prunes pool id from ALL keys that reference it", async () => {
|
||||
|
||||
// ── 6. deletePool still returns true/false correctly ─────────────────────────
|
||||
|
||||
test("deletePool returns true for existing pool, false for non-existent", () => {
|
||||
test("deletePool returns true for existing pool, false for non-existent", async () => {
|
||||
const pool = poolsDb.createPool({ connectionId: "conn-ret-1", name: "Return Test" });
|
||||
assert.equal(poolsDb.deletePool(pool.id), true, "should return true for existing pool");
|
||||
assert.equal(poolsDb.deletePool(pool.id), false, "should return false for already-deleted pool");
|
||||
assert.equal(poolsDb.deletePool("nonexistent-id"), false, "should return false for unknown id");
|
||||
assert.equal(await poolsDb.deletePool(pool.id), true, "should return true for existing pool");
|
||||
assert.equal(
|
||||
await poolsDb.deletePool(pool.id),
|
||||
false,
|
||||
"should return false for already-deleted pool"
|
||||
);
|
||||
assert.equal(
|
||||
await poolsDb.deletePool("nonexistent-id"),
|
||||
false,
|
||||
"should return false for unknown id"
|
||||
);
|
||||
});
|
||||
|
||||
// ── 7. Pool row and allocation rows are gone after delete (regression guard) ──
|
||||
|
||||
test("deletePool removes pool and allocation rows from DB", () => {
|
||||
test("deletePool removes pool and allocation rows from DB", async () => {
|
||||
const pool = poolsDb.createPool({
|
||||
connectionId: "conn-reg-1",
|
||||
name: "Regression Pool",
|
||||
allocations: [{ apiKeyId: "key-reg-1", weight: 50, policy: "hard" }],
|
||||
});
|
||||
|
||||
poolsDb.deletePool(pool.id);
|
||||
await poolsDb.deletePool(pool.id);
|
||||
|
||||
assert.equal(poolsDb.getPool(pool.id), null, "getPool should return null after delete");
|
||||
const { items: allPools } = poolsDb.listPools();
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
import test from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
|
||||
const rlm = await import("../../open-sse/services/rateLimitManager.ts");
|
||||
const { enableRateLimitProtection, withRateLimit, __resetRateLimitManagerForTests } = rlm;
|
||||
|
||||
test.beforeEach(async () => {
|
||||
await __resetRateLimitManagerForTests();
|
||||
});
|
||||
|
||||
test("withRateLimit works without abort signal (backward compat)", async () => {
|
||||
enableRateLimitProtection("test-queue-1");
|
||||
const result = await withRateLimit("openai", "test-queue-1", "gpt-4", async () => "ok");
|
||||
assert.equal(result, "ok");
|
||||
});
|
||||
|
||||
test("withRateLimit works with AbortSignal", async () => {
|
||||
enableRateLimitProtection("test-queue-2");
|
||||
const ac = new AbortController();
|
||||
const result = await withRateLimit(
|
||||
"openai",
|
||||
"test-queue-2",
|
||||
"gpt-4",
|
||||
async () => "ok",
|
||||
ac.signal
|
||||
);
|
||||
assert.equal(result, "ok");
|
||||
ac.abort();
|
||||
});
|
||||
|
||||
test("multiple sequential withRateLimit calls work", async () => {
|
||||
enableRateLimitProtection("test-queue-3");
|
||||
const results = await Promise.all([
|
||||
withRateLimit("openai", "test-queue-3", "gpt-4", async () => "a"),
|
||||
withRateLimit("openai", "test-queue-3", "gpt-4", async () => "b"),
|
||||
]);
|
||||
assert.deepEqual(results.sort(), ["a", "b"]);
|
||||
});
|
||||
@@ -1,43 +0,0 @@
|
||||
import test from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
|
||||
const rlm = await import("../../open-sse/services/rateLimitManager.ts");
|
||||
const {
|
||||
enableRateLimitProtection,
|
||||
withRateLimit,
|
||||
updateFromHeaders,
|
||||
updateFromResponseBody,
|
||||
__resetRateLimitManagerForTests,
|
||||
} = rlm;
|
||||
|
||||
test.beforeEach(async () => {
|
||||
await __resetRateLimitManagerForTests();
|
||||
});
|
||||
|
||||
test("updateFromResponseBody overwrites updateFromHeaders retry-after", async () => {
|
||||
enableRateLimitProtection("test-seq-1");
|
||||
await withRateLimit("openai", "test-seq-1", "gpt-4", async () => "ok");
|
||||
const headers = new Headers({ "retry-after": "5" });
|
||||
updateFromHeaders("openai", "test-seq-1", headers, 429, "gpt-4");
|
||||
updateFromResponseBody("openai", "test-seq-1", JSON.stringify({ retry_after: 10 }), 429, "gpt-4");
|
||||
});
|
||||
|
||||
test("no retry-after in either source leaves limiter state unchanged", async () => {
|
||||
enableRateLimitProtection("test-seq-2");
|
||||
await withRateLimit("openai", "test-seq-2", "gpt-4", async () => "ok");
|
||||
const headers = new Headers({});
|
||||
updateFromHeaders("openai", "test-seq-2", headers, 200, "gpt-4");
|
||||
updateFromResponseBody("openai", "test-seq-2", "{}", 200, "gpt-4");
|
||||
});
|
||||
|
||||
test("response body retry-after is parsed correctly", async () => {
|
||||
enableRateLimitProtection("test-seq-3");
|
||||
await withRateLimit("openai", "test-seq-3", "gpt-4", async () => "ok");
|
||||
updateFromResponseBody(
|
||||
"openai",
|
||||
"test-seq-3",
|
||||
JSON.stringify({ data: { retry_after: 30 } }),
|
||||
429,
|
||||
"gpt-4"
|
||||
);
|
||||
});
|
||||
62
tests/unit/repro-9626.test.ts
Normal file
62
tests/unit/repro-9626.test.ts
Normal file
@@ -0,0 +1,62 @@
|
||||
import test from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import { readFileSync } from "node:fs";
|
||||
import { join } from "node:path";
|
||||
|
||||
const root = join(import.meta.dirname, "../..");
|
||||
const llmChatCardPath =
|
||||
"src/app/(dashboard)/dashboard/media-providers/components/LlmChatCard.tsx";
|
||||
const src = readFileSync(join(root, llmChatCardPath), "utf8");
|
||||
|
||||
const DISABLED_ON_LOADING = /disabled\s*=\s*\{\s*loading\s*\}/;
|
||||
const MODELS_LOADING_MARKER = /modelsLoading|Loading…|Loading\.\.\./;
|
||||
const ERROR_BRANCH = /error\s*&&/;
|
||||
const RETRY_ACTION = /onClick\s*=\s*\{[^}]*retry|retry[A-Za-z]*\s*\(\)|const\s+\[reload/i;
|
||||
const NO_MODELS_AFTER_EMPTY = /modelOptions\.length\s*===?\s*0|models\.length\s*===?\s*0/;
|
||||
|
||||
test("LlmChatCard destructures loading and error from useProviderModels (#9626)", () => {
|
||||
const match = src.match(/const\s*\{\s*([^}]+)\s*\}\s*=\s*useProviderModels\(/);
|
||||
assert.ok(match, "Expected to find a destructuring of useProviderModels");
|
||||
|
||||
const destructured = match[1];
|
||||
assert.ok(
|
||||
destructured.includes("loading"),
|
||||
"loading state must be destructured from useProviderModels"
|
||||
);
|
||||
assert.ok(destructured.includes("error"), "error state must be destructured from useProviderModels");
|
||||
});
|
||||
|
||||
test("LlmChatCard disables the model selector while models are loading (#9626)", () => {
|
||||
assert.ok(
|
||||
DISABLED_ON_LOADING.test(src),
|
||||
"The model <select> must be disabled while the models request is pending"
|
||||
);
|
||||
});
|
||||
|
||||
test("LlmChatCard shows a visible loading label while models are pending (#9626)", () => {
|
||||
assert.ok(
|
||||
MODELS_LOADING_MARKER.test(src),
|
||||
"A visible loading text (e.g. 'Loading…') must appear while the models request is pending"
|
||||
);
|
||||
});
|
||||
|
||||
test("LlmChatCard surfaces the provider model error in the UI (#9626)", () => {
|
||||
assert.ok(
|
||||
ERROR_BRANCH.test(src),
|
||||
"An error branch that renders the captured error message must exist"
|
||||
);
|
||||
});
|
||||
|
||||
test("LlmChatCard offers a retry action when the model request fails (#9626)", () => {
|
||||
assert.ok(
|
||||
RETRY_ACTION.test(src),
|
||||
"A retry action must be offered next to the model error"
|
||||
);
|
||||
});
|
||||
|
||||
test("LlmChatCard keeps the empty-state message distinct from an error (#9626)", () => {
|
||||
assert.ok(
|
||||
NO_MODELS_AFTER_EMPTY.test(src),
|
||||
"The empty-state (no models) message must only be shown for a successful empty response"
|
||||
);
|
||||
});
|
||||
@@ -40,13 +40,21 @@ test("Responses->Chat: first tool_call chunk announces role=assistant", () => {
|
||||
);
|
||||
assert.equal(first.choices[0].delta.tool_calls[0].function.name, "get_weather");
|
||||
|
||||
// Subsequent argument deltas must NOT repeat the role announcement.
|
||||
// #9168: arguments deltas are buffered until output_item.done for schema normalization.
|
||||
const next = openaiResponsesToOpenAIResponse(
|
||||
{ type: "response.function_call_arguments.delta", delta: '{"x":1}' },
|
||||
state
|
||||
);
|
||||
assert.ok(next, "should emit a chunk for arguments.delta");
|
||||
assert.equal(next.choices[0].delta.role, undefined, "only the first delta announces the role");
|
||||
assert.equal(next, null, "arguments delta should buffer until output_item.done");
|
||||
|
||||
// The args are emitted at output_item.done, and the role is not re-announced.
|
||||
const done = openaiResponsesToOpenAIResponse(
|
||||
{ type: "response.output_item.done", item: { type: "function_call", call_id: "call_abc", name: "get_weather" } },
|
||||
state
|
||||
);
|
||||
assert.ok(done, "should emit a chunk for output_item.done");
|
||||
assert.equal(done.choices[0].delta.role, undefined, "role announcement already happened on first chunk");
|
||||
assert.equal(done.choices[0].delta.tool_calls[0].function.arguments, '{"x":1}');
|
||||
});
|
||||
|
||||
test("Responses->Chat: first text chunk announces role=assistant", () => {
|
||||
|
||||
@@ -23,11 +23,17 @@ test("sseCommentsEnabled defaults to true when the env var is unset", () => {
|
||||
withEnv(undefined, () => assert.equal(sseCommentsEnabled(), true));
|
||||
});
|
||||
|
||||
test("sseCommentsEnabled is false only when set to 'off' (case-insensitive)", () => {
|
||||
test("sseCommentsEnabled is false for 'off', 'false', '0', 'no' (case-insensitive)", () => {
|
||||
withEnv("off", () => assert.equal(sseCommentsEnabled(), false));
|
||||
withEnv("OFF", () => assert.equal(sseCommentsEnabled(), false));
|
||||
withEnv("false", () => assert.equal(sseCommentsEnabled(), false));
|
||||
withEnv("FALSE", () => assert.equal(sseCommentsEnabled(), false));
|
||||
withEnv("0", () => assert.equal(sseCommentsEnabled(), false));
|
||||
withEnv("no", () => assert.equal(sseCommentsEnabled(), false));
|
||||
withEnv("NO", () => assert.equal(sseCommentsEnabled(), false));
|
||||
withEnv("on", () => assert.equal(sseCommentsEnabled(), true));
|
||||
withEnv("false", () => assert.equal(sseCommentsEnabled(), true));
|
||||
withEnv("yes", () => assert.equal(sseCommentsEnabled(), true));
|
||||
withEnv("1", () => assert.equal(sseCommentsEnabled(), true));
|
||||
});
|
||||
|
||||
test("shapeForClientFormat maps known client formats", () => {
|
||||
|
||||
@@ -203,7 +203,8 @@ test("Responses -> OpenAI: incremental tool call events + response.completed sna
|
||||
},
|
||||
state
|
||||
);
|
||||
assert.ok(args, "should emit args delta chunk");
|
||||
// #9168: arguments deltas are buffered until output_item.done for schema normalization
|
||||
assert.equal(args, null, "args delta should buffer until output_item.done");
|
||||
|
||||
openaiResponsesToOpenAIResponse(
|
||||
{
|
||||
|
||||
@@ -474,7 +474,7 @@ test("Responses -> OpenAI: tool-call delta, reasoning delta and completed usage
|
||||
},
|
||||
state
|
||||
);
|
||||
openaiResponsesToOpenAIResponse(
|
||||
const done = openaiResponsesToOpenAIResponse(
|
||||
{
|
||||
type: "response.output_item.done",
|
||||
item: { type: "function_call", call_id: "call_2", name: "weather" },
|
||||
@@ -497,7 +497,10 @@ test("Responses -> OpenAI: tool-call delta, reasoning delta and completed usage
|
||||
);
|
||||
|
||||
assert.equal(added.choices[0].delta.tool_calls[0].function.name, "weather");
|
||||
assert.equal(args.choices[0].delta.tool_calls[0].function.arguments, '{"city":"SP"}');
|
||||
// #9168: function_call_arguments.delta is buffered and returns null;
|
||||
// arguments are emitted by output_item.done instead.
|
||||
assert.equal(args, null);
|
||||
assert.equal(done.choices[0].delta.tool_calls[0].function.arguments, '{"city":"SP"}');
|
||||
assert.equal(reasoning.choices[0].delta.reasoning_content, "Need weather info.");
|
||||
assert.equal(completed.choices[0].finish_reason, "tool_calls");
|
||||
const comp = completed as {
|
||||
|
||||
@@ -1,124 +1,3 @@
|
||||
/**
|
||||
* #8853 — authenticated HTTP proxy health checks drop credentials
|
||||
*
|
||||
* Root cause: both the auto-test route and the scheduler build proxy URLs
|
||||
* manually as `${proxy.type}://${proxy.host}:${proxy.port}`, dropping
|
||||
* username/password. The `proxyConfigToUrl()` function in proxyDispatcher.ts
|
||||
* already handles URL-encoded credentials correctly.
|
||||
*
|
||||
* We prove the bug by showing that the proxy URL produced by the current
|
||||
* manual construction lacks credentials, and that `proxyConfigToUrl()` with
|
||||
* the same config object includes them — therefore the fix is to reuse it.
|
||||
*/
|
||||
import test from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
|
||||
// The function that fixes the bug — we import it here to verify it works
|
||||
import { proxyConfigToUrl } from "@omniroute/open-sse/utils/proxyDispatcher";
|
||||
|
||||
// ── proxyConfigToUrl credential tests ──────────────────────────────────────
|
||||
|
||||
test("#8853 proxyConfigToUrl encodes username and password into proxy URL", () => {
|
||||
const url = proxyConfigToUrl({
|
||||
type: "http",
|
||||
host: "127.0.0.1",
|
||||
port: 3128,
|
||||
username: "alice",
|
||||
password: "s3cret",
|
||||
});
|
||||
assert.ok(url, "proxyConfigToUrl must return a URL");
|
||||
assert.match(url!, /:\/\/alice:s3cret@/, "URL must contain credentials");
|
||||
});
|
||||
|
||||
test("#8853 proxyConfigToUrl encodes special characters in credentials", () => {
|
||||
const url = proxyConfigToUrl({
|
||||
type: "http",
|
||||
host: "proxy.example.com",
|
||||
port: 8080,
|
||||
username: "user@domain",
|
||||
password: "p@ss:w0rd",
|
||||
});
|
||||
assert.ok(url, "proxyConfigToUrl must return a URL");
|
||||
assert.match(url!, /:\/\/user%40domain:p%40ss%3Aw0rd@/, "URL must URL-encode special chars");
|
||||
});
|
||||
|
||||
test("#8853 proxyConfigToUrl omits auth when no username", () => {
|
||||
const url = proxyConfigToUrl({
|
||||
type: "http",
|
||||
host: "127.0.0.1",
|
||||
port: 3128,
|
||||
});
|
||||
assert.ok(url, "proxyConfigToUrl must return a URL");
|
||||
assert.doesNotMatch(url!, /@/, "URL must not contain @ (no auth)");
|
||||
});
|
||||
|
||||
test("#8853 proxyConfigToUrl handles IPv6 host with family", () => {
|
||||
const url = proxyConfigToUrl({
|
||||
type: "http",
|
||||
host: "[::1]",
|
||||
port: 3128,
|
||||
family: "ipv6",
|
||||
});
|
||||
assert.ok(url, "proxyConfigToUrl must return a URL");
|
||||
assert.match(url!, /\[::1\]/, "IPv6 host must be bracketed");
|
||||
});
|
||||
|
||||
// ── Simulate the buggy construction ─────────────────────────────────────────
|
||||
|
||||
function buggyManualUrl(proxy: { type: string; host: string; port: number }) {
|
||||
return `${proxy.type}://${proxy.host}:${proxy.port}`;
|
||||
}
|
||||
|
||||
test("#8853 manual URL construction (current bug) drops credentials", () => {
|
||||
const proxy = {
|
||||
type: "http",
|
||||
host: "127.0.0.1",
|
||||
port: 3128,
|
||||
username: "alice",
|
||||
password: "s3cret",
|
||||
};
|
||||
const manualUrl = buggyManualUrl(proxy);
|
||||
assert.doesNotMatch(manualUrl, /alice/, "Buggy URL must NOT contain username");
|
||||
assert.doesNotMatch(manualUrl, /s3cret/, "Buggy URL must NOT contain password");
|
||||
|
||||
// Compare with proxyConfigToUrl which includes credentials
|
||||
const fixedUrl = proxyConfigToUrl(proxy);
|
||||
assert.ok(fixedUrl);
|
||||
assert.match(fixedUrl!, /alice/, "Fixed URL must contain username");
|
||||
assert.match(fixedUrl!, /s3cret/, "Fixed URL must contain password");
|
||||
});
|
||||
|
||||
// ── Verify the scheduler and auto-test would use proxyConfigToUrl ──────────
|
||||
|
||||
test("#8853 proxyConfigToUrl accepts ProxyRegistryRecord-shaped object", () => {
|
||||
// Simulating the shape of a proxy record returned by listProxies({ includeSecrets: true })
|
||||
const proxyRecord = {
|
||||
id: "p1",
|
||||
name: "test",
|
||||
type: "http",
|
||||
host: "10.0.0.1",
|
||||
port: 8888,
|
||||
username: "bob",
|
||||
password: "p4ss",
|
||||
family: "auto",
|
||||
region: null,
|
||||
notes: null,
|
||||
status: "active",
|
||||
source: "manual",
|
||||
subscriptionId: null,
|
||||
createdAt: "2026-01-01",
|
||||
updatedAt: "2026-01-01",
|
||||
};
|
||||
const url = proxyConfigToUrl(proxyRecord);
|
||||
assert.ok(url, "proxyConfigToUrl must accept ProxyRegistryRecord-shaped objects");
|
||||
assert.match(url!, /bob:p4ss/, "URL must include credentials from the record");
|
||||
});
|
||||
|
||||
test("#8853 proxyConfigToUrl returns null for partial config (no host)", () => {
|
||||
const url = proxyConfigToUrl({ type: "http", port: 8080 } as Record<string, unknown>);
|
||||
assert.equal(url, null, "proxyConfigToUrl must return null for partial config without host");
|
||||
});
|
||||
|
||||
import test from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import { openaiResponsesToOpenAIRequest } from "../../open-sse/translator/request/openai-responses.ts";
|
||||
@@ -163,4 +42,65 @@ test("non-GPT-5.6 models still get max downgraded to xhigh", () => {
|
||||
)
|
||||
);
|
||||
assert.equal(translated.reasoning_effort, "xhigh");
|
||||
});
|
||||
<<<<<<< HEAD
|
||||
});
|
||||
|
||||
// ─────────────────────────────────────────────────────────────────────
|
||||
// PR #9142 — Anthropic top-level `system` prompts must trigger background detection
|
||||
// ─────────────────────────────────────────────────────────────────────
|
||||
const { getBackgroundTaskReason, setBackgroundDegradationConfig } =
|
||||
await import("../../open-sse/services/backgroundTaskDetector.ts");
|
||||
|
||||
test("#9142 Anthropic top-level system prompts must trigger background detection", () => {
|
||||
setBackgroundDegradationConfig({ enabled: true });
|
||||
assert.equal(
|
||||
getBackgroundTaskReason({
|
||||
system: "Generate a title for this conversation",
|
||||
messages: [{ role: "user", content: "hello" }],
|
||||
}),
|
||||
"system_prompt_pattern"
|
||||
);
|
||||
});
|
||||
=======
|
||||
|
||||
// #9140 — VS Code routes filter out built-in auto models
|
||||
const { isUsableChatModel } = await import(
|
||||
"../../src/app/api/v1/vscode/[token]/usableChatModel.ts"
|
||||
);
|
||||
|
||||
test("#9140 VS Code listing must accept built-in auto routing entries", () => {
|
||||
assert.equal(
|
||||
isUsableChatModel({ id: "auto/best-coding", owned_by: "combo" }),
|
||||
true,
|
||||
"built-in auto/* model should be accepted"
|
||||
);
|
||||
assert.equal(
|
||||
isUsableChatModel({ id: "operator-combo", owned_by: "combo" }),
|
||||
false,
|
||||
"operator-created combo should still be rejected"
|
||||
);
|
||||
>>>>>>> origin/release/v3.8.50
|
||||
|
||||
|
||||
});
|
||||
|
||||
// ── #9160 model discovery: capabilities.effort_tiers ────────────────────────
|
||||
|
||||
// #9160: model discovery must ingest capabilities.effort_tiers
|
||||
test("#9160 model discovery must ingest capabilities.effort_tiers", () => {
|
||||
assert.deepEqual(
|
||||
detectSupportedThinkingEfforts({
|
||||
capabilities: { effort_tiers: ["low", "medium", "high", "xhigh"] },
|
||||
}),
|
||||
["low", "medium", "high", "xhigh"]
|
||||
);
|
||||
});
|
||||
|
||||
test("#9160 capabilities.effort_tiers with duplicate and synonym", () => {
|
||||
assert.deepEqual(
|
||||
detectSupportedThinkingEfforts({
|
||||
capabilities: { effort_tiers: ["low", "low", "max"] },
|
||||
}),
|
||||
["low", "xhigh"]
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user