mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-08-04 22:32:12 +03:00
* chore(release): open v3.8.36 development cycle * refactor(chatCore): extrai resolveCompressionSettings (#3501) (#4826) Integrated into release/v3.8.36 (#3501 chatCore extraction stack 1/13) * refactor(chatCore): extrai predicados puros de combo de compressão (#3501) (#4824) Integrated into release/v3.8.36 (#3501 chatCore extraction stack 2/13) * refactor(chatCore): extrai emitOutputStyleTelemetry (#3501) (#4811) Integrated into release/v3.8.36 (#3501 chatCore extraction stack 3/13) * refactor(chatCore): extrai writeCompressionAnalytics (bloco analytics completo, #3501) (#4817) Integrated into release/v3.8.36 (#3501 chatCore extraction stack 4/13) * refactor(chatCore): extrai runPluginOnRequestHook (#3501) (#4827) Integrated into release/v3.8.36 (#3501 chatCore extraction stack 5/13) * refactor(chatCore): extrai applyClientUsageBuffer (buffer/estimate de usage non-streaming, #3501) (#4832) Integrated into release/v3.8.36 (#3501 chatCore extraction stack 6/13) * refactor(chatCore): extrai buildPostCallGuardrailContext (contexto guardrail post-call, #3501) (#4831) Integrated into release/v3.8.36 (#3501 chatCore extraction stack 7/13) * refactor(chatCore): extrai storeSemanticCacheResponse (cache-store non-streaming, #3501) (#4828) Integrated into release/v3.8.36 (#3501 chatCore extraction stack 8/13) * refactor(chatCore): extrai buildNonStreamingResponseHeaders (headers de resposta non-streaming, #3501) (#4835) Integrated into release/v3.8.36 (#3501 chatCore extraction stack 9/13) * refactor(chatCore): extrai maybeConvertJsonBodyToSse (#3089 JSON→SSE streaming, #3501) (#4833) Integrated into release/v3.8.36 (#3501 chatCore extraction stack 10/13) * refactor(chatCore): extrai assembleStreamingResponseHeaders (headers de resposta streaming, #3501) (#4836) Integrated into release/v3.8.36 (#3501 chatCore extraction stack 11/13) * refactor(chatCore): extrai storeStreamingSemanticCacheResponse (cache-store streaming, #3501) (#4829) Integrated into release/v3.8.36 (#3501 chatCore extraction stack 12/13) * refactor(chatCore): extrai assembleStreamingPipeline (chain de transforms streaming, #3501) (#4837) Integrated into release/v3.8.36 (#3501 chatCore extraction stack 13/13) * ci(quality): shift heavy validations to the PR→release fast-path (release-acceleration) (#4857) * feat(quality): add check:test-runner-api gate (vitest-only dirs must use vitest API) * feat(release): reusable CHANGELOG i18n-mirror sync script * chore(ops): add prune-stale-worktrees.sh (dry-run by default) * ci(quality): run test-runner-api + docs-all + vitest + full unit suite on PR->release fast-path --------- Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * fix(quota): cota exclusiva lista qtSd/ no /v1/models (#4806) + limite EPSILON não bloqueia (#4830) Integrated into release/v3.8.36 — quota-exclusive qtSd/ listing (#4806) + EPSILON placeholder no longer blocks; rebuilt from stale base (3 defining commits cherry-picked clean over release tip) * feat(sse): add Google Flow video-generation provider (#4569) (#4769) Integrated into release/v3.8.36 — Google Flow video-generation provider (#4569), release-green validated (typecheck + 21 tests + file-size) * fix(api): auth on compression run-telemetry + document OMNIROUTE_EVAL_CREDENTIALS (#4694, #4720) (#4796) Integrated into release/v3.8.36 — auth on compression run-telemetry + OMNIROUTE_EVAL_CREDENTIALS doc, release-green validated (typecheck + 3 tests + env-doc-sync) * fix(translator): strip top-level client_metadata on the OpenAI passthrough (port from 9router#1157) (#4624) Integrated into release/v3.8.36 — port (rebuilt from stale base; defining commit cherry-picked clean over release tip, release-green validated) * fix(translator): normalize `developer` role to `system` for OpenAI-format providers (#4625) Integrated into release/v3.8.36 — port (rebuilt from stale base; defining commit cherry-picked clean over release tip, release-green validated) * fix(translator): emit </think> close marker for Anthropic thinking blocks (#4633) Integrated into release/v3.8.36 — port (rebuilt from stale base; defining commit cherry-picked clean over release tip, release-green validated) * fix(translator): normalize tools to Anthropic-native shape for non-Anthropic providers (#4650) Integrated into release/v3.8.36 — port (rebuilt from stale base; defining commit cherry-picked clean over release tip, release-green validated) * fix(gemini): preserve `pattern` in antigravity tool schema sanitizer (#4651) Integrated into release/v3.8.36 — port (rebuilt from stale base; defining commit cherry-picked clean over release tip, release-green validated) * fix(perplexity): validate API keys via /v1/models endpoint (#4654) Integrated into release/v3.8.36 — port (rebuilt from stale base; defining commit cherry-picked clean over release tip, release-green validated) * fix(image): prevent compatible nodes from shadowing provider aliases (#4656) Integrated into release/v3.8.36 — port (rebuilt from stale base; defining commit cherry-picked clean over release tip, release-green validated) * fix(cli-tools): tolerate JSONC (comments, trailing commas) in tool settings (#4659) Integrated into release/v3.8.36 — port (rebuilt from stale base; defining commit cherry-picked clean over release tip, release-green validated) * fix(security): validate kiro region to prevent SSRF (GHSA-6mwv-4mrm-5p3m) (#4629) Integrated into release/v3.8.36 — kiro region SSRF guard (GHSA-6mwv-4mrm-5p3m), port rebuilt clean over release tip * fix(cli): harden the systray2 tray runtime (port of 9router#1080) (#4628) Integrated into release/v3.8.36 — port rebuilt clean over release tip, release-green validated * fix(test): validate anthropic-compatible connections via POST /v1/messages (#4657) Integrated into release/v3.8.36 — anthropic-compat validation via POST /v1/messages (port 584cf66a), rebuilt clean + baseline; release-green * fix(executors): strip params unsupported by the target provider/model (#4658) Integrated into release/v3.8.36 — port rebuilt clean over release tip, release-green validated * fix(claude-oauth): respect 429 backoff on usage endpoint to reduce spam (#4655) Integrated into release/v3.8.36 — port rebuilt clean over release tip, release-green validated * feat(api/v1): include alias-backed models in /v1/models listing (#4630) Integrated into release/v3.8.36 — port rebuilt clean over release tip, release-green validated * chore(quality): rebaseline catalog.ts 1574->1577 (#4630 aliases sobre quota-exclusive da release) (#4879) rebaseline * feat(compression): Kiro/CodeWhisperer tool-result compression engine (#4635) Integrated into release/v3.8.36 — port rebuilt clean, release-green * fix(security): don't trust loopback socket as local when behind reverse proxy (#4632) Integrated into release/v3.8.36 — port rebuilt clean, release-green * fix(opencode): preserve DeepSeek reasoning content in streamed responses (#4631) Integrated into release/v3.8.36 — DeepSeek reasoning_content injection (port #1099); release-green * fix(copilot,antigravity): cap maxOutputTokens at 16384 to stop "Invalid Argument" 400 (#4636) Integrated into release/v3.8.36 — cap maxOutputTokens 16384 antigravity (port #779); release-green * fix(dashboard): show custom vision models in LLM selector (#4653) Integrated into release/v3.8.36 — custom vision models in LLM selector (port 5e5e78d3); release-green * fix(claude): omit adaptive thinking + output_config.effort for haiku (#4661) Integrated into release/v3.8.36 — haiku adaptive-thinking omit (port); release-green * feat(provider): CodeBuddy CN (copilot.tencent.com) — full stack (#4664) Integrated into release/v3.8.36 — CodeBuddy CN provider (port efd20be8); usage.ts import + public-creds allowlist line reconciled; release-green * feat(combo): Fusion strategy — parallel panel + judge synthesis (16th strategy) (#4652) Integrated into release/v3.8.36 — Fusion combo strategy (16th, port 87e5c1c6); combo.ts baseline reconciled; release-green * feat(proxy-pool): Deno Deploy relays + group action buttons (#4643) Integrated into release/v3.8.36 — Deno Deploy relays (port #1437); proxies.ts baseline reconciled + env docs restored; release-green * fix(security): pin image fetch DNS resolution to prevent SSRF rebinding (GHSA-cmhj-wh2f-9cgx) (#4634) Integrated into release/v3.8.36 — pin DNS for image fetch SSRF rebinding guard (GHSA-cmhj-wh2f-9cgx, port c7d07448); caller DNS stubs + test-file baseline reconciled; release-green * fix(github): route Copilot Codex models to /responses (port from 9router#102) (#4626) Integrated into release/v3.8.36 — route Copilot Codex models to /responses (port #102); release-green * fix(copilot): never route Gemini/Claude variants to /responses (chat-completions only) (#4627) Integrated into release/v3.8.36 — never route Gemini/Claude to /responses (port #1536); fused with #4626 codex routing via supportsResponsesEndpoint gate; release-green * docs(ops): add canonical incident response runbook (#4868) Integrated into release/v3.8.36 * docs(perf): add per-endpoint p50/p95/p99 latency + cost budgets (#4867) Integrated into release/v3.8.36 * fix(proxy): fan out direct dispatcher streams (#4803) Integrated into release/v3.8.36 * fix(antigravity): exclude standard Gemini rate limit message from quota exhaustion keywords (#4810) Integrated into release/v3.8.36 * fix(sse): skip third-party tool-name cloak for Anthropic server tools (#4808) Integrated into release/v3.8.36 * fix(install): make transformers optional for CUDA-host installs (#4807) Integrated into release/v3.8.36 * fix(combo): propagate selected connection ID to fallback error responses for correct model lockout (#4809) Integrated into release/v3.8.36 * fix db storage tuning settings (#4834) Integrated into release/v3.8.36 * fix(sse): drop ccp pin when pinned provider is durably unhealthy (failover + anti-flap) (#4864) Integrated into release/v3.8.36 * fix(claude): skip mcp__ tool-name cloak + guard missing connectionId (#4861) Integrated into release/v3.8.36 * chore(quality): reconcile env-doc + file-size base-reds in release/v3.8.36 (#4886) - env-doc-sync: document PIN_DROP_BACKOFF_LEVEL / PIN_DROP_GRACE_MS (added by the ccp-pin health gate #4864) in .env.example + ENVIRONMENT.md. - file-size: rebaseline image-generation-handler.test.ts 1996 -> 2019 to its actual size (pre-existing drift). Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * fix(codex): drop non-standard codex.* events that break responses.stream (env-gated, #4602) (#4715) Integrated into release/v3.8.36 * feat(routing): honor X-Route-Model header to override body.model (#4863) Integrated into release/v3.8.36 * feat(live-ws): allow non-loopback clients via LIVE_WS_ALLOWED_HOSTS (closes #4873) (#4877) Integrated into release/v3.8.36 (live-ws + combo-api commits; Tailscale CGNAT commit held pending opt-in/opt-out decision) * chore(claude,codex): bump pinned CLI identity — Claude 2.1.158→2.1.187, Codex 0.132.0→0.142.0 (#4883) Integrated into release/v3.8.36 * fix(security): SSRF allowlist bypass via x-relay-path nos relays Deno/Vercel (#4899) Integrated into release/v3.8.36 * feat(quota): recuperação proativa de conexões em cooldown (cron heal) [Fase 3 #8] (#4900) Integrated into release/v3.8.36 * fix(quota): policy inválida não vaza allow + guard connectionIds vazio [Fase 3 #10] (#4901) Integrated into release/v3.8.36 * feat(quota): saturação real do Claude no fair-share via /api/oauth/usage (#4885) Integrated into release/v3.8.36 * chore(dashboard): rename Qoder display label from "Qoder AI" to "Qoder" (#4733) Integrated into release/v3.8.36 * fix(ci): include coverage/lcov.info in coverage-report artifact for SonarQube (#4670) Integrated into release/v3.8.36 * fix(cli): bump better-sqlite3 runtime pin to 12.10.1 for Node 26 (#4685) Integrated into release/v3.8.36 * docs: clarify Kiro is ~50 credits/month per account, not unlimited (#4690) Integrated into release/v3.8.36 * docs(agentbridge): document Electron NODE_EXTRA_CA_CERTS, real model IDs, identity caveat (#4718) Integrated into release/v3.8.36 * docs(ops): document the release-green family (green-prs, check:release-green, babysit, nightly) (#4679) Integrated into release/v3.8.36 * fix(translator): replay reasoning_content on plain Xiaomi MiMo turns (port from 9router#1321) (#4639) Integrated into release/v3.8.36 * feat(opencode-go): advertise glm-5.2 and kimi-k2.7-code (align with official Go endpoints) (#4711) Integrated into release/v3.8.36 * feat(db): track API endpoint dimension on usage_history (#4676) Integrated into release/v3.8.36 (migration renumbered 103→105; endpoint plumbed through extracted usage-stats helpers) * fix(cli): SIGKILL systray child PID before IPC close to avoid macOS NSStatusItem orphan (#4732) Integrated into release/v3.8.36 * feat(proxy-pool): Cloudflare Workers proxy deployer + pool integration (#4640) Integrated into release/v3.8.36 (relay type added to RELAY_TYPES set; dropdown UX preserved + Cloudflare item added; proxies.ts file-size rebaselined 1057→1060) * chore(quality): conserta base-red de release/v3.8.36 (gates + 7 testes + build MDX) (#4915) A base tinha base-red sistêmica herdada de PRs de outras sessões, bloqueando TODOS os PRs do ciclo (o TIA roda a suíte full em fail-safe p/ diffs hub). 4 Fast Quality Gates: - test-discovery (#4877): live-server-allowlist.test.ts em tests/unit/server/ (não-coletado) + vitest → nunca rodava. Convertido p/ node:test em tests/unit/security/. - any-budget:t11 (#4664): 3 explicit-any em tokenRefresh.ts tipados (sem crescer file-size). - docs-symbols (#4868): rotas inexistentes → /api/system/version e PUT /api/providers/{id} {isActive:false}. - docs-all fabricated-claim (#4868 + #4718): 5 bin/*.sh reais criados (rollback, snapshot-data, restore-data, restore-policies, cold-start-bench) + _ops-common.sh (snapshot VACUUM INTO, guards de confirmação/TTY, testes de contrato); NODE_EXTRA_CA_CERTS (env de runtime Node) na allowlist do checker. 7 testes unit base-red (de features alheias à quota): - oauth-providers-config (#4664): teste alinhado ao provider codebuddy-cn do registry. - antigravity-model-aliases (#4636): maxOutputTokens esperado 32769→16384 (cap intencional). - provider-request-capture #4091 (#4861): exemplo do teste trocado de mcp__ (que #4861 isenta de cloak por causa dos 400s de assimetria de histórico) para um tool de terceiro cloakável — preserva o invariante de #4091 SEM reverter #4861. - combo-error-response: convertido de vitest p/ node:test (era coletado pelo glob node:test e crashava); api/** e server/** removidos do vitest.config (config morta). Build MDX (dast-smoke, #4679): - docs/ops/RELEASE_GREEN.md não tinha frontmatter `title` → fumadocs-mdx rejeitava no webpack compile ("invalid frontmatter: title expected string"), quebrando o next build (e o deploy). Frontmatter title adicionado (único doc do collection sem ele). 17/17 Fast Quality Gates + suíte unit completa (17737 testes, 0 fail) + vitest verdes localmente. Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * feat(quota): saturação proativa por headers de tokens (universal) [Fase 3 #2] (#4907) storeRateLimitHeaders só capturava os headers de REQUESTS (RPM/min), que não refletem a pressão de TOKENS. Agora também parseia os headers de tokens (em toda resposta, sucesso também) para throttle proativo antes do 429: - Anthropic: anthropic-ratelimit-tokens-{limit,remaining,reset} (+ input/output), RFC3339. - OpenAI: x-ratelimit-{limit,remaining,reset}-tokens, reset em duração (6m0s). saturation = 1 − remaining/limit; resetAt normalizado a epoch (parse de duração ReDoS-safe). getTokenHeaderSaturation por (provider, connectionId). fetchGeneric- Saturation passa a usar esse sinal (complementa o oauth/usage do #1, que segue primário p/ Claude). Fail-open, cache mantido, request-path inalterado. 16 testes novos + regressão (oauth/usage #1 8/8, signals 6/6) = 30/30; typecheck:core + eslint limpos. Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * feat(quota): estratégia de combo "headroom" — seleção por folga de cota [Fase 3 #4] (#4908) Nova estratégia de roteamento que escolhe a conexão com MAIS folga de plano: headroom = 1 − max(util_5h, util_7d) (técnica do dario), via getSaturation (melhorado p/ Claude no #1). Proativo em vez de só fill-first reativo. - Helper PURO headroomRanking.ts (computeHeadroom + rankByHeadroom; saturação injetada, não-mutante, tie-break estável, fail-open). - Orderer async em combo/quotaStrategies.ts (reusa a maquinaria reset-aware de expansão de conexões + concorrência limitada; seam injetável). - Registrada como "headroom" em routingStrategies (combo-only); fill-first segue default — nenhuma estratégia existente tocada. - baseline file-size combo.ts 3168->3180 (só +12L de dispatch; lógica fora do god-file). 16 testes novos + combo-strategies 15/15 = 31/31; typecheck:core + eslint + file-size limpos. Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * feat(quota): cap per-(key,model) — quota_allocation_model_caps [Fase 3 #7] (#4927) * feat(quota): cap per-(key,model) com tabela quota_allocation_model_caps [Fase 3 #7] Fecha o buraco onde uma API key pode drenar o pool inteiro consumindo um único modelo. Tabela nova: quota_allocation_model_caps(pool_id, api_key_id, model, cap_value, cap_unit) PK composta (pool_id, api_key_id, model). cap_unit alinhado ao QuotaUnit existente. Comportamento: keyA acima do cap para modelo M → bloqueada somente em M; ainda permitida em qualquer outro modelo no mesmo pool. Cap <= EPSILON → ignorado (seed). Consumo por-(key,model) usa bucket segregado no quota_consumption existente (poolId mangled ':model:<model>') com window fixa 'hourly'; nenhuma nova tabela ou método de store necessário. Módulo novo: src/lib/db/quotaModelCaps.ts (getModelCap/setModelCap/deleteModelCap/listModelCaps) enforce.ts ganha o pre-check em enforceQuotaShare + recording em recordConsumption. EnforceInput e RecordConsumptionInput ganham model?: string (backward-compatible). localDb.ts re-exporta os 4 helpers (Hard Rule #2). TDD: tests/unit/quota-per-key-model.test.ts — 4 cenários (bloqueia em M, permite em M2, sem cap → sem bloqueio, EPSILON → ignorado). Todos os gates de qualidade passam. * feat(quota): plumba model resolvido no hot path para ativar o per-(key,model) cap [Fase 3 #7] A tabela/enforce do commit anterior estavam INERTES: o hot path não passava `model` ao enforce nem ao record, então nenhum model-cap disparava em produção. Plumbagem (model resolvido = mesma var usada no log/roteamento, pós background-redirect/alias): - chatCore.ts: enforceQuotaShare ganha `model`; scheduleQuotaShareConsumption recebe `model`. - chatCore/quotaShareConsumption.ts: threade `model` no RecordConsumptionInput (non-streaming). - spendRecorder.ts: recordStreamingConsumption já recebia `model` — agora o coloca no RecordConsumptionInput (streaming accrue por-modelo). - embeddings.ts: enforce + record ganham `model`. Namespace do cap = id do modelo RESOLVIDO (o mesmo de modelForScope/pendingScope/getUnsupportedParams), não o requestedModel cru nem o finalModelToUpstream (sem prefixo de provider). Operador configura o cap contra esse id. `model || undefined` em todos os pontos: vazio/null → check pulado (fail-safe, zero latência — só um campo no objeto). Teste de integração novo (tests/unit/quota-per-key-model-hotpath.test.ts): prova end-to-end que N consumos via scheduleQuotaShareConsumption({model}) → enforceQuotaShare({model}) bloqueia, e que outro modelo no mesmo pool ainda passa; + guard de que enforce SEM model nunca dispara model-cap. --------- Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * feat(quota): session stickiness p/ integridade de prompt-cache [Fase 3 #5] (#4929) * feat(quota): session stickiness p/ integridade de prompt-cache [Fase 3 #5] Adiciona stickiness de sessão ao roteamento de combo: uma conversa multi-turno é roteada para a MESMA conexão enquanto ela permanecer saudável, evitando a perda do prompt-cache do provider (custo 5-10× sem stickiness, efeito conhecido no dario/clewdr). Implementação: - `open-sse/services/combo/sessionStickiness.ts` (novo, <800 linhas): mapa em memória (messageHash → connectionId) com TTL 15 min + cap 500 entradas; `applySessionStickiness` promove a conexão sticky ao índice 0 dos targets ordenados pelo strategy, guardado por `computeHeadroom > 0.15` (threshold); quando saturada (headroom ≤ 0.15), o binding é limpo e a seleção normal reage. Hash da sessão = SHA-256 dos primeiros chars da 1ª mensagem user → 16 hex chars. Seam de teste: `__setStickinessHeadroomFetcherForTests`. - `open-sse/services/combo.ts`: import + 2 pontos de integração (pré-eval-scores e pós-success), dentro do orçamento congelado de 3180 linhas. - `tests/unit/combo-session-stickiness.test.ts`: 19 testes node:test + assert/strict, todos via injeção de fetcher (zero rede/DB). Threshold 0.15: conexão a >85% de utilização está a um burst de rate-limit; o benefício de cache não compensa manter-se numa conexão degradada. Valor alinhado com a zona de soft-penalty do restante do engine de quota-share. * test(combo): isola combo-strategies da session stickiness (#5) selectedConnectionFor reusa o mesmo body, então o sticky map (#5) fixava a connection após a 1ª chamada e quebrava o round-robin tie-break do teste reset-aware. Limpa o sticky map no início da helper — a stickiness tem suíte própria (combo-session-stickiness). Sem enfraquecer asserts. --------- Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * feat(quota): buckets multi-janela por conexão (5h/7d/per-model) [Fase 3 #3] (#4928) Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * refactor(providers): decompõe catálogo providers.ts em módulos de dados (godfile sweep, #3501) (#4917) Integrado em release/v3.8.36 (godfile sweep providers.ts, #3501) * refactor(pricing): decompõe pricing.ts em shared-tiers + DEFAULT_PRICING particionado (godfile sweep, #3501) (#4918) Integrado em release/v3.8.36 (godfile sweep pricing.ts, #3501) * refactor(api): extrai camada-folha pura de validation.ts (URL/headers/transport) (#4921) Integrado em release/v3.8.36 (validation.ts split fatia 1 — leaf layer) * refactor(api): extrai validators web-cookie + Meta AI de validation.ts (#4922) Integrado em release/v3.8.36 (validation.ts split fatia 2 — web-cookie + Meta AI) * refactor(api): extrai validators enterprise-cloud + probe compartilhado de validation.ts (#4923) Integrado em release/v3.8.36 (validation.ts split fatia 3 — enterprise-cloud + probe) * refactor(api): extrai validators áudio/speech + misc apikey de validation.ts (#4930) Integrado em release/v3.8.36 (validation.ts split fatia 4 — áudio/speech + misc apikey) * feat(quota): estratégia dedicada de quota-share (DRR + P2C in-flight + gating per-model) [Fase 3 #9] (#4939) * feat(quota): estratégia dedicada de quota-share (DRR + P2C in-flight + gating per-model) [Fase 3 #9] Estratégia interna "quota-share" isolada num módulo dedicado — NÃO toca a seleção/ fair-share genérica (decisão do dono: não mexer no que já funciona). Os combos qtSd/ (quotaCombos.ts) passam de fill-first para essa strategy; combo.ts ganha só 1 branch de dispatch que delega 100% ao módulo (nenhum case existente alterado). - quotaShareStrategy.ts: gating per-model (isBucketSaturated do #3) + DRR (quantum proporcional ao weight) + P2C sobre carga in-flight. - quotaShareInflight.ts: contador in-flight com TTL/lease de 120s — fallback do decrement-on-abort sem precisar instrumentar o combo genérico. - "quota-share" registrada como strategy INTERNA (não exposta na UI). - testes de síntese (quota-combo-balancing, quota-multiprovider) alinhados: a strategy esperada dos combos qtSd/ passa de "fill-first" para "quota-share" (alinhamento ao novo comportamento intencional, não mascaramento — os 73 testes de qtSd/ seguem verdes). * test(quota-share): alinha 2 scope-guards ao godfile sweep (base-reds que bloqueavam o CI) Dois testes de "arquivo contém X" quebraram por decomposições de godfile que outras sessões mergearam no release DURANTE a validação de #9 — NÃO são regressão de #9 (que não toca validation/oauth). Alinhados ao novo layout, asserts preservados: - proxy-bypass-scope-guard #3226: bypassProxyPatch foi extraído de validation.ts para validation/headers.ts (split #4921–#4930) → o teste lê a camada de validação. - sse-error-passthrough #3324: a windsurf authHint foi extraída de providers.ts para providers/oauth.ts → o teste lê o novo local. --------- Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * refactor(api): extrai validators search + embedding/rerank de validation.ts (#4932) Integrated into release/v3.8.36 * refactor(api): extrai format-validators (OpenAI/Anthropic) de validation.ts (#4933) Integrated into release/v3.8.36 * refactor(db): extrai model-permission matching de db/apiKeys.ts (#4936) Integrated into release/v3.8.36 * refactor(db): extrai row-parsers + tipos compartilhados de db/apiKeys.ts (#4943) Integrated into release/v3.8.36 * refactor(db): extrai column-mapping (snake↔camel) de db/core.ts (#4947) Integrated into release/v3.8.36 * refactor(db): extrai schema-column reconciliation de db/core.ts (#4948) Integrated into release/v3.8.36 * refactor(sse): extrai scalar/format helpers de services/usage.ts (#4949) Integrated into release/v3.8.36 * refactor(sse): extrai quota-core (UsageQuota + builders) de services/usage.ts (#4950) Integrated into release/v3.8.36 * fix(translator): regroup parallel tool results adjacent to their assistant (#4714) (#4882) Integrated into release/v3.8.36 (fixes #4714) * fix(qoder): exchange PAT for jt-* job token before Cosy chat (#4683) (#4884) Integrated into release/v3.8.36 (fixes #4683) * refactor(sse): dedup fallback tool_call id helper (#4736) Integrated into release/v3.8.36 * refactor(open-sse): extract safeParseJSON util, dedup tryParseJSON (#4735) Integrated into release/v3.8.36 * fix(compression): eliminate ReDoS in math_inline preservation pattern (#4795) (#4838) Integrated into release/v3.8.36 (fixes #4795) * fix(combo): fetch models dynamically from custom provider endpoints (#4860) Integrated into release/v3.8.36 * feat(providers): update volcengine-ark model list with DeepSeek V4 (#4905) Integrated into release/v3.8.36 * fix(translator): provider thinking compatibility (DeepSeek/Gemini) (#4946) Integrated into release/v3.8.36 * feat(combo): task-aware routing strategy (#4945) Integrated into release/v3.8.36 * refactor(sse): extrai a família MiniMax de services/usage.ts (#4952) Integrated into release/v3.8.36 * refactor(sse): extrai a família GLM de services/usage.ts (#4953) Integrated into release/v3.8.36 * refactor(sse): extrai a família Antigravity de services/usage.ts (#4956) Integrated into release/v3.8.36 * fix(dashboard): show custom provider given-name instead of internal id across dashboard pages (#4603) (#4960) Integrated into release/v3.8.36 (fixes #4603) * fix(api): evict stale in-memory rate-limit windows to stop slow heap leak (#4041) (#4957) Integrated into release/v3.8.36 (fixes #4041) * fix(api): parse /v1/responses body once instead of 3-4x on the hot path (#4041) (#4958) Integrated into release/v3.8.36 (fixes #4041) * fix(translator): preserve legitimate empty-string tool arguments in openai-to-claude streaming (#4951) (#4959) Integrated into release/v3.8.36 (fixes #4951) * chore(quality): reconcile file-size baseline for #4960 provider-display-name (#4961) Integrated into release/v3.8.36 * fix(dashboard): restore home provider-topology card hidden by #4596 default (#4963) Integrated into release/v3.8.36 — restores home topology card (#4596 regression) * fix(build): drop @omniroute/open-sse from optimizePackageImports (build OOM) (#4968) Integrated into release/v3.8.36 — fixes build OOM (optimizePackageImports open-sse) * fix(quota): migração 107 ativa estratégia quota-share nos combos qtSd/ existentes [Fase 3 #9] (#4962) Integrated into release/v3.8.36 * feat(quota): respeita max_concurrent por conexão no roteamento (#4965) Integrated into release/v3.8.36 * feat(quota): combo quota-share espera cooldown curto e re-despacha (Variante A) (#4967) Integrated into release/v3.8.36 * fix(quality): resolve base-reds da release — db-rules allowlist + task-aware router precedence (#4973) Dois base-reds pré-existentes que reprovavam o CI da release v3.8.36 (Fast Quality Gates + Unit Tests fast-path), independentes de qualquer feature em voo: 1. check:db-rules / allowlist: os módulos db-internal caseMapping (#4947) e schemaColumns (#4948), extraídos de db/core.ts e importados só por ele, não estavam em INTENTIONALLY_INTERNAL. Registrados na allowlist (correção canônica — são internos legítimos, não re-exportados pelo localDb). 2. auto-strategy honra LKGP/cost (combo-routing-engine.test.ts, 2 testes): o task-aware reordering (#4945, reorderByTaskWeight) roda para strategy "auto" e era aplicado DEPOIS do router explícito (selectWithStrategy: lkgp/cost), sobrescrevendo o orderedTargets[0] que o operador escolheu. Instrumentação provou: post-filter [0]=claude (LKGP) → post-task [0]=gpt-oss. Correção: quando o auto usa router explícito, preserva o [0] dele e deixa o task-aware refinar só a cauda de fallback. gpt-oss-120b PERMANECE tool-capable (não é mudança de catálogo; o model-capabilities-registry test segue verde). Validado: 121 testes (combo-routing-engine + combo-task-aware + registry) verdes, red-check confirmado, db-rules/file-size/typecheck/lint/prettier OK. Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * feat(quota): serializa concorrência por conexão no caminho quota-share (FASE 2.1) (#4970) O gating de quota-share em selectQuotaShareTarget é fail-open: uma conexão at-cap só é despriorizada, nunca bloqueada. Com 1 conexão por conta de assinatura (caso comum), chamadas concorrentes ainda floodam a conta (→ 429 + cooldown) — provado live na .15: 3 chamadas concorrentes com max_concurrent=1 despacharam todas em 94ms. Adiciona um semáforo POR CONEXÃO em torno do dispatch quota-share: chamadas excedentes esperam na fila em vez de floodar (key qsconn:<connectionId>, cap = max_concurrent da conexão). Fail-open em fila saturada/timeout para nunca piorar disponibilidade. Gated por strategy===quota-share + kill-switch resilienceSettings.quotaShareConcurrencyLimit (default on; UI no ResilienceTab). Lógica extraível isolada no leaf puro combo/quotaShareConcurrency.ts (unit-testado: estabilidade da key, no-op sem cap, serialização real, fail-open). Settings + schema + UI espelham comboCooldownWait. Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * docs(resilience): document Quota-Share Concurrency Control (max_concurrent + serialization + cooldown-wait) (#4980) Documents the v3.8.36 quota-share concurrency layers in RESILIENCE_GUIDE.md: per-connection max_concurrent cap, the quota-share request serialization semaphore (FASE 2.1, qsconn:<connectionId>, fail-open, kill-switch), and the combo cooldown-aware retry — so operators know how to cap a subscription account's concurrency and why the routing gate alone cannot contain a single-connection flood. Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * fix(dashboard): proxy-pool success gating, sync timestamp, opt-in Redis (#4878) (#4988) Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * fix(sse): fail over on 400 responses carrying rate-limit text (#4976) (#4986) * fix(sse): fail over on 400 responses carrying rate-limit text (#4976) * chore(quality): rebaseline accountFallback.ts file-size for #4976 fix --------- Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * fix(compression): stop RTK over-truncating file-read tool results (#4559) (#4987) * fix(compression): stop RTK over-truncating file-read tool results (#4559) * chore(quality): trim #4559 comment to keep rtk/index.ts within size cap --------- Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * fix(sse): honor per-account proxies and fingerprint rotation in opencode executor (#4954) (#4989) * fix(sse): honor per-account proxies and fingerprint rotation in opencode executor (#4954) * chore(quality): rebaseline auth.ts file-size for #4954 (+39: synthetic no-auth providerSpecificData hydration of fingerprints/accountProxies; irreducible credential-path wiring, covered by opencode-proxy-rotation-4954.test.ts + 159 auth/noauth regression) --------- Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * fix(sse): soft-penalize exhausted providers in auto-combo scoring (#4540) (#4990) * fix(sse): soft-penalize exhausted providers in auto-combo scoring (#4540) * chore(quality): document STATUS_SOFT_DEPRIORITIZE_FACTOR + rebaseline combo.ts for #4540 --------- Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * fix(dashboard): switch to visible filter after auto-hiding failed models in test-all (#4887) (#4991) * fix(dashboard): switch to visible filter after auto-hiding failed models in OAuth provider test-all (#4887) * test(dashboard): move #4887 test into tests/unit/ui so a CI runner collects it --------- Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * fix(pollinations): only enable jsonMode when JSON output is requested (#3981) (#5009) Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * fix(antigravity): default safetySettings to all-OFF for parity with native Gemini paths (#5003) (#5008) * fix(antigravity): default safetySettings to all-OFF for parity with native Gemini paths (#5003) * docs(changelog): restore #3981 pollinations entry eaten by merge --------- Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * fix(chatgpt-web): map advertised gpt-5.5/5.4-pro/5.2-pro slugs to prevent silent model substitution (#4665) (#5010) * fix(chatgpt-web): map advertised gpt-5.5/5.4-pro/5.2-pro slugs to prevent silent model substitution (#4665) MODEL_MAP was missing the advertised catalog ids gpt-5.5, gpt-5.5-pro, gpt-5.4-pro and gpt-5.2-pro, so MODEL_MAP[model] ?? model sent the dot-form id verbatim to the ChatGPT backend-api, which silently rejected it and served the default Plus model. Map each to its dash-form slug. gpt-4-5 is already dash-form and falls through correctly, so it is intentionally left unmapped. Extends the executor MODEL_MAP test with the four ids and adds a drift guard asserting every advertised dot-form catalog id reaches the backend in dash-form (never verbatim), guarding future catalog<->map drift. file-size: tests/unit/chatgpt-web.test.ts frozen baseline 2809->2855 (+46) for the added test cases and drift-guard test; executor source unchanged in baseline. * docs(changelog): restore #3981/#5003 entries eaten by merge --------- Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * feat(combos): add editable per-combo description field persisted via /api/combos (#5005) (#5011) * feat(combos): add editable per-combo description field persisted via /api/combos (#5005) * docs(changelog): restore #3981/#5003/#4665 entries eaten by merge --------- Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> * Fix Ollama Cloud max reasoning effort (#4993) Integrated into release/v3.8.36 * fix(copilot): replace execSync with execFile to prevent command injection (#5024) Integrated into release/v3.8.36 * fix(plugin): auth.json dual-key fallback for auto-prefix migration (#5027) Integrated into release/v3.8.36 * feat(endpoint): per-endpoint custom system prompt injection (#5022) Integrated into release/v3.8.36 * fix(headroom): translate openai-responses input through OpenAI for compression (#5023) Integrated into release/v3.8.36 * docs(changelog): add entries for #4993, #5024, #5027 (release notes credit) * fix(api): stop /api/system/env/repair 500 on packaged install (#5006) (#5028) * fix(api): stop /api/system/env/repair 500 on packaged install — lazy createRequire in sync-env.mjs (#5006) scripts/dev/sync-env.mjs ran createRequire(import.meta.url) at module top-level. When webpack bundles it into the standalone env-repair route, import.meta.url is frozen to the build-machine path (file:///home/runner/...) and createRequire throws during module evaluation, so the whole route module fails to load and every GET returns HTTP 500 — breaking the onboarding wizard on packaged/global installs. - Move createRequire into the guarded better-sqlite3 block (only place that needs it); a bad import.meta.url now returns the safe default. - resolveRootDir() falls back to process.cwd() when fileURLToPath throws. - route.ts passes an explicit rootDir (process.cwd()) so the helper never derives the root from the frozen import.meta.url, matching the .env target used by createEnvBackup(). - Regression guard: assert sync-env.mjs has no top-level createRequire + getEnvSyncPlan(oauth) works with explicit rootDir without throwing. * docs(changelog): restore #4993/#5023/#5024/#5027 + custom-system-prompt/headroom entries eaten by release merge * chore(quality): rebaseline 3 inherited base-reds from release merge Files NOT touched by this PR — grew on release/v3.8.36 via --admin merges and inherited here through 'git merge origin/release': - open-sse/executors/base.ts 1414->1416 (#4993 Ollama Cloud max-effort) - src/lib/db/settings.ts 1149->1151 (#5023 custom system prompt) - src/app/(dashboard)/.../endpoint/EndpointPageClient.tsx 2570->2612 (custom system prompt UI) * chore(release): finalize v3.8.36 CHANGELOG + docs (2026-06-25) --------- Co-authored-by: Diego Rodrigues de Sa e Souza <souzamiriamrodrigues790@gmail.com> Co-authored-by: KooshaPari <42529354+KooshaPari@users.noreply.github.com> Co-authored-by: Makcim Ivanov <makcimbx@gmail.com> Co-authored-by: Chewji <126886556+Chewji9875@users.noreply.github.com> Co-authored-by: Anton <39598727+NomenAK@users.noreply.github.com> Co-authored-by: Demiurge The Single <megamen932@gmail.com> Co-authored-by: Randi <55005611+rdself@users.noreply.github.com> Co-authored-by: Éder Costa <eder.almeida.costa@gmail.com> Co-authored-by: Jefferson Felizardo <jeffer1312@gmail.com> Co-authored-by: Arthur Bodera <abodera@gmail.com> Co-authored-by: Hamsa_M <116961508+hamsa0x7@users.noreply.github.com> Co-authored-by: Hernan Javier Ardila Sanchez <hjasgr@gmail.com>
1416 lines
60 KiB
TypeScript
1416 lines
60 KiB
TypeScript
import { HTTP_STATUS, FETCH_TIMEOUT_MS } from "../config/constants.ts";
|
||
import { mergeClientAnthropicBeta } from "../config/anthropicHeaders.ts";
|
||
import { applyContextEditingToBody } from "../config/contextEditing.ts";
|
||
import { findOffendingField, stripGroqUnsupportedFields } from "../config/providerFieldStrips.ts";
|
||
import { applyFingerprint, isCliCompatEnabled } from "../config/cliFingerprints.ts";
|
||
import { supportsClaudeMaxEffort, supportsXHighEffort } from "../config/providerModels.ts";
|
||
import type { PoolConfig } from "../services/sessionPool/types.ts";
|
||
import type { Session } from "../services/sessionPool/session.ts";
|
||
import { SessionPool } from "../services/sessionPool/sessionPool.ts";
|
||
import { PoolRegistry } from "../services/sessionPool/poolRegistry.ts";
|
||
import {
|
||
getRotatingApiKey,
|
||
getValidApiKey,
|
||
resolveKeyForRequest,
|
||
} from "../services/apiKeyRotator.ts";
|
||
import type { KeyHealth } from "../services/apiKeyRotator.ts";
|
||
import { getOpenAICompatibleType, isClaudeCodeCompatible } from "../services/provider.ts";
|
||
import {
|
||
runWithOnPersist,
|
||
getRefreshLeadMs,
|
||
isUnrecoverableRefreshError,
|
||
} from "../services/tokenRefresh.ts";
|
||
import type { ProviderRequestDefaults } from "../services/providerRequestDefaults.ts";
|
||
import { signRequestBody } from "../services/claudeCodeCCH.ts";
|
||
import {
|
||
appendAnthropicBetaHeader,
|
||
CONTEXT_1M_BETA_HEADER,
|
||
enforceThinkingTemperature,
|
||
modelSupportsContext1mBeta,
|
||
} from "../services/claudeCodeCompatible.ts";
|
||
import { getClaudeCodeCompatibleRequestDefaults } from "@/lib/providers/requestDefaults";
|
||
import {
|
||
cloakThirdPartyToolNames,
|
||
remapToolNamesInRequest,
|
||
} from "../services/claudeCodeToolRemapper.ts";
|
||
import { obfuscateInBody } from "../services/claudeCodeObfuscation.ts";
|
||
import { sanitizeClaudeToolSchemas } from "../translator/helpers/schemaCoercion.ts";
|
||
import { sanitizeResponsesInputItems } from "../services/responsesInputSanitizer.ts";
|
||
import { applySystemTransformPipeline, PROVIDER_CLAUDE } from "../services/systemTransforms.ts";
|
||
import * as prl from "../utils/providerRequestLogging.ts";
|
||
import {
|
||
fixToolPairs,
|
||
fixToolAdjacency,
|
||
stripTrailingAssistantOrphanToolUse,
|
||
stripTrailingAssistantForProvider,
|
||
} from "../services/contextManager.ts";
|
||
import { randomUUID } from "node:crypto";
|
||
import {
|
||
CLAUDE_CODE_VERSION,
|
||
CLAUDE_CODE_STAINLESS_VERSION,
|
||
buildHashFor,
|
||
buildUserIdJson,
|
||
getSessionId,
|
||
parseUpstreamMetadataUserId,
|
||
passthroughUpstreamSessionId,
|
||
resolveAccountUUID,
|
||
resolveCliUserID,
|
||
selectBetaFlags,
|
||
stainlessArch,
|
||
stainlessOS,
|
||
stainlessRuntimeVersion,
|
||
stripProxyToolPrefix,
|
||
} from "./claudeIdentity.ts";
|
||
|
||
/**
|
||
* Sanitizes a custom API path to prevent path traversal attacks.
|
||
* Valid paths must start with '/', contain no '..' segments,
|
||
* no null bytes, and be reasonable in length.
|
||
*/
|
||
function sanitizePath(path: string): boolean {
|
||
if (typeof path !== "string") return false;
|
||
if (!path.startsWith("/")) return false;
|
||
if (path.includes("\0")) return false; // null byte
|
||
if (path.includes("..")) return false; // path traversal
|
||
if (path.length > 512) return false; // sanity limit
|
||
return true;
|
||
}
|
||
|
||
type JsonRecord = Record<string, unknown>;
|
||
|
||
export type ProviderConfig = {
|
||
id?: string;
|
||
baseUrl?: string;
|
||
baseUrls?: string[];
|
||
responsesBaseUrl?: string;
|
||
chatPath?: string;
|
||
clientVersion?: string;
|
||
clientId?: string;
|
||
clientSecret?: string;
|
||
tokenUrl?: string;
|
||
refreshUrl?: string;
|
||
authUrl?: string;
|
||
headers?: Record<string, string>;
|
||
requestDefaults?: ProviderRequestDefaults;
|
||
timeoutMs?: number;
|
||
format?: string;
|
||
};
|
||
|
||
export type ProviderCredentials = {
|
||
accessToken?: string;
|
||
refreshToken?: string;
|
||
apiKey?: string;
|
||
projectId?: string | null;
|
||
expiresAt?: string;
|
||
connectionId?: string; // T07: used for API key rotation index
|
||
maxConcurrent?: number | null;
|
||
providerSpecificData?: JsonRecord;
|
||
requestEndpointPath?: string;
|
||
};
|
||
|
||
export type ExecutorLog = {
|
||
debug?: (tag: string, message: string) => void;
|
||
info?: (tag: string, message: string) => void;
|
||
warn?: (tag: string, message: string) => void;
|
||
error?: (tag: string, message: string) => void;
|
||
};
|
||
|
||
export type ExecuteInput = {
|
||
model: string;
|
||
body: unknown;
|
||
stream: boolean;
|
||
credentials: ProviderCredentials;
|
||
signal?: AbortSignal | null;
|
||
log?: ExecutorLog | null;
|
||
extendedContext?: boolean;
|
||
/** Merged after auth + CLI fingerprint headers (values override same-named defaults). */
|
||
upstreamExtraHeaders?: Record<string, string> | null;
|
||
/** Original client request headers (read-only). Executors may forward select headers upstream. */
|
||
clientHeaders?: Record<string, string> | null;
|
||
/** Callback to persist tokens that are proactively refreshed during execution.
|
||
* Accepts a partial credentials patch (e.g. `{ accessToken, refreshToken }` or
|
||
* `{ testStatus: "expired", isActive: false }`); the caller merges into the
|
||
* stored connection row. */
|
||
onCredentialsRefreshed?: (
|
||
newCredentials: Partial<ProviderCredentials> & Record<string, unknown>
|
||
) => Promise<void> | void;
|
||
/** When true, skip the intra-URL 429 retry in execute() so the caller handles fallback. */
|
||
skipUpstreamRetry?: boolean;
|
||
/** Delegated Context Editing (Claude only): when enabled, attach the
|
||
* `context_management.clear_tool_uses` strategy so the provider clears stale
|
||
* tool-use blocks server-side. Honored only on the genuine `claude` path. */
|
||
contextEditing?: { enabled: boolean } | null;
|
||
};
|
||
|
||
export type CountTokensInput = {
|
||
body: Record<string, unknown>;
|
||
credentials: ProviderCredentials;
|
||
log?: ExecutorLog | null;
|
||
model: string;
|
||
signal?: AbortSignal | null;
|
||
};
|
||
|
||
/** Apply model-level extra upstream headers (e.g. Authentication, X-Custom-Auth). */
|
||
export function mergeUpstreamExtraHeaders(
|
||
headers: Record<string, string>,
|
||
extra?: Record<string, string> | null
|
||
): void {
|
||
if (!extra) return;
|
||
for (const [k, v] of Object.entries(extra)) {
|
||
if (typeof k === "string" && k.length > 0 && typeof v === "string") {
|
||
if (k.toLowerCase() === "user-agent") {
|
||
setUserAgentHeader(headers, v);
|
||
continue;
|
||
}
|
||
headers[k] = v;
|
||
}
|
||
}
|
||
}
|
||
|
||
export function getCustomUserAgent(providerSpecificData?: JsonRecord | null): string | null {
|
||
const customUserAgent =
|
||
typeof providerSpecificData?.customUserAgent === "string"
|
||
? providerSpecificData.customUserAgent.trim()
|
||
: "";
|
||
return customUserAgent || null;
|
||
}
|
||
|
||
export function setUserAgentHeader(headers: Record<string, string>, userAgent: string): void {
|
||
headers["User-Agent"] = userAgent;
|
||
if ("user-agent" in headers) {
|
||
headers["user-agent"] = userAgent;
|
||
}
|
||
}
|
||
|
||
export function applyConfiguredUserAgent(
|
||
headers: Record<string, string>,
|
||
providerSpecificData?: JsonRecord | null
|
||
): void {
|
||
const customUserAgent = getCustomUserAgent(providerSpecificData);
|
||
if (customUserAgent) {
|
||
setUserAgentHeader(headers, customUserAgent);
|
||
}
|
||
}
|
||
|
||
export function mergeAbortSignals(primary: AbortSignal, secondary: AbortSignal): AbortSignal {
|
||
const controller = new AbortController();
|
||
|
||
const abortFrom = (source: AbortSignal) => {
|
||
if (!controller.signal.aborted) {
|
||
controller.abort(source.reason);
|
||
}
|
||
};
|
||
|
||
if (primary.aborted) {
|
||
abortFrom(primary);
|
||
return controller.signal;
|
||
}
|
||
if (secondary.aborted) {
|
||
abortFrom(secondary);
|
||
return controller.signal;
|
||
}
|
||
|
||
primary.addEventListener("abort", () => abortFrom(primary), { once: true });
|
||
secondary.addEventListener("abort", () => abortFrom(secondary), { once: true });
|
||
return controller.signal;
|
||
}
|
||
|
||
function hasActiveClaudeThinking(body: Record<string, unknown>): boolean {
|
||
const thinking = body.thinking as Record<string, unknown> | undefined;
|
||
return thinking?.type === "enabled" || thinking?.type === "adaptive";
|
||
}
|
||
|
||
/**
|
||
* Sanitize reasoning_effort for providers that don't accept all values.
|
||
*
|
||
* The claude→openai translator may emit reasoning_effort=max/xhigh when the
|
||
* client sends output_config.effort=max on a Claude-shape request. Combined with
|
||
* runtime alias remapping (e.g. claude-opus-4-6 → mimo/mimo-v2.5-pro), this
|
||
* routes xhigh to OpenAI-shape providers that don't accept the value:
|
||
*
|
||
* xiaomi-mimo : low|medium|high only — 400 literal_error on xhigh
|
||
* mistral : devstral models reject reasoning_effort entirely
|
||
* github : claude/haiku/oswe models reject reasoning_effort entirely
|
||
*
|
||
* Each rejection burns a combo fallback attempt before reaching a working
|
||
* provider. Apply provider-aware sanitation here (after transformRequest, so
|
||
* reintroductions by per-provider transforms are also caught) before fetch.
|
||
* xhigh support is opt-out: pass through unchanged unless the registry marks
|
||
* a model as unsupported. Literal max support is provider-specific and
|
||
* intentionally separate: some upstreams accept max even when they do not
|
||
* accept xhigh. For OpenAI-shape providers, max normalizes to xhigh by default
|
||
* and falls back to high only for explicit xhigh opt-outs.
|
||
*/
|
||
const MISTRAL_NO_REASONING_EFFORT_PATTERN = /devstral/i;
|
||
// GitHub Copilot Claude routing is granular (upstream port: decolua/9router#791):
|
||
// ✅ Pass through — Claude Opus 4.6, Claude Sonnet 4.6. Copilot routes both to
|
||
// Anthropic's chat/completions surface, which honors reasoning_effort and
|
||
// emits visible reasoning tokens (verified upstream: 3× token increase
|
||
// between low/medium/high).
|
||
// ❌ Strip — Claude Haiku 4.5 and Claude Opus 4.7 (rejected upstream by
|
||
// Copilot's Claude backend), older Claude variants, all `haiku`-named
|
||
// models, and the `oswe-*` family (Raptor) which still rejects
|
||
// reasoning_effort.
|
||
// Order matters: the opt-in check must run BEFORE the broad Claude/haiku/oswe strip.
|
||
const GITHUB_REASONING_EFFORT_OPT_IN_PATTERN = /claude[-_.]?(?:opus|sonnet)[-_.]?4[-_.]6/i;
|
||
const GITHUB_NO_REASONING_EFFORT_PATTERN = /(claude|haiku|oswe)/i;
|
||
|
||
function supportsMaxEffortForProvider(provider: string, model: string): boolean {
|
||
const isClaude =
|
||
(provider === PROVIDER_CLAUDE || isClaudeCodeCompatible(provider)) &&
|
||
supportsClaudeMaxEffort(model);
|
||
// opencode-go proxies DeepSeek with the native DeepSeek API contract, which
|
||
// accepts {high, max} literally. Without this opt-in, max would be
|
||
// normalized to xhigh (the OmniRoute-internal top tier) and rejected by the
|
||
// upstream. Scoped to opencode-go deliberately: OpenRouter's DeepSeek path
|
||
// (pi#4055) is the documented inverse and expects xhigh, not max.
|
||
// Ollama Cloud also accepts literal max (for example GLM 5.2 supports
|
||
// low|medium|high|max|none) and rejects xhigh.
|
||
const isOpencodeGoDeepSeek =
|
||
provider === "opencode-go" && model.toLowerCase().includes("deepseek");
|
||
const isOllamaCloud = provider === "ollama-cloud";
|
||
return isClaude || isOpencodeGoDeepSeek || isOllamaCloud;
|
||
}
|
||
|
||
export function sanitizeReasoningEffortForProvider(
|
||
body: unknown,
|
||
provider: string,
|
||
model: string | undefined,
|
||
log?: { info?: (tag: string, msg: string) => void } | null
|
||
): unknown {
|
||
if (!body || typeof body !== "object" || Array.isArray(body)) return body;
|
||
const b = body as Record<string, unknown>;
|
||
const reasoning =
|
||
b.reasoning && typeof b.reasoning === "object" && !Array.isArray(b.reasoning)
|
||
? (b.reasoning as Record<string, unknown>)
|
||
: null;
|
||
const hasTopLevelReasoningEffort = Object.prototype.hasOwnProperty.call(b, "reasoning_effort");
|
||
const effort = b.reasoning_effort ?? reasoning?.effort;
|
||
if (effort === undefined) return body;
|
||
const effortStr = typeof effort === "string" ? effort.toLowerCase() : "";
|
||
const modelStr = model || "";
|
||
|
||
const githubOptIn =
|
||
provider === "github" && GITHUB_REASONING_EFFORT_OPT_IN_PATTERN.test(modelStr);
|
||
const rejecting =
|
||
(provider === "mistral" && MISTRAL_NO_REASONING_EFFORT_PATTERN.test(modelStr)) ||
|
||
(provider === "github" && !githubOptIn && GITHUB_NO_REASONING_EFFORT_PATTERN.test(modelStr));
|
||
if (rejecting) {
|
||
log?.info?.(
|
||
"REASONING_SANITIZE",
|
||
`${provider}/${modelStr}: removed unsupported reasoning_effort`
|
||
);
|
||
const next: Record<string, unknown> = { ...b };
|
||
delete next.reasoning_effort;
|
||
if (reasoning) {
|
||
const r = { ...reasoning };
|
||
delete r.effort;
|
||
if (Object.keys(r).length === 0) delete next.reasoning;
|
||
else next.reasoning = r;
|
||
}
|
||
return next;
|
||
}
|
||
|
||
// Native DeepSeek (api.deepseek.com) — V4 thinking mode accepts reasoning_effort
|
||
// ONLY as {high, max} (its own top tier is literally "max"). OmniRoute's internal
|
||
// scale is low|medium|high|xhigh where xhigh is the top, so map onto DeepSeek's
|
||
// vocabulary: xhigh → max (top→top), low|medium → high (below the enum floor).
|
||
// high/max pass through unchanged. Without this, the claude→openai translator's
|
||
// xhigh (and max-normalized-to-xhigh below) reaches DeepSeek as an unknown value,
|
||
// silently dropping the client's requested effort. This is the INVERSE of the
|
||
// OpenRouter-DeepSeek path, whose normalized API expects xhigh, not max (pi#4055).
|
||
if (provider === "deepseek") {
|
||
const mapped =
|
||
effortStr === "xhigh" ? "max" : effortStr === "low" || effortStr === "medium" ? "high" : null;
|
||
if (mapped && mapped !== effortStr) {
|
||
log?.info?.(
|
||
"REASONING_SANITIZE",
|
||
`deepseek/${modelStr}: normalized reasoning_effort ${effortStr} → ${mapped}`
|
||
);
|
||
const next: Record<string, unknown> = { ...b };
|
||
if (hasTopLevelReasoningEffort) next.reasoning_effort = mapped;
|
||
if (reasoning) next.reasoning = { ...reasoning, effort: mapped };
|
||
return next;
|
||
}
|
||
return body;
|
||
}
|
||
|
||
const supportsXHigh = supportsXHighEffort(provider, modelStr);
|
||
const shouldDowngradeXHigh = effortStr === "xhigh" && !supportsXHigh;
|
||
const supportsXHighForMax = supportsXHigh;
|
||
const supportsMax = supportsMaxEffortForProvider(provider, modelStr);
|
||
const shouldNormalizeMaxToXHigh = effortStr === "max" && !supportsMax && supportsXHighForMax;
|
||
const shouldDowngradeMax = effortStr === "max" && !supportsMax && !supportsXHighForMax;
|
||
|
||
if (shouldNormalizeMaxToXHigh) {
|
||
log?.info?.(
|
||
"REASONING_SANITIZE",
|
||
`${provider}/${modelStr}: normalized reasoning_effort max → xhigh`
|
||
);
|
||
const next: Record<string, unknown> = { ...b };
|
||
if (hasTopLevelReasoningEffort) {
|
||
next.reasoning_effort = "xhigh";
|
||
}
|
||
if (reasoning) {
|
||
next.reasoning = { ...reasoning, effort: "xhigh" };
|
||
}
|
||
return next;
|
||
}
|
||
|
||
if (shouldDowngradeXHigh || shouldDowngradeMax) {
|
||
log?.info?.(
|
||
"REASONING_SANITIZE",
|
||
`${provider}/${modelStr}: downgraded reasoning_effort ${effortStr} → high`
|
||
);
|
||
const next: Record<string, unknown> = { ...b };
|
||
if (hasTopLevelReasoningEffort) {
|
||
next.reasoning_effort = "high";
|
||
}
|
||
if (reasoning) {
|
||
next.reasoning = { ...reasoning, effort: "high" };
|
||
}
|
||
return next;
|
||
}
|
||
|
||
return body;
|
||
}
|
||
|
||
/**
|
||
* Strip the OmniRoute provider prefix from versioned built-in tool model
|
||
* fields (e.g. `cc/claude-opus-4-8` → `claude-opus-4-8`). Versioned built-in
|
||
* tool types carry an 8-digit date suffix (`advisor_20260301`, `bash_20250124`);
|
||
* the real Claude CLI sends a bare model id there, never a prefixed one, so a
|
||
* leaked OmniRoute prefix makes Anthropic reject the request. Mutates in place.
|
||
*/
|
||
export function stripVersionedToolModelPrefix(tools: unknown): void {
|
||
if (!Array.isArray(tools)) return;
|
||
for (const t of tools as Array<Record<string, unknown>>) {
|
||
if (
|
||
typeof t.type === "string" &&
|
||
/^[a-z][a-z0-9_]*_\d{8}$/.test(t.type) &&
|
||
typeof t.model === "string" &&
|
||
t.model.includes("/")
|
||
) {
|
||
t.model = t.model.split("/").pop();
|
||
}
|
||
}
|
||
}
|
||
|
||
/**
|
||
* BaseExecutor - Base class for provider executors.
|
||
* Implements the Strategy pattern: subclasses override specific methods
|
||
* (buildUrl, buildHeaders, transformRequest, etc.) for each provider.
|
||
*/
|
||
export class BaseExecutor {
|
||
provider: string;
|
||
config: ProviderConfig;
|
||
|
||
// Session pool support — subclasses can set poolConfig to opt in
|
||
protected poolConfig?: PoolConfig;
|
||
private _pool: import("../services/sessionPool/sessionPool.ts").SessionPool | null = null;
|
||
|
||
constructor(provider: string, config: ProviderConfig) {
|
||
this.provider = provider;
|
||
this.config = config;
|
||
}
|
||
|
||
getProvider() {
|
||
return this.provider;
|
||
}
|
||
|
||
protected getPool(): SessionPool | null {
|
||
if (!this.poolConfig) return null;
|
||
if (!this._pool) {
|
||
const pool = new SessionPool(this.provider, this.poolConfig);
|
||
pool.warmUp(this.poolConfig.minSessions).catch(() => {});
|
||
PoolRegistry.register(this.provider, pool);
|
||
this._pool = pool;
|
||
}
|
||
return this._pool;
|
||
}
|
||
|
||
protected buildPoolHeaders(session: Session | null): Record<string, string> {
|
||
if (!session) return {};
|
||
return session.buildHeaders();
|
||
}
|
||
|
||
getBaseUrls() {
|
||
return this.config.baseUrls || (this.config.baseUrl ? [this.config.baseUrl] : []);
|
||
}
|
||
|
||
getFallbackCount() {
|
||
return this.getBaseUrls().length || 1;
|
||
}
|
||
|
||
getTimeoutMs() {
|
||
const configured = this.config?.timeoutMs;
|
||
if (typeof configured !== "number" || !Number.isFinite(configured)) {
|
||
return FETCH_TIMEOUT_MS;
|
||
}
|
||
return Math.max(1, Math.floor(configured));
|
||
}
|
||
|
||
getCountTokensTimeoutMs() {
|
||
return this.getTimeoutMs();
|
||
}
|
||
|
||
buildUrl(
|
||
model: string,
|
||
stream: boolean,
|
||
urlIndex = 0,
|
||
credentials: ProviderCredentials | null = null
|
||
) {
|
||
void model;
|
||
void stream;
|
||
if (this.provider?.startsWith?.("openai-compatible-")) {
|
||
const psd = credentials?.providerSpecificData;
|
||
const baseUrl = typeof psd?.baseUrl === "string" ? psd.baseUrl : "https://api.openai.com/v1";
|
||
const normalized = baseUrl.replace(/\/$/, "");
|
||
// Sanitize custom path: must start with '/', no path traversal, no null bytes
|
||
const rawPath = typeof psd?.chatPath === "string" && psd.chatPath ? psd.chatPath : null;
|
||
const customPath = rawPath && sanitizePath(rawPath) ? rawPath : null;
|
||
if (customPath) return `${normalized}${customPath}`;
|
||
const path =
|
||
getOpenAICompatibleType(this.provider, psd) === "responses"
|
||
? "/responses"
|
||
: "/chat/completions";
|
||
return `${normalized}${path}`;
|
||
}
|
||
const baseUrls = this.getBaseUrls();
|
||
return baseUrls[urlIndex] || baseUrls[0] || this.config.baseUrl || "";
|
||
}
|
||
|
||
buildHeaders(
|
||
credentials: ProviderCredentials,
|
||
stream = true,
|
||
clientHeaders?: Record<string, string> | null,
|
||
model?: string,
|
||
health?: Record<string, KeyHealth>
|
||
): Record<string, string> {
|
||
void clientHeaders;
|
||
void model;
|
||
const headers: Record<string, string> = {
|
||
"Content-Type": "application/json",
|
||
...this.config.headers,
|
||
};
|
||
|
||
// Allow per-provider User-Agent override via environment variable.
|
||
// Example: CLAUDE_USER_AGENT="my-agent/2.0" overrides the default for the Claude provider.
|
||
const providerId = this.config?.id || this.provider;
|
||
if (providerId) {
|
||
const envKey = `${providerId.toUpperCase().replace(/[^A-Z0-9]/g, "_")}_USER_AGENT`;
|
||
const envUA = process.env[envKey]?.trim();
|
||
if (envUA) {
|
||
setUserAgentHeader(headers, envUA);
|
||
}
|
||
}
|
||
|
||
if (credentials.accessToken) {
|
||
headers["Authorization"] = `Bearer ${credentials.accessToken}`;
|
||
} else if (credentials.apiKey) {
|
||
const extraKeys =
|
||
(credentials.providerSpecificData?.extraApiKeys as string[] | undefined) ?? [];
|
||
const selectedKeyId = (
|
||
credentials.providerSpecificData as Record<string, unknown> | undefined
|
||
)?.selectedKeyId as string | undefined;
|
||
let effectiveKey = credentials.apiKey;
|
||
if (extraKeys.length > 0 && credentials.connectionId) {
|
||
const resolved = resolveKeyForRequest(
|
||
credentials.connectionId,
|
||
credentials.apiKey,
|
||
extraKeys,
|
||
selectedKeyId ?? null
|
||
);
|
||
effectiveKey = resolved?.key ?? credentials.apiKey;
|
||
if (resolved && credentials.providerSpecificData) {
|
||
(credentials.providerSpecificData as Record<string, unknown>).selectedKeyId =
|
||
resolved.keyId;
|
||
}
|
||
}
|
||
headers["Authorization"] = `Bearer ${effectiveKey}`;
|
||
}
|
||
|
||
headers["Accept"] = stream ? "text/event-stream" : "application/json";
|
||
|
||
return headers;
|
||
}
|
||
|
||
// Override in subclass for provider-specific transformations
|
||
transformRequest(
|
||
model: string,
|
||
body: unknown,
|
||
stream: boolean,
|
||
credentials: ProviderCredentials
|
||
): unknown {
|
||
void model;
|
||
void stream;
|
||
void credentials;
|
||
|
||
// Fix #1674: Remove empty string values from optional parameters
|
||
// like tool descriptions to avoid upstream validation failures.
|
||
if (body && typeof body === "object" && !Array.isArray(body)) {
|
||
const cloned = { ...body } as Record<string, unknown>;
|
||
|
||
if (Array.isArray(cloned.input)) {
|
||
cloned.input = sanitizeResponsesInputItems(cloned.input, false);
|
||
}
|
||
|
||
if (Array.isArray(cloned.tools)) {
|
||
cloned.tools = cloned.tools.map((tool: unknown) => {
|
||
if (tool && typeof tool === "object" && !Array.isArray(tool)) {
|
||
const toolRecord = tool as JsonRecord;
|
||
const toolFunction = toolRecord.function;
|
||
if (toolFunction && typeof toolFunction === "object" && !Array.isArray(toolFunction)) {
|
||
const func = { ...(toolFunction as JsonRecord) };
|
||
if (func.description === "") delete func.description;
|
||
if (typeof func.name !== "string" || func.name.trim() === "") {
|
||
func.name = "unnamed_tool";
|
||
}
|
||
return { ...toolRecord, function: func };
|
||
}
|
||
}
|
||
return tool;
|
||
});
|
||
}
|
||
|
||
// Fix #1884: Cursor sends prompt_cache_retention which breaks strict upstream endpoints
|
||
delete cloned.prompt_cache_retention;
|
||
|
||
// Also clean up top level optional fields that commonly cause issues when empty
|
||
const optionalKeys = ["user", "stop", "seed", "response_format"];
|
||
for (const key of optionalKeys) {
|
||
if (cloned[key] === "") delete cloned[key];
|
||
}
|
||
|
||
return cloned;
|
||
}
|
||
|
||
return body;
|
||
}
|
||
|
||
shouldRetry(status: number, urlIndex: number) {
|
||
return status === HTTP_STATUS.RATE_LIMITED && urlIndex + 1 < this.getFallbackCount();
|
||
}
|
||
|
||
// Intra-URL retry config: retry same URL before falling back to next node
|
||
static readonly RETRY_CONFIG = { maxAttempts: 2, delayMs: 2000 };
|
||
// Timeout for receiving the initial upstream response headers. Once the response
|
||
// starts streaming, STREAM_IDLE_TIMEOUT_MS / Undici bodyTimeout handle stalls.
|
||
static FETCH_START_TIMEOUT_MS = FETCH_TIMEOUT_MS;
|
||
|
||
// Override in subclass for provider-specific refresh
|
||
async refreshCredentials(
|
||
credentials: ProviderCredentials,
|
||
log: ExecutorLog | null
|
||
): Promise<Partial<ProviderCredentials> | null> {
|
||
void credentials;
|
||
void log;
|
||
return null;
|
||
}
|
||
|
||
needsRefresh(credentials?: ProviderCredentials | null) {
|
||
if (!credentials?.expiresAt) return false;
|
||
const expiresAtMs = new Date(credentials.expiresAt).getTime();
|
||
// Use the provider-specific lead time (REFRESH_LEAD_MS) so rotating-token
|
||
// providers like Codex refresh proactively far ahead of expiry. Keeping the
|
||
// refresh_token "warm" prevents Auth0 from marking it as stale and revoking
|
||
// the token family on first use after long idle.
|
||
const lead = getRefreshLeadMs(this.provider);
|
||
return expiresAtMs - Date.now() < lead;
|
||
}
|
||
|
||
parseError(response: Response, bodyText: string) {
|
||
return { status: response.status, message: bodyText || `HTTP ${response.status}` };
|
||
}
|
||
|
||
buildCountTokensUrl(model: string, credentials: ProviderCredentials | null = null) {
|
||
void model;
|
||
void credentials;
|
||
const baseUrl = this.buildUrl(model, false, 0, credentials);
|
||
if (typeof baseUrl !== "string" || baseUrl.length === 0) return null;
|
||
if (this.config?.format !== "claude" || !baseUrl.includes("/messages")) return null;
|
||
|
||
const [path, query = ""] = baseUrl.split("?");
|
||
const normalizedPath = path.endsWith("/messages")
|
||
? `${path}/count_tokens`
|
||
: `${path}/count_tokens`;
|
||
return query ? `${normalizedPath}?${query}` : normalizedPath;
|
||
}
|
||
|
||
async countTokens({ model, body, credentials, signal, log }: CountTokensInput) {
|
||
const url = this.buildCountTokensUrl(model, credentials);
|
||
if (!url) return null;
|
||
|
||
const headers = this.buildHeaders(credentials, false);
|
||
const requestBody =
|
||
body && typeof body === "object"
|
||
? {
|
||
...body,
|
||
model,
|
||
}
|
||
: { model };
|
||
|
||
let timeoutId: ReturnType<typeof setTimeout> | null = null;
|
||
let activeSignal = signal || null;
|
||
let controller: AbortController | null = null;
|
||
const timeoutMs = this.getCountTokensTimeoutMs();
|
||
|
||
if (timeoutMs > 0) {
|
||
controller = new AbortController();
|
||
timeoutId = setTimeout(() => controller?.abort(), timeoutMs);
|
||
activeSignal = signal ? mergeAbortSignals(signal, controller.signal) : controller.signal;
|
||
}
|
||
|
||
try {
|
||
const response = await fetch(url, {
|
||
method: "POST",
|
||
headers,
|
||
body: JSON.stringify(requestBody),
|
||
signal: activeSignal || undefined,
|
||
});
|
||
|
||
const text = await response.text();
|
||
if (!response.ok) {
|
||
const parsedError = this.parseError(response, text);
|
||
throw new Error(parsedError.message);
|
||
}
|
||
|
||
const parsed = text ? JSON.parse(text) : {};
|
||
const inputTokens = Number(parsed?.input_tokens);
|
||
if (!Number.isFinite(inputTokens)) {
|
||
throw new Error("Provider count_tokens response missing input_tokens");
|
||
}
|
||
|
||
return { input_tokens: inputTokens, provider: this.provider, source: "provider" };
|
||
} catch (error) {
|
||
log?.debug?.(
|
||
"COUNT_TOKENS",
|
||
`${this.provider}/${model} real count unavailable: ${error instanceof Error ? error.message : String(error)}`
|
||
);
|
||
return null;
|
||
} finally {
|
||
if (timeoutId) clearTimeout(timeoutId);
|
||
}
|
||
}
|
||
|
||
async execute(input: ExecuteInput) {
|
||
const {
|
||
model,
|
||
body,
|
||
stream,
|
||
credentials,
|
||
signal,
|
||
log,
|
||
extendedContext,
|
||
upstreamExtraHeaders,
|
||
clientHeaders,
|
||
skipUpstreamRetry = false,
|
||
onCredentialsRefreshed,
|
||
contextEditing,
|
||
} = input;
|
||
const fallbackCount = this.getFallbackCount();
|
||
let lastError: unknown = null;
|
||
let lastStatus = 0;
|
||
let activeCredentials = credentials;
|
||
// Track per-URL intra-retry attempts to avoid infinite loops
|
||
const retryAttemptsByUrl: Record<number, number> = {};
|
||
|
||
if (this.needsRefresh(credentials)) {
|
||
try {
|
||
// Fix A: wire onCredentialsRefreshed through runWithOnPersist so it runs
|
||
// INSIDE the per-connection mutex inside getAccessToken. Not every
|
||
// executor routes through getAccessToken (e.g. github.ts), so use a flag
|
||
// to detect whether the persist callback actually fired and fall back to
|
||
// post-refresh mutation when it didn't.
|
||
let proactivePersistRan = false;
|
||
const proactiveOnPersist = onCredentialsRefreshed
|
||
? async (refreshResult: Record<string, unknown>) => {
|
||
proactivePersistRan = true;
|
||
activeCredentials = {
|
||
...credentials,
|
||
...(refreshResult as Partial<ProviderCredentials>),
|
||
};
|
||
await onCredentialsRefreshed(refreshResult as Partial<ProviderCredentials>);
|
||
}
|
||
: null;
|
||
|
||
const refreshed = await runWithOnPersist(proactiveOnPersist, () =>
|
||
this.refreshCredentials(credentials, log || null)
|
||
);
|
||
|
||
if (refreshed && !proactivePersistRan) {
|
||
// ─────────────────────────────────────────────────────────────────────
|
||
// ⚠️ SOURCE OF TRUTH — do not flip the proactive path back to
|
||
// "persist expired+inactive". Ask the operator first.
|
||
//
|
||
// History (do not repeat past regressions):
|
||
// - ad3d4b696 (#2718, 2026-05-25): per-connection mutex + onPersist
|
||
// wiring so multi-account Codex (rotating refresh tokens) stops
|
||
// hitting refresh_token_reused under concurrent load.
|
||
// - 0c94c397d (#2743, 2026-05-26): a multi-agent review added a
|
||
// `await onCredentialsRefreshed({ testStatus: "expired",
|
||
// isActive: false })` here. That BROKE multi-account Codex —
|
||
// transient sentinels (refresh_token_reused recoverable via
|
||
// rotation map; generic invalid_request blips) were treated as
|
||
// terminal, so the proactive path sequentially disabled
|
||
// working accounts in the DB before any upstream call confirmed
|
||
// the failure. Reverted intentionally.
|
||
//
|
||
// Contract for the PROACTIVE refresh path:
|
||
// - Classify the sentinel ONLY to avoid spreading it into
|
||
// activeCredentials (which would send a non-token upstream).
|
||
// - DO NOT persist `{ testStatus: "expired", isActive: false }`
|
||
// from here. That decision belongs to the REACTIVE path in
|
||
// open-sse/handlers/chatCore.ts:~3912, which runs AFTER the
|
||
// upstream confirmed the auth failure. By then the rotation
|
||
// map (tokenRefresh.ts:~1541) and the DB-staleness check have
|
||
// already had their chance to recover the request.
|
||
//
|
||
// If a future review/agent thinks the expired-flip is "missing"
|
||
// here, STOP — flipping it here re-introduces the multi-account
|
||
// Codex regression. Discuss with the operator before touching.
|
||
// ─────────────────────────────────────────────────────────────────────
|
||
if (isUnrecoverableRefreshError(refreshed)) {
|
||
const refreshCode = (refreshed as Record<string, unknown>).code;
|
||
log?.warn?.(
|
||
"TOKEN",
|
||
`${this.provider.toUpperCase()} | proactive refresh returned unrecoverable sentinel (code=${String(refreshCode ?? "unknown")}); keeping stale credentials, deferring to reactive path.`
|
||
);
|
||
// Intentionally NOT spreading the sentinel and NOT persisting
|
||
// expired status. The next upstream call either succeeds (rotation
|
||
// map / DB-staleness saved us) or fails — chatCore.ts then marks
|
||
// the account expired with confidence.
|
||
} else {
|
||
activeCredentials = {
|
||
...credentials,
|
||
...refreshed,
|
||
};
|
||
if (onCredentialsRefreshed) {
|
||
await onCredentialsRefreshed(refreshed);
|
||
}
|
||
}
|
||
}
|
||
} catch (error) {
|
||
// tokenRefresh.ts:1352 documents that onPersist throws are re-thrown so
|
||
// the caller is aware of the persistence failure. Honor that contract:
|
||
// log at error level (not warn), with sanitized message — and let the
|
||
// request continue with stale credentials so the user-visible error
|
||
// surfaces upstream rather than being silently absorbed here.
|
||
log?.error?.(
|
||
"TOKEN",
|
||
`Credential refresh failed for ${this.provider}: ${error instanceof Error ? error.message : String(error)}`
|
||
);
|
||
}
|
||
}
|
||
|
||
// Set by the Context Editing 400-fallback below: once an upstream rejects the
|
||
// `context_management` param, suppress its re-injection on every later
|
||
// retry/fallback URL (each iteration rebuilds a fresh `transformedBody`).
|
||
let contextEditingDisabled = false;
|
||
// Tracks which request fields have already been stripped via the generic 400
|
||
// field-downgrade below, so each known field is stripped at most once across
|
||
// all fallback URLs (bounded retry loop).
|
||
const strippedFields = new Set<string>();
|
||
|
||
for (let urlIndex = 0; urlIndex < fallbackCount; urlIndex++) {
|
||
const url = this.buildUrl(model, stream, urlIndex, activeCredentials);
|
||
const headers = this.buildHeaders(activeCredentials, stream, clientHeaders, model);
|
||
applyConfiguredUserAgent(headers, activeCredentials?.providerSpecificData);
|
||
|
||
const ccRequestDefaults = isClaudeCodeCompatible(this.provider)
|
||
? getClaudeCodeCompatibleRequestDefaults(activeCredentials?.providerSpecificData)
|
||
: {};
|
||
const shouldForwardExtendedContext =
|
||
extendedContext &&
|
||
modelSupportsContext1mBeta(model) &&
|
||
!isClaudeCodeCompatible(this.provider);
|
||
const shouldForwardCcCompatibleContext1m =
|
||
isClaudeCodeCompatible(this.provider) && ccRequestDefaults.context1m === true;
|
||
if (shouldForwardExtendedContext || shouldForwardCcCompatibleContext1m) {
|
||
appendAnthropicBetaHeader(headers, CONTEXT_1M_BETA_HEADER);
|
||
}
|
||
|
||
const rawTransformedBody = await this.transformRequest(
|
||
model,
|
||
body,
|
||
stream,
|
||
activeCredentials
|
||
);
|
||
let transformedBody = sanitizeReasoningEffortForProvider(
|
||
rawTransformedBody,
|
||
this.provider,
|
||
model,
|
||
log
|
||
);
|
||
if (this.provider === "groq") {
|
||
transformedBody = stripGroqUnsupportedFields(
|
||
transformedBody as Record<string, unknown>
|
||
) as typeof transformedBody;
|
||
}
|
||
|
||
try {
|
||
// Timeout only covers response start; stream stalls are handled downstream.
|
||
const fetchStartTimeoutMs = this.getTimeoutMs();
|
||
const fetchWithStartTimeout = async (requestUrl: string, requestOptions: RequestInit) => {
|
||
const timeoutController = fetchStartTimeoutMs > 0 ? new AbortController() : null;
|
||
let timeoutId: ReturnType<typeof setTimeout> | null = null;
|
||
if (timeoutController) {
|
||
timeoutId = setTimeout(() => {
|
||
const timeoutError = new Error(
|
||
`Fetch timeout after ${fetchStartTimeoutMs}ms on ${requestUrl}`
|
||
);
|
||
timeoutError.name = "TimeoutError";
|
||
timeoutController.abort(timeoutError);
|
||
}, fetchStartTimeoutMs);
|
||
}
|
||
|
||
const timeoutSignal = timeoutController?.signal ?? null;
|
||
const combinedSignal =
|
||
signal && timeoutSignal
|
||
? mergeAbortSignals(signal, timeoutSignal)
|
||
: signal || timeoutSignal;
|
||
const optionsWithSignal = combinedSignal
|
||
? { ...requestOptions, signal: combinedSignal }
|
||
: requestOptions;
|
||
|
||
try {
|
||
return await fetch(requestUrl, optionsWithSignal);
|
||
} finally {
|
||
if (timeoutId) clearTimeout(timeoutId);
|
||
}
|
||
};
|
||
|
||
const isClaudeCodeClient =
|
||
clientHeaders?.["x-app"] === "cli" ||
|
||
(clientHeaders?.["user-agent"] &&
|
||
clientHeaders["user-agent"].toLowerCase().includes("claude-code")) ||
|
||
(clientHeaders?.["user-agent"] &&
|
||
clientHeaders["user-agent"].toLowerCase().includes("claude-cli"));
|
||
|
||
// Anthropic's user:sessions:claude_code OAuth scope expects CLI-shaped
|
||
// traffic. Apply the cloak whenever we have an OAuth token, regardless
|
||
// of upstream client.
|
||
const hasClaudeOAuthToken =
|
||
typeof activeCredentials?.accessToken === "string" &&
|
||
activeCredentials.accessToken.startsWith("sk-ant-oat") &&
|
||
!activeCredentials?.apiKey;
|
||
|
||
if (
|
||
this.provider === "claude" &&
|
||
(isClaudeCodeClient || hasClaudeOAuthToken) &&
|
||
typeof transformedBody === "object" &&
|
||
transformedBody !== null
|
||
) {
|
||
const tb = transformedBody as Record<string, unknown>;
|
||
|
||
stripProxyToolPrefix(tb);
|
||
remapToolNamesInRequest(tb);
|
||
// Cloak third-party tool names + sanitize invalid tool schemas so
|
||
// Anthropic does not refuse native Claude OAuth traffic with a
|
||
// misleading "out of extra usage" placeholder. See Spec E.
|
||
cloakThirdPartyToolNames(tb);
|
||
if (Array.isArray(tb.tools)) {
|
||
tb.tools = sanitizeClaudeToolSchemas(tb.tools);
|
||
}
|
||
obfuscateInBody(tb);
|
||
|
||
// NOTE (issue #2260): This is the native `claude` provider OAuth path.
|
||
// It is intentionally NOT routed through applyCcBridgeTransformPipeline.
|
||
// The native OAuth path already prepends its own billing line + sentinel
|
||
// (see lines ~744-773 below, dayStamp-based, cc_entrypoint=cli, cch=00000
|
||
// placeholder, signed at body level). The CC bridge transforms DSL is
|
||
// wired into buildAndSignClaudeCodeRequest (claudeCodeCompatible.ts step 5b)
|
||
// which is the anthropic-compatible-cc-* relay path — a different,
|
||
// separately classified surface. Do not double-prepend here.
|
||
|
||
// Real CLI never sets cache_control on tools.
|
||
if (Array.isArray(tb.tools)) {
|
||
for (const t of tb.tools as Array<Record<string, unknown>>) {
|
||
delete t.cache_control;
|
||
}
|
||
// Also strip OmniRoute provider prefix from versioned built-in tool
|
||
// model fields (e.g. cc/claude-opus-4-8 → claude-opus-4-8).
|
||
stripVersionedToolModelPrefix(tb.tools);
|
||
}
|
||
|
||
// Per-request behavior overrides via custom client headers.
|
||
// x-omniroute-effort: low | medium | high | xhigh | max | off
|
||
// x-omniroute-thinking: adaptive | off
|
||
// A header value applies only when the corresponding body field is
|
||
// not already set; "off" force-strips the field.
|
||
const headerEffort = (
|
||
clientHeaders?.["x-omniroute-effort"] ?? clientHeaders?.["X-OmniRoute-Effort"]
|
||
)
|
||
?.trim()
|
||
.toLowerCase();
|
||
const headerThinking = (
|
||
clientHeaders?.["x-omniroute-thinking"] ?? clientHeaders?.["X-OmniRoute-Thinking"]
|
||
)
|
||
?.trim()
|
||
.toLowerCase();
|
||
let appliedEffort: string | null = null;
|
||
let appliedThinking: string | null = null;
|
||
|
||
if (headerEffort === "off") {
|
||
if (tb.output_config && typeof tb.output_config === "object") {
|
||
delete (tb.output_config as Record<string, unknown>).effort;
|
||
}
|
||
appliedEffort = "off";
|
||
} else if (
|
||
headerEffort &&
|
||
["low", "medium", "high", "xhigh", "max"].includes(headerEffort)
|
||
) {
|
||
const oc =
|
||
tb.output_config && typeof tb.output_config === "object"
|
||
? (tb.output_config as Record<string, unknown>)
|
||
: {};
|
||
if (oc.effort === undefined) {
|
||
oc.effort = headerEffort;
|
||
tb.output_config = oc;
|
||
appliedEffort = headerEffort;
|
||
}
|
||
}
|
||
|
||
// Anthropic rejects `thinking` (enabled/adaptive) when tool_choice forces a
|
||
// specific tool ({type:"any"|"tool"}): "Thinking may not be enabled when
|
||
// tool_choice forces tool use". Treat forced tool_choice as an implicit
|
||
// `thinking: off` so neither the explicit-adaptive branch nor the default CC
|
||
// injection below produces the invalid combination (incl. client-sent thinking).
|
||
const toolChoiceForced =
|
||
tb.tool_choice === "any" ||
|
||
(typeof tb.tool_choice === "object" &&
|
||
tb.tool_choice !== null &&
|
||
((tb.tool_choice as Record<string, unknown>).type === "any" ||
|
||
(tb.tool_choice as Record<string, unknown>).type === "tool"));
|
||
const effThinking = toolChoiceForced ? "off" : headerThinking;
|
||
if (effThinking === "adaptive") {
|
||
if (tb.thinking === undefined) {
|
||
tb.thinking = { type: "adaptive" };
|
||
appliedThinking = "adaptive";
|
||
}
|
||
if (tb.context_management === undefined) {
|
||
tb.context_management = {
|
||
edits: [{ type: "clear_thinking_20251015", keep: "all" }],
|
||
};
|
||
}
|
||
} else if (effThinking === "off") {
|
||
delete tb.thinking;
|
||
delete tb.context_management;
|
||
appliedThinking = "off";
|
||
} else if (!effThinking && !headerEffort) {
|
||
// Default CC logic when no override headers are present
|
||
const isHaiku = typeof tb.model === "string" && tb.model.includes("haiku");
|
||
if (isHaiku) {
|
||
// Keep tb.thinking — real Claude Desktop keeps thinking enabled for Haiku
|
||
// (issue #2454). Only strip output_config (effort) which Haiku rejects;
|
||
// context_management is re-paired with the preserved thinking below.
|
||
delete tb.output_config;
|
||
delete tb.context_management;
|
||
} else if (tb.thinking === undefined && tb.output_config === undefined) {
|
||
tb.thinking = { type: "adaptive" };
|
||
tb.context_management = {
|
||
edits: [{ type: "clear_thinking_20251015", keep: "all" }],
|
||
};
|
||
tb.output_config = { effort: "high" };
|
||
}
|
||
}
|
||
|
||
// Real CLI always pairs context_management with thinking. Mirror
|
||
// that invariant so long sessions don't accumulate thinking blocks
|
||
// toward the context cap.
|
||
if (hasActiveClaudeThinking(tb) && !tb.context_management) {
|
||
tb.context_management = {
|
||
edits: [{ type: "clear_thinking_20251015", keep: "all" }],
|
||
};
|
||
}
|
||
|
||
const seed = activeCredentials?.accessToken || activeCredentials?.apiKey || "anon";
|
||
const psd = activeCredentials?.providerSpecificData as
|
||
| Record<string, unknown>
|
||
| undefined;
|
||
|
||
let identitySource:
|
||
| "upstream-metadata"
|
||
| "upstream-header"
|
||
| "synthesized"
|
||
| "synthesized-cloaked" = "synthesized";
|
||
let sessionId: string;
|
||
let deviceId: string;
|
||
let accountUUID: string;
|
||
|
||
// For any Claude OAuth request, ignore client-supplied metadata.user_id /
|
||
// X-Claude-Code-Session-Id and synthesize per-account: the CC device_id from
|
||
// ~/.claude.json is shared across every account on one machine, which lets
|
||
// Anthropic correlate accounts behind one OmniRoute.
|
||
const cloakIdentity = isClaudeCodeClient || hasClaudeOAuthToken;
|
||
const upstreamUserId = cloakIdentity ? null : parseUpstreamMetadataUserId(tb);
|
||
if (upstreamUserId) {
|
||
sessionId = upstreamUserId.session_id;
|
||
deviceId = upstreamUserId.device_id;
|
||
accountUUID = upstreamUserId.account_uuid;
|
||
identitySource = "upstream-metadata";
|
||
} else {
|
||
const headerSid = cloakIdentity
|
||
? null
|
||
: passthroughUpstreamSessionId(
|
||
clientHeaders as Record<string, string | undefined> | undefined
|
||
);
|
||
sessionId = headerSid ?? getSessionId(seed);
|
||
deviceId = resolveCliUserID(psd, seed);
|
||
accountUUID = resolveAccountUUID(psd, seed, activeCredentials?.accessToken);
|
||
identitySource = headerSid
|
||
? "upstream-header"
|
||
: cloakIdentity
|
||
? "synthesized-cloaked"
|
||
: "synthesized";
|
||
}
|
||
|
||
// system[0] (billing) and system[1] (sentinel) must not carry
|
||
// cache_control — that belongs on upstream prompt blocks at [2..].
|
||
const dayStamp = new Date().toISOString().slice(0, 10);
|
||
const buildHash = buildHashFor(CLAUDE_CODE_VERSION, dayStamp);
|
||
const billingLine = `x-anthropic-billing-header: cc_version=${CLAUDE_CODE_VERSION}.${buildHash}; cc_entrypoint=cli; cch=00000;`;
|
||
const SENTINEL = "You are Claude Code, Anthropic's official CLI for Claude.";
|
||
|
||
const sysBlocks: Array<Record<string, unknown>> = Array.isArray(tb.system)
|
||
? (tb.system as Array<Record<string, unknown>>)
|
||
: typeof tb.system === "string"
|
||
? [{ type: "text", text: tb.system }]
|
||
: [];
|
||
|
||
// Strip any pre-existing billing/sentinel before re-prepending — keeps
|
||
// retries idempotent and avoids stacking that breaks prompt-cache prefix
|
||
// matching (see issue #1712).
|
||
for (let i = sysBlocks.length - 1; i >= 0; i--) {
|
||
const t = sysBlocks[i]?.text;
|
||
if (typeof t === "string" && t.startsWith("x-anthropic-billing-header:")) {
|
||
sysBlocks.splice(i, 1);
|
||
}
|
||
}
|
||
for (let i = sysBlocks.length - 1; i >= 0; i--) {
|
||
const t = sysBlocks[i]?.text;
|
||
if (typeof t === "string" && t.startsWith(SENTINEL)) {
|
||
sysBlocks.splice(i, 1);
|
||
}
|
||
}
|
||
sysBlocks.unshift({ type: "text", text: billingLine }, { type: "text", text: SENTINEL });
|
||
tb.system = sysBlocks;
|
||
|
||
// Run the configurable system-transforms pipeline for the native
|
||
// `claude` provider (issue #2260 / comment 4459544580). The default
|
||
// claude pipeline runs cosmetic ops only (Open WebUI paragraph
|
||
// anchors, identity-prefix paragraph drop, ZWJ obfuscation of
|
||
// sensitive words). It deliberately does NOT include
|
||
// `inject_billing_header` — billing + sentinel are already
|
||
// prepended above. Users can extend the pipeline via Settings UI.
|
||
{
|
||
const transformResult = applySystemTransformPipeline(PROVIDER_CLAUDE, tb);
|
||
if (transformResult.appliedOpKinds.length > 0) {
|
||
console.log(
|
||
`[SystemTransforms] claude-native: ${transformResult.appliedOpKinds.join(", ")}`
|
||
);
|
||
}
|
||
}
|
||
|
||
if (!tb.metadata || typeof tb.metadata !== "object") tb.metadata = {};
|
||
(tb.metadata as Record<string, unknown>).user_id = buildUserIdJson({
|
||
deviceId,
|
||
accountUUID,
|
||
sessionId,
|
||
});
|
||
|
||
// Headers. Accept stays application/json even on streams (Stainless
|
||
// convention; SSE decoding is gated on body.stream). anthropic-beta
|
||
// is selected per request shape; the full set on a quota probe is
|
||
// itself a fingerprint.
|
||
// Respect the client's negotiated anthropic-beta (real Claude Code) instead
|
||
// of force-injecting thinking/effort betas it never requested (#3415).
|
||
const clientAnthropicBeta =
|
||
clientHeaders?.["anthropic-beta"] ?? clientHeaders?.["Anthropic-Beta"] ?? null;
|
||
const ccHeaders: Record<string, string> = {
|
||
Accept: "application/json",
|
||
"anthropic-version": "2023-06-01",
|
||
// #3974: merge the client's allowlisted betas (e.g. tool-search-tool)
|
||
// on top of the shape-derived set so deferred-tool requests are not
|
||
// rejected; selectBetaFlags still gates thinking/effort per #3415.
|
||
"anthropic-beta": mergeClientAnthropicBeta(
|
||
selectBetaFlags(tb, null, clientAnthropicBeta),
|
||
clientAnthropicBeta
|
||
),
|
||
"anthropic-dangerous-direct-browser-access": "true",
|
||
"x-app": "cli",
|
||
"User-Agent": `claude-cli/${CLAUDE_CODE_VERSION} (external, cli)`,
|
||
"X-Stainless-Package-Version": CLAUDE_CODE_STAINLESS_VERSION,
|
||
"X-Stainless-Timeout": "600",
|
||
"accept-encoding": "gzip, deflate, br, zstd",
|
||
connection: "keep-alive",
|
||
"x-client-request-id": randomUUID(),
|
||
"X-Claude-Code-Session-Id": sessionId,
|
||
};
|
||
|
||
// Drop case variants of the same header name before merging — undici
|
||
// would otherwise concatenate them (issue #1454).
|
||
const ccKeysLower = new Set(Object.keys(ccHeaders).map((k) => k.toLowerCase()));
|
||
for (const key of Object.keys(headers)) {
|
||
if (ccKeysLower.has(key.toLowerCase())) delete headers[key];
|
||
}
|
||
Object.assign(headers, ccHeaders);
|
||
delete headers["X-Stainless-Helper-Method"];
|
||
|
||
// Stainless OS/Arch/Runtime are host-derived (Stainless SDK does the
|
||
// same at runtime). Hardcoding them was a unique-per-deployment tell.
|
||
headers["X-Stainless-Arch"] = stainlessArch();
|
||
headers["X-Stainless-Lang"] = "js";
|
||
headers["X-Stainless-OS"] = stainlessOS();
|
||
headers["X-Stainless-Runtime"] = "node";
|
||
headers["X-Stainless-Runtime-Version"] = stainlessRuntimeVersion();
|
||
headers["X-Stainless-Retry-Count"] = "0";
|
||
delete headers["X-Stainless-Os"];
|
||
|
||
const overrideTag =
|
||
appliedEffort || appliedThinking
|
||
? ` overrides=effort:${appliedEffort ?? "-"},thinking:${appliedThinking ?? "-"}`
|
||
: "";
|
||
log?.debug?.(
|
||
"CLAUDE",
|
||
`identity=${identitySource} sid=${sessionId.slice(0, 8)} dev=${deviceId.slice(0, 8)} acct=${accountUUID.slice(0, 8)}${overrideTag}`
|
||
);
|
||
}
|
||
|
||
// CLI fingerprint ordering — always-on for native Claude OAuth, opt-in
|
||
// for other providers. Header + body field order is itself a fingerprint.
|
||
let finalHeaders = headers;
|
||
// Strip internal sentinel fields set by remapToolNamesInRequest before
|
||
// serializing — Anthropic rejects unknown top-level fields (issue #2260).
|
||
delete (transformedBody as Record<string, unknown>)[
|
||
"_claudeCodeRequiresLowercaseToolNames"
|
||
];
|
||
// Guard against orphan tool_use / tool_result pairs. Clients can ship
|
||
// truncated histories mid-tool-call which Anthropic rejects with
|
||
// `messages.N: tool_use ids were found without tool_result blocks
|
||
// immediately after: toolu_...`. fixToolPairs strips orphans, then
|
||
// stripTrailingAssistantOrphanToolUse catches the case where the
|
||
// request body itself ends on an unmatched assistant(tool_use) —
|
||
// invalid for an upstream-send turn since the body must end on a
|
||
// user message. Both are idempotent on clean histories.
|
||
{
|
||
const tb = transformedBody as Record<string, unknown>;
|
||
if (Array.isArray(tb?.messages)) {
|
||
const fixed = fixToolPairs(tb.messages as Record<string, unknown>[]);
|
||
// fixToolAdjacency enforces Claude's strict adjacency rule
|
||
// (tool_result must be in immediately next message).
|
||
// Only apply for Claude/Claude-compatible — OpenAI allows results
|
||
// spread across multiple subsequent messages.
|
||
const isClaude = this.provider === "claude" || isClaudeCodeCompatible(this.provider);
|
||
// For Claude, fixToolAdjacency may strip tool_use blocks whose
|
||
// tool_result isn't in the next message; re-run fixToolPairs to
|
||
// drop any tool_result orphaned by that strip (discussion #2410).
|
||
const adjacent = isClaude ? fixToolPairs(fixToolAdjacency(fixed)) : fixed;
|
||
const stripped = stripTrailingAssistantOrphanToolUse(adjacent);
|
||
// Some providers (e.g. Mistral) require the last message to be user
|
||
// or tool and reject trailing assistant text messages with 400 (#3396).
|
||
tb.messages = stripTrailingAssistantForProvider(stripped, this.provider);
|
||
}
|
||
}
|
||
|
||
// Anthropic's extended-thinking contract forbids non-default sampling
|
||
// params: temperature must be 1 and top_p >= 0.95 (or unset) whenever
|
||
// thinking is enabled/adaptive. Thinking can be injected by per-model
|
||
// requestDefaults *after* the translator/constraint passes, so normalize
|
||
// at this final dispatch point — the single chokepoint every Claude
|
||
// routing mode (grouped/raw/combo) and the native passthrough share,
|
||
// before fingerprinting and CCH signing serialize the body.
|
||
if (this.provider === "claude" || isClaudeCodeCompatible(this.provider)) {
|
||
enforceThinkingTemperature(transformedBody as Record<string, unknown>);
|
||
}
|
||
|
||
// Delegated Context Editing (opt-in): attach the clear_tool_uses strategy so
|
||
// the provider clears stale tool-use blocks server-side. Runs at this same
|
||
// chokepoint, composing with the clear_thinking edit the fingerprint path may
|
||
// have already set. Scoped to genuine `claude` (real Anthropic key/OAuth) and
|
||
// `anthropic-compatible-cc-*` relays — the latter advertise Claude Code
|
||
// compatibility, so they are the relays most likely to accept the beta. A
|
||
// rejecting upstream is caught by the 400-fallback below. Deliberately
|
||
// EXCLUDED: `claude-web` (a browser relay with a `create_conversation_params`
|
||
// request shape that never sees `context_management`) and generic
|
||
// `anthropic-compatible-*` (third-party endpoints with uncertain beta support).
|
||
// `contextEditingDisabled` (set by the 400-fallback) suppresses re-injection
|
||
// when a fresh `transformedBody` is built for a retry/fallback URL.
|
||
if (
|
||
(this.provider === "claude" || isClaudeCodeCompatible(this.provider)) &&
|
||
contextEditing?.enabled &&
|
||
!contextEditingDisabled
|
||
) {
|
||
applyContextEditingToBody(transformedBody as Record<string, unknown>, {
|
||
enabled: true,
|
||
});
|
||
log?.debug?.(
|
||
"CONTEXT_EDITING",
|
||
"Delegated context editing on — attached clear_tool_uses to the Claude request"
|
||
);
|
||
}
|
||
|
||
let bodyString = JSON.stringify(transformedBody);
|
||
|
||
const shouldFingerprint =
|
||
isCliCompatEnabled(this.provider) ||
|
||
(this.provider === "claude" && (isClaudeCodeClient || hasClaudeOAuthToken));
|
||
if (shouldFingerprint) {
|
||
const fingerprinted = applyFingerprint(this.provider, headers, transformedBody);
|
||
finalHeaders = fingerprinted.headers;
|
||
bodyString = fingerprinted.bodyString;
|
||
}
|
||
|
||
// CCH signing — replaces the cch=00000 placeholder in the billing
|
||
// header with an xxHash64 integrity token over the serialized body.
|
||
if (isClaudeCodeCompatible(this.provider) || this.provider === "claude") {
|
||
bodyString = await signRequestBody(bodyString);
|
||
}
|
||
|
||
mergeUpstreamExtraHeaders(finalHeaders, upstreamExtraHeaders);
|
||
const serializedBody = prl.parseBody(bodyString);
|
||
// #4307 — Preserve the non-enumerable tool-name cloak/remap reverse map
|
||
// (`_toolNameMap`, set on the live `transformedBody` by
|
||
// remapToolNamesInRequest / cloakThirdPartyToolNames) that the JSON
|
||
// round-trip above drops. chatCore's response-side un-cloak reads it off
|
||
// `result.transformedBody` to restore the client's original tool-name
|
||
// casing (e.g. `read`, not the cloaked `Read`). Without this re-attach the
|
||
// map is lost and the client receives the cloaked casing — a regression
|
||
// from #3941's serialized-body capture. Mirrors antigravity.ts's
|
||
// `attachToolNameMap`; non-enumerable so it never re-serializes upstream.
|
||
if (
|
||
transformedBody &&
|
||
typeof transformedBody === "object" &&
|
||
serializedBody &&
|
||
typeof serializedBody === "object"
|
||
) {
|
||
const liveToolNameMap = (transformedBody as Record<string, unknown>)._toolNameMap;
|
||
if (
|
||
liveToolNameMap instanceof Map &&
|
||
liveToolNameMap.size > 0 &&
|
||
!((serializedBody as Record<string, unknown>)._toolNameMap instanceof Map)
|
||
) {
|
||
Object.defineProperty(serializedBody, "_toolNameMap", {
|
||
value: liveToolNameMap,
|
||
enumerable: false,
|
||
configurable: true,
|
||
writable: true,
|
||
});
|
||
}
|
||
}
|
||
const fetchOptions: RequestInit = {
|
||
method: "POST",
|
||
headers: finalHeaders,
|
||
body: bodyString,
|
||
};
|
||
|
||
let response = await fetchWithStartTimeout(url, fetchOptions);
|
||
|
||
// Context Editing 400-fallback for Claude-compatible relays.
|
||
if (
|
||
response.status === HTTP_STATUS.BAD_REQUEST &&
|
||
contextEditing?.enabled &&
|
||
!contextEditingDisabled &&
|
||
transformedBody &&
|
||
typeof transformedBody === "object" &&
|
||
(transformedBody as Record<string, unknown>).context_management !== undefined
|
||
) {
|
||
const errText = await response
|
||
.clone()
|
||
.text()
|
||
.catch(() => "");
|
||
if (/context[_-]management|context editing/i.test(errText)) {
|
||
contextEditingDisabled = true;
|
||
delete (transformedBody as Record<string, unknown>).context_management;
|
||
let retryBody = JSON.stringify(transformedBody);
|
||
if (isClaudeCodeCompatible(this.provider) || this.provider === "claude") {
|
||
retryBody = await signRequestBody(retryBody);
|
||
}
|
||
log?.debug?.(
|
||
"CONTEXT_EDITING",
|
||
`Upstream 400 rejected context_management on ${url} — retrying without it`
|
||
);
|
||
response = await fetchWithStartTimeout(url, { ...fetchOptions, body: retryBody });
|
||
}
|
||
}
|
||
|
||
// Generic reactive 400 field-downgrade; each field is stripped at most once.
|
||
if (
|
||
response.status === HTTP_STATUS.BAD_REQUEST &&
|
||
transformedBody &&
|
||
typeof transformedBody === "object"
|
||
) {
|
||
const errText = await response
|
||
.clone()
|
||
.text()
|
||
.catch(() => "");
|
||
const offending = findOffendingField(errText);
|
||
if (
|
||
offending &&
|
||
!strippedFields.has(offending) &&
|
||
(transformedBody as Record<string, unknown>)[offending] !== undefined
|
||
) {
|
||
strippedFields.add(offending);
|
||
delete (transformedBody as Record<string, unknown>)[offending];
|
||
let retryBody = JSON.stringify(transformedBody);
|
||
if (isClaudeCodeCompatible(this.provider) || this.provider === "claude") {
|
||
retryBody = await signRequestBody(retryBody);
|
||
}
|
||
log?.debug?.(
|
||
"FIELD_400",
|
||
`Upstream 400 rejected ${offending} on ${url} — retrying without it`
|
||
);
|
||
response = await fetchWithStartTimeout(url, { ...fetchOptions, body: retryBody });
|
||
}
|
||
}
|
||
|
||
// Intra-URL retry: if 429 and we haven't exhausted per-URL retries, wait and retry the same URL
|
||
if (
|
||
!skipUpstreamRetry &&
|
||
response.status === HTTP_STATUS.RATE_LIMITED &&
|
||
(retryAttemptsByUrl[urlIndex] ?? 0) < BaseExecutor.RETRY_CONFIG.maxAttempts
|
||
) {
|
||
retryAttemptsByUrl[urlIndex] = (retryAttemptsByUrl[urlIndex] ?? 0) + 1;
|
||
const attempt = retryAttemptsByUrl[urlIndex];
|
||
log?.debug?.(
|
||
"RETRY",
|
||
`429 intra-retry ${attempt}/${BaseExecutor.RETRY_CONFIG.maxAttempts} on ${url} — waiting ${BaseExecutor.RETRY_CONFIG.delayMs}ms`
|
||
);
|
||
await new Promise((resolve) => setTimeout(resolve, BaseExecutor.RETRY_CONFIG.delayMs));
|
||
urlIndex--; // re-run this urlIndex on the next loop iteration
|
||
continue;
|
||
}
|
||
|
||
// T07: Handle 401 authentication errors — log and continue to fallback
|
||
if (response.status === 401 && credentials.connectionId && credentials.apiKey) {
|
||
log?.warn?.("AUTH", `401 on ${url} - API key may be invalid`);
|
||
}
|
||
|
||
if (!skipUpstreamRetry && this.shouldRetry(response.status, urlIndex)) {
|
||
log?.debug?.("RETRY", `${response.status} on ${url}, trying fallback ${urlIndex + 1}`);
|
||
lastStatus = response.status;
|
||
continue;
|
||
}
|
||
|
||
return { response, url, headers: finalHeaders, transformedBody: serializedBody };
|
||
} catch (error) {
|
||
// Distinguish timeout errors from other abort errors
|
||
const err = error instanceof Error ? error : new Error(String(error));
|
||
if (err.name === "TimeoutError") {
|
||
log?.warn?.("TIMEOUT", `Fetch timeout after ${this.getTimeoutMs()}ms on ${url}`);
|
||
}
|
||
lastError = err;
|
||
if (!skipUpstreamRetry && urlIndex + 1 < fallbackCount) {
|
||
log?.debug?.("RETRY", `Error on ${url}, trying fallback ${urlIndex + 1}`);
|
||
continue;
|
||
}
|
||
throw err;
|
||
}
|
||
}
|
||
|
||
throw lastError || new Error(`All ${fallbackCount} URLs failed with status ${lastStatus}`);
|
||
}
|
||
}
|
||
|
||
export default BaseExecutor;
|