glm

Author: lee101

codex-rs/model-provider-info/src/lib.rs

@@ -440,7 +440,6 @@ impl ModelProviderInfo {
         }
     }
 
-
     pub fn is_openai(&self) -> bool {
         self.name == OPENAI_PROVIDER_NAME
     }
@@ -449,7 +448,9 @@ impl ModelProviderInfo {
         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)
+            slug.strip_prefix("zhipu/")
+                .or_else(|| slug.strip_prefix("z-ai/"))
+                .unwrap_or(slug)
         } else {
             slug
         }
@@ -459,12 +460,10 @@ impl ModelProviderInfo {
         self.name == AMAZON_BEDROCK_PROVIDER_NAME
     }
 
-
     pub fn supports_remote_compaction(&self) -> bool {
         self.is_openai() || is_azure_responses_provider(&self.name, self.base_url.as_deref())
     }
 
-
     pub fn has_command_auth(&self) -> bool {
         self.auth.is_some()
     }
@@ -515,7 +514,15 @@ 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") {
+    if (lower.starts_with("glm-")
+        || lower
+            .strip_prefix("z-ai/")
+            .is_some_and(|slug| slug.starts_with("glm-"))
+        || lower
+            .strip_prefix("zhipu/")
+            .is_some_and(|slug| slug.starts_with("glm-")))
+        && non_empty_env_var("ZAI_API_KEY")
+    {
         return Some(ZHIPU_PROVIDER_ID);
     }
     match model.split_once('/') {
@@ -560,7 +567,6 @@ pub fn merge_configured_model_providers(
     Ok(model_providers)
 }
 
-
 pub fn create_oss_provider(default_provider_port: u16, wire_api: WireApi) -> ModelProviderInfo {
     // These CODEX_OSS_ environment variables are experimental: we may
     // switch to reading values from config.toml instead.

codex-rs/model-provider-info/src/model_provider_info_tests.rs

@@ -259,6 +259,14 @@ fn gemini_provider_normalizes_google_prefix() {
     );
 }
 
+#[test]
+fn zhipu_provider_normalizes_zai_prefix() {
+    let provider = ModelProviderInfo::create_zhipu_provider();
+    assert_eq!(provider.effective_model_name("z-ai/glm-5.1"), "glm-5.1");
+    assert_eq!(provider.effective_model_name("zhipu/glm-5.1"), "glm-5.1");
+    assert_eq!(provider.effective_model_name("glm-5.1"), "glm-5.1");
+}
+
 #[test]
 fn infer_builtin_provider_prefers_env_backed_routes() {
     let gemini_remove_guard = EnvVarGuard::remove("GEMINI_API_KEY");
@@ -268,15 +276,13 @@ fn infer_builtin_provider_prefers_env_backed_routes() {
         None
     );
 
-    drop(gemini_remove_guard);
     let gemini_set_guard = EnvVarGuard::set("GEMINI_API_KEY", "gemini-key");
     assert_eq!(
         infer_builtin_provider_id_for_model("google/gemini-3.1-pro-preview"),
         Some(GEMINI_PROVIDER_ID)
     );
 
     drop(gemini_set_guard);
-    drop(openrouter_remove_guard);
     let _openrouter_set_guard = EnvVarGuard::set("OPENROUTER_API_KEY", "openrouter-key");
     assert_eq!(
         infer_builtin_provider_id_for_model("google/gemini-3.1-pro-preview"),
@@ -290,6 +296,16 @@ fn infer_builtin_provider_prefers_env_backed_routes() {
         infer_builtin_provider_id_for_model("z-ai/glm-5"),
         Some(OPENROUTER_PROVIDER_ID)
     );
+
+    let _zai_set_guard = EnvVarGuard::set("ZAI_API_KEY", "zai-key");
+    assert_eq!(
+        infer_builtin_provider_id_for_model("glm-5.1"),
+        Some(ZHIPU_PROVIDER_ID)
+    );
+    assert_eq!(
+        infer_builtin_provider_id_for_model("z-ai/glm-5.1"),
+        Some(ZHIPU_PROVIDER_ID)
+    );
 }
 
 #[test]