feat(api): 支持旧版标量 API 密钥格式的检测与迁移

AoaoMH · AoaoMH · commit b55a6d5ba378 · 2026-03-04T13:00:57.000+08:00
diff --git a/README.md b/README.md
@@ -1,175 +1 @@
-# CLI Proxy API
-
-English | [中文](README_CN.md)
-
-A proxy server that provides OpenAI/Gemini/Claude/Codex compatible API interfaces for CLI.
-
-It now also supports OpenAI Codex (GPT models) and Claude Code via OAuth.
-
-So you can use local or multi-account CLI access with OpenAI(include Responses)/Gemini/Claude-compatible clients and SDKs.
-
-## Sponsor
-
-[![z.ai](https://assets.router-for.me/english-5.png)](https://z.ai/subscribe?ic=8JVLJQFSKB)
-
-This project is sponsored by Z.ai, supporting us with their GLM CODING PLAN.
-
-GLM CODING PLAN is a subscription service designed for AI coding, starting at just $10/month. It provides access to their flagship GLM-4.7 & （GLM-5 Only Available  for Pro Users）model across 10+ popular AI coding tools (Claude Code, Cline, Roo Code, etc.), offering developers top-tier, fast, and stable coding experiences.
-
-Get 10% OFF GLM CODING PLAN：https://z.ai/subscribe?ic=8JVLJQFSKB
-
----
-
-<table>
-<tbody>
-<tr>
-<td width="180"><a href="https://www.packyapi.com/register?aff=cliproxyapi"><img src="./assets/packycode.png" alt="PackyCode" width="150"></a></td>
-<td>Thanks to PackyCode for sponsoring this project! PackyCode is a reliable and efficient API relay service provider, offering relay services for Claude Code, Codex, Gemini, and more. PackyCode provides special discounts for our software users: register using <a href="https://www.packyapi.com/register?aff=cliproxyapi">this link</a> and enter the "cliproxyapi" promo code during recharge to get 10% off.</td>
-</tr>
-<tr>
-<td width="180"><a href="https://www.aicodemirror.com/register?invitecode=TJNAIF"><img src="./assets/aicodemirror.png" alt="AICodeMirror" width="150"></a></td>
-<td>Thanks to AICodeMirror for sponsoring this project! AICodeMirror provides official high-stability relay services for Claude Code / Codex / Gemini CLI, with enterprise-grade concurrency, fast invoicing, and 24/7 dedicated technical support. Claude Code / Codex / Gemini official channels at 38% / 2% / 9% of original price, with extra discounts on top-ups! AICodeMirror offers special benefits for CLIProxyAPI users: register via <a href="https://www.aicodemirror.com/register?invitecode=TJNAIF">this link</a> to enjoy 20% off your first top-up, and enterprise customers can get up to 25% off!</td>
-</tr>
-</tbody>
-</table>
-
-## Overview
-
-- OpenAI/Gemini/Claude compatible API endpoints for CLI models
-- OpenAI Codex support (GPT models) via OAuth login
-- Claude Code support via OAuth login
-- Qwen Code support via OAuth login
-- iFlow support via OAuth login
-- Amp CLI and IDE extensions support with provider routing
-- Streaming and non-streaming responses
-- Function calling/tools support
-- Multimodal input support (text and images)
-- Multiple accounts with round-robin load balancing (Gemini, OpenAI, Claude, Qwen and iFlow)
-- Simple CLI authentication flows (Gemini, OpenAI, Claude, Qwen and iFlow)
-- Generative Language API Key support
-- AI Studio Build multi-account load balancing
-- Gemini CLI multi-account load balancing
-- Claude Code multi-account load balancing
-- Qwen Code multi-account load balancing
-- iFlow multi-account load balancing
-- OpenAI Codex multi-account load balancing
-- OpenAI-compatible upstream providers via config (e.g., OpenRouter)
-- Reusable Go SDK for embedding the proxy (see `docs/sdk-usage.md`)
-
-## Getting Started
-
-CLIProxyAPI Guides: [https://help.router-for.me/](https://help.router-for.me/)
-
-## Management API
-
-see [MANAGEMENT_API.md](https://help.router-for.me/management/api)
-
-## Amp CLI Support
-
-CLIProxyAPI includes integrated support for [Amp CLI](https://ampcode.com) and Amp IDE extensions, enabling you to use your Google/ChatGPT/Claude OAuth subscriptions with Amp's coding tools:
-
-- Provider route aliases for Amp's API patterns (`/api/provider/{provider}/v1...`)
-- Management proxy for OAuth authentication and account features
-- Smart model fallback with automatic routing
-- **Model mapping** to route unavailable models to alternatives (e.g., `claude-opus-4.5` → `claude-sonnet-4`)
-- Security-first design with localhost-only management endpoints
-
-**→ [Complete Amp CLI Integration Guide](https://help.router-for.me/agent-client/amp-cli.html)**
-
-## SDK Docs
-
-- Usage: [docs/sdk-usage.md](docs/sdk-usage.md)
-- Advanced (executors & translators): [docs/sdk-advanced.md](docs/sdk-advanced.md)
-- Access: [docs/sdk-access.md](docs/sdk-access.md)
-- Watcher: [docs/sdk-watcher.md](docs/sdk-watcher.md)
-- Custom Provider Example: `examples/custom-provider`
-
-## Contributing
-
-Contributions are welcome! Please feel free to submit a Pull Request.
-
-1. Fork the repository
-2. Create your feature branch (`git checkout -b feature/amazing-feature`)
-3. Commit your changes (`git commit -m 'Add some amazing feature'`)
-4. Push to the branch (`git push origin feature/amazing-feature`)
-5. Open a Pull Request
-
-## Who is with us?
-
-Those projects are based on CLIProxyAPI:
-
-### [vibeproxy](https://github.com/automazeio/vibeproxy)
-
-Native macOS menu bar app to use your Claude Code & ChatGPT subscriptions with AI coding tools - no API keys needed
-
-### [Subtitle Translator](https://github.com/VjayC/SRT-Subtitle-Translator-Validator)
-
-Browser-based tool to translate SRT subtitles using your Gemini subscription via CLIProxyAPI with automatic validation/error correction - no API keys needed
-
-### [CCS (Claude Code Switch)](https://github.com/kaitranntt/ccs)
-
-CLI wrapper for instant switching between multiple Claude accounts and alternative models (Gemini, Codex, Antigravity) via CLIProxyAPI OAuth - no API keys needed
-
-### [ProxyPal](https://github.com/heyhuynhgiabuu/proxypal)
-
-Native macOS GUI for managing CLIProxyAPI: configure providers, model mappings, and endpoints via OAuth - no API keys needed.
-
-### [Quotio](https://github.com/nguyenphutrong/quotio)
-
-Native macOS menu bar app that unifies Claude, Gemini, OpenAI, Qwen, and Antigravity subscriptions with real-time quota tracking and smart auto-failover for AI coding tools like Claude Code, OpenCode, and Droid - no API keys needed.
-
-### [CodMate](https://github.com/loocor/CodMate)
-
-Native macOS SwiftUI app for managing CLI AI sessions (Codex, Claude Code, Gemini CLI) with unified provider management, Git review, project organization, global search, and terminal integration. Integrates CLIProxyAPI to provide OAuth authentication for Codex, Claude, Gemini, Antigravity, and Qwen Code, with built-in and third-party provider rerouting through a single proxy endpoint - no API keys needed for OAuth providers.
-
-### [ProxyPilot](https://github.com/Finesssee/ProxyPilot)
-
-Windows-native CLIProxyAPI fork with TUI, system tray, and multi-provider OAuth for AI coding tools - no API keys needed.
-
-### [Claude Proxy VSCode](https://github.com/uzhao/claude-proxy-vscode)
-
-VSCode extension for quick switching between Claude Code models, featuring integrated CLIProxyAPI as its backend with automatic background lifecycle management.
-
-### [ZeroLimit](https://github.com/0xtbug/zero-limit)
-
-Windows desktop app built with Tauri + React for monitoring AI coding assistant quotas via CLIProxyAPI. Track usage across Gemini, Claude, OpenAI Codex, and Antigravity accounts with real-time dashboard, system tray integration, and one-click proxy control - no API keys needed.
-
-### [CPA-XXX Panel](https://github.com/ferretgeek/CPA-X)
-
-A lightweight web admin panel for CLIProxyAPI with health checks, resource monitoring, real-time logs, auto-update, request statistics and pricing display. Supports one-click installation and systemd service.
-
-### [CLIProxyAPI Tray](https://github.com/kitephp/CLIProxyAPI_Tray)
-
-A Windows tray application implemented using PowerShell scripts, without relying on any third-party libraries. The main features include: automatic creation of shortcuts, silent running, password management, channel switching (Main / Plus), and automatic downloading and updating.
-
-### [霖君](https://github.com/wangdabaoqq/LinJun)
-
-霖君 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.
-
-## More choices
-
-Those projects are ports of CLIProxyAPI or inspired by it:
-
-### [9Router](https://github.com/decolua/9router)
-
-A Next.js implementation inspired by CLIProxyAPI, easy to install and use, built from scratch with format translation (OpenAI/Claude/Gemini/Ollama), combo system with auto-fallback, multi-account management with exponential backoff, a Next.js web dashboard, and support for CLI tools (Cursor, Claude Code, Cline, RooCode) - no API keys needed.
-
-### [OmniRoute](https://github.com/diegosouzapw/OmniRoute)
-
-Never stop coding. Smart routing to FREE & low-cost AI models with automatic fallback.
-
-OmniRoute is an AI gateway for multi-provider LLMs: an OpenAI-compatible endpoint with smart routing, load balancing, retries, and fallbacks. Add policies, rate limits, caching, and observability for reliable, cost-aware inference.
-
-> [!NOTE]  
-> If you have developed a port of CLIProxyAPI or a project inspired by it, please open a PR to add it to this list.
-
-## License
-
-This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+# CLI Proxy API - Aoao
diff --git a/internal/api/handlers/management/config_lists.go b/internal/api/handlers/management/config_lists.go
@@ -1,7 +1,6 @@
 package management
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"strings"
@@ -10,7 +9,6 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 	"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
-	"github.com/router-for-me/CLIProxyAPI/v6/internal/usagerecord"
 )
 
 // Generic helpers for list[string]
@@ -108,58 +106,28 @@ func (h *Handler) deleteFromStringList(c *gin.Context, target *[]string, after f
 	c.JSON(400, gin.H{"error": "missing index or value"})
 }
 
-// apiKeyResponse is a DTO for API key responses (avoids copying mutex from config.ApiKeyEntry)
-type apiKeyResponse struct {
-	ID           string `json:"id,omitempty"`
-	Key          string `json:"api-key"`
-	Name         string `json:"name,omitempty"`
-	IsActive     bool   `json:"is-active"`
-	UsageCount   int64  `json:"usage-count,omitempty"`
-	InputTokens  int64  `json:"input-tokens,omitempty"`
-	OutputTokens int64  `json:"output-tokens,omitempty"`
-	LastUsedAt   string `json:"last-used-at,omitempty"`
-	CreatedAt    string `json:"created-at,omitempty"`
+func apiKeyEntriesToStrings(entries []config.ApiKeyEntry) []string {
+	if len(entries) == 0 {
+		return nil
+	}
+	out := make([]string, 0, len(entries))
+	for i := range entries {
+		key := strings.TrimSpace(entries[i].Key)
+		if key == "" {
+			continue
+		}
+		out = append(out, key)
+	}
+	if len(out) == 0 {
+		return nil
+	}
+	return out
 }
 
 // api-keys
 func (h *Handler) GetAPIKeys(c *gin.Context) {
-	// Get persistent stats from SQLite database
-	var persistentStats map[string]*usagerecord.APIKeyStats
-	if store := usagerecord.DefaultStore(); store != nil {
-		ctx, cancel := context.WithTimeout(c.Request.Context(), 5*time.Second)
-		defer cancel()
-		var err error
-		persistentStats, err = store.GetAPIKeyStats(ctx)
-		if err != nil {
-			// Log error but continue with empty stats
-			c.Error(err)
-		}
-	}
-
-	// Build response DTOs (avoids copying mutex from config.ApiKeyEntry)
-	apiKeys := make([]apiKeyResponse, len(h.cfg.APIKeys))
-	for i, entry := range h.cfg.APIKeys {
-		apiKeys[i] = apiKeyResponse{
-			ID:         entry.ID,
-			Key:        entry.Key,
-			Name:       entry.Name,
-			IsActive:   entry.IsActive,
-			CreatedAt:  entry.CreatedAt,
-			LastUsedAt: entry.LastUsedAt,
-		}
-		// Merge persistent stats from SQLite if available
-		if stats, ok := persistentStats[entry.Key]; ok {
-			// Use persistent stats (from DB) as the source of truth
-			apiKeys[i].UsageCount = stats.UsageCount
-			apiKeys[i].InputTokens = stats.InputTokens
-			apiKeys[i].OutputTokens = stats.OutputTokens
-			if stats.LastUsedAt != "" {
-				apiKeys[i].LastUsedAt = stats.LastUsedAt
-			}
-		}
-	}
-
-	c.JSON(200, gin.H{"api-keys": apiKeys})
+	// Align to upstream: return a simple list of api key strings.
+	c.JSON(200, gin.H{"api-keys": apiKeyEntriesToStrings(h.cfg.APIKeys)})
 }
 
 func (h *Handler) PutAPIKeys(c *gin.Context) {
@@ -241,9 +209,10 @@ func (h *Handler) PatchAPIKeys(c *gin.Context) {
 		// For updating by old/new key value (backward compatible)
 		Old *string `json:"old"`
 		New *string `json:"new"`
-		// For updating by index (deprecated, but kept for compatibility)
-		Index *int                `json:"index"`
-		Value *config.ApiKeyEntry `json:"value"`
+		// For updating by index (legacy)
+		Index *int `json:"index"`
+		// Value may be either a string (upstream-compatible) or an ApiKeyEntry object (extended).
+		Value json.RawMessage `json:"value"`
 		// Partial update fields (use pointers to distinguish nil from zero value)
 		IsActive *bool   `json:"is-active"`
 		Name     *string `json:"name"`
@@ -254,6 +223,53 @@ func (h *Handler) PatchAPIKeys(c *gin.Context) {
 		return
 	}
 
+	// Update by index with value (string or object) - legacy compatibility.
+	if body.Index != nil && *body.Index >= 0 && *body.Index < len(h.cfg.APIKeys) && len(body.Value) > 0 {
+		// Prefer parsing as string (upstream-compatible TUI expects this).
+		var asString string
+		if err := json.Unmarshal(body.Value, &asString); err == nil {
+			newKey := strings.TrimSpace(asString)
+			if newKey == "" {
+				c.JSON(400, gin.H{"error": "key cannot be empty"})
+				return
+			}
+			for i, existing := range h.cfg.APIKeys {
+				if i != *body.Index && existing.Key == newKey {
+					c.JSON(409, gin.H{"error": "key already exists"})
+					return
+				}
+			}
+			h.cfg.APIKeys[*body.Index].Key = newKey
+			h.persist(c)
+			return
+		}
+
+		// Fallback: parse as full ApiKeyEntry object.
+		var entry config.ApiKeyEntry
+		if err := json.Unmarshal(body.Value, &entry); err == nil {
+			entry.Key = strings.TrimSpace(entry.Key)
+			if entry.Key == "" {
+				c.JSON(400, gin.H{"error": "key cannot be empty"})
+				return
+			}
+			for i, existing := range h.cfg.APIKeys {
+				if i != *body.Index && existing.Key == entry.Key {
+					c.JSON(409, gin.H{"error": "key already exists"})
+					return
+				}
+			}
+			if entry.ID == "" {
+				entry.ID = h.cfg.APIKeys[*body.Index].ID
+			}
+			if entry.CreatedAt == "" {
+				entry.CreatedAt = h.cfg.APIKeys[*body.Index].CreatedAt
+			}
+			h.cfg.APIKeys[*body.Index] = entry
+			h.persist(c)
+			return
+		}
+	}
+
 	// Find target entry by ID or Key
 	targetIndex := -1
 	if body.ID != nil && *body.ID != "" {
@@ -315,26 +331,22 @@ func (h *Handler) PatchAPIKeys(c *gin.Context) {
 		}
 	}
 
-	// Update by index with full value (legacy support)
-	if body.Index != nil && body.Value != nil && *body.Index >= 0 && *body.Index < len(h.cfg.APIKeys) {
-		entry := *body.Value
-		entry.Key = strings.TrimSpace(entry.Key)
-		if entry.Key == "" {
-			c.JSON(400, gin.H{"error": "key cannot be empty"})
-			return
-		}
-		// Check for duplicate key (excluding current index)
-		for i, existing := range h.cfg.APIKeys {
-			if i != *body.Index && existing.Key == entry.Key {
+	// Append-only add (compat): allow {"new": "..."} or {"old": null, "new": "..."}.
+	if body.New != nil && strings.TrimSpace(*body.New) != "" && body.Old == nil {
+		newKey := strings.TrimSpace(*body.New)
+		for _, entry := range h.cfg.APIKeys {
+			if entry.Key == newKey {
 				c.JSON(409, gin.H{"error": "key already exists"})
 				return
 			}
 		}
-		// Preserve ID if not provided
-		if entry.ID == "" {
-			entry.ID = h.cfg.APIKeys[*body.Index].ID
-		}
-		h.cfg.APIKeys[*body.Index] = entry
+		now := time.Now().UTC().Format(time.RFC3339)
+		h.cfg.APIKeys = append(h.cfg.APIKeys, config.ApiKeyEntry{
+			ID:        uuid.New().String(),
+			Key:       newKey,
+			IsActive:  true,
+			CreatedAt: now,
+		})
 		h.persist(c)
 		return
 	}
diff --git a/internal/api/server.go b/internal/api/server.go
