From f3ccd85ba1ad49e116446681587ba0e1c9b1e755 Mon Sep 17 00:00:00 2001 From: sususu98 Date: Wed, 11 Feb 2026 16:53:38 +0800 Subject: [PATCH 01/11] feat(gemini-cli): add Google One login and improve auto-discovery Add Google One personal account login to Gemini CLI OAuth flow: - CLI --login shows mode menu (Code Assist vs Google One) - Web management API accepts project_id=GOOGLE_ONE sentinel - Auto-discover project via onboardUser without cloudaicompanionProject when project is unresolved Improve robustness of auto-discovery and token handling: - Add context-aware auto-discovery polling (30s timeout, 2s interval) - Distinguish network errors from project-selection-required errors - Refresh expired access tokens in readAuthFile before project lookup - Extend project_id auto-fill to gemini auth type (was antigravity-only) Unify credential file naming to geminicli- prefix for both CLI and web. Add extractAccessToken unit tests (9 cases). --- .../api/handlers/management/auth_files.go | 67 +++++++- internal/auth/gemini/gemini_token.go | 6 +- internal/cmd/login.go | 143 +++++++++++++----- sdk/auth/filestore.go | 77 +++++++++- sdk/auth/filestore_test.go | 80 ++++++++++ 5 files changed, 327 insertions(+), 46 deletions(-) create mode 100644 sdk/auth/filestore_test.go diff --git a/internal/api/handlers/management/auth_files.go b/internal/api/handlers/management/auth_files.go index e2ff23f1..0f855a03 100644 --- a/internal/api/handlers/management/auth_files.go +++ b/internal/api/handlers/management/auth_files.go @@ -1188,6 +1188,30 @@ func (h *Handler) RequestGeminiCLIToken(c *gin.Context) { } ts.ProjectID = strings.Join(projects, ",") ts.Checked = true + } else if strings.EqualFold(requestedProjectID, "GOOGLE_ONE") { + ts.Auto = false + if errSetup := performGeminiCLISetup(ctx, gemClient, &ts, ""); errSetup != nil { + log.Errorf("Google One auto-discovery failed: %v", errSetup) + SetOAuthSessionError(state, "Google One auto-discovery failed") + return + } + if strings.TrimSpace(ts.ProjectID) == "" { + log.Error("Google One auto-discovery returned empty project ID") + SetOAuthSessionError(state, "Google One auto-discovery returned empty project ID") + return + } + isChecked, errCheck := checkCloudAPIIsEnabled(ctx, gemClient, ts.ProjectID) + if errCheck != nil { + log.Errorf("Failed to verify Cloud AI API status: %v", errCheck) + SetOAuthSessionError(state, "Failed to verify Cloud AI API status") + return + } + ts.Checked = isChecked + if !isChecked { + log.Error("Cloud AI API is not enabled for the auto-discovered project") + SetOAuthSessionError(state, "Cloud AI API not enabled") + return + } } else { if errEnsure := ensureGeminiProjectAndOnboard(ctx, gemClient, &ts, requestedProjectID); errEnsure != nil { log.Errorf("Failed to complete Gemini CLI onboarding: %v", errEnsure) @@ -2036,7 +2060,48 @@ func performGeminiCLISetup(ctx context.Context, httpClient *http.Client, storage } } if projectID == "" { - return &projectSelectionRequiredError{} + // Auto-discovery: try onboardUser without specifying a project + // to let Google auto-provision one (matches Gemini CLI headless behavior + // and Antigravity's FetchProjectID pattern). + autoOnboardReq := map[string]any{ + "tierId": tierID, + "metadata": metadata, + } + + autoCtx, autoCancel := context.WithTimeout(ctx, 30*time.Second) + defer autoCancel() + for attempt := 1; ; attempt++ { + var onboardResp map[string]any + if errOnboard := callGeminiCLI(autoCtx, httpClient, "onboardUser", autoOnboardReq, &onboardResp); errOnboard != nil { + return fmt.Errorf("auto-discovery onboardUser: %w", errOnboard) + } + + if done, okDone := onboardResp["done"].(bool); okDone && done { + if resp, okResp := onboardResp["response"].(map[string]any); okResp { + switch v := resp["cloudaicompanionProject"].(type) { + case string: + projectID = strings.TrimSpace(v) + case map[string]any: + if id, okID := v["id"].(string); okID { + projectID = strings.TrimSpace(id) + } + } + } + break + } + + log.Debugf("Auto-discovery: onboarding in progress, attempt %d...", attempt) + select { + case <-autoCtx.Done(): + return &projectSelectionRequiredError{} + case <-time.After(2 * time.Second): + } + } + + if projectID == "" { + return &projectSelectionRequiredError{} + } + log.Infof("Auto-discovered project ID via onboarding: %s", projectID) } onboardReqBody := map[string]any{ diff --git a/internal/auth/gemini/gemini_token.go b/internal/auth/gemini/gemini_token.go index 0ec7da17..f7fca810 100644 --- a/internal/auth/gemini/gemini_token.go +++ b/internal/auth/gemini/gemini_token.go @@ -71,17 +71,17 @@ func (ts *GeminiTokenStorage) SaveTokenToFile(authFilePath string) error { // CredentialFileName returns the filename used to persist Gemini CLI credentials. // When projectID represents multiple projects (comma-separated or literal ALL), -// the suffix is normalized to "all" and a "gemini-" prefix is enforced to keep +// the suffix is normalized to "all" and a "geminicli-" prefix is enforced to keep // web and CLI generated files consistent. func CredentialFileName(email, projectID string, includeProviderPrefix bool) string { email = strings.TrimSpace(email) project := strings.TrimSpace(projectID) if strings.EqualFold(project, "all") || strings.Contains(project, ",") { - return fmt.Sprintf("gemini-%s-all.json", email) + return fmt.Sprintf("geminicli-%s-all.json", email) } prefix := "" if includeProviderPrefix { - prefix = "gemini-" + prefix = "geminicli-" } return fmt.Sprintf("%s%s-%s.json", prefix, email, project) } diff --git a/internal/cmd/login.go b/internal/cmd/login.go index b5129cfd..3286e7a7 100644 --- a/internal/cmd/login.go +++ b/internal/cmd/login.go @@ -100,49 +100,75 @@ func DoLogin(cfg *config.Config, projectID string, options *LoginOptions) { log.Info("Authentication successful.") - projects, errProjects := fetchGCPProjects(ctx, httpClient) - if errProjects != nil { - log.Errorf("Failed to get project list: %v", errProjects) - return + var activatedProjects []string + + useGoogleOne := false + if trimmedProjectID == "" && promptFn != nil { + fmt.Println("\nSelect login mode:") + fmt.Println(" 1. Code Assist (GCP project, manual selection)") + fmt.Println(" 2. Google One (personal account, auto-discover project)") + choice, errPrompt := promptFn("Enter choice [1/2] (default: 1): ") + if errPrompt == nil && strings.TrimSpace(choice) == "2" { + useGoogleOne = true + } } - selectedProjectID := promptForProjectSelection(projects, trimmedProjectID, promptFn) - projectSelections, errSelection := resolveProjectSelections(selectedProjectID, projects) - if errSelection != nil { - log.Errorf("Invalid project selection: %v", errSelection) - return - } - if len(projectSelections) == 0 { - log.Error("No project selected; aborting login.") - return - } - - activatedProjects := make([]string, 0, len(projectSelections)) - seenProjects := make(map[string]bool) - for _, candidateID := range projectSelections { - log.Infof("Activating project %s", candidateID) - if errSetup := performGeminiCLISetup(ctx, httpClient, storage, candidateID); errSetup != nil { - var projectErr *projectSelectionRequiredError - if errors.As(errSetup, &projectErr) { - log.Error("Failed to start user onboarding: A project ID is required.") - showProjectSelectionHelp(storage.Email, projects) - return - } - log.Errorf("Failed to complete user setup: %v", errSetup) + if useGoogleOne { + log.Info("Google One mode: auto-discovering project...") + if errSetup := performGeminiCLISetup(ctx, httpClient, storage, ""); errSetup != nil { + log.Errorf("Google One auto-discovery failed: %v", errSetup) return } - finalID := strings.TrimSpace(storage.ProjectID) - if finalID == "" { - finalID = candidateID + autoProject := strings.TrimSpace(storage.ProjectID) + if autoProject == "" { + log.Error("Google One auto-discovery returned empty project ID") + return + } + log.Infof("Auto-discovered project: %s", autoProject) + activatedProjects = []string{autoProject} + } else { + projects, errProjects := fetchGCPProjects(ctx, httpClient) + if errProjects != nil { + log.Errorf("Failed to get project list: %v", errProjects) + return } - // Skip duplicates - if seenProjects[finalID] { - log.Infof("Project %s already activated, skipping", finalID) - continue + selectedProjectID := promptForProjectSelection(projects, trimmedProjectID, promptFn) + projectSelections, errSelection := resolveProjectSelections(selectedProjectID, projects) + if errSelection != nil { + log.Errorf("Invalid project selection: %v", errSelection) + return + } + if len(projectSelections) == 0 { + log.Error("No project selected; aborting login.") + return + } + + seenProjects := make(map[string]bool) + for _, candidateID := range projectSelections { + log.Infof("Activating project %s", candidateID) + if errSetup := performGeminiCLISetup(ctx, httpClient, storage, candidateID); errSetup != nil { + var projectErr *projectSelectionRequiredError + if errors.As(errSetup, &projectErr) { + log.Error("Failed to start user onboarding: A project ID is required.") + showProjectSelectionHelp(storage.Email, projects) + return + } + log.Errorf("Failed to complete user setup: %v", errSetup) + return + } + finalID := strings.TrimSpace(storage.ProjectID) + if finalID == "" { + finalID = candidateID + } + + if seenProjects[finalID] { + log.Infof("Project %s already activated, skipping", finalID) + continue + } + seenProjects[finalID] = true + activatedProjects = append(activatedProjects, finalID) } - seenProjects[finalID] = true - activatedProjects = append(activatedProjects, finalID) } storage.Auto = false @@ -235,7 +261,48 @@ func performGeminiCLISetup(ctx context.Context, httpClient *http.Client, storage } } if projectID == "" { - return &projectSelectionRequiredError{} + // Auto-discovery: try onboardUser without specifying a project + // to let Google auto-provision one (matches Gemini CLI headless behavior + // and Antigravity's FetchProjectID pattern). + autoOnboardReq := map[string]any{ + "tierId": tierID, + "metadata": metadata, + } + + autoCtx, autoCancel := context.WithTimeout(ctx, 30*time.Second) + defer autoCancel() + for attempt := 1; ; attempt++ { + var onboardResp map[string]any + if errOnboard := callGeminiCLI(autoCtx, httpClient, "onboardUser", autoOnboardReq, &onboardResp); errOnboard != nil { + return fmt.Errorf("auto-discovery onboardUser: %w", errOnboard) + } + + if done, okDone := onboardResp["done"].(bool); okDone && done { + if resp, okResp := onboardResp["response"].(map[string]any); okResp { + switch v := resp["cloudaicompanionProject"].(type) { + case string: + projectID = strings.TrimSpace(v) + case map[string]any: + if id, okID := v["id"].(string); okID { + projectID = strings.TrimSpace(id) + } + } + } + break + } + + log.Debugf("Auto-discovery: onboarding in progress, attempt %d...", attempt) + select { + case <-autoCtx.Done(): + return &projectSelectionRequiredError{} + case <-time.After(2 * time.Second): + } + } + + if projectID == "" { + return &projectSelectionRequiredError{} + } + log.Infof("Auto-discovered project ID via onboarding: %s", projectID) } onboardReqBody := map[string]any{ @@ -617,7 +684,7 @@ func updateAuthRecord(record *cliproxyauth.Auth, storage *gemini.GeminiTokenStor return } - finalName := gemini.CredentialFileName(storage.Email, storage.ProjectID, false) + finalName := gemini.CredentialFileName(storage.Email, storage.ProjectID, true) if record.Metadata == nil { record.Metadata = make(map[string]any) diff --git a/sdk/auth/filestore.go b/sdk/auth/filestore.go index 0bb7ff7d..795bba0d 100644 --- a/sdk/auth/filestore.go +++ b/sdk/auth/filestore.go @@ -4,8 +4,10 @@ import ( "context" "encoding/json" "fmt" + "io" "io/fs" "net/http" + "net/url" "os" "path/filepath" "strings" @@ -186,15 +188,21 @@ func (s *FileTokenStore) readAuthFile(path, baseDir string) (*cliproxyauth.Auth, if provider == "" { provider = "unknown" } - if provider == "antigravity" { + if provider == "antigravity" || provider == "gemini" { projectID := "" if pid, ok := metadata["project_id"].(string); ok { projectID = strings.TrimSpace(pid) } if projectID == "" { - accessToken := "" - if token, ok := metadata["access_token"].(string); ok { - accessToken = strings.TrimSpace(token) + accessToken := extractAccessToken(metadata) + // For gemini type, the stored access_token is likely expired (~1h lifetime). + // Refresh it using the long-lived refresh_token before querying. + if provider == "gemini" { + if tokenMap, ok := metadata["token"].(map[string]any); ok { + if refreshed, errRefresh := refreshGeminiAccessToken(tokenMap, http.DefaultClient); errRefresh == nil { + accessToken = refreshed + } + } } if accessToken != "" { fetchedProjectID, errFetch := FetchAntigravityProjectID(context.Background(), accessToken, http.DefaultClient) @@ -304,6 +312,67 @@ func (s *FileTokenStore) baseDirSnapshot() string { return s.baseDir } +func extractAccessToken(metadata map[string]any) string { + if at, ok := metadata["access_token"].(string); ok { + if v := strings.TrimSpace(at); v != "" { + return v + } + } + if tokenMap, ok := metadata["token"].(map[string]any); ok { + if at, ok := tokenMap["access_token"].(string); ok { + if v := strings.TrimSpace(at); v != "" { + return v + } + } + } + return "" +} + +func refreshGeminiAccessToken(tokenMap map[string]any, httpClient *http.Client) (string, error) { + refreshToken, _ := tokenMap["refresh_token"].(string) + clientID, _ := tokenMap["client_id"].(string) + clientSecret, _ := tokenMap["client_secret"].(string) + tokenURI, _ := tokenMap["token_uri"].(string) + + if refreshToken == "" || clientID == "" || clientSecret == "" { + return "", fmt.Errorf("missing refresh credentials") + } + if tokenURI == "" { + tokenURI = "https://oauth2.googleapis.com/token" + } + + data := url.Values{ + "grant_type": {"refresh_token"}, + "refresh_token": {refreshToken}, + "client_id": {clientID}, + "client_secret": {clientSecret}, + } + + resp, err := httpClient.PostForm(tokenURI, data) + if err != nil { + return "", fmt.Errorf("refresh request: %w", err) + } + defer func() { _ = resp.Body.Close() }() + + body, _ := io.ReadAll(resp.Body) + if resp.StatusCode != http.StatusOK { + return "", fmt.Errorf("refresh failed: status %d", resp.StatusCode) + } + + var result map[string]any + if errUnmarshal := json.Unmarshal(body, &result); errUnmarshal != nil { + return "", fmt.Errorf("decode refresh response: %w", errUnmarshal) + } + + newAccessToken, _ := result["access_token"].(string) + if newAccessToken == "" { + return "", fmt.Errorf("no access_token in refresh response") + } + + tokenMap["access_token"] = newAccessToken + return newAccessToken, nil +} + // jsonEqual compares two JSON blobs by parsing them into Go objects and deep comparing. func jsonEqual(a, b []byte) bool { var objA any diff --git a/sdk/auth/filestore_test.go b/sdk/auth/filestore_test.go new file mode 100644 index 00000000..9e135ad4 --- /dev/null +++ b/sdk/auth/filestore_test.go @@ -0,0 +1,80 @@ +package auth + +import "testing" + +func TestExtractAccessToken(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + metadata map[string]any + expected string + }{ + { + "antigravity top-level access_token", + map[string]any{"access_token": "tok-abc"}, + "tok-abc", + }, + { + "gemini nested token.access_token", + map[string]any{ + "token": map[string]any{"access_token": "tok-nested"}, + }, + "tok-nested", + }, + { + "top-level takes precedence over nested", + map[string]any{ + "access_token": "tok-top", + "token": map[string]any{"access_token": "tok-nested"}, + }, + "tok-top", + }, + { + "empty metadata", + map[string]any{}, + "", + }, + { + "whitespace-only access_token", + map[string]any{"access_token": " "}, + "", + }, + { + "wrong type access_token", + map[string]any{"access_token": 12345}, + "", + }, + { + "token is not a map", + map[string]any{"token": "not-a-map"}, + "", + }, + { + "nested whitespace-only", + map[string]any{ + "token": map[string]any{"access_token": " "}, + }, + "", + }, + { + "fallback to nested when top-level empty", + map[string]any{ + "access_token": "", + "token": map[string]any{"access_token": "tok-fallback"}, + }, + "tok-fallback", + }, + } + + for _, tt := range tests { + tt := tt + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + got := extractAccessToken(tt.metadata) + if got != tt.expected { + t.Errorf("extractAccessToken() = %q, want %q", got, tt.expected) + } + }) + } +} From 4b2d40bd67bb9be51403c420c21adf17bdf33618 Mon Sep 17 00:00:00 2001 From: xSpaM <34112129+itsmylife44@users.noreply.github.com> Date: Thu, 12 Feb 2026 17:15:46 +0100 Subject: [PATCH 02/11] Add CLIProxyAPI Dashboard to 'Who is with us?' section --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 214fe600..4fa495c6 100644 --- a/README.md +++ b/README.md @@ -146,6 +146,10 @@ A Windows tray application implemented using PowerShell scripts, without relying 霖君 is a cross-platform desktop application for managing AI programming assistants, supporting macOS, Windows, and Linux systems. Unified management of Claude Code, Gemini CLI, OpenAI Codex, Qwen Code, and other AI coding tools, with local proxy for multi-account quota tracking and one-click configuration. +### [CLIProxyAPI Dashboard](https://github.com/itsmylife44/cliproxyapi-dashboard) + +A modern web-based management dashboard for CLIProxyAPI built with Next.js, React, and PostgreSQL. Features real-time log streaming, structured configuration editing, API key management, OAuth provider integration for Claude/Gemini/Codex, usage analytics, container management, and config sync with OpenCode via companion plugin - no manual YAML editing needed. + > [!NOTE] > If you developed a project based on CLIProxyAPI, please open a PR to add it to this list. From 1ff5de9a311de8c129af069e6f0433273180fd08 Mon Sep 17 00:00:00 2001 From: Luis Pater Date: Fri, 13 Feb 2026 00:40:39 +0800 Subject: [PATCH 03/11] docs(readme): add CLIProxyAPI Dashboard to project list --- README_CN.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README_CN.md b/README_CN.md index b7c45df7..5c91cbdc 100644 --- a/README_CN.md +++ b/README_CN.md @@ -145,6 +145,10 @@ Windows 托盘应用,基于 PowerShell 脚本实现,不依赖任何第三方 霖君是一款用于管理AI编程助手的跨平台桌面应用,支持macOS、Windows、Linux系统。统一管理Claude Code、Gemini CLI、OpenAI Codex、Qwen Code等AI编程工具,本地代理实现多账户配额跟踪和一键配置。 +### [CLIProxyAPI Dashboard](https://github.com/itsmylife44/cliproxyapi-dashboard) + +一个面向 CLIProxyAPI 的现代化 Web 管理仪表盘,基于 Next.js、React 和 PostgreSQL 构建。支持实时日志流、结构化配置编辑、API Key 管理、Claude/Gemini/Codex 的 OAuth 提供方集成、使用量分析、容器管理,并可通过配套插件与 OpenCode 同步配置,无需手动编辑 YAML。 + > [!NOTE] > 如果你开发了基于 CLIProxyAPI 的项目,请提交一个 PR(拉取请求)将其添加到此列表中。 From 41a78be3a2cbf4382b70970e9688cd1b1dabb296 Mon Sep 17 00:00:00 2001 From: Franz Bettag Date: Thu, 12 Feb 2026 23:24:08 +0100 Subject: [PATCH 04/11] feat(registry): add gpt-5.3-codex-spark model definition --- internal/registry/model_definitions_static_data.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/internal/registry/model_definitions_static_data.go b/internal/registry/model_definitions_static_data.go index baf39412..4162ec6c 100644 --- a/internal/registry/model_definitions_static_data.go +++ b/internal/registry/model_definitions_static_data.go @@ -742,6 +742,20 @@ func GetOpenAIModels() []*ModelInfo { SupportedParameters: []string{"tools"}, Thinking: &ThinkingSupport{Levels: []string{"low", "medium", "high", "xhigh"}}, }, + { + ID: "gpt-5.3-codex-spark", + Object: "model", + Created: 1770307200, + OwnedBy: "openai", + Type: "openai", + Version: "gpt-5.3", + DisplayName: "GPT-5.3-Codex-Spark", + Description: "Ultra-fast coding model.", + ContextLength: 128000, + MaxCompletionTokens: 128000, + SupportedParameters: []string{"tools"}, + Thinking: &ThinkingSupport{Levels: []string{"low", "medium", "high", "xhigh"}}, + }, } } From 1ce56d7413b6c83a849b38f685863bac663a0349 Mon Sep 17 00:00:00 2001 From: Franz Bettag Date: Thu, 12 Feb 2026 23:37:27 +0100 Subject: [PATCH 05/11] Update internal/registry/model_definitions_static_data.go Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- internal/registry/model_definitions_static_data.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/registry/model_definitions_static_data.go b/internal/registry/model_definitions_static_data.go index 4162ec6c..120bbac7 100644 --- a/internal/registry/model_definitions_static_data.go +++ b/internal/registry/model_definitions_static_data.go @@ -749,7 +749,7 @@ func GetOpenAIModels() []*ModelInfo { OwnedBy: "openai", Type: "openai", Version: "gpt-5.3", - DisplayName: "GPT-5.3-Codex-Spark", +DisplayName: "GPT 5.3 Codex Spark", Description: "Ultra-fast coding model.", ContextLength: 128000, MaxCompletionTokens: 128000, From ae1e8a5191d7e94587e2fad24ef99016a1727b67 Mon Sep 17 00:00:00 2001 From: Luis Pater Date: Fri, 13 Feb 2026 12:47:48 +0800 Subject: [PATCH 06/11] chore(runtime, registry): update Codex client version and GPT-5.3 model creation date --- internal/registry/model_definitions_static_data.go | 4 ++-- internal/runtime/executor/codex_executor.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/registry/model_definitions_static_data.go b/internal/registry/model_definitions_static_data.go index 120bbac7..39b2aa0c 100644 --- a/internal/registry/model_definitions_static_data.go +++ b/internal/registry/model_definitions_static_data.go @@ -745,11 +745,11 @@ func GetOpenAIModels() []*ModelInfo { { ID: "gpt-5.3-codex-spark", Object: "model", - Created: 1770307200, + Created: 1770912000, OwnedBy: "openai", Type: "openai", Version: "gpt-5.3", -DisplayName: "GPT 5.3 Codex Spark", + DisplayName: "GPT 5.3 Codex Spark", Description: "Ultra-fast coding model.", ContextLength: 128000, MaxCompletionTokens: 128000, diff --git a/internal/runtime/executor/codex_executor.go b/internal/runtime/executor/codex_executor.go index d74cc685..728e7cb7 100644 --- a/internal/runtime/executor/codex_executor.go +++ b/internal/runtime/executor/codex_executor.go @@ -28,8 +28,8 @@ import ( ) const ( - codexClientVersion = "0.98.0" - codexUserAgent = "codex_cli_rs/0.98.0 (Mac OS 26.0.1; arm64) Apple_Terminal/464" + codexClientVersion = "0.101.0" + codexUserAgent = "codex_cli_rs/0.101.0 (Mac OS 26.0.1; arm64) Apple_Terminal/464" ) var dataTag = []byte("data:") From 63d4de5eea09a89e6d99eca038ad33501e719a1c Mon Sep 17 00:00:00 2001 From: Alexey Yanchenko Date: Sun, 15 Feb 2026 12:04:15 +0700 Subject: [PATCH 07/11] Pass cache usage from codex to openai chat completions --- .../codex/openai/chat-completions/codex_openai_response.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/translator/codex/openai/chat-completions/codex_openai_response.go b/internal/translator/codex/openai/chat-completions/codex_openai_response.go index 6d86c247..cdea33ee 100644 --- a/internal/translator/codex/openai/chat-completions/codex_openai_response.go +++ b/internal/translator/codex/openai/chat-completions/codex_openai_response.go @@ -90,6 +90,9 @@ func ConvertCodexResponseToOpenAI(_ context.Context, modelName string, originalR if inputTokensResult := usageResult.Get("input_tokens"); inputTokensResult.Exists() { template, _ = sjson.Set(template, "usage.prompt_tokens", inputTokensResult.Int()) } + if cachedTokensResult := usageResult.Get("input_tokens_details.cached_tokens"); cachedTokensResult.Exists() { + template, _ = sjson.Set(template, "usage.prompt_tokens_details.cached_tokens", cachedTokensResult.Int()) + } if reasoningTokensResult := usageResult.Get("output_tokens_details.reasoning_tokens"); reasoningTokensResult.Exists() { template, _ = sjson.Set(template, "usage.completion_tokens_details.reasoning_tokens", reasoningTokensResult.Int()) } @@ -205,6 +208,9 @@ func ConvertCodexResponseToOpenAINonStream(_ context.Context, _ string, original if inputTokensResult := usageResult.Get("input_tokens"); inputTokensResult.Exists() { template, _ = sjson.Set(template, "usage.prompt_tokens", inputTokensResult.Int()) } + if cachedTokensResult := usageResult.Get("input_tokens_details.cached_tokens"); cachedTokensResult.Exists() { + template, _ = sjson.Set(template, "usage.prompt_tokens_details.cached_tokens", cachedTokensResult.Int()) + } if reasoningTokensResult := usageResult.Get("output_tokens_details.reasoning_tokens"); reasoningTokensResult.Exists() { template, _ = sjson.Set(template, "usage.completion_tokens_details.reasoning_tokens", reasoningTokensResult.Int()) } From c359f61859b4ddddb621ef6bb44ef5aec4cfb918 Mon Sep 17 00:00:00 2001 From: Luis Pater Date: Sun, 15 Feb 2026 13:59:33 +0800 Subject: [PATCH 08/11] fix(auth): normalize Gemini credential file prefix for consistency --- internal/auth/gemini/gemini_token.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/auth/gemini/gemini_token.go b/internal/auth/gemini/gemini_token.go index f7fca810..0ec7da17 100644 --- a/internal/auth/gemini/gemini_token.go +++ b/internal/auth/gemini/gemini_token.go @@ -71,17 +71,17 @@ func (ts *GeminiTokenStorage) SaveTokenToFile(authFilePath string) error { // CredentialFileName returns the filename used to persist Gemini CLI credentials. // When projectID represents multiple projects (comma-separated or literal ALL), -// the suffix is normalized to "all" and a "geminicli-" prefix is enforced to keep +// the suffix is normalized to "all" and a "gemini-" prefix is enforced to keep // web and CLI generated files consistent. func CredentialFileName(email, projectID string, includeProviderPrefix bool) string { email = strings.TrimSpace(email) project := strings.TrimSpace(projectID) if strings.EqualFold(project, "all") || strings.Contains(project, ",") { - return fmt.Sprintf("geminicli-%s-all.json", email) + return fmt.Sprintf("gemini-%s-all.json", email) } prefix := "" if includeProviderPrefix { - prefix = "geminicli-" + prefix = "gemini-" } return fmt.Sprintf("%s%s-%s.json", prefix, email, project) } From 46a678206516093b2ac551ec89139a3140db6304 Mon Sep 17 00:00:00 2001 From: Luis Pater Date: Sun, 15 Feb 2026 14:10:10 +0800 Subject: [PATCH 09/11] refactor(all): replace manual pointer assignments with `new` to enhance code readability and maintainability --- .github/workflows/release.yaml | 2 +- go.mod | 2 +- internal/api/handlers/management/config_basic.go | 3 +-- internal/api/modules/amp/amp.go | 3 +-- internal/cmd/anthropic_login.go | 3 +-- internal/cmd/iflow_login.go | 3 +-- internal/cmd/login.go | 3 +-- internal/cmd/openai_login.go | 3 +-- internal/cmd/qwen_login.go | 3 +-- internal/registry/model_registry.go | 3 +-- internal/runtime/executor/gemini_cli_executor.go | 3 +-- sdk/api/handlers/gemini/gemini-cli_handlers.go | 3 +-- sdk/api/handlers/gemini/gemini_handlers.go | 3 +-- sdk/auth/antigravity.go | 3 +-- sdk/auth/claude.go | 3 +-- sdk/auth/codex.go | 3 +-- sdk/auth/iflow.go | 3 +-- sdk/auth/qwen.go | 3 +-- sdk/cliproxy/auth/conductor.go | 15 +++++---------- 19 files changed, 23 insertions(+), 44 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4bb5e63b..64e7a5b7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -19,7 +19,7 @@ jobs: - run: git fetch --force --tags - uses: actions/setup-go@v4 with: - go-version: '>=1.24.0' + go-version: '>=1.26.0' cache: true - name: Generate Build Metadata run: | diff --git a/go.mod b/go.mod index 38a499be..9e9a9c9e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/router-for-me/CLIProxyAPI/v6 -go 1.24.0 +go 1.26.0 require ( github.com/andybalholm/brotli v1.0.6 diff --git a/internal/api/handlers/management/config_basic.go b/internal/api/handlers/management/config_basic.go index ee2d5c35..f77e91e9 100644 --- a/internal/api/handlers/management/config_basic.go +++ b/internal/api/handlers/management/config_basic.go @@ -28,8 +28,7 @@ func (h *Handler) GetConfig(c *gin.Context) { c.JSON(200, gin.H{}) return } - cfgCopy := *h.cfg - c.JSON(200, &cfgCopy) + c.JSON(200, new(*h.cfg)) } type releaseInfo struct { diff --git a/internal/api/modules/amp/amp.go b/internal/api/modules/amp/amp.go index b5626ce9..a12733e2 100644 --- a/internal/api/modules/amp/amp.go +++ b/internal/api/modules/amp/amp.go @@ -127,8 +127,7 @@ func (m *AmpModule) Register(ctx modules.Context) error { m.modelMapper = NewModelMapper(settings.ModelMappings) // Store initial config for partial reload comparison - settingsCopy := settings - m.lastConfig = &settingsCopy + m.lastConfig = new(settings) // Initialize localhost restriction setting (hot-reloadable) m.setRestrictToLocalhost(settings.RestrictManagementToLocalhost) diff --git a/internal/cmd/anthropic_login.go b/internal/cmd/anthropic_login.go index dafdd02b..f7381461 100644 --- a/internal/cmd/anthropic_login.go +++ b/internal/cmd/anthropic_login.go @@ -40,8 +40,7 @@ func DoClaudeLogin(cfg *config.Config, options *LoginOptions) { _, savedPath, err := manager.Login(context.Background(), "claude", cfg, authOpts) if err != nil { - var authErr *claude.AuthenticationError - if errors.As(err, &authErr) { + if authErr, ok := errors.AsType[*claude.AuthenticationError](err); ok { log.Error(claude.GetUserFriendlyMessage(authErr)) if authErr.Type == claude.ErrPortInUse.Type { os.Exit(claude.ErrPortInUse.Code) diff --git a/internal/cmd/iflow_login.go b/internal/cmd/iflow_login.go index 07360b8c..49e18e5b 100644 --- a/internal/cmd/iflow_login.go +++ b/internal/cmd/iflow_login.go @@ -32,8 +32,7 @@ func DoIFlowLogin(cfg *config.Config, options *LoginOptions) { _, savedPath, err := manager.Login(context.Background(), "iflow", cfg, authOpts) if err != nil { - var emailErr *sdkAuth.EmailRequiredError - if errors.As(err, &emailErr) { + if emailErr, ok := errors.AsType[*sdkAuth.EmailRequiredError](err); ok { log.Error(emailErr.Error()) return } diff --git a/internal/cmd/login.go b/internal/cmd/login.go index 3286e7a7..1d8a1ae3 100644 --- a/internal/cmd/login.go +++ b/internal/cmd/login.go @@ -148,8 +148,7 @@ func DoLogin(cfg *config.Config, projectID string, options *LoginOptions) { for _, candidateID := range projectSelections { log.Infof("Activating project %s", candidateID) if errSetup := performGeminiCLISetup(ctx, httpClient, storage, candidateID); errSetup != nil { - var projectErr *projectSelectionRequiredError - if errors.As(errSetup, &projectErr) { + if _, ok := errors.AsType[*projectSelectionRequiredError](errSetup); ok { log.Error("Failed to start user onboarding: A project ID is required.") showProjectSelectionHelp(storage.Email, projects) return diff --git a/internal/cmd/openai_login.go b/internal/cmd/openai_login.go index 5f2fb162..783a9484 100644 --- a/internal/cmd/openai_login.go +++ b/internal/cmd/openai_login.go @@ -54,8 +54,7 @@ func DoCodexLogin(cfg *config.Config, options *LoginOptions) { _, savedPath, err := manager.Login(context.Background(), "codex", cfg, authOpts) if err != nil { - var authErr *codex.AuthenticationError - if errors.As(err, &authErr) { + if authErr, ok := errors.AsType[*codex.AuthenticationError](err); ok { log.Error(codex.GetUserFriendlyMessage(authErr)) if authErr.Type == codex.ErrPortInUse.Type { os.Exit(codex.ErrPortInUse.Code) diff --git a/internal/cmd/qwen_login.go b/internal/cmd/qwen_login.go index 92a57aa5..10179fa8 100644 --- a/internal/cmd/qwen_login.go +++ b/internal/cmd/qwen_login.go @@ -44,8 +44,7 @@ func DoQwenLogin(cfg *config.Config, options *LoginOptions) { _, savedPath, err := manager.Login(context.Background(), "qwen", cfg, authOpts) if err != nil { - var emailErr *sdkAuth.EmailRequiredError - if errors.As(err, &emailErr) { + if emailErr, ok := errors.AsType[*sdkAuth.EmailRequiredError](err); ok { log.Error(emailErr.Error()) return } diff --git a/internal/registry/model_registry.go b/internal/registry/model_registry.go index edb1f124..7b8b262e 100644 --- a/internal/registry/model_registry.go +++ b/internal/registry/model_registry.go @@ -596,8 +596,7 @@ func (r *ModelRegistry) SetModelQuotaExceeded(clientID, modelID string) { defer r.mutex.Unlock() if registration, exists := r.models[modelID]; exists { - now := time.Now() - registration.QuotaExceededClients[clientID] = &now + registration.QuotaExceededClients[clientID] = new(time.Now()) log.Debugf("Marked model %s as quota exceeded for client %s", modelID, clientID) } } diff --git a/internal/runtime/executor/gemini_cli_executor.go b/internal/runtime/executor/gemini_cli_executor.go index 4ac7bdba..3e218c0f 100644 --- a/internal/runtime/executor/gemini_cli_executor.go +++ b/internal/runtime/executor/gemini_cli_executor.go @@ -899,8 +899,7 @@ func parseRetryDelay(errorBody []byte) (*time.Duration, error) { if matches := re.FindStringSubmatch(message); len(matches) > 1 { seconds, err := strconv.Atoi(matches[1]) if err == nil { - duration := time.Duration(seconds) * time.Second - return &duration, nil + return new(time.Duration(seconds) * time.Second), nil } } } diff --git a/sdk/api/handlers/gemini/gemini-cli_handlers.go b/sdk/api/handlers/gemini/gemini-cli_handlers.go index 917902e7..07cedc55 100644 --- a/sdk/api/handlers/gemini/gemini-cli_handlers.go +++ b/sdk/api/handlers/gemini/gemini-cli_handlers.go @@ -185,8 +185,7 @@ func (h *GeminiCLIAPIHandler) handleInternalGenerateContent(c *gin.Context, rawJ func (h *GeminiCLIAPIHandler) forwardCLIStream(c *gin.Context, flusher http.Flusher, alt string, cancel func(error), data <-chan []byte, errs <-chan *interfaces.ErrorMessage) { var keepAliveInterval *time.Duration if alt != "" { - disabled := time.Duration(0) - keepAliveInterval = &disabled + keepAliveInterval = new(time.Duration(0)) } h.ForwardStream(c, flusher, cancel, data, errs, handlers.StreamForwardOptions{ diff --git a/sdk/api/handlers/gemini/gemini_handlers.go b/sdk/api/handlers/gemini/gemini_handlers.go index 71c485ad..a5eb337d 100644 --- a/sdk/api/handlers/gemini/gemini_handlers.go +++ b/sdk/api/handlers/gemini/gemini_handlers.go @@ -300,8 +300,7 @@ func (h *GeminiAPIHandler) handleGenerateContent(c *gin.Context, modelName strin func (h *GeminiAPIHandler) forwardGeminiStream(c *gin.Context, flusher http.Flusher, alt string, cancel func(error), data <-chan []byte, errs <-chan *interfaces.ErrorMessage) { var keepAliveInterval *time.Duration if alt != "" { - disabled := time.Duration(0) - keepAliveInterval = &disabled + keepAliveInterval = new(time.Duration(0)) } h.ForwardStream(c, flusher, cancel, data, errs, handlers.StreamForwardOptions{ diff --git a/sdk/auth/antigravity.go b/sdk/auth/antigravity.go index ecca0a00..6ed31d6d 100644 --- a/sdk/auth/antigravity.go +++ b/sdk/auth/antigravity.go @@ -28,8 +28,7 @@ func (AntigravityAuthenticator) Provider() string { return "antigravity" } // RefreshLead instructs the manager to refresh five minutes before expiry. func (AntigravityAuthenticator) RefreshLead() *time.Duration { - lead := 5 * time.Minute - return &lead + return new(5 * time.Minute) } // Login launches a local OAuth flow to obtain antigravity tokens and persists them. diff --git a/sdk/auth/claude.go b/sdk/auth/claude.go index a6b19af5..706763b3 100644 --- a/sdk/auth/claude.go +++ b/sdk/auth/claude.go @@ -32,8 +32,7 @@ func (a *ClaudeAuthenticator) Provider() string { } func (a *ClaudeAuthenticator) RefreshLead() *time.Duration { - d := 4 * time.Hour - return &d + return new(4 * time.Hour) } func (a *ClaudeAuthenticator) Login(ctx context.Context, cfg *config.Config, opts *LoginOptions) (*coreauth.Auth, error) { diff --git a/sdk/auth/codex.go b/sdk/auth/codex.go index b655a239..c81842eb 100644 --- a/sdk/auth/codex.go +++ b/sdk/auth/codex.go @@ -34,8 +34,7 @@ func (a *CodexAuthenticator) Provider() string { } func (a *CodexAuthenticator) RefreshLead() *time.Duration { - d := 5 * 24 * time.Hour - return &d + return new(5 * 24 * time.Hour) } func (a *CodexAuthenticator) Login(ctx context.Context, cfg *config.Config, opts *LoginOptions) (*coreauth.Auth, error) { diff --git a/sdk/auth/iflow.go b/sdk/auth/iflow.go index 6d4ff946..a695311d 100644 --- a/sdk/auth/iflow.go +++ b/sdk/auth/iflow.go @@ -26,8 +26,7 @@ func (a *IFlowAuthenticator) Provider() string { return "iflow" } // RefreshLead indicates how soon before expiry a refresh should be attempted. func (a *IFlowAuthenticator) RefreshLead() *time.Duration { - d := 24 * time.Hour - return &d + return new(24 * time.Hour) } // Login performs the OAuth code flow using a local callback server. diff --git a/sdk/auth/qwen.go b/sdk/auth/qwen.go index 151fba68..310d4987 100644 --- a/sdk/auth/qwen.go +++ b/sdk/auth/qwen.go @@ -27,8 +27,7 @@ func (a *QwenAuthenticator) Provider() string { } func (a *QwenAuthenticator) RefreshLead() *time.Duration { - d := 3 * time.Hour - return &d + return new(3 * time.Hour) } func (a *QwenAuthenticator) Login(ctx context.Context, cfg *config.Config, opts *LoginOptions) (*coreauth.Auth, error) { diff --git a/sdk/cliproxy/auth/conductor.go b/sdk/cliproxy/auth/conductor.go index 51c40537..2c3e9f48 100644 --- a/sdk/cliproxy/auth/conductor.go +++ b/sdk/cliproxy/auth/conductor.go @@ -599,8 +599,7 @@ func (m *Manager) executeMixedOnce(ctx context.Context, providers []string, req return cliproxyexecutor.Response{}, errCtx } result.Error = &Error{Message: errExec.Error()} - var se cliproxyexecutor.StatusError - if errors.As(errExec, &se) && se != nil { + if se, ok := errors.AsType[cliproxyexecutor.StatusError](errExec); ok && se != nil { result.Error.HTTPStatus = se.StatusCode() } if ra := retryAfterFromError(errExec); ra != nil { @@ -655,8 +654,7 @@ func (m *Manager) executeCountMixedOnce(ctx context.Context, providers []string, return cliproxyexecutor.Response{}, errCtx } result.Error = &Error{Message: errExec.Error()} - var se cliproxyexecutor.StatusError - if errors.As(errExec, &se) && se != nil { + if se, ok := errors.AsType[cliproxyexecutor.StatusError](errExec); ok && se != nil { result.Error.HTTPStatus = se.StatusCode() } if ra := retryAfterFromError(errExec); ra != nil { @@ -710,8 +708,7 @@ func (m *Manager) executeStreamMixedOnce(ctx context.Context, providers []string return nil, errCtx } rerr := &Error{Message: errStream.Error()} - var se cliproxyexecutor.StatusError - if errors.As(errStream, &se) && se != nil { + if se, ok := errors.AsType[cliproxyexecutor.StatusError](errStream); ok && se != nil { rerr.HTTPStatus = se.StatusCode() } result := Result{AuthID: auth.ID, Provider: provider, Model: routeModel, Success: false, Error: rerr} @@ -732,8 +729,7 @@ func (m *Manager) executeStreamMixedOnce(ctx context.Context, providers []string if chunk.Err != nil && !failed { failed = true rerr := &Error{Message: chunk.Err.Error()} - var se cliproxyexecutor.StatusError - if errors.As(chunk.Err, &se) && se != nil { + if se, ok := errors.AsType[cliproxyexecutor.StatusError](chunk.Err); ok && se != nil { rerr.HTTPStatus = se.StatusCode() } m.MarkResult(streamCtx, Result{AuthID: streamAuth.ID, Provider: streamProvider, Model: routeModel, Success: false, Error: rerr}) @@ -1431,8 +1427,7 @@ func retryAfterFromError(err error) *time.Duration { if retryAfter == nil { return nil } - val := *retryAfter - return &val + return new(*retryAfter) } func statusCodeFromResult(err *Error) int { From 55789df2752303facf54fc77d0b4a3d49bebb228 Mon Sep 17 00:00:00 2001 From: Luis Pater Date: Sun, 15 Feb 2026 14:26:44 +0800 Subject: [PATCH 10/11] chore(docker): update Go base image to 1.26-alpine --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8623dc5e..3e10c4f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24-alpine AS builder +FROM golang:1.26-alpine AS builder WORKDIR /app From d1f667cf8d1be798f5e60fe35712c570ac682fc2 Mon Sep 17 00:00:00 2001 From: Supra4E8C Date: Sun, 15 Feb 2026 15:21:33 +0800 Subject: [PATCH 11/11] feat(registry): add support for 'kimi' channel in model definitions --- internal/registry/model_definitions.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/registry/model_definitions.go b/internal/registry/model_definitions.go index 585bdf8c..c1796979 100644 --- a/internal/registry/model_definitions.go +++ b/internal/registry/model_definitions.go @@ -19,6 +19,7 @@ import ( // - codex // - qwen // - iflow +// - kimi // - antigravity (returns static overrides only) func GetStaticModelDefinitionsByChannel(channel string) []*ModelInfo { key := strings.ToLower(strings.TrimSpace(channel)) @@ -39,6 +40,8 @@ func GetStaticModelDefinitionsByChannel(channel string) []*ModelInfo { return GetQwenModels() case "iflow": return GetIFlowModels() + case "kimi": + return GetKimiModels() case "antigravity": cfg := GetAntigravityModelConfig() if len(cfg) == 0 { @@ -83,6 +86,7 @@ func LookupStaticModelInfo(modelID string) *ModelInfo { GetOpenAIModels(), GetQwenModels(), GetIFlowModels(), + GetKimiModels(), } for _, models := range allModels { for _, m := range models {