Fix merged PR check regressions

apps/aether-gateway/src/ai_serving/planner/passthrough/provider/family/payload.rs

@@ -91,11 +91,6 @@ pub(crate) async fn maybe_build_local_same_format_provider_decision_payload_for_
             "envelope_name".to_string(),
             json!(crate::ai_serving::transport::kiro::KIRO_ENVELOPE_NAME),
         );
-    } else if resolved.is_gemini_cli {
-        extra_fields.insert(
-            "envelope_name".to_string(),
-            json!(aether_ai_formats::api::GEMINI_CLI_V1INTERNAL_ENVELOPE_NAME),
-        );
     } else if resolved.is_antigravity {
         extra_fields.insert(
             "envelope_name".to_string(),

apps/aether-gateway/src/tests/architecture/ai_serving.rs

@@ -1429,10 +1429,10 @@ fn ai_serving_planner_separates_local_candidate_resolution_from_ranking() {
         "with_builtin_adapters",
         "AntigravityProviderPoolAdapter",
         "CodexProviderPoolAdapter",
+        "GeminiCliProviderPoolAdapter",
         "KiroProviderPoolAdapter",
         "ChatGptWebProviderPoolAdapter",
         "CLAUDE_CODE_PROVIDER_POOL_ADAPTER",
-        "GEMINI_CLI_PROVIDER_POOL_ADAPTER",
         "VERTEX_AI_PROVIDER_POOL_ADAPTER",
         "provider_types_for_capability",
         "supports_quota_refresh",
@@ -1455,6 +1455,7 @@ fn ai_serving_planner_separates_local_candidate_resolution_from_ranking() {
         "pub mod unsupported;",
         "pub mod antigravity;",
         "pub mod codex;",
+        "pub mod gemini_cli;",
         "pub mod kiro;",
         "pub mod chatgpt_web;",
     ] {
@@ -1480,6 +1481,14 @@ fn ai_serving_planner_separates_local_candidate_resolution_from_ranking() {
                 "quota_exhausted_from_bucket",
             ],
         ),
+        (
+            "crates/aether-provider-pool/src/providers/gemini_cli.rs",
+            vec![
+                "GeminiCliProviderPoolAdapter",
+                "build_gemini_cli_pool_quota_request",
+                "GEMINI_CLI_RETRIEVE_USER_QUOTA_PATH",
+            ],
+        ),
         (
             "crates/aether-provider-pool/src/providers/kiro.rs",
             vec!["KiroProviderPoolAdapter", "quota_exhausted_from_bucket"],
@@ -1499,7 +1508,6 @@ fn ai_serving_planner_separates_local_candidate_resolution_from_ranking() {
             vec![
                 "UnsupportedQuotaProviderPoolAdapter",
                 "CLAUDE_CODE_PROVIDER_POOL_ADAPTER",
-                "GEMINI_CLI_PROVIDER_POOL_ADAPTER",
                 "VERTEX_AI_PROVIDER_POOL_ADAPTER",
             ],
         ),

crates/aether-provider-transport/src/same_format_provider/mod.rs

@@ -128,13 +128,7 @@ pub fn classify_same_format_provider_request_behavior(
     );
     let report_kind = if is_kiro && !params.require_streaming {
         "claude_cli_sync_finalize"
-    } else if is_gemini_cli && !params.require_streaming {
+    } else if (is_gemini_cli || is_antigravity) && !params.require_streaming {
-        match params.report_kind {
-            "gemini_chat_sync_success" => "gemini_chat_sync_finalize",
-            "gemini_cli_sync_success" => "gemini_cli_sync_finalize",
-            _ => params.report_kind,
-        }
-    } else if is_antigravity && !params.require_streaming {
         match params.report_kind {
             "gemini_chat_sync_success" => "gemini_chat_sync_finalize",
             "gemini_cli_sync_success" => "gemini_cli_sync_finalize",