From bf6b19370b839759a13feffd9c01af8f865a9af5 Mon Sep 17 00:00:00 2001
From: bensonz <mr.bz@hotmail.com>
Date: Tue, 10 Feb 2026 12:26:27 +0800
Subject: [PATCH] fix: strip unsupported cache_control fields for Bedrock
 compatibility

Claude Code v2.1.38+ sends cache_control with a 'scope' field
(e.g. {type: 'ephemeral', scope: 'global'}) on system prompt blocks.
AWS Bedrock only accepts {type: 'ephemeral'} and rejects the extra
'scope' field with a ValidationException.

Added _sanitizeCacheControl() that recursively strips unsupported
fields from cache_control objects in system, messages, and tools
before forwarding to Bedrock.
---
 src/services/bedrockRelayService.js | 30 +++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/services/bedrockRelayService.js b/src/services/bedrockRelayService.js
index 87e65105..49982dbb 100644
--- a/src/services/bedrockRelayService.js
+++ b/src/services/bedrockRelayService.js
@@ -511,6 +511,33 @@ class BedrockRelayService {
     return this.defaultRegion
   }
 
+  // Sanitize cache_control fields for Bedrock compatibility.
+  // Bedrock only supports { type: "ephemeral" } — extra fields like "scope"
+  // (added in Claude Code v2.1.38+) cause ValidationException.
+  _sanitizeCacheControl(obj) {
+    if (obj == null || typeof obj !== 'object') return obj
+
+    if (Array.isArray(obj)) {
+      obj.forEach((item) => this._sanitizeCacheControl(item))
+      return obj
+    }
+
+    if (obj.cache_control && typeof obj.cache_control === 'object') {
+      // Keep only the "type" field that Bedrock accepts
+      obj.cache_control = { type: obj.cache_control.type || 'ephemeral' }
+    }
+
+    // Recurse into known nested structures (messages[].content, tool input_schema, etc.)
+    for (const key of Object.keys(obj)) {
+      const val = obj[key]
+      if (val && typeof val === 'object') {
+        this._sanitizeCacheControl(val)
+      }
+    }
+
+    return obj
+  }
+
   // 转换Claude格式请求到Bedrock格式
   _convertToBedrockFormat(requestBody) {
     const bedrockPayload = {
@@ -550,6 +577,9 @@ class BedrockRelayService {
       bedrockPayload.tool_choice = requestBody.tool_choice
     }
 
+    // Sanitize cache_control for Bedrock compatibility (strip unsupported fields like "scope")
+    this._sanitizeCacheControl(bedrockPayload)
+
     return bedrockPayload
   }