From f1937985c16ec5cabfb91ef166edcb1c4d5cea21 Mon Sep 17 00:00:00 2001 From: Koosha Paridehpour Date: Thu, 26 Feb 2026 05:40:24 -0700 Subject: [PATCH 1/2] fix(access): register sdk config alias directly Address Gemini review feedback by removing unnecessary field-by-field SDKConfig copy and registering newCfg.SDKConfig directly. Co-authored-by: Codex --- pkg/llmproxy/access/reconcile.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkg/llmproxy/access/reconcile.go b/pkg/llmproxy/access/reconcile.go index dad762d3a3..9ba5193a3a 100644 --- a/pkg/llmproxy/access/reconcile.go +++ b/pkg/llmproxy/access/reconcile.go @@ -9,7 +9,6 @@ import ( configaccess "github.com/router-for-me/CLIProxyAPI/v6/pkg/llmproxy/access/config_access" "github.com/router-for-me/CLIProxyAPI/v6/internal/config" sdkaccess "github.com/router-for-me/CLIProxyAPI/v6/sdk/access" - sdkconfig "github.com/router-for-me/CLIProxyAPI/v6/sdk/config" log "github.com/sirupsen/logrus" ) @@ -86,16 +85,7 @@ func ApplyAccessProviders(manager *sdkaccess.Manager, oldCfg, newCfg *config.Con } existing := manager.Providers() - sdkCfg := sdkconfig.SDKConfig{ - ProxyURL: newCfg.SDKConfig.ProxyURL, - ForceModelPrefix: newCfg.SDKConfig.ForceModelPrefix, - RequestLog: newCfg.SDKConfig.RequestLog, - APIKeys: newCfg.SDKConfig.APIKeys, - PassthroughHeaders: newCfg.SDKConfig.PassthroughHeaders, - Streaming: sdkconfig.StreamingConfig(newCfg.SDKConfig.Streaming), - NonStreamKeepAliveInterval: newCfg.SDKConfig.NonStreamKeepAliveInterval, - } - configaccess.Register(&sdkCfg) + configaccess.Register(&newCfg.SDKConfig) providers, added, updated, removed, err := ReconcileProviders(oldCfg, newCfg, existing) if err != nil { log.Errorf("failed to reconcile request auth providers: %v", err) From 99588709e81010d40a9b8dc265ea7196679cfcd9 Mon Sep 17 00:00:00 2001 From: Koosha Paridehpour Date: Fri, 27 Feb 2026 00:30:32 -0700 Subject: [PATCH 2/2] fix(pkg/config): restore Config and load/save aliases Expose Config, LoadConfig, and SaveConfigPreserveComments from pkg/llmproxy/config for cliproxyctl compatibility on PR #611. Co-authored-by: Codex --- pkg/llmproxy/config/sdk_config.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkg/llmproxy/config/sdk_config.go b/pkg/llmproxy/config/sdk_config.go index 63e25a079b..4156fb954b 100644 --- a/pkg/llmproxy/config/sdk_config.go +++ b/pkg/llmproxy/config/sdk_config.go @@ -6,8 +6,16 @@ package config import internalconfig "github.com/router-for-me/CLIProxyAPI/v6/internal/config" +// Config is an alias to internal/config.Config. +type Config = internalconfig.Config + // SDKConfig is an alias to internal/config.SDKConfig. type SDKConfig = internalconfig.SDKConfig // StreamingConfig is an alias to internal/config.StreamingConfig. type StreamingConfig = internalconfig.StreamingConfig + +var ( + LoadConfig = internalconfig.LoadConfig + SaveConfigPreserveComments = internalconfig.SaveConfigPreserveComments +)