diff --git a/.gitignore b/.gitignore
index fccaf9d4..71806478 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,9 +10,16 @@ hawk
 .commandcode/
 .hawk/
 .yaad/
+.openclaude/
+.grok/
+.hermes/
+.qoder/
 
 # Cache / local data
 .gocache/
+.gocache-*/
+.gomodcache/
+.gomodcache-*/
 *.codegraph.db
 .DS_Store
 
diff --git a/external/eyrie b/external/eyrie
index dce29ff9..d9dba7d3 160000
--- a/external/eyrie
+++ b/external/eyrie
@@ -1 +1 @@
-Subproject commit dce29ff995f63b9a84dae6750d438636f1de1a3f
+Subproject commit d9dba7d3007096dcc3251398cf9dc914709b473a
diff --git a/internal/config/catalog_api.go b/internal/config/catalog_api.go
index 95c43025..0a0a2928 100644
--- a/internal/config/catalog_api.go
+++ b/internal/config/catalog_api.go
@@ -86,7 +86,7 @@ func setupGatewayRegistryID(provider string) string {
 	}
 }
 
-// SetupGatewayCredentialEnv returns the registry env var for a setup gateway (e.g. XIAOMI_MIMO_API_KEY).
+// SetupGatewayCredentialEnv returns the registry env var for a setup gateway (e.g. XIAOMI_MIMO_PAYG_API_KEY).
 func SetupGatewayCredentialEnv(providerID string) string {
 	spec, ok := registry.DefaultRegistry.Get(setupGatewayRegistryID(providerID))
 	if !ok || !spec.RequiresKey {
diff --git a/internal/config/catalog_gateways_test.go b/internal/config/catalog_gateways_test.go
index 052d458e..e025cff5 100644
--- a/internal/config/catalog_gateways_test.go
+++ b/internal/config/catalog_gateways_test.go
@@ -11,15 +11,15 @@ import (
 
 func TestAllSetupGateways_RegistryOnly(t *testing.T) {
 	gws := AllSetupGateways()
-	if len(gws) != 16 {
-		t.Fatalf("expected 16 setup gateways, got %d: %v", len(gws), gws)
+	if len(gws) != 18 {
+		t.Fatalf("expected 18 setup gateways, got %d: %v", len(gws), gws)
 	}
 	for _, id := range gws {
 		if id == "ai21" || id == "alibaba" {
 			t.Fatalf("owner slug %q should not be a gateway", id)
 		}
 	}
-	want := map[string]bool{"azure": true, "bedrock": true, "gemini": true, "grok": true, "openrouter": true, "kimi": true, "vertex": true, "xiaomi_mimo_payg": true, "xiaomi_mimo_token_plan": true, "deepseek": true}
+	want := map[string]bool{"azure": true, "bedrock": true, "gemini": true, "grok": true, "openrouter": true, "kimi": true, "vertex": true, "xiaomi_mimo_payg": true, "xiaomi_mimo_token_plan": true, "deepseek": true, "minimax_token_plan": true, "minimax_payg": true}
 	for id := range want {
 		found := false
 		for _, gw := range gws {
@@ -100,10 +100,10 @@ func TestGatewayDisplayName(t *testing.T) {
 	if got := GatewayDisplayName("openrouter"); got != "OpenRouter" {
 		t.Fatalf("display name = %q", got)
 	}
-	if got := GatewayDisplayName("google"); got != "Google Gemini" {
+	if got := GatewayDisplayName("google"); got != "Gemini API" {
 		t.Fatalf("google alias display = %q", got)
 	}
-	if got := GatewayDisplayName("gemini"); got != "Google Gemini" {
+	if got := GatewayDisplayName("gemini"); got != "Gemini API" {
 		t.Fatalf("gemini display = %q", got)
 	}
 }
diff --git a/internal/config/settings.go b/internal/config/settings.go
index 45b2e03a..c9cc0108 100644
--- a/internal/config/settings.go
+++ b/internal/config/settings.go
@@ -614,7 +614,7 @@ func providerCredentialEnvAliases(provider string) []string {
 	case "grok", "xai":
 		return nil
 	case "xiaomi_mimo", "xiaomi_mimo_payg":
-		return []string{"XIAOMI_MIMO_API_KEY"}
+		return []string{"XIAOMI_MIMO_PAYG_API_KEY"}
 	default:
 		return nil
 	}
diff --git a/internal/config/xiaomi_setup.go b/internal/config/xiaomi_setup.go
index 3819c0b4..e3aa269a 100644
--- a/internal/config/xiaomi_setup.go
+++ b/internal/config/xiaomi_setup.go
@@ -38,10 +38,10 @@ func SetXiaomiTokenPlanRegion(region string) error {
 	if saveErr := eyriecfg.SaveProviderConfig(cfg, ""); saveErr != nil {
 		return saveErr
 	}
-	_ = os.Setenv(eyriecfg.EnvXiaomiTokenPlanRegion, string(normalized))
-	base, err := eyriecfg.ResolveXiaomiOpenAIBase(ProviderXiaomiTokenPlan, cfg)
+	_ = os.Setenv(eyriecfg.EnvXiaomiMimoTokenPlanRegion, string(normalized))
+	base, err := eyriecfg.ResolveXiaomiMimoOpenAIBase(ProviderXiaomiTokenPlan, cfg)
 	if err == nil && base != "" {
-		_ = os.Setenv(eyriecfg.EnvXiaomiTokenPlanBaseURL, base)
+		_ = os.Setenv(eyriecfg.EnvXiaomiMimoTokenPlanBaseURL, base)
 		cfg.XiaomiMimoTokenPlanBaseURL = base
 		_ = eyriecfg.SaveProviderConfig(cfg, "")
 	}
@@ -69,9 +69,9 @@ func ApplyXiaomiTokenPlanRegionEnv(ctx context.Context) {
 		return
 	}
 	if r := strings.TrimSpace(cfg.XiaomiMimoTokenPlanRegion); r != "" {
-		_ = os.Setenv(eyriecfg.EnvXiaomiTokenPlanRegion, r)
+		_ = os.Setenv(eyriecfg.EnvXiaomiMimoTokenPlanRegion, r)
 	}
-	if base, err := eyriecfg.ResolveXiaomiOpenAIBase(ProviderXiaomiTokenPlan, cfg); err == nil && base != "" {
-		_ = os.Setenv(eyriecfg.EnvXiaomiTokenPlanBaseURL, base)
+	if base, err := eyriecfg.ResolveXiaomiMimoOpenAIBase(ProviderXiaomiTokenPlan, cfg); err == nil && base != "" {
+		_ = os.Setenv(eyriecfg.EnvXiaomiMimoTokenPlanBaseURL, base)
 	}
 }