Add Z.AI (Zhipu/GLM) provider and x-ai/Grok OpenRouter routing

- Add built-in zhipu provider with GLM coding API (api.z.ai/api/coding/paas/v4)
- Auto-detect GLM-* models to zhipu provider when ZAI_API_KEY is set
- Auto-detect x-ai/* models (Grok) to OpenRouter
- Add model families for GLM-5, GLM-4, and Grok models
- Support zhipu/ prefix stripping in effective_model_name

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: lee101

codex-rs/Cargo.lock

@@ -238,6 +238,21 @@ pub fn find_family_for_model(slug: &str) -> Option<ModelFamily> {
             needs_special_apply_patch_instructions: true,
             support_verbosity: true,
         )
+    } else if slug.starts_with("glm-5") || slug.starts_with("GLM-5") {
+        model_family!(
+            slug, "glm-5",
+            needs_special_apply_patch_instructions: true,
+        )
+    } else if slug.starts_with("glm-4") || slug.starts_with("GLM-4") {
+        model_family!(
+            slug, "glm-4",
+            needs_special_apply_patch_instructions: true,
+        )
+    } else if slug.contains("grok") {
+        model_family!(
+            slug, "grok",
+            needs_special_apply_patch_instructions: true,
+        )
     } else {
         None
     }

codex-rs/core/src/model_family.rs

@@ -37,6 +37,8 @@ const GEMINI_PROVIDER_NAME: &str = "Google Gemini";
 pub const GEMINI_PROVIDER_ID: &str = "gemini";
 const OPENROUTER_PROVIDER_NAME: &str = "OpenRouter";
 pub const OPENROUTER_PROVIDER_ID: &str = "openrouter";
+const ZHIPU_PROVIDER_NAME: &str = "Z.AI (Zhipu)";
+pub const ZHIPU_PROVIDER_ID: &str = "zhipu";
 const CHAT_WIRE_API_REMOVED_ERROR: &str = "`wire_api = \"chat\"` is no longer supported.\nHow to fix: set `wire_api = \"responses\"` in your provider config.\nMore info: https://github.com/openai/codex/discussions/7782";
 pub const LEGACY_OLLAMA_CHAT_PROVIDER_ID: &str = "ollama-chat";
 pub const OLLAMA_CHAT_PROVIDER_REMOVED_ERROR: &str = "`ollama-chat` is no longer supported.\nHow to fix: replace `ollama-chat` with `ollama` in `model_provider`, `oss_provider`, or `--local-provider`.\nMore info: https://github.com/openai/codex/discussions/7782";
@@ -342,13 +344,38 @@ impl ModelProviderInfo {
         }
     }
 
+    pub fn create_zhipu_provider() -> ModelProviderInfo {
+        ModelProviderInfo {
+            name: ZHIPU_PROVIDER_NAME.into(),
+            base_url: Some("https://api.z.ai/api/coding/paas/v4".into()),
+            env_key: Some("ZAI_API_KEY".into()),
+            env_key_instructions: Some(
+                "Get your API key from https://z.ai and set ZAI_API_KEY".into(),
+            ),
+            experimental_bearer_token: None,
+            auth: None,
+            wire_api: WireApi::Responses,
+            query_params: None,
+            http_headers: None,
+            env_http_headers: None,
+            request_max_retries: None,
+            stream_max_retries: None,
+            stream_idle_timeout_ms: None,
+            websocket_connect_timeout_ms: None,
+            requires_openai_auth: false,
+            supports_websockets: false,
+        }
+    }
+
     pub fn is_openai(&self) -> bool {
         self.name == OPENAI_PROVIDER_NAME
     }
 
     pub fn effective_model_name<'a>(&self, slug: &'a str) -> &'a str {
         if self.name == GEMINI_PROVIDER_NAME {
             slug.strip_prefix("google/").unwrap_or(slug)
+        } else if self.name == ZHIPU_PROVIDER_NAME {
+            slug.strip_prefix("zhipu/").unwrap_or(slug)
         } else {
             slug
         }
@@ -379,6 +406,7 @@ pub fn built_in_model_providers(
         (OPENAI_PROVIDER_ID, openai_provider),
         (OPENROUTER_PROVIDER_ID, P::create_openrouter_provider()),
         (GEMINI_PROVIDER_ID, P::create_gemini_provider()),
+        (ZHIPU_PROVIDER_ID, P::create_zhipu_provider()),
         (
             OLLAMA_OSS_PROVIDER_ID,
             create_oss_provider(DEFAULT_OLLAMA_PORT, WireApi::Responses),
@@ -400,14 +428,19 @@ fn non_empty_env_var(name: &str) -> bool {
 }
 
 pub fn infer_builtin_provider_id_for_model(model: &str) -> Option<&'static str> {
+    let lower = model.to_lowercase();
+    if lower.starts_with("glm-") && non_empty_env_var("ZAI_API_KEY") {
+        return Some(ZHIPU_PROVIDER_ID);
+    }
     match model.split_once('/') {
         Some(("google", _)) if non_empty_env_var("GEMINI_API_KEY") => Some(GEMINI_PROVIDER_ID),
         Some(("google", _)) if non_empty_env_var("OPENROUTER_API_KEY") => {
             Some(OPENROUTER_PROVIDER_ID)
         }
-        Some(("anthropic" | "z-ai", _)) if non_empty_env_var("OPENROUTER_API_KEY") => {
+        Some(("anthropic" | "z-ai" | "x-ai", _)) if non_empty_env_var("OPENROUTER_API_KEY") => {
             Some(OPENROUTER_PROVIDER_ID)
         }
+        Some(("zhipu", _)) if non_empty_env_var("ZAI_API_KEY") => Some(ZHIPU_PROVIDER_ID),
         _ => None,
     }
 }