Release clovapi v0.2.1 updates

Author: joohw

core/cmd/cli_smoke_test.go

@@ -164,7 +164,7 @@ func TestCLISmokeProfilesLoadSaveRoundtrip(t *testing.T) {
 						"id":       "smoke-model",
 						"label":    "Smoke Model",
 						"model":    "smoke-model",
-						"apiStyle": "openai-chat",
+						"apiStyle": "chat",
 					},
 				},
 			},

core/cmd/main.go

@@ -180,7 +180,7 @@ func cmdSet() *cobra.Command {
 		},
 	}
 	c.Flags().StringVar(&name, "name", "", "Profile name (required)")
-	c.Flags().StringVar(&styleStr, "api-style", "", "API style: claude|openai-chat|openai-responses|gemini (alias openai鈫抩penai-responses)")
+	c.Flags().StringVar(&styleStr, "api-style", "", "API style: chat|responses|message|gemini (legacy aliases: openai-chat|openai-responses|claude|openai)")
 	c.Flags().StringVar(&baseURL, "base-url", "", "Upstream base URL")
 	c.Flags().StringVar(&apiKey, "api-key", "", "API key (or prompt)")
 	c.Flags().StringVar(&model, "model", "", "Default model id (required; used for connectivity test)")

core/internal/apistyle/apistyle.go

@@ -9,33 +9,37 @@ import (
 type Style string
 
 const (
-	Claude          Style = "claude"
-	OpenAIChat      Style = "openai-chat"      // POST …/v1/chat/completions
-	OpenAIResponses Style = "openai-responses" // POST …/v1/responses (Codex wire_api)
+	Claude          Style = "message"   // POST .../v1/messages (Anthropic Messages)
+	OpenAIChat      Style = "chat"      // POST .../v1/chat/completions
+	OpenAIResponses Style = "responses" // POST .../v1/responses (Codex wire_api)
 	Gemini          Style = "gemini"
 )
 
-// Parse accepts claude, openai-chat, openai-responses, gemini, and legacy alias openai → openai-responses.
+// Parse accepts canonical styles (message, chat, responses, gemini) plus legacy aliases.
 func Parse(s string) (Style, error) {
 	switch strings.ToLower(strings.TrimSpace(s)) {
 	case string(Claude):
 		return Claude, nil
+	case "claude", "anthropic", "messages":
+		return Claude, nil
 	case string(OpenAIChat):
 		return OpenAIChat, nil
+	case "openai-chat":
+		return OpenAIChat, nil
 	case string(OpenAIResponses):
 		return OpenAIResponses, nil
-	case "openai":
+	case "openai", "openai-responses":
 		return OpenAIResponses, nil
 	case string(Gemini):
 		return Gemini, nil
 	default:
-		return "", fmt.Errorf("unknown api style %q (want claude|openai-chat|openai-responses|gemini; alias openai→openai-responses)", s)
+		return "", fmt.Errorf("unknown api style %q (want chat|responses|message|gemini; legacy aliases: openai-chat|openai-responses|claude|openai)", s)
 	}
 }
 
 func (s Style) String() string { return string(s) }
 
 // All lists styles shown in help / matrices (stable order).
 func All() []Style {
-	return []Style{Claude, OpenAIChat, OpenAIResponses, Gemini}
+	return []Style{OpenAIChat, OpenAIResponses, Claude, Gemini}
 }

core/internal/buildinfo/buildinfo.go

@@ -4,7 +4,7 @@ import "strings"
 
 // Set at link time via -ldflags (see .goreleaser.yaml).
 var (
-	Version = "dev0.2.1"
+	Version = "dev0.2.13"
 	Commit  = "none"
 	Date    = "unknown"
 )

core/internal/desktop/models.go

@@ -828,19 +828,19 @@ func ListVendorModels(vendorName string) ListModelsResult {
 	if adapterID == "" {
 		adapterID = "openai-compatible"
 	}
-	defaultStyle := "openai-chat"
+	defaultStyle := "chat"
 	switch adapterID {
 	case "manual":
 		return ListModelsResult{OK: false, Error: "手动维护供应商不支持自动拉取模型"}
 	case "openai-compatible":
-		defaultStyle = "openai-chat"
+		defaultStyle = "chat"
 	case "ollama":
-		defaultStyle = "openai-chat"
+		defaultStyle = "chat"
 	case "subscription":
 		if strings.TrimSpace(vendor.SubscriptionProviderID) == provider.CodexProviderID {
-			defaultStyle = "openai-responses"
+			defaultStyle = "responses"
 		} else {
-			defaultStyle = "claude"
+			defaultStyle = "message"
 		}
 	}
 

core/internal/desktop/models_test.go

@@ -256,7 +256,7 @@ func TestParseCodexSubscriptionModelsSupportsCurrentShapes(t *testing.T) {
 		t.Fatalf("expected displayName label, got %q", models[0].Label)
 	}
 	if models[0].APIStyle != apistyle.OpenAIResponses {
-		t.Fatalf("expected openai-responses api style, got %q", models[0].APIStyle)
+		t.Fatalf("expected responses api style, got %q", models[0].APIStyle)
 	}
 }
 

core/internal/desktop/test.go

@@ -24,6 +24,8 @@ type TestResult struct {
 	Error   string `json:"error,omitempty"`
 }
 
+const defaultModelTestAPIKey = "clovapi-test"
+
 func proxyConfigForTest(s *profile.Store, portOverride int) profile.ProxyConfig {
 	cfg := profile.ProxyConfig{Enabled: true, Host: profile.DefaultProxyHost, Port: profile.DefaultProxyPort}
 	if s != nil {
@@ -149,7 +151,7 @@ func TestProviderModel(providerID, modelID string, portOverride int) TestResult
 	responsesBaseURL := provider.BuildProxyIngressBaseURL(proxyCfg.Port, providerID)
 	claudeBaseURL := provider.BuildProxyIngressBaseURL(proxyCfg.Port, providerID)
 
-	if err := testclient.ProbeToolRoundTrip(responsesBaseURL, claudeBaseURL, "clovapi-local", modelWire); err != nil {
+	if err := testclient.ProbeToolRoundTrip(responsesBaseURL, claudeBaseURL, defaultModelTestAPIKey, modelWire); err != nil {
 		return TestResult{
 			OK: true, Passed: false, Summary: "Test failed",
 			Text:  fmt.Sprintf("connectivity probe failed: %v", err),
@@ -158,6 +160,6 @@ func TestProviderModel(providerID, modelID string, portOverride int) TestResult
 	}
 	return TestResult{
 		OK: true, Passed: true, Summary: "Test passed",
-		Text: fmt.Sprintf("Local proxy probe passed for %s/%s (%s): openai-responses + anthropic messages.", providerID, pathModelID, modelWire),
+		Text: fmt.Sprintf("Local proxy probe passed for %s/%s (%s): responses + message.", providerID, pathModelID, modelWire),
 	}
 }

core/internal/profile/desktop.go

@@ -25,23 +25,9 @@ var subscriptionVendorDefs = []struct {
 	{SubscriptionProviderID: provider.CodexProviderID, Name: provider.CodexVendorName},
 }
 
-var allowedAPIStyles = map[string]apistyle.Style{
-	"claude":           apistyle.Claude,
-	"openai-chat":      apistyle.OpenAIChat,
-	"openai-responses": apistyle.OpenAIResponses,
-	"gemini":           apistyle.Gemini,
-}
-
 // NormalizeAPIStyle maps legacy/desktop style strings to canonical apistyle values.
 func NormalizeAPIStyle(raw string) apistyle.Style {
-	s := strings.ToLower(strings.TrimSpace(raw))
-	if s == "openai" {
-		return apistyle.OpenAIResponses
-	}
-	if s == "anthropic" {
-		return apistyle.Claude
-	}
-	if st, ok := allowedAPIStyles[s]; ok {
+	if st, err := apistyle.Parse(raw); err == nil {
 		return st
 	}
 	return apistyle.OpenAIResponses

core/internal/profile/store.go

@@ -10,7 +10,6 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/clovapi/switcher/internal/apistyle"
 	cfgpkg "github.com/clovapi/switcher/internal/config"
 	"github.com/clovapi/switcher/internal/syslog"
 )
@@ -113,11 +112,12 @@ func migrateLegacyCurrentIntoProfiles(raw []byte, s *Store) {
 	s.List = append(s.List, cur)
 }
 
-// migrateLegacyAPIStyles maps pre-split JSON api_style "openai" to openai-responses (Codex wire_api).
+// migrateLegacyAPIStyles maps older JSON api_style names to canonical styles.
 func migrateLegacyAPIStyles(s *Store) {
 	for i := range s.List {
-		if string(s.List[i].APIStyle) == "openai" {
-			s.List[i].APIStyle = apistyle.OpenAIResponses
+		s.List[i].APIStyle = NormalizeAPIStyle(string(s.List[i].APIStyle))
+		for j := range s.List[i].Models {
+			s.List[i].Models[j].APIStyle = NormalizeAPIStyle(string(s.List[i].Models[j].APIStyle))
 		}
 	}
 }

core/internal/provider/registry.go

@@ -4,6 +4,8 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
+
+	"github.com/clovapi/switcher/internal/apistyle"
 )
 
 const (
@@ -130,14 +132,18 @@ func parseLegacyProxyIngressParts(parts []string) (Ingress, bool) {
 	if err != nil {
 		return Ingress{}, false
 	}
+	normalizedAPIStyle, err := apistyle.Parse(apiStyle)
+	if err != nil {
+		return Ingress{}, false
+	}
 	pathSuffix := "/"
 	if len(parts) > 4 {
 		pathSuffix = "/" + strings.Join(parts[4:], "/")
 	}
 	if !IsFixedProviderID(providerID) || strings.TrimSpace(modelID) == "" || strings.TrimSpace(apiStyle) == "" {
 		return Ingress{}, false
 	}
-	return Ingress{ProviderID: providerID, ModelID: modelID, APIStyle: strings.ToLower(apiStyle), PathSuffix: pathSuffix}, true
+	return Ingress{ProviderID: providerID, ModelID: modelID, APIStyle: normalizedAPIStyle.String(), PathSuffix: pathSuffix}, true
 }
 
 // normalizeProxyIngressPath collapses /v1/v1/ from Anthropic clients whose base URL already ends with /v1.
@@ -158,15 +164,15 @@ func apiStyleFromPathSuffix(pathSuffix string) string {
 	}
 	switch {
 	case p == "/messages" || strings.HasPrefix(p, "/messages/"):
-		return "claude"
+		return apistyle.Claude.String()
 	case p == "/responses" || strings.HasPrefix(p, "/responses/"):
-		return "openai-responses"
+		return apistyle.OpenAIResponses.String()
 	case p == "/chat/completions" || strings.HasPrefix(p, "/chat/completions/"):
-		return "openai-chat"
+		return apistyle.OpenAIChat.String()
 	case strings.HasPrefix(p, "/models/") && (strings.Contains(p, ":generatecontent") || strings.Contains(p, ":streamgeneratecontent")):
-		return "gemini"
+		return apistyle.Gemini.String()
 	case p == "/models" || strings.HasPrefix(p, "/models/"):
-		return "openai-responses"
+		return apistyle.OpenAIResponses.String()
 	default:
 		return ""
 	}