feat(catalog,client,setup): Z.AI proper plan separation (z-ai general + z-ai-coding) with dual OpenAI+Anthropic endpoints and region support (#36)

* feat(catalog,client,setup): Z.AI proper plan separation (z-ai general + z-ai-coding) with dual OpenAI+Anthropic endpoints and region support

* fix(setup): nil-check cfg in Z.AI deployment resolvers

resolveZAIOpenAIBaseForDeployment and resolveZAIAnthropicBaseForDeployment
panicked when config.LoadProviderConfig("") returned nil (no provider.json
configured). Add the nil guard so deployment lookup is safe for first-run
users without a provider config.

Author: Patel230

catalog/deployment_env_test.go

@@ -48,9 +48,9 @@ func TestDefaultDeploymentEnvFallbacks_GrokHasXAIAPIKey(t *testing.T) {
 
 func TestDefaultDeploymentEnvFallbacks_ZAIHasZAIAPIBase(t *testing.T) {
 	fbs := DefaultDeploymentEnvFallbacks
-	zai, ok := fbs["z-ai-direct"]
+	zai, ok := fbs["zai_payg-direct"]
 	if !ok {
-		t.Fatal("z-ai-direct not found in env fallbacks")
+		t.Fatal("zai_payg-direct not found in env fallbacks")
 	}
 	hasZAIAPIBase := false
 	for _, fb := range zai {
@@ -63,7 +63,7 @@ func TestDefaultDeploymentEnvFallbacks_ZAIHasZAIAPIBase(t *testing.T) {
 		}
 	}
 	if !hasZAIAPIBase {
-		t.Error("z-ai-direct base_url fallbacks should include ZAI_API_BASE")
+		t.Error("zai_payg-direct base_url fallbacks should include ZAI_API_BASE")
 	}
 }
 

catalog/live/fetchers.go

@@ -24,6 +24,7 @@ const (
 	DefaultOpenRouterBaseURL = "https://openrouter.ai/api/v1"
 	DefaultCanopyWaveBaseURL = "https://inference.canopywave.io/v1"
 	DefaultZAIBaseURL        = "https://api.z.ai/api/paas/v4"
+	DefaultZAICodingBaseURL  = "https://api.z.ai/api/coding/paas/v4"
 	DefaultOpenAIBaseURL     = "https://api.openai.com/v1"
 	DefaultGrokBaseURL       = "https://api.x.ai/v1"
 	DefaultOpenCodeGoBaseURL = opencodego.DefaultBaseURL
@@ -47,7 +48,8 @@ var Registry = map[string]FetchFunc{
 	"vertex":                 FetchVertex,
 	"openrouter":             FetchOpenRouter,
 	"grok":                   FetchGrok,
-	"z-ai":                   FetchZAI,
+	"zai_payg":               FetchZAI,
+	"zai_coding":             FetchZAICoding,
 	"canopywave":             FetchCanopyWave,
 	"opencodego":             FetchOpenCodeGo,
 	"kimi":                   FetchKimi,
@@ -739,6 +741,17 @@ func FetchZAI(env map[string]string) ([]Entry, error) {
 	return entries, nil
 }
 
+// FetchZAICoding lists models using the GLM Coding Plan dedicated endpoint.
+// It expects ZAI_CODING_API_KEY (and optional ZAI_CODING_BASE_URL) in the env map.
+// This ensures proper quota/billing separation from the general pay-as-you-go path.
+func FetchZAICoding(env map[string]string) ([]Entry, error) {
+	return fetchOpenAICompatModels(
+		context.Background(),
+		envOr(env, "ZAI_CODING_BASE_URL", DefaultZAICodingBaseURL),
+		env["ZAI_CODING_API_KEY"], "Bearer",
+	)
+}
+
 func FetchCanopyWave(env map[string]string) ([]Entry, error) {
 	entries, err := fetchOpenAICompatModels(
 		context.Background(),

catalog/live/zai_test.go

@@ -21,8 +21,8 @@ func TestFetchZAI_MockHTTPServer(t *testing.T) {
 			Data []json.RawMessage `json:"data"`
 		}{
 			Data: []json.RawMessage{
-				json.RawMessage(`{"id":"z-ai/model-a","display_name":"ZAI Model A","status":1}`),
-				json.RawMessage(`{"id":"z-ai/model-b","display_name":"ZAI Model B","status":1}`),
+				json.RawMessage(`{"id":"zai_payg/model-a","display_name":"ZAI Model A","status":1}`),
+				json.RawMessage(`{"id":"zai_payg/model-b","display_name":"ZAI Model B","status":1}`),
 			},
 		}
 		_ = json.NewEncoder(w).Encode(resp)
@@ -43,9 +43,9 @@ func TestFetchZAI_MockHTTPServer(t *testing.T) {
 	for _, e := range entries {
 		byID[e.ID] = e
 	}
-	a, ok := byID["z-ai/model-a"]
+	a, ok := byID["zai_payg/model-a"]
 	if !ok {
-		t.Fatal("missing z-ai/model-a")
+		t.Fatal("missing zai_payg/model-a")
 	}
 	if a.DisplayName != "ZAI Model A" {
 		t.Fatalf("display name = %q", a.DisplayName)
@@ -80,3 +80,51 @@ func TestFetchZAI_Unauthorized(t *testing.T) {
 		t.Fatal("expected error for 401")
 	}
 }
+
+func TestFetchZAICoding_MockHTTPServer(t *testing.T) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path != "/models" {
+			http.NotFound(w, r)
+			return
+		}
+		if r.Header.Get("Authorization") != "Bearer test-coding-key" {
+			w.WriteHeader(http.StatusUnauthorized)
+			return
+		}
+		resp := struct {
+			Data []json.RawMessage `json:"data"`
+		}{
+			Data: []json.RawMessage{
+				json.RawMessage(`{"id":"zai_coding/model-c","display_name":"ZAI Coding Model C","status":1}`),
+				json.RawMessage(`{"id":"zai_coding/model-d","display_name":"ZAI Coding Model D","status":1}`),
+			},
+		}
+		_ = json.NewEncoder(w).Encode(resp)
+	}))
+	defer srv.Close()
+
+	entries, err := FetchZAICoding(map[string]string{
+		"ZAI_CODING_API_KEY":  "test-coding-key",
+		"ZAI_CODING_BASE_URL": srv.URL,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(entries) != 2 {
+		t.Fatalf("expected 2 models, got %d", len(entries))
+	}
+	byID := map[string]Entry{}
+	for _, e := range entries {
+		byID[e.ID] = e
+	}
+	c, ok := byID["zai_coding/model-c"]
+	if !ok {
+		t.Fatal("missing zai_coding/model-c")
+	}
+	if c.DisplayName != "ZAI Coding Model C" {
+		t.Fatalf("display name = %q", c.DisplayName)
+	}
+	if len(c.RawJSON) == 0 {
+		t.Fatal("expected RawJSON to be preserved")
+	}
+}

catalog/live_catalog_test.go

@@ -9,7 +9,7 @@ import (
 func TestIsLiveOnlyProvider(t *testing.T) {
 	// All providers are now fully dynamic
 	allProviders := []string{
-		"anthropic", "openai", "gemini", "grok", "canopywave", "z-ai", "openrouter", "ollama", "opencodego",
+		"anthropic", "openai", "gemini", "grok", "canopywave", "z_ai", "openrouter", "ollama", "opencodego",
 		"azure", "bedrock", "vertex", "kimi", "xiaomi_mimo_payg", "xiaomi_mimo_token_plan", "deepseek",
 	}
 	for _, p := range allProviders {
@@ -21,12 +21,12 @@ func TestIsLiveOnlyProvider(t *testing.T) {
 
 func TestFirstModelForProvider(t *testing.T) {
 	c := catalog.TestSeedCatalogV1()
-	c.Models["z-ai/glm-5.1"] = catalog.ModelV1{ID: "z-ai/glm-5.1", ProviderID: "z-ai", Name: "GLM-5.1"}
+	c.Models["zai_payg/glm-5.1"] = catalog.ModelV1{ID: "zai_payg/glm-5.1", ProviderID: "zai_payg", Name: "GLM-5.1"}
 	compiled, err := catalog.CompileCatalogV1(&c)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if got := catalog.FirstModelForProvider(compiled, "z-ai"); got != "z-ai/glm-5.1" {
+	if got := catalog.FirstModelForProvider(compiled, "zai_payg"); got != "zai_payg/glm-5.1" {
 		t.Fatalf("FirstModelForProvider = %q", got)
 	}
 }

catalog/model_tiers_test.go

@@ -75,7 +75,7 @@ func TestAllProvidersAreLiveOnly(t *testing.T) {
 	// All providers should now return nil candidates (fully dynamic)
 	allProviders := []string{
 		"anthropic", "openai", "gemini", "grok", "opencodego",
-		"canopywave", "z-ai", "openrouter", "ollama",
+		"canopywave", "z_ai", "openrouter", "ollama",
 		"azure", "bedrock", "vertex", "kimi",
 		"xiaomi_mimo_payg", "xiaomi_mimo_token_plan", "deepseek",
 	}

catalog/provider_credentials_test.go

@@ -17,8 +17,11 @@ func TestPrimaryAPIKeyEnvForProvider(t *testing.T) {
 	if got := PrimaryAPIKeyEnvForProvider(compiled, "canopywave"); got != "CANOPYWAVE_API_KEY" {
 		t.Fatalf("canopywave env = %q", got)
 	}
-	if got := PrimaryAPIKeyEnvForProvider(compiled, "z-ai"); got != "ZAI_API_KEY" {
-		t.Fatalf("z-ai env = %q", got)
+	if got := PrimaryAPIKeyEnvForProvider(compiled, "zai_payg"); got != "ZAI_API_KEY" {
+		t.Fatalf("zai_payg env = %q", got)
+	}
+	if got := PrimaryAPIKeyEnvForProvider(compiled, "zai_coding"); got != "ZAI_CODING_API_KEY" {
+		t.Fatalf("zai_coding env = %q", got)
 	}
 }
 

catalog/provider_live_parity_test.go

@@ -10,8 +10,8 @@ import (
 
 func TestAllProviders_LiveFetchParity(t *testing.T) {
 	specs := registry.All()
-	if len(specs) != 18 {
-		t.Fatalf("expected 16 providers, got %d", len(specs))
+	if len(specs) != 19 {
+		t.Fatalf("expected 19 providers, got %d", len(specs))
 	}
 	for _, spec := range specs {
 		t.Run(spec.ProviderID, func(t *testing.T) {

catalog/provider_registration_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func TestSpecByProviderID_RegisteredProviders(t *testing.T) {
-	providers := []string{"anthropic", "openai", "gemini", "grok", "openrouter", "z-ai", "canopywave", "ollama", "opencodego", "kimi", "xiaomi_mimo_payg", "xiaomi_mimo_token_plan"}
+	providers := []string{"anthropic", "openai", "gemini", "grok", "openrouter", "zai_payg", "zai_coding", "canopywave", "ollama", "opencodego", "kimi", "xiaomi_mimo_payg", "xiaomi_mimo_token_plan"}
 	for _, id := range providers {
 		spec, ok := SpecByProviderID(id)
 		if !ok {

catalog/registry/provider_spec_test.go

@@ -8,8 +8,8 @@ import (
 )
 
 func TestAllProviders_Count(t *testing.T) {
-	if n := len(registry.All()); n != 18 {
-		t.Fatalf("expected 18 providers, got %d", n)
+	if n := len(registry.All()); n != 19 {
+		t.Fatalf("expected 19 providers, got %d", n)
 	}
 }
 
@@ -21,8 +21,8 @@ func TestCredentialRegistry_MatchesAll(t *testing.T) {
 
 func TestLiveFetcherKeys_AllProviders(t *testing.T) {
 	keys := registry.LiveFetcherKeys()
-	if len(keys) != 18 {
-		t.Fatalf("expected 18 live fetcher keys, got %d", len(keys))
+	if len(keys) != 19 {
+		t.Fatalf("expected 19 live fetcher keys, got %d", len(keys))
 	}
 }
 
@@ -59,7 +59,8 @@ func TestProviderSpecs_TableDriven(t *testing.T) {
 		{"vertex", "vertex", true, registry.ProbeNone, true, "gemini-vertex"},
 		{"openrouter", "openrouter", true, registry.ProbeOpenAIModels, true, "openrouter"},
 		{"grok", "grok", true, registry.ProbeOpenAIModels, true, "grok-direct"},
-		{"z-ai", "z-ai", true, registry.ProbeOpenAIModels, true, "z-ai-direct"},
+		{"zai_payg", "zai_payg", true, registry.ProbeOpenAIModels, true, "zai_payg-direct"},
+		{"zai_coding", "zai_coding", true, registry.ProbeOpenAIModels, true, "zai_coding-direct"},
 		{"canopywave", "canopywave", true, registry.ProbeOpenAIModels, true, "canopywave"},
 		{"opencodego", "opencodego", true, registry.ProbeOpenAIModels, true, "opencodego"},
 		{"kimi", "kimi", true, registry.ProbeOpenAIModels, true, "kimi-direct"},

catalog/registry/providers.go

@@ -65,39 +65,47 @@ func providerSpecs() []ProviderSpec {
 			APIProtocolID: "openai-chat-completions", AdapterID: "kimi",
 		},
 		{
-			ProviderID: "z-ai", DisplayName: "Z.AI", DeploymentID: "z-ai-direct", SortOrder: 7,
+			ProviderID: "zai_coding", DisplayName: "Z.AI — Coding Plan", DeploymentID: "zai_coding-direct", SortOrder: 7,
+			RequiresKey: true, CredentialEnv: "ZAI_CODING_API_KEY",
+			BaseURLEnv: []string{"ZAI_CODING_BASE_URL", "ZAI_BASE_URL", "OPENAI_BASE_URL", "OPENAI_API_BASE"},
+			ProbeKind:  ProbeOpenAIModels, ProbeBaseURL: "https://api.z.ai/api/coding/paas/v4",
+			LiveFetcherKey: "zai_coding", LiveCatalogKey: "zai_coding",
+			APIProtocolID: "openai-chat-completions", AdapterID: "zai_coding",
+		},
+		{
+			ProviderID: "zai_payg", DisplayName: "Z.AI — Pay-as-you-go", DeploymentID: "zai_payg-direct", SortOrder: 8,
 			RequiresKey: true, CredentialEnv: "ZAI_API_KEY",
 			BaseURLEnv: []string{"ZAI_BASE_URL", "ZAI_API_BASE", "OPENAI_BASE_URL", "OPENAI_API_BASE"},
 			ProbeKind:  ProbeOpenAIModels, ProbeBaseURL: "https://api.z.ai/api/paas/v4",
-			LiveFetcherKey: "z-ai", LiveCatalogKey: "z-ai",
-			APIProtocolID: "openai-chat-completions", AdapterID: "z-ai",
+			LiveFetcherKey: "zai_payg", LiveCatalogKey: "zai_payg",
+			APIProtocolID: "openai-chat-completions", AdapterID: "zai_payg",
 		},
 		{
-			ProviderID: "xiaomi_mimo_token_plan", DisplayName: "Xiaomi MiMo — Token Plan", DeploymentID: "xiaomi_mimo_token_plan-direct", SortOrder: 8,
+			ProviderID: "xiaomi_mimo_token_plan", DisplayName: "Xiaomi MiMo — Token Plan", DeploymentID: "xiaomi_mimo_token_plan-direct", SortOrder: 9,
 			RequiresKey: true, CredentialEnv: "XIAOMI_MIMO_TOKEN_PLAN_API_KEY",
 			BaseURLEnv: []string{"XIAOMI_MIMO_TOKEN_PLAN_BASE_URL", "OPENAI_BASE_URL", "OPENAI_API_BASE"},
 			ProbeKind:  ProbeOpenAIModels, ProbeBaseURL: "",
 			LiveFetcherKey: "xiaomi_mimo_token_plan", LiveCatalogKey: "xiaomi_mimo_token_plan",
 			APIProtocolID: "openai-chat-completions", AdapterID: "xiaomi_mimo",
 		},
 		{
-			ProviderID: "xiaomi_mimo_payg", DisplayName: "Xiaomi MiMo — Pay-as-you-go", DeploymentID: "xiaomi_mimo_payg-direct", SortOrder: 9,
+			ProviderID: "xiaomi_mimo_payg", DisplayName: "Xiaomi MiMo — Pay-as-you-go", DeploymentID: "xiaomi_mimo_payg-direct", SortOrder: 10,
 			RequiresKey: true, CredentialEnv: "XIAOMI_MIMO_PAYG_API_KEY",
 			BaseURLEnv: []string{"XIAOMI_MIMO_PAYG_BASE_URL", "XIAOMI_BASE_URL", "OPENAI_BASE_URL", "OPENAI_API_BASE"},
 			ProbeKind:  ProbeOpenAIModels, ProbeBaseURL: "https://api.xiaomimimo.com/v1",
 			LiveFetcherKey: "xiaomi_mimo_payg", LiveCatalogKey: "xiaomi_mimo_payg",
 			APIProtocolID: "openai-chat-completions", AdapterID: "xiaomi_mimo",
 		},
 		{
-			ProviderID: "minimax_token_plan", DisplayName: "MiniMax — Token Plan", DeploymentID: "minimax_token_plan-direct", SortOrder: 10,
+			ProviderID: "minimax_token_plan", DisplayName: "MiniMax — Token Plan", DeploymentID: "minimax_token_plan-direct", SortOrder: 11,
 			RequiresKey: true, CredentialEnv: "MINIMAX_TOKEN_PLAN_API_KEY",
 			BaseURLEnv: []string{"MINIMAX_TOKEN_PLAN_BASE_URL", "OPENAI_BASE_URL", "OPENAI_API_BASE"},
 			ProbeKind:  ProbeOpenAIModels, ProbeBaseURL: "https://api.minimax.io/v1",
 			LiveFetcherKey: "minimax_token_plan", LiveCatalogKey: "minimax_token_plan",
 			APIProtocolID: "openai-chat-completions", AdapterID: "openai",
 		},
 		{
-			ProviderID: "minimax_payg", DisplayName: "MiniMax — Pay-as-you-go", DeploymentID: "minimax_payg-direct", SortOrder: 11,
+			ProviderID: "minimax_payg", DisplayName: "MiniMax — Pay-as-you-go", DeploymentID: "minimax_payg-direct", SortOrder: 12,
 			RequiresKey: true, CredentialEnv: "MINIMAX_PAYG_API_KEY",
 			BaseURLEnv: []string{"MINIMAX_PAYG_BASE_URL", "MINIMAX_BASE_URL", "OPENAI_BASE_URL", "OPENAI_API_BASE"},
 			ProbeKind:  ProbeOpenAIModels, ProbeBaseURL: "https://api.minimax.io/v1",
@@ -107,15 +115,15 @@ func providerSpecs() []ProviderSpec {
 
 		// ── Cloud platform providers ──────────────────────────────────────
 		{
-			ProviderID: "azure", DisplayName: "Azure OpenAI", DeploymentID: "openai-azure", SortOrder: 12,
+			ProviderID: "azure", DisplayName: "Azure OpenAI", DeploymentID: "openai-azure", SortOrder: 13,
 			RequiresKey: true, CredentialEnv: "AZURE_OPENAI_API_KEY",
 			BaseURLEnv:     []string{"AZURE_OPENAI_ENDPOINT"},
 			ProbeKind:      ProbeNone,
 			LiveFetcherKey: "azure", LiveCatalogKey: "azure",
 			APIProtocolID: "openai-chat-completions", AdapterID: "openai-azure",
 		},
 		{
-			ProviderID: "bedrock", DisplayName: "Amazon Bedrock", DeploymentID: "anthropic-bedrock", SortOrder: 13,
+			ProviderID: "bedrock", DisplayName: "Amazon Bedrock", DeploymentID: "anthropic-bedrock", SortOrder: 14,
 			RequiresKey: true, CredentialEnv: "AWS_SECRET_ACCESS_KEY",
 			CredentialEnvFallbacks: []string{"AWS_ACCESS_KEY_ID", "AWS_SESSION_TOKEN"},
 			BaseURLEnv:             []string{"AWS_REGION", "AWS_DEFAULT_REGION"},
@@ -124,7 +132,7 @@ func providerSpecs() []ProviderSpec {
 			APIProtocolID: "anthropic-messages", AdapterID: "anthropic-bedrock",
 		},
 		{
-			ProviderID: "vertex", DisplayName: "Vertex AI", DeploymentID: "gemini-vertex", SortOrder: 14,
+			ProviderID: "vertex", DisplayName: "Vertex AI", DeploymentID: "gemini-vertex", SortOrder: 15,
 			RequiresKey: true, CredentialEnv: "VERTEX_ACCESS_TOKEN",
 			CredentialEnvFallbacks: []string{"GOOGLE_OAUTH_ACCESS_TOKEN"},
 			BaseURLEnv:             []string{"VERTEX_PROJECT_ID", "VERTEX_REGION"},
@@ -135,7 +143,7 @@ func providerSpecs() []ProviderSpec {
 
 		// ── Aggregators ───────────────────────────────────────────────────
 		{
-			ProviderID: "openrouter", DisplayName: "OpenRouter", DeploymentID: "openrouter", SortOrder: 15,
+			ProviderID: "openrouter", DisplayName: "OpenRouter", DeploymentID: "openrouter", SortOrder: 16,
 			RequiresKey: true, CredentialEnv: "OPENROUTER_API_KEY",
 			BaseURLEnv: []string{"OPENROUTER_BASE_URL", "OPENAI_BASE_URL", "OPENAI_API_BASE"},
 			ProbeKind:  ProbeOpenAIModels, ProbeBaseURL: "https://openrouter.ai/api/v1",
@@ -145,15 +153,15 @@ func providerSpecs() []ProviderSpec {
 
 		// ── Niche ─────────────────────────────────────────────────────────
 		{
-			ProviderID: "canopywave", DisplayName: "CanopyWave", DeploymentID: "canopywave", SortOrder: 16,
+			ProviderID: "canopywave", DisplayName: "CanopyWave", DeploymentID: "canopywave", SortOrder: 17,
 			RequiresKey: true, CredentialEnv: "CANOPYWAVE_API_KEY",
 			BaseURLEnv: []string{"CANOPYWAVE_BASE_URL", "OPENAI_BASE_URL", "OPENAI_API_BASE"},
 			ProbeKind:  ProbeOpenAIModels, ProbeBaseURL: "https://inference.canopywave.io/v1",
 			LiveFetcherKey: "canopywave", LiveCatalogKey: "canopywave",
 			APIProtocolID: "openai-chat-completions", AdapterID: "canopywave",
 		},
 		{
-			ProviderID: "opencodego", DisplayName: "OpenCode Go", DeploymentID: "opencodego", SortOrder: 17,
+			ProviderID: "opencodego", DisplayName: "OpenCode Go", DeploymentID: "opencodego", SortOrder: 18,
 			RequiresKey: true, CredentialEnv: "OPENCODEGO_API_KEY",
 			BaseURLEnv:     []string{"OPENCODEGO_BASE_URL", "OPENAI_BASE_URL", "OPENAI_API_BASE"},
 			ProbeKind:      ProbeOpenAIModels,
@@ -164,7 +172,7 @@ func providerSpecs() []ProviderSpec {
 
 		// ── Local ─────────────────────────────────────────────────────────
 		{
-			ProviderID: "ollama", DisplayName: "Ollama", DeploymentID: "ollama-local", SortOrder: 18,
+			ProviderID: "ollama", DisplayName: "Ollama", DeploymentID: "ollama-local", SortOrder: 19,
 			RequiresKey: false, CredentialEnv: "OLLAMA_BASE_URL",
 			BaseURLEnv:     []string{"OLLAMA_BASE_URL"},
 			ProbeKind:      ProbeOllama,