Skip to content

Merge upstream new-api main (10 commits through a2defd2a8) - #129

Merged
Gyarados4157 merged 11 commits into
mainfrom
chore/sync-upstream-main-a2defd2a8
Oct 30, 2026
Merged

Gyarados4157 merged 11 commits into
mainfrom
chore/sync-upstream-main-a2defd2a8

Conversation

@Gyarados4157

Copy link
Copy Markdown
Collaborator

Summary

Merges the 10 upstream QuantumNous/new-api commits since 34003e9c2, ahead of v1.0.0-rc.48, mainly for the security advisory fix to MaskSensitiveInfo (relaykit/relayconvert/kitutil/mask.go), which rescanned the whole URL for each trailing ).

Also included: Bedrock Invoke safeguards, Cloudflare embedding response data, exact bare done markers in streams, Azure Responses WebSocket opt-in, affinity fallback starting at the highest priority, cached param override regexes, GPT-6.1 parameter rules, and perf metrics for non-stream and immediate task results.

  • No conflicts. controller/relay.go and pkg/perf_metrics/outcome.go were changed on both sides; the upstream hunks touch only perf metrics.
  • The merge-by-tag Agent Note now records when upstream main is merged instead of a tag.

Merge with a merge commit, not squash, so the upstream parent is kept.

Verification

  • go vet ./... passes.
  • go test on the CI packages plus pkg/perf_metrics, relay/common, relay/helper, relay/channel/aws, relay/channel/cloudflare and relay: exit 0. go test -race ./pkg/deployment ./pkg/riskpolicy passes.
  • relaykit: GOWORK=off go build ./... and the kitutil / dto tests pass.
  • Web: bun run lint:check (no new findings), bun run typecheck, bunx vitest run (254 files, 2776 tests) pass.

🤖 Generated with Claude Code

seefs001 and others added 11 commits October 28, 2026 00:16
…antumNous#8047) (QuantumNous#8075)

Azure channels with responses_websocket_enabled were rejected by
FilterResponsesWebSocket, and the channel form hid the toggle for type 3.
The OpenAI adaptor already builds the Azure /openai/v1/responses URL with
api-version and sets the api-key header, and DoWssRequest reuses both, so
no relay URL change is needed.
MaskSensitiveInfo trimmed trailing punctuation one byte at a time and
recounted the parentheses of the whole URL for each trailing ')'. Trim
the punctuation set, including ')', with strings.TrimRight; the trimmed
characters are still appended after the masked URL.
Takes the 10 upstream commits since 34003e9 without waiting for
v1.0.0-rc.48, for the security advisory fix to MaskSensitiveInfo
(relaykit/relayconvert/kitutil/mask.go), which rescanned the whole URL
for each trailing ')'. Also: Bedrock Invoke safeguards, Cloudflare
embedding data, exact bare done markers in streams, Azure Responses
WebSocket opt-in, affinity fallback priority, param override regex
caching, GPT-6.1 parameter rules, and perf metrics for non-stream and
immediate task results.

No conflicts. controller/relay.go and pkg/perf_metrics/outcome.go changed
on both sides; the upstream hunks touch only perf metrics.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@Gyarados4157
Gyarados4157 merged commit 24f741b into main Oct 30, 2026
3 checks passed
@Gyarados4157
Gyarados4157 deleted the chore/sync-upstream-main-a2defd2a8 branch October 30, 2026 06:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants