use original request sources for endpoint conditions

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

@@ -129,6 +129,7 @@ pub(crate) async fn resolve_local_same_format_provider_candidate_payload_parts(
             &prepared.mapped_model,
             spec,
             prepared.transport.endpoint.body_rules.as_ref(),
+            Some(&parts.headers),
             prepared.upstream_is_stream,
             prepared.kiro_auth.as_ref(),
             prepared.is_claude_code,

apps/aether-gateway/src/ai_serving/planner/passthrough/provider/request/body.rs

@@ -12,6 +12,7 @@ pub(crate) fn build_same_format_provider_request_body(
     mapped_model: &str,
     spec: LocalSameFormatProviderSpec,
     body_rules: Option<&Value>,
+    request_headers: Option<&http::HeaderMap>,
     upstream_is_stream: bool,
     kiro_auth: Option<&crate::ai_serving::transport::kiro::KiroRequestAuth>,
     is_claude_code: bool,
@@ -25,6 +26,7 @@ pub(crate) fn build_same_format_provider_request_body(
         source_model: body_json.get("model").and_then(Value::as_str),
         family: same_format_provider_family(spec.family),
         body_rules,
+        request_headers,
         upstream_is_stream,
         kiro_auth_config: kiro_auth.map(|auth| &auth.auth_config),
         is_claude_code,

apps/aether-gateway/src/ai_serving/planner/specialized/files/request.rs

@@ -103,6 +103,7 @@ pub(super) async fn resolve_local_gemini_files_candidate_payload_parts(
         body_is_empty,
         spec_metadata.decision_kind == GEMINI_FILES_UPLOAD_PLAN_KIND,
         transport.endpoint.body_rules.as_ref(),
+        Some(&parts.headers),
     ) {
         Ok(parts) => parts,
         Err(GeminiFilesRequestBodyError::BodyRulesUnsupportedForBinaryUpload) => {

apps/aether-gateway/src/ai_serving/planner/specialized/video/request.rs

@@ -124,6 +124,7 @@ pub(super) async fn resolve_local_video_create_candidate_payload_parts(
         provider_family,
         &mapped_model,
         transport.endpoint.body_rules.as_ref(),
+        Some(&parts.headers),
     ) else {
         mark_skipped_local_video_candidate_with_failure_diagnostic(
             state,

apps/aether-gateway/src/ai_serving/planner/standard/family/request.rs

@@ -176,7 +176,7 @@ pub(crate) async fn resolve_local_standard_candidate_payload_parts(
         )
         .await;
     let mut provider_request_body =
-        match crate::ai_serving::planner::standard::build_standard_request_body_with_model_directives(
+        match crate::ai_serving::planner::standard::build_standard_request_body_with_model_directives_and_request_headers(
             body_json,
             spec_metadata.api_format,
             &prepared_candidate.mapped_model,
@@ -190,6 +190,7 @@ pub(crate) async fn resolve_local_standard_candidate_payload_parts(
                 transport.endpoint.body_rules.as_ref()
             },
             Some(input.auth_context.api_key_id.as_str()),
+            Some(&parts.headers),
             enable_model_directives,
         ) {
             Some(body) => body,
@@ -353,6 +354,7 @@ async fn build_kiro_cross_format_payload_parts(
         &mapped_model,
         &kiro_auth.auth_config,
         transport.endpoint.body_rules.as_ref(),
+        Some(&parts.headers),
     ) {
         Some(body) => body,
         None => {

apps/aether-gateway/src/ai_serving/planner/standard/mod.rs

@@ -51,6 +51,7 @@ pub(crate) use crate::ai_serving::{
 };
 pub(crate) use crate::ai_serving::{
     build_standard_request_body, build_standard_request_body_with_model_directives,
+    build_standard_request_body_with_model_directives_and_request_headers,
     convert_openai_chat_request_to_claude_request, convert_openai_chat_request_to_gemini_request,
     convert_openai_chat_request_to_openai_responses_request, extract_openai_text_content,
     normalize_openai_responses_request_to_openai_chat_request, parse_openai_tool_result_content,

apps/aether-gateway/src/ai_serving/planner/standard/normalize/chat.rs

@@ -1,6 +1,6 @@
 use serde_json::Value;
 
-use crate::ai_serving::transport::apply_standard_provider_request_body_rules;
+use crate::ai_serving::transport::apply_standard_provider_request_body_rules_with_request_headers;
 use crate::ai_serving::{
     apply_codex_openai_responses_special_body_edits,
     apply_openai_responses_compact_special_body_edits,
@@ -14,6 +14,7 @@ pub(crate) fn build_local_openai_chat_request_body(
     mapped_model: &str,
     upstream_is_stream: bool,
     body_rules: Option<&Value>,
+    request_headers: &http::HeaderMap,
     enable_model_directives: bool,
 ) -> Option<Value> {
     let provider_request_body = surface_build_local_openai_chat_request_body(
@@ -22,7 +23,12 @@ pub(crate) fn build_local_openai_chat_request_body(
         upstream_is_stream,
         enable_model_directives,
     )?;
-    apply_standard_provider_request_body_rules(provider_request_body, body_rules, body_json)
+    apply_standard_provider_request_body_rules_with_request_headers(
+        provider_request_body,
+        body_rules,
+        body_json,
+        request_headers,
+    )
 }
 
 pub(crate) fn build_local_openai_chat_upstream_url(
@@ -40,6 +46,7 @@ pub(crate) fn build_cross_format_openai_chat_request_body(
     upstream_is_stream: bool,
     body_rules: Option<&Value>,
     user_api_key_id: Option<&str>,
+    request_headers: &http::HeaderMap,
     enable_model_directives: bool,
 ) -> Option<Value> {
     let provider_request_body = surface_build_cross_format_openai_chat_request_body(
@@ -50,7 +57,12 @@ pub(crate) fn build_cross_format_openai_chat_request_body(
         enable_model_directives,
     )?;
     let mut provider_request_body =
-        apply_standard_provider_request_body_rules(provider_request_body, body_rules, body_json)?;
+        apply_standard_provider_request_body_rules_with_request_headers(
+            provider_request_body,
+            body_rules,
+            body_json,
+            request_headers,
+        )?;
     apply_codex_openai_responses_special_body_edits(
         &mut provider_request_body,
         provider_type,

apps/aether-gateway/src/ai_serving/planner/standard/normalize/responses.rs

@@ -1,6 +1,6 @@
 use serde_json::Value;
 
-use crate::ai_serving::transport::apply_standard_provider_request_body_rules;
+use crate::ai_serving::transport::apply_standard_provider_request_body_rules_with_request_headers;
 use crate::ai_serving::{
     apply_codex_openai_responses_special_body_edits,
     apply_openai_responses_compact_special_body_edits,
@@ -17,6 +17,7 @@ pub(crate) fn build_local_openai_responses_request_body(
     provider_api_format: &str,
     body_rules: Option<&Value>,
     user_api_key_id: Option<&str>,
+    request_headers: &http::HeaderMap,
     enable_model_directives: bool,
 ) -> Option<Value> {
     let provider_request_body = surface_build_local_openai_responses_request_body(
@@ -26,7 +27,12 @@ pub(crate) fn build_local_openai_responses_request_body(
         enable_model_directives,
     )?;
     let mut provider_request_body =
-        apply_standard_provider_request_body_rules(provider_request_body, body_rules, body_json)?;
+        apply_standard_provider_request_body_rules_with_request_headers(
+            provider_request_body,
+            body_rules,
+            body_json,
+            request_headers,
+        )?;
     apply_codex_openai_responses_special_body_edits(
         &mut provider_request_body,
         provider_type,
@@ -50,6 +56,7 @@ pub(crate) fn build_cross_format_openai_responses_request_body(
     provider_type: &str,
     body_rules: Option<&Value>,
     user_api_key_id: Option<&str>,
+    request_headers: &http::HeaderMap,
     enable_model_directives: bool,
 ) -> Option<Value> {
     let provider_request_body = surface_build_cross_format_openai_responses_request_body(
@@ -61,7 +68,12 @@ pub(crate) fn build_cross_format_openai_responses_request_body(
         enable_model_directives,
     )?;
     let mut provider_request_body =
-        apply_standard_provider_request_body_rules(provider_request_body, body_rules, body_json)?;
+        apply_standard_provider_request_body_rules_with_request_headers(
+            provider_request_body,
+            body_rules,
+            body_json,
+            request_headers,
+        )?;
     apply_codex_openai_responses_special_body_edits(
         &mut provider_request_body,
         provider_type,

apps/aether-gateway/src/ai_serving/planner/standard/normalize/tests.rs

@@ -90,6 +90,7 @@ fn builds_openai_chat_cross_format_request_body_from_openai_responses_source() {
         "openai",
         None,
         None,
+        &http::HeaderMap::new(),
         false,
     )
     .expect("openai responses to openai chat body should build");
@@ -124,6 +125,7 @@ fn local_openai_responses_wrapper_preserves_body_order_after_edits() {
         "openai:responses",
         None,
         Some("key-123"),
+        &http::HeaderMap::new(),
         false,
     )
     .expect("local openai responses body should build");
@@ -162,6 +164,7 @@ fn local_openai_responses_compact_wrapper_strips_store_for_same_format_requests(
         "openai:responses:compact",
         None,
         None,
+        &http::HeaderMap::new(),
         false,
     )
     .expect("local openai compact body should build");
@@ -188,6 +191,7 @@ fn local_openai_responses_wrapper_applies_model_directive_before_body_rules() {
         "openai:responses",
         Some(&body_rules),
         None,
+        &http::HeaderMap::new(),
         true,
     )
     .expect("local openai responses body should build");
@@ -236,6 +240,7 @@ fn strips_metadata_for_codex_openai_responses_requests() {
         "codex",
         None,
         None,
+        &http::HeaderMap::new(),
         false,
     )
     .expect("claude cli to codex request should build");
@@ -269,6 +274,7 @@ fn applies_codex_defaults_unless_body_rules_handle_the_field() {
         "codex",
         Some(&body_rules),
         None,
+        &http::HeaderMap::new(),
         false,
     )
     .expect("claude cli to codex request should build");
@@ -297,6 +303,7 @@ fn injects_codex_prompt_cache_key_for_openai_responses_cross_format_requests() {
         "codex",
         None,
         Some("key-123"),
+        &http::HeaderMap::new(),
         false,
     )
     .expect("claude cli to codex request should build");
@@ -325,6 +332,7 @@ fn injects_codex_prompt_cache_key_for_openai_chat_cross_format_requests() {
         false,
         None,
         Some("key-123"),
+        &http::HeaderMap::new(),
         false,
     )
     .expect("openai chat to codex request should build");

apps/aether-gateway/src/ai_serving/planner/standard/openai/chat/decision/request.rs

@@ -129,6 +129,7 @@ pub(crate) async fn resolve_local_openai_chat_candidate_payload_parts(
             &prepared_candidate.mapped_model,
             upstream_is_stream,
             transport.endpoint.body_rules.as_ref(),
+            &parts.headers,
             enable_model_directives,
         ) else {
             mark_skipped_local_openai_chat_candidate_with_extra_data(
@@ -354,6 +355,7 @@ pub(crate) async fn resolve_local_openai_chat_candidate_payload_parts(
             transport.endpoint.body_rules.as_ref()
         },
         Some(input.auth_context.api_key_id.as_str()),
+        &parts.headers,
         enable_model_directives,
     ) else {
         mark_skipped_local_openai_chat_candidate_with_extra_data(
@@ -527,6 +529,7 @@ async fn build_kiro_openai_chat_cross_format_payload_parts(
         &mapped_model,
         &kiro_auth.auth_config,
         transport.endpoint.body_rules.as_ref(),
+        Some(&parts.headers),
     ) {
         Some(body) => body,
         None => {

apps/aether-gateway/src/ai_serving/planner/standard/openai/responses/decision/request.rs

@@ -244,6 +244,7 @@ pub(crate) async fn resolve_local_openai_responses_candidate_payload_parts(
                 transport.endpoint.body_rules.as_ref()
             },
             Some(input.auth_context.api_key_id.as_str()),
+            &parts.headers,
             enable_model_directives,
         )
     } else {
@@ -259,6 +260,7 @@ pub(crate) async fn resolve_local_openai_responses_candidate_payload_parts(
                 transport.endpoint.body_rules.as_ref()
             },
             Some(input.auth_context.api_key_id.as_str()),
+            &parts.headers,
             enable_model_directives,
         )
     }) else {
@@ -532,6 +534,7 @@ async fn build_kiro_openai_responses_payload_parts(
         &mapped_model,
         &kiro_auth.auth_config,
         transport.endpoint.body_rules.as_ref(),
+        Some(&parts.headers),
     ) {
         Some(body) => body,
         None => {