From 6f45ea9c270c4def4f0ab4e4e727d13ad4c65b65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Thu, 26 Mar 2026 16:03:39 +0800 Subject: [PATCH] Revert "fix(ocm): inject synthetic rate limits inline when intercepting upstream events" This reverts commit ca60f93184aeb1ca0d18c4a538c66d900bc9f086. --- service/ocm/service_websocket.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/service/ocm/service_websocket.go b/service/ocm/service_websocket.go index a441bdc8d..4f76179ef 100644 --- a/service/ocm/service_websocket.go +++ b/service/ocm/service_websocket.go @@ -342,7 +342,7 @@ func (s *Service) handleWebSocket( go func() { defer waitGroup.Done() defer session.Close() - s.proxyWebSocketUpstreamToClient(ctx, upstreamReadWriter, clientConn, &clientWriteAccess, selectedCredential, modelChannel, username, weeklyCycleHint, provider, userConfig) + s.proxyWebSocketUpstreamToClient(ctx, upstreamReadWriter, clientConn, &clientWriteAccess, selectedCredential, modelChannel, username, weeklyCycleHint) }() go func() { defer waitGroup.Done() @@ -407,7 +407,7 @@ func (s *Service) proxyWebSocketClientToUpstream(ctx context.Context, clientConn } } -func (s *Service) proxyWebSocketUpstreamToClient(ctx context.Context, upstreamReadWriter io.ReadWriter, clientConn net.Conn, clientWriteAccess *sync.Mutex, selectedCredential Credential, modelChannel <-chan string, username string, weeklyCycleHint *WeeklyCycleHint, provider credentialProvider, userConfig *option.OCMUser) { +func (s *Service) proxyWebSocketUpstreamToClient(ctx context.Context, upstreamReadWriter io.ReadWriter, clientConn net.Conn, clientWriteAccess *sync.Mutex, selectedCredential Credential, modelChannel <-chan string, username string, weeklyCycleHint *WeeklyCycleHint) { usageTracker := selectedCredential.usageTrackerOrNil() var requestModel string for { @@ -428,8 +428,6 @@ func (s *Service) proxyWebSocketUpstreamToClient(ctx context.Context, upstreamRe switch event.Type { case "codex.rate_limits": s.handleWebSocketRateLimitsEvent(data, selectedCredential) - status := s.computeAggregatedUtilization(provider, userConfig) - writeWebSocketAggregatedStatus(clientConn, clientWriteAccess, status) continue case "error": s.handleWebSocketErrorEvent(data, selectedCredential)