@librechat/agents 3.0.19 → 3.0.20

package/dist/cjs/main.cjs

@@ -63,6 +63,8 @@ exports.labelContentByAgent = format.labelContentByAgent;
 exports.shiftIndexTokenCountMap = format.shiftIndexTokenCountMap;
 exports.addBedrockCacheControl = cache.addBedrockCacheControl;
 exports.addCacheControl = cache.addCacheControl;
+exports.stripAnthropicCacheControl = cache.stripAnthropicCacheControl;
+exports.stripBedrockCacheControl = cache.stripBedrockCacheControl;
 exports.formatContentStrings = content.formatContentStrings;
 exports.Graph = Graph.Graph;
 exports.StandardGraph = Graph.StandardGraph;

package/dist/cjs/main.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"main.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"main.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/cjs/messages/cache.cjs

@@ -4,6 +4,9 @@ var _enum = require('../common/enum.cjs');
 
 /**
  * Anthropic API: Adds cache control to the appropriate user messages in the payload.
+ * Strips ALL existing cache control (both Anthropic and Bedrock formats) from all messages,
+ * then adds fresh cache control to the last 2 user messages in a single backward pass.
+ * This ensures we don't accumulate stale cache points across multiple turns.
  * @param messages - The array of message objects.
  * @returns - The updated array of message objects with cache control added.
  */
@@ -13,12 +16,20 @@ function addCacheControl(messages) {
     }
     const updatedMessages = [...messages];
     let userMessagesModified = 0;
-    for (let i = updatedMessages.length - 1; i >= 0 && userMessagesModified < 2; i--) {
+    for (let i = updatedMessages.length - 1; i >= 0; i--) {
         const message = updatedMessages[i];
-        if ('getType' in message && message.getType() !== 'human') {
-            continue;
+        const isUserMessage = ('getType' in message && message.getType() === 'human') ||
+            ('role' in message && message.role === 'user');
+        if (Array.isArray(message.content)) {
+            message.content = message.content.filter((block) => !isCachePoint(block));
+            for (let j = 0; j < message.content.length; j++) {
+                const block = message.content[j];
+                if ('cache_control' in block) {
+                    delete block.cache_control;
+                }
+            }
         }
-        else if ('role' in message && message.role !== 'user') {
+        if (userMessagesModified >= 2 || !isUserMessage) {
             continue;
         }
         if (typeof message.content === 'string') {
@@ -46,10 +57,60 @@ function addCacheControl(messages) {
     }
     return updatedMessages;
 }
+/**
+ * Checks if a content block is a cache point
+ */
+function isCachePoint(block) {
+    return 'cachePoint' in block && !('type' in block);
+}
+/**
+ * Removes all Anthropic cache_control fields from messages
+ * Used when switching from Anthropic to Bedrock provider
+ */
+function stripAnthropicCacheControl(messages) {
+    if (!Array.isArray(messages)) {
+        return messages;
+    }
+    const updatedMessages = [...messages];
+    for (let i = 0; i < updatedMessages.length; i++) {
+        const message = updatedMessages[i];
+        const content = message.content;
+        if (Array.isArray(content)) {
+            for (let j = 0; j < content.length; j++) {
+                const block = content[j];
+                if ('cache_control' in block) {
+                    delete block.cache_control;
+                }
+            }
+        }
+    }
+    return updatedMessages;
+}
+/**
+ * Removes all Bedrock cachePoint blocks from messages
+ * Used when switching from Bedrock to Anthropic provider
+ */
+function stripBedrockCacheControl(messages) {
+    if (!Array.isArray(messages)) {
+        return messages;
+    }
+    const updatedMessages = [...messages];
+    for (let i = 0; i < updatedMessages.length; i++) {
+        const message = updatedMessages[i];
+        const content = message.content;
+        if (Array.isArray(content)) {
+            message.content = content.filter((block) => !isCachePoint(block));
+        }
+    }
+    return updatedMessages;
+}
 /**
  * Adds Bedrock Converse API cache points to the last two messages.
  * Inserts `{ cachePoint: { type: 'default' } }` as a separate content block
  * immediately after the last text block in each targeted message.
+ * Strips ALL existing cache control (both Bedrock and Anthropic formats) from all messages,
+ * then adds fresh cache points to the last 2 messages in a single backward pass.
+ * This ensures we don't accumulate stale cache points across multiple turns.
  * @param messages - The array of message objects.
  * @returns - The updated array of message objects with cache points added.
  */
@@ -59,14 +120,24 @@ function addBedrockCacheControl(messages) {
     }
     const updatedMessages = messages.slice();
     let messagesModified = 0;
-    for (let i = updatedMessages.length - 1; i >= 0 && messagesModified < 2; i--) {
+    for (let i = updatedMessages.length - 1; i >= 0; i--) {
         const message = updatedMessages[i];
-        if ('getType' in message &&
+        const isToolMessage = 'getType' in message &&
             typeof message.getType === 'function' &&
-            message.getType() === 'tool') {
+            message.getType() === 'tool';
+        const content = message.content;
+        if (Array.isArray(content)) {
+            message.content = content.filter((block) => !isCachePoint(block));
+            for (let j = 0; j < message.content.length; j++) {
+                const block = message.content[j];
+                if ('cache_control' in block) {
+                    delete block.cache_control;
+                }
+            }
+        }
+        if (messagesModified >= 2 || isToolMessage) {
             continue;
         }
-        const content = message.content;
         if (typeof content === 'string' && content === '') {
             continue;
         }
@@ -78,9 +149,9 @@ function addBedrockCacheControl(messages) {
             messagesModified++;
             continue;
         }
-        if (Array.isArray(content)) {
+        if (Array.isArray(message.content)) {
             let hasCacheableContent = false;
-            for (const block of content) {
+            for (const block of message.content) {
                 if (block.type === _enum.ContentTypes.TEXT) {
                     if (typeof block.text === 'string' && block.text !== '') {
                         hasCacheableContent = true;
@@ -92,15 +163,15 @@ function addBedrockCacheControl(messages) {
                 continue;
             }
             let inserted = false;
-            for (let j = content.length - 1; j >= 0; j--) {
-                const block = content[j];
+            for (let j = message.content.length - 1; j >= 0; j--) {
+                const block = message.content[j];
                 const type = block.type;
                 if (type === _enum.ContentTypes.TEXT || type === 'text') {
                     const text = block.text;
                     if (text === '' || text === undefined) {
                         continue;
                     }
-                    content.splice(j + 1, 0, {
+                    message.content.splice(j + 1, 0, {
                         cachePoint: { type: 'default' },
                     });
                     inserted = true;
@@ -108,7 +179,7 @@ function addBedrockCacheControl(messages) {
                 }
             }
             if (!inserted) {
-                content.push({
+                message.content.push({
                     cachePoint: { type: 'default' },
                 });
             }
@@ -120,4 +191,6 @@ function addBedrockCacheControl(messages) {
 
 exports.addBedrockCacheControl = addBedrockCacheControl;
 exports.addCacheControl = addCacheControl;
+exports.stripAnthropicCacheControl = stripAnthropicCacheControl;
+exports.stripBedrockCacheControl = stripBedrockCacheControl;
 //# sourceMappingURL=cache.cjs.map

package/dist/cjs/messages/cache.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"cache.cjs","sources":["../../../src/messages/cache.ts"],"sourcesContent":["import { BaseMessage, MessageContentComplex } from '@langchain/core/messages';\nimport type { AnthropicMessage } from '@/types/messages';\nimport type Anthropic from '@anthropic-ai/sdk';\nimport { ContentTypes } from '@/common/enum';\n\ntype MessageWithContent = {\n  content?: string | MessageContentComplex[];\n};\n\n/**\n * Anthropic API: Adds cache control to the appropriate user messages in the payload.\n * @param messages - The array of message objects.\n * @returns - The updated array of message objects with cache control added.\n */\nexport function addCacheControl<T extends AnthropicMessage | BaseMessage>(\n  messages: T[]\n): T[] {\n  if (!Array.isArray(messages) || messages.length < 2) {\n    return messages;\n  }\n\n  const updatedMessages = [...messages];\n  let userMessagesModified = 0;\n\n  for (\n    let i = updatedMessages.length - 1;\n    i >= 0 && userMessagesModified < 2;\n    i--\n  ) {\n    const message = updatedMessages[i];\n    if ('getType' in message && message.getType() !== 'human') {\n      continue;\n    } else if ('role' in message && message.role !== 'user') {\n      continue;\n    }\n\n    if (typeof message.content === 'string') {\n      message.content = [\n        {\n          type: 'text',\n          text: message.content,\n          cache_control: { type: 'ephemeral' },\n        },\n      ];\n      userMessagesModified++;\n    } else if (Array.isArray(message.content)) {\n      for (let j = message.content.length - 1; j >= 0; j--) {\n        const contentPart = message.content[j];\n        if ('type' in contentPart && contentPart.type === 'text') {\n          (contentPart as Anthropic.TextBlockParam).cache_control = {\n            type: 'ephemeral',\n          };\n          userMessagesModified++;\n          break;\n        }\n      }\n    }\n  }\n\n  return updatedMessages;\n}\n\n/**\n * Adds Bedrock Converse API cache points to the last two messages.\n * Inserts `{ cachePoint: { type: 'default' } }` as a separate content block\n * immediately after the last text block in each targeted message.\n * @param messages - The array of message objects.\n * @returns - The updated array of message objects with cache points added.\n */\nexport function addBedrockCacheControl<\n  T extends Partial<BaseMessage> & MessageWithContent,\n>(messages: T[]): T[] {\n  if (!Array.isArray(messages) || messages.length < 2) {\n    return messages;\n  }\n\n  const updatedMessages: T[] = messages.slice();\n  let messagesModified = 0;\n\n  for (\n    let i = updatedMessages.length - 1;\n    i >= 0 && messagesModified < 2;\n    i--\n  ) {\n    const message = updatedMessages[i];\n\n    if (\n      'getType' in message &&\n      typeof message.getType === 'function' &&\n      message.getType() === 'tool'\n    ) {\n      continue;\n    }\n\n    const content = message.content;\n\n    if (typeof content === 'string' && content === '') {\n      continue;\n    }\n\n    if (typeof content === 'string') {\n      message.content = [\n        { type: ContentTypes.TEXT, text: content },\n        { cachePoint: { type: 'default' } },\n      ] as MessageContentComplex[];\n      messagesModified++;\n      continue;\n    }\n\n    if (Array.isArray(content)) {\n      let hasCacheableContent = false;\n      for (const block of content) {\n        if (block.type === ContentTypes.TEXT) {\n          if (typeof block.text === 'string' && block.text !== '') {\n            hasCacheableContent = true;\n            break;\n          }\n        }\n      }\n\n      if (!hasCacheableContent) {\n        continue;\n      }\n\n      let inserted = false;\n      for (let j = content.length - 1; j >= 0; j--) {\n        const block = content[j] as MessageContentComplex;\n        const type = (block as { type?: string }).type;\n        if (type === ContentTypes.TEXT || type === 'text') {\n          const text = (block as { text?: string }).text;\n          if (text === '' || text === undefined) {\n            continue;\n          }\n          content.splice(j + 1, 0, {\n            cachePoint: { type: 'default' },\n          } as MessageContentComplex);\n          inserted = true;\n          break;\n        }\n      }\n      if (!inserted) {\n        content.push({\n          cachePoint: { type: 'default' },\n        } as MessageContentComplex);\n      }\n      messagesModified++;\n    }\n  }\n\n  return updatedMessages;\n}\n"],"names":["ContentTypes"],"mappings":"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"}
+{"version":3,"file":"cache.cjs","sources":["../../../src/messages/cache.ts"],"sourcesContent":["import { BaseMessage, MessageContentComplex } from '@langchain/core/messages';\nimport type { AnthropicMessage } from '@/types/messages';\nimport type Anthropic from '@anthropic-ai/sdk';\nimport { ContentTypes } from '@/common/enum';\n\ntype MessageWithContent = {\n  content?: string | MessageContentComplex[];\n};\n\n/**\n * Anthropic API: Adds cache control to the appropriate user messages in the payload.\n * Strips ALL existing cache control (both Anthropic and Bedrock formats) from all messages,\n * then adds fresh cache control to the last 2 user messages in a single backward pass.\n * This ensures we don't accumulate stale cache points across multiple turns.\n * @param messages - The array of message objects.\n * @returns - The updated array of message objects with cache control added.\n */\nexport function addCacheControl<T extends AnthropicMessage | BaseMessage>(\n  messages: T[]\n): T[] {\n  if (!Array.isArray(messages) || messages.length < 2) {\n    return messages;\n  }\n\n  const updatedMessages = [...messages];\n  let userMessagesModified = 0;\n\n  for (let i = updatedMessages.length - 1; i >= 0; i--) {\n    const message = updatedMessages[i];\n    const isUserMessage =\n      ('getType' in message && message.getType() === 'human') ||\n      ('role' in message && message.role === 'user');\n\n    if (Array.isArray(message.content)) {\n      message.content = message.content.filter(\n        (block) => !isCachePoint(block as MessageContentComplex)\n      ) as typeof message.content;\n\n      for (let j = 0; j < message.content.length; j++) {\n        const block = message.content[j] as Record<string, unknown>;\n        if ('cache_control' in block) {\n          delete block.cache_control;\n        }\n      }\n    }\n\n    if (userMessagesModified >= 2 || !isUserMessage) {\n      continue;\n    }\n\n    if (typeof message.content === 'string') {\n      message.content = [\n        {\n          type: 'text',\n          text: message.content,\n          cache_control: { type: 'ephemeral' },\n        },\n      ];\n      userMessagesModified++;\n    } else if (Array.isArray(message.content)) {\n      for (let j = message.content.length - 1; j >= 0; j--) {\n        const contentPart = message.content[j];\n        if ('type' in contentPart && contentPart.type === 'text') {\n          (contentPart as Anthropic.TextBlockParam).cache_control = {\n            type: 'ephemeral',\n          };\n          userMessagesModified++;\n          break;\n        }\n      }\n    }\n  }\n\n  return updatedMessages;\n}\n\n/**\n * Checks if a content block is a cache point\n */\nfunction isCachePoint(block: MessageContentComplex): boolean {\n  return 'cachePoint' in block && !('type' in block);\n}\n\n/**\n * Removes all Anthropic cache_control fields from messages\n * Used when switching from Anthropic to Bedrock provider\n */\nexport function stripAnthropicCacheControl<T extends MessageWithContent>(\n  messages: T[]\n): T[] {\n  if (!Array.isArray(messages)) {\n    return messages;\n  }\n\n  const updatedMessages = [...messages];\n\n  for (let i = 0; i < updatedMessages.length; i++) {\n    const message = updatedMessages[i];\n    const content = message.content;\n\n    if (Array.isArray(content)) {\n      for (let j = 0; j < content.length; j++) {\n        const block = content[j] as Record<string, unknown>;\n        if ('cache_control' in block) {\n          delete block.cache_control;\n        }\n      }\n    }\n  }\n\n  return updatedMessages;\n}\n\n/**\n * Removes all Bedrock cachePoint blocks from messages\n * Used when switching from Bedrock to Anthropic provider\n */\nexport function stripBedrockCacheControl<T extends MessageWithContent>(\n  messages: T[]\n): T[] {\n  if (!Array.isArray(messages)) {\n    return messages;\n  }\n\n  const updatedMessages = [...messages];\n\n  for (let i = 0; i < updatedMessages.length; i++) {\n    const message = updatedMessages[i];\n    const content = message.content;\n\n    if (Array.isArray(content)) {\n      message.content = content.filter(\n        (block) => !isCachePoint(block as MessageContentComplex)\n      ) as typeof content;\n    }\n  }\n\n  return updatedMessages;\n}\n\n/**\n * Adds Bedrock Converse API cache points to the last two messages.\n * Inserts `{ cachePoint: { type: 'default' } }` as a separate content block\n * immediately after the last text block in each targeted message.\n * Strips ALL existing cache control (both Bedrock and Anthropic formats) from all messages,\n * then adds fresh cache points to the last 2 messages in a single backward pass.\n * This ensures we don't accumulate stale cache points across multiple turns.\n * @param messages - The array of message objects.\n * @returns - The updated array of message objects with cache points added.\n */\nexport function addBedrockCacheControl<\n  T extends Partial<BaseMessage> & MessageWithContent,\n>(messages: T[]): T[] {\n  if (!Array.isArray(messages) || messages.length < 2) {\n    return messages;\n  }\n\n  const updatedMessages: T[] = messages.slice();\n  let messagesModified = 0;\n\n  for (let i = updatedMessages.length - 1; i >= 0; i--) {\n    const message = updatedMessages[i];\n    const isToolMessage =\n      'getType' in message &&\n      typeof message.getType === 'function' &&\n      message.getType() === 'tool';\n\n    const content = message.content;\n\n    if (Array.isArray(content)) {\n      message.content = content.filter(\n        (block) => !isCachePoint(block)\n      ) as typeof content;\n\n      for (let j = 0; j < message.content.length; j++) {\n        const block = message.content[j] as Record<string, unknown>;\n        if ('cache_control' in block) {\n          delete block.cache_control;\n        }\n      }\n    }\n\n    if (messagesModified >= 2 || isToolMessage) {\n      continue;\n    }\n\n    if (typeof content === 'string' && content === '') {\n      continue;\n    }\n\n    if (typeof content === 'string') {\n      message.content = [\n        { type: ContentTypes.TEXT, text: content },\n        { cachePoint: { type: 'default' } },\n      ] as MessageContentComplex[];\n      messagesModified++;\n      continue;\n    }\n\n    if (Array.isArray(message.content)) {\n      let hasCacheableContent = false;\n      for (const block of message.content) {\n        if (block.type === ContentTypes.TEXT) {\n          if (typeof block.text === 'string' && block.text !== '') {\n            hasCacheableContent = true;\n            break;\n          }\n        }\n      }\n\n      if (!hasCacheableContent) {\n        continue;\n      }\n\n      let inserted = false;\n      for (let j = message.content.length - 1; j >= 0; j--) {\n        const block = message.content[j] as MessageContentComplex;\n        const type = (block as { type?: string }).type;\n        if (type === ContentTypes.TEXT || type === 'text') {\n          const text = (block as { text?: string }).text;\n          if (text === '' || text === undefined) {\n            continue;\n          }\n          message.content.splice(j + 1, 0, {\n            cachePoint: { type: 'default' },\n          } as MessageContentComplex);\n          inserted = true;\n          break;\n        }\n      }\n      if (!inserted) {\n        message.content.push({\n          cachePoint: { type: 'default' },\n        } as MessageContentComplex);\n      }\n      messagesModified++;\n    }\n  }\n\n  return updatedMessages;\n}\n"],"names":["ContentTypes"],"mappings":"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"}

package/dist/esm/main.mjs

@@ -6,7 +6,7 @@ export { convertMessagesToContent, findLastIndex, formatAnthropicArtifactContent
 export { getMessageId } from './messages/ids.mjs';
 export { calculateTotalTokens, checkValidNumber, createPruneMessages, getMessagesWithinTokenLimit } from './messages/prune.mjs';
 export { ensureThinkingBlockInMessages, formatAgentMessages, formatFromLangChain, formatLangChainMessages, formatMediaMessage, formatMessage, labelContentByAgent, shiftIndexTokenCountMap } from './messages/format.mjs';
-export { addBedrockCacheControl, addCacheControl } from './messages/cache.mjs';
+export { addBedrockCacheControl, addCacheControl, stripAnthropicCacheControl, stripBedrockCacheControl } from './messages/cache.mjs';
 export { formatContentStrings } from './messages/content.mjs';
 export { Graph, StandardGraph } from './graphs/Graph.mjs';
 export { MultiAgentGraph } from './graphs/MultiAgentGraph.mjs';

package/dist/esm/messages/cache.mjs

@@ -2,6 +2,9 @@ import { ContentTypes } from '../common/enum.mjs';
 
 /**
  * Anthropic API: Adds cache control to the appropriate user messages in the payload.
+ * Strips ALL existing cache control (both Anthropic and Bedrock formats) from all messages,
+ * then adds fresh cache control to the last 2 user messages in a single backward pass.
+ * This ensures we don't accumulate stale cache points across multiple turns.
  * @param messages - The array of message objects.
  * @returns - The updated array of message objects with cache control added.
  */
@@ -11,12 +14,20 @@ function addCacheControl(messages) {
     }
     const updatedMessages = [...messages];
     let userMessagesModified = 0;
-    for (let i = updatedMessages.length - 1; i >= 0 && userMessagesModified < 2; i--) {
+    for (let i = updatedMessages.length - 1; i >= 0; i--) {
         const message = updatedMessages[i];
-        if ('getType' in message && message.getType() !== 'human') {
-            continue;
+        const isUserMessage = ('getType' in message && message.getType() === 'human') ||
+            ('role' in message && message.role === 'user');
+        if (Array.isArray(message.content)) {
+            message.content = message.content.filter((block) => !isCachePoint(block));
+            for (let j = 0; j < message.content.length; j++) {
+                const block = message.content[j];
+                if ('cache_control' in block) {
+                    delete block.cache_control;
+                }
+            }
         }
-        else if ('role' in message && message.role !== 'user') {
+        if (userMessagesModified >= 2 || !isUserMessage) {
             continue;
         }
         if (typeof message.content === 'string') {
@@ -44,10 +55,60 @@ function addCacheControl(messages) {
     }
     return updatedMessages;
 }
+/**
+ * Checks if a content block is a cache point
+ */
+function isCachePoint(block) {
+    return 'cachePoint' in block && !('type' in block);
+}
+/**
+ * Removes all Anthropic cache_control fields from messages
+ * Used when switching from Anthropic to Bedrock provider
+ */
+function stripAnthropicCacheControl(messages) {
+    if (!Array.isArray(messages)) {
+        return messages;
+    }
+    const updatedMessages = [...messages];
+    for (let i = 0; i < updatedMessages.length; i++) {
+        const message = updatedMessages[i];
+        const content = message.content;
+        if (Array.isArray(content)) {
+            for (let j = 0; j < content.length; j++) {
+                const block = content[j];
+                if ('cache_control' in block) {
+                    delete block.cache_control;
+                }
+            }
+        }
+    }
+    return updatedMessages;
+}
+/**
+ * Removes all Bedrock cachePoint blocks from messages
+ * Used when switching from Bedrock to Anthropic provider
+ */
+function stripBedrockCacheControl(messages) {
+    if (!Array.isArray(messages)) {
+        return messages;
+    }
+    const updatedMessages = [...messages];
+    for (let i = 0; i < updatedMessages.length; i++) {
+        const message = updatedMessages[i];
+        const content = message.content;
+        if (Array.isArray(content)) {
+            message.content = content.filter((block) => !isCachePoint(block));
+        }
+    }
+    return updatedMessages;
+}
 /**
  * Adds Bedrock Converse API cache points to the last two messages.
  * Inserts `{ cachePoint: { type: 'default' } }` as a separate content block
  * immediately after the last text block in each targeted message.
+ * Strips ALL existing cache control (both Bedrock and Anthropic formats) from all messages,
+ * then adds fresh cache points to the last 2 messages in a single backward pass.
+ * This ensures we don't accumulate stale cache points across multiple turns.
  * @param messages - The array of message objects.
  * @returns - The updated array of message objects with cache points added.
  */
@@ -57,14 +118,24 @@ function addBedrockCacheControl(messages) {
     }
     const updatedMessages = messages.slice();
     let messagesModified = 0;
-    for (let i = updatedMessages.length - 1; i >= 0 && messagesModified < 2; i--) {
+    for (let i = updatedMessages.length - 1; i >= 0; i--) {
         const message = updatedMessages[i];
-        if ('getType' in message &&
+        const isToolMessage = 'getType' in message &&
             typeof message.getType === 'function' &&
-            message.getType() === 'tool') {
+            message.getType() === 'tool';
+        const content = message.content;
+        if (Array.isArray(content)) {
+            message.content = content.filter((block) => !isCachePoint(block));
+            for (let j = 0; j < message.content.length; j++) {
+                const block = message.content[j];
+                if ('cache_control' in block) {
+                    delete block.cache_control;
+                }
+            }
+        }
+        if (messagesModified >= 2 || isToolMessage) {
             continue;
         }
-        const content = message.content;
         if (typeof content === 'string' && content === '') {
             continue;
         }
@@ -76,9 +147,9 @@ function addBedrockCacheControl(messages) {
             messagesModified++;
             continue;
         }
-        if (Array.isArray(content)) {
+        if (Array.isArray(message.content)) {
             let hasCacheableContent = false;
-            for (const block of content) {
+            for (const block of message.content) {
                 if (block.type === ContentTypes.TEXT) {
                     if (typeof block.text === 'string' && block.text !== '') {
                         hasCacheableContent = true;
@@ -90,15 +161,15 @@ function addBedrockCacheControl(messages) {
                 continue;
             }
             let inserted = false;
-            for (let j = content.length - 1; j >= 0; j--) {
-                const block = content[j];
+            for (let j = message.content.length - 1; j >= 0; j--) {
+                const block = message.content[j];
                 const type = block.type;
                 if (type === ContentTypes.TEXT || type === 'text') {
                     const text = block.text;
                     if (text === '' || text === undefined) {
                         continue;
                     }
-                    content.splice(j + 1, 0, {
+                    message.content.splice(j + 1, 0, {
                         cachePoint: { type: 'default' },
                     });
                     inserted = true;
@@ -106,7 +177,7 @@ function addBedrockCacheControl(messages) {
                 }
             }
             if (!inserted) {
-                content.push({
+                message.content.push({
                     cachePoint: { type: 'default' },
                 });
             }
@@ -116,5 +187,5 @@ function addBedrockCacheControl(messages) {
     return updatedMessages;
 }
 
-export { addBedrockCacheControl, addCacheControl };
+export { addBedrockCacheControl, addCacheControl, stripAnthropicCacheControl, stripBedrockCacheControl };
 //# sourceMappingURL=cache.mjs.map

package/dist/esm/messages/cache.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"cache.mjs","sources":["../../../src/messages/cache.ts"],"sourcesContent":["import { BaseMessage, MessageContentComplex } from '@langchain/core/messages';\nimport type { AnthropicMessage } from '@/types/messages';\nimport type Anthropic from '@anthropic-ai/sdk';\nimport { ContentTypes } from '@/common/enum';\n\ntype MessageWithContent = {\n  content?: string | MessageContentComplex[];\n};\n\n/**\n * Anthropic API: Adds cache control to the appropriate user messages in the payload.\n * @param messages - The array of message objects.\n * @returns - The updated array of message objects with cache control added.\n */\nexport function addCacheControl<T extends AnthropicMessage | BaseMessage>(\n  messages: T[]\n): T[] {\n  if (!Array.isArray(messages) || messages.length < 2) {\n    return messages;\n  }\n\n  const updatedMessages = [...messages];\n  let userMessagesModified = 0;\n\n  for (\n    let i = updatedMessages.length - 1;\n    i >= 0 && userMessagesModified < 2;\n    i--\n  ) {\n    const message = updatedMessages[i];\n    if ('getType' in message && message.getType() !== 'human') {\n      continue;\n    } else if ('role' in message && message.role !== 'user') {\n      continue;\n    }\n\n    if (typeof message.content === 'string') {\n      message.content = [\n        {\n          type: 'text',\n          text: message.content,\n          cache_control: { type: 'ephemeral' },\n        },\n      ];\n      userMessagesModified++;\n    } else if (Array.isArray(message.content)) {\n      for (let j = message.content.length - 1; j >= 0; j--) {\n        const contentPart = message.content[j];\n        if ('type' in contentPart && contentPart.type === 'text') {\n          (contentPart as Anthropic.TextBlockParam).cache_control = {\n            type: 'ephemeral',\n          };\n          userMessagesModified++;\n          break;\n        }\n      }\n    }\n  }\n\n  return updatedMessages;\n}\n\n/**\n * Adds Bedrock Converse API cache points to the last two messages.\n * Inserts `{ cachePoint: { type: 'default' } }` as a separate content block\n * immediately after the last text block in each targeted message.\n * @param messages - The array of message objects.\n * @returns - The updated array of message objects with cache points added.\n */\nexport function addBedrockCacheControl<\n  T extends Partial<BaseMessage> & MessageWithContent,\n>(messages: T[]): T[] {\n  if (!Array.isArray(messages) || messages.length < 2) {\n    return messages;\n  }\n\n  const updatedMessages: T[] = messages.slice();\n  let messagesModified = 0;\n\n  for (\n    let i = updatedMessages.length - 1;\n    i >= 0 && messagesModified < 2;\n    i--\n  ) {\n    const message = updatedMessages[i];\n\n    if (\n      'getType' in message &&\n      typeof message.getType === 'function' &&\n      message.getType() === 'tool'\n    ) {\n      continue;\n    }\n\n    const content = message.content;\n\n    if (typeof content === 'string' && content === '') {\n      continue;\n    }\n\n    if (typeof content === 'string') {\n      message.content = [\n        { type: ContentTypes.TEXT, text: content },\n        { cachePoint: { type: 'default' } },\n      ] as MessageContentComplex[];\n      messagesModified++;\n      continue;\n    }\n\n    if (Array.isArray(content)) {\n      let hasCacheableContent = false;\n      for (const block of content) {\n        if (block.type === ContentTypes.TEXT) {\n          if (typeof block.text === 'string' && block.text !== '') {\n            hasCacheableContent = true;\n            break;\n          }\n        }\n      }\n\n      if (!hasCacheableContent) {\n        continue;\n      }\n\n      let inserted = false;\n      for (let j = content.length - 1; j >= 0; j--) {\n        const block = content[j] as MessageContentComplex;\n        const type = (block as { type?: string }).type;\n        if (type === ContentTypes.TEXT || type === 'text') {\n          const text = (block as { text?: string }).text;\n          if (text === '' || text === undefined) {\n            continue;\n          }\n          content.splice(j + 1, 0, {\n            cachePoint: { type: 'default' },\n          } as MessageContentComplex);\n          inserted = true;\n          break;\n        }\n      }\n      if (!inserted) {\n        content.push({\n          cachePoint: { type: 'default' },\n        } as MessageContentComplex);\n      }\n      messagesModified++;\n    }\n  }\n\n  return updatedMessages;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"cache.mjs","sources":["../../../src/messages/cache.ts"],"sourcesContent":["import { BaseMessage, MessageContentComplex } from '@langchain/core/messages';\nimport type { AnthropicMessage } from '@/types/messages';\nimport type Anthropic from '@anthropic-ai/sdk';\nimport { ContentTypes } from '@/common/enum';\n\ntype MessageWithContent = {\n  content?: string | MessageContentComplex[];\n};\n\n/**\n * Anthropic API: Adds cache control to the appropriate user messages in the payload.\n * Strips ALL existing cache control (both Anthropic and Bedrock formats) from all messages,\n * then adds fresh cache control to the last 2 user messages in a single backward pass.\n * This ensures we don't accumulate stale cache points across multiple turns.\n * @param messages - The array of message objects.\n * @returns - The updated array of message objects with cache control added.\n */\nexport function addCacheControl<T extends AnthropicMessage | BaseMessage>(\n  messages: T[]\n): T[] {\n  if (!Array.isArray(messages) || messages.length < 2) {\n    return messages;\n  }\n\n  const updatedMessages = [...messages];\n  let userMessagesModified = 0;\n\n  for (let i = updatedMessages.length - 1; i >= 0; i--) {\n    const message = updatedMessages[i];\n    const isUserMessage =\n      ('getType' in message && message.getType() === 'human') ||\n      ('role' in message && message.role === 'user');\n\n    if (Array.isArray(message.content)) {\n      message.content = message.content.filter(\n        (block) => !isCachePoint(block as MessageContentComplex)\n      ) as typeof message.content;\n\n      for (let j = 0; j < message.content.length; j++) {\n        const block = message.content[j] as Record<string, unknown>;\n        if ('cache_control' in block) {\n          delete block.cache_control;\n        }\n      }\n    }\n\n    if (userMessagesModified >= 2 || !isUserMessage) {\n      continue;\n    }\n\n    if (typeof message.content === 'string') {\n      message.content = [\n        {\n          type: 'text',\n          text: message.content,\n          cache_control: { type: 'ephemeral' },\n        },\n      ];\n      userMessagesModified++;\n    } else if (Array.isArray(message.content)) {\n      for (let j = message.content.length - 1; j >= 0; j--) {\n        const contentPart = message.content[j];\n        if ('type' in contentPart && contentPart.type === 'text') {\n          (contentPart as Anthropic.TextBlockParam).cache_control = {\n            type: 'ephemeral',\n          };\n          userMessagesModified++;\n          break;\n        }\n      }\n    }\n  }\n\n  return updatedMessages;\n}\n\n/**\n * Checks if a content block is a cache point\n */\nfunction isCachePoint(block: MessageContentComplex): boolean {\n  return 'cachePoint' in block && !('type' in block);\n}\n\n/**\n * Removes all Anthropic cache_control fields from messages\n * Used when switching from Anthropic to Bedrock provider\n */\nexport function stripAnthropicCacheControl<T extends MessageWithContent>(\n  messages: T[]\n): T[] {\n  if (!Array.isArray(messages)) {\n    return messages;\n  }\n\n  const updatedMessages = [...messages];\n\n  for (let i = 0; i < updatedMessages.length; i++) {\n    const message = updatedMessages[i];\n    const content = message.content;\n\n    if (Array.isArray(content)) {\n      for (let j = 0; j < content.length; j++) {\n        const block = content[j] as Record<string, unknown>;\n        if ('cache_control' in block) {\n          delete block.cache_control;\n        }\n      }\n    }\n  }\n\n  return updatedMessages;\n}\n\n/**\n * Removes all Bedrock cachePoint blocks from messages\n * Used when switching from Bedrock to Anthropic provider\n */\nexport function stripBedrockCacheControl<T extends MessageWithContent>(\n  messages: T[]\n): T[] {\n  if (!Array.isArray(messages)) {\n    return messages;\n  }\n\n  const updatedMessages = [...messages];\n\n  for (let i = 0; i < updatedMessages.length; i++) {\n    const message = updatedMessages[i];\n    const content = message.content;\n\n    if (Array.isArray(content)) {\n      message.content = content.filter(\n        (block) => !isCachePoint(block as MessageContentComplex)\n      ) as typeof content;\n    }\n  }\n\n  return updatedMessages;\n}\n\n/**\n * Adds Bedrock Converse API cache points to the last two messages.\n * Inserts `{ cachePoint: { type: 'default' } }` as a separate content block\n * immediately after the last text block in each targeted message.\n * Strips ALL existing cache control (both Bedrock and Anthropic formats) from all messages,\n * then adds fresh cache points to the last 2 messages in a single backward pass.\n * This ensures we don't accumulate stale cache points across multiple turns.\n * @param messages - The array of message objects.\n * @returns - The updated array of message objects with cache points added.\n */\nexport function addBedrockCacheControl<\n  T extends Partial<BaseMessage> & MessageWithContent,\n>(messages: T[]): T[] {\n  if (!Array.isArray(messages) || messages.length < 2) {\n    return messages;\n  }\n\n  const updatedMessages: T[] = messages.slice();\n  let messagesModified = 0;\n\n  for (let i = updatedMessages.length - 1; i >= 0; i--) {\n    const message = updatedMessages[i];\n    const isToolMessage =\n      'getType' in message &&\n      typeof message.getType === 'function' &&\n      message.getType() === 'tool';\n\n    const content = message.content;\n\n    if (Array.isArray(content)) {\n      message.content = content.filter(\n        (block) => !isCachePoint(block)\n      ) as typeof content;\n\n      for (let j = 0; j < message.content.length; j++) {\n        const block = message.content[j] as Record<string, unknown>;\n        if ('cache_control' in block) {\n          delete block.cache_control;\n        }\n      }\n    }\n\n    if (messagesModified >= 2 || isToolMessage) {\n      continue;\n    }\n\n    if (typeof content === 'string' && content === '') {\n      continue;\n    }\n\n    if (typeof content === 'string') {\n      message.content = [\n        { type: ContentTypes.TEXT, text: content },\n        { cachePoint: { type: 'default' } },\n      ] as MessageContentComplex[];\n      messagesModified++;\n      continue;\n    }\n\n    if (Array.isArray(message.content)) {\n      let hasCacheableContent = false;\n      for (const block of message.content) {\n        if (block.type === ContentTypes.TEXT) {\n          if (typeof block.text === 'string' && block.text !== '') {\n            hasCacheableContent = true;\n            break;\n          }\n        }\n      }\n\n      if (!hasCacheableContent) {\n        continue;\n      }\n\n      let inserted = false;\n      for (let j = message.content.length - 1; j >= 0; j--) {\n        const block = message.content[j] as MessageContentComplex;\n        const type = (block as { type?: string }).type;\n        if (type === ContentTypes.TEXT || type === 'text') {\n          const text = (block as { text?: string }).text;\n          if (text === '' || text === undefined) {\n            continue;\n          }\n          message.content.splice(j + 1, 0, {\n            cachePoint: { type: 'default' },\n          } as MessageContentComplex);\n          inserted = true;\n          break;\n        }\n      }\n      if (!inserted) {\n        message.content.push({\n          cachePoint: { type: 'default' },\n        } as MessageContentComplex);\n      }\n      messagesModified++;\n    }\n  }\n\n  return updatedMessages;\n}\n"],"names":[],"mappings":"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"}

package/dist/types/messages/cache.d.ts

@@ -5,14 +5,30 @@ type MessageWithContent = {
 };
 /**
  * Anthropic API: Adds cache control to the appropriate user messages in the payload.
+ * Strips ALL existing cache control (both Anthropic and Bedrock formats) from all messages,
+ * then adds fresh cache control to the last 2 user messages in a single backward pass.
+ * This ensures we don't accumulate stale cache points across multiple turns.
  * @param messages - The array of message objects.
  * @returns - The updated array of message objects with cache control added.
  */
 export declare function addCacheControl<T extends AnthropicMessage | BaseMessage>(messages: T[]): T[];
+/**
+ * Removes all Anthropic cache_control fields from messages
+ * Used when switching from Anthropic to Bedrock provider
+ */
+export declare function stripAnthropicCacheControl<T extends MessageWithContent>(messages: T[]): T[];
+/**
+ * Removes all Bedrock cachePoint blocks from messages
+ * Used when switching from Bedrock to Anthropic provider
+ */
+export declare function stripBedrockCacheControl<T extends MessageWithContent>(messages: T[]): T[];
 /**
  * Adds Bedrock Converse API cache points to the last two messages.
  * Inserts `{ cachePoint: { type: 'default' } }` as a separate content block
  * immediately after the last text block in each targeted message.
+ * Strips ALL existing cache control (both Bedrock and Anthropic formats) from all messages,
+ * then adds fresh cache points to the last 2 messages in a single backward pass.
+ * This ensures we don't accumulate stale cache points across multiple turns.
  * @param messages - The array of message objects.
  * @returns - The updated array of message objects with cache points added.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@librechat/agents",
-  "version": "3.0.19",
+  "version": "3.0.20",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/esm/main.mjs",
   "types": "./dist/types/index.d.ts",

package/src/messages/cache.test.ts

@@ -1,6 +1,11 @@
 import type Anthropic from '@anthropic-ai/sdk';
 import type { AnthropicMessages } from '@/types/messages';
-import { addCacheControl, addBedrockCacheControl } from './cache';
+import {
+  stripAnthropicCacheControl,
+  stripBedrockCacheControl,
+  addBedrockCacheControl,
+  addCacheControl,
+} from './cache';
 import { MessageContentComplex } from '@langchain/core/messages';
 import { ContentTypes } from '@/common/enum';
 
@@ -393,7 +398,7 @@ describe('addBedrockCacheControl (Bedrock cache checkpoints)', () => {
     expect(first[1]).toEqual({ cachePoint: { type: 'default' } });
   });
 
-  it('works with the example from the langchain pr', () => {
+  it('works with the example from the langchain pr (with multi-turn behavior)', () => {
     const messages: TestMsg[] = [
       {
         role: 'system',
@@ -445,7 +450,8 @@ describe('addBedrockCacheControl (Bedrock cache checkpoints)', () => {
       type: ContentTypes.TEXT,
       text: 'You\'re an advanced AI assistant.',
     });
-    expect(system[1]).toEqual({ cachePoint: { type: 'default' } });
+    expect(system.length).toBe(1);
+
     expect(user[0]).toEqual({
       type: ContentTypes.TEXT,
       text: 'What is the capital of France?',
@@ -458,4 +464,494 @@ describe('addBedrockCacheControl (Bedrock cache checkpoints)', () => {
     });
     expect(assistant[1]).toEqual({ cachePoint: { type: 'default' } });
   });
+
+  it('is idempotent - calling multiple times does not add duplicate cache points', () => {
+    const messages: TestMsg[] = [
+      {
+        role: 'user',
+        content: [{ type: ContentTypes.TEXT, text: 'First message' }],
+      },
+      {
+        role: 'assistant',
+        content: [{ type: ContentTypes.TEXT, text: 'First response' }],
+      },
+    ];
+
+    const result1 = addBedrockCacheControl(messages);
+    const firstContent = result1[0].content as MessageContentComplex[];
+    const secondContent = result1[1].content as MessageContentComplex[];
+
+    expect(firstContent.length).toBe(2);
+    expect(firstContent[0]).toEqual({
+      type: ContentTypes.TEXT,
+      text: 'First message',
+    });
+    expect(firstContent[1]).toEqual({ cachePoint: { type: 'default' } });
+
+    expect(secondContent.length).toBe(2);
+    expect(secondContent[0]).toEqual({
+      type: ContentTypes.TEXT,
+      text: 'First response',
+    });
+    expect(secondContent[1]).toEqual({ cachePoint: { type: 'default' } });
+
+    const result2 = addBedrockCacheControl(result1);
+    const firstContentAfter = result2[0].content as MessageContentComplex[];
+    const secondContentAfter = result2[1].content as MessageContentComplex[];
+
+    expect(firstContentAfter.length).toBe(2);
+    expect(firstContentAfter[0]).toEqual({
+      type: ContentTypes.TEXT,
+      text: 'First message',
+    });
+    expect(firstContentAfter[1]).toEqual({ cachePoint: { type: 'default' } });
+
+    expect(secondContentAfter.length).toBe(2);
+    expect(secondContentAfter[0]).toEqual({
+      type: ContentTypes.TEXT,
+      text: 'First response',
+    });
+    expect(secondContentAfter[1]).toEqual({ cachePoint: { type: 'default' } });
+  });
+
+  it('skips messages that already have cache points in multi-agent scenarios', () => {
+    const messages: TestMsg[] = [
+      {
+        role: 'user',
+        content: [{ type: ContentTypes.TEXT, text: 'Hello' }],
+      },
+      {
+        role: 'assistant',
+        content: [
+          { type: ContentTypes.TEXT, text: 'Response from agent 1' },
+          { cachePoint: { type: 'default' } },
+        ],
+      },
+      {
+        role: 'user',
+        content: [{ type: ContentTypes.TEXT, text: 'Follow-up question' }],
+      },
+    ];
+
+    const result = addBedrockCacheControl(messages);
+    const lastContent = result[2].content as MessageContentComplex[];
+    const secondLastContent = result[1].content as MessageContentComplex[];
+
+    expect(lastContent.length).toBe(2);
+    expect(lastContent[0]).toEqual({
+      type: ContentTypes.TEXT,
+      text: 'Follow-up question',
+    });
+    expect(lastContent[1]).toEqual({ cachePoint: { type: 'default' } });
+
+    expect(secondLastContent.length).toBe(2);
+    expect(secondLastContent[0]).toEqual({
+      type: ContentTypes.TEXT,
+      text: 'Response from agent 1',
+    });
+    expect(secondLastContent[1]).toEqual({ cachePoint: { type: 'default' } });
+  });
+});
+
+describe('stripAnthropicCacheControl', () => {
+  it('removes cache_control fields from content blocks', () => {
+    const messages: TestMsg[] = [
+      {
+        role: 'user',
+        content: [
+          {
+            type: ContentTypes.TEXT,
+            text: 'Hello',
+            cache_control: { type: 'ephemeral' },
+          } as MessageContentComplex,
+        ],
+      },
+      {
+        role: 'assistant',
+        content: [
+          {
+            type: ContentTypes.TEXT,
+            text: 'Hi there',
+            cache_control: { type: 'ephemeral' },
+          } as MessageContentComplex,
+        ],
+      },
+    ];
+
+    const result = stripAnthropicCacheControl(messages);
+
+    const firstContent = result[0].content as MessageContentComplex[];
+    const secondContent = result[1].content as MessageContentComplex[];
+
+    expect(firstContent[0]).toEqual({
+      type: ContentTypes.TEXT,
+      text: 'Hello',
+    });
+    expect('cache_control' in firstContent[0]).toBe(false);
+
+    expect(secondContent[0]).toEqual({
+      type: ContentTypes.TEXT,
+      text: 'Hi there',
+    });
+    expect('cache_control' in secondContent[0]).toBe(false);
+  });
+
+  it('handles messages without cache_control gracefully', () => {
+    const messages: TestMsg[] = [
+      {
+        role: 'user',
+        content: [{ type: ContentTypes.TEXT, text: 'Hello' }],
+      },
+    ];
+
+    const result = stripAnthropicCacheControl(messages);
+
+    expect(result[0].content).toEqual([
+      { type: ContentTypes.TEXT, text: 'Hello' },
+    ]);
+  });
+
+  it('handles string content gracefully', () => {
+    const messages: TestMsg[] = [
+      {
+        role: 'user',
+        content: 'Hello',
+      },
+    ];
+
+    const result = stripAnthropicCacheControl(messages);
+
+    expect(result[0].content).toBe('Hello');
+  });
+
+  it('returns non-array input unchanged', () => {
+    const notArray = 'not an array';
+    /** @ts-expect-error - Testing invalid input */
+    const result = stripAnthropicCacheControl(notArray);
+    expect(result).toBe('not an array');
+  });
+});
+
+describe('stripBedrockCacheControl', () => {
+  it('removes cachePoint blocks from content arrays', () => {
+    const messages: TestMsg[] = [
+      {
+        role: 'user',
+        content: [
+          { type: ContentTypes.TEXT, text: 'Hello' },
+          { cachePoint: { type: 'default' } },
+        ],
+      },
+      {
+        role: 'assistant',
+        content: [
+          { type: ContentTypes.TEXT, text: 'Hi there' },
+          { cachePoint: { type: 'default' } },
+        ],
+      },
+    ];
+
+    const result = stripBedrockCacheControl(messages);
+
+    const firstContent = result[0].content as MessageContentComplex[];
+    const secondContent = result[1].content as MessageContentComplex[];
+
+    expect(firstContent.length).toBe(1);
+    expect(firstContent[0]).toEqual({
+      type: ContentTypes.TEXT,
+      text: 'Hello',
+    });
+
+    expect(secondContent.length).toBe(1);
+    expect(secondContent[0]).toEqual({
+      type: ContentTypes.TEXT,
+      text: 'Hi there',
+    });
+  });
+
+  it('handles messages without cachePoint blocks gracefully', () => {
+    const messages: TestMsg[] = [
+      {
+        role: 'user',
+        content: [{ type: ContentTypes.TEXT, text: 'Hello' }],
+      },
+    ];
+
+    const result = stripBedrockCacheControl(messages);
+
+    expect(result[0].content).toEqual([
+      { type: ContentTypes.TEXT, text: 'Hello' },
+    ]);
+  });
+
+  it('handles string content gracefully', () => {
+    const messages: TestMsg[] = [
+      {
+        role: 'user',
+        content: 'Hello',
+      },
+    ];
+
+    const result = stripBedrockCacheControl(messages);
+
+    expect(result[0].content).toBe('Hello');
+  });
+
+  it('preserves content with type field', () => {
+    const messages: TestMsg[] = [
+      {
+        role: 'user',
+        content: [
+          { type: ContentTypes.TEXT, text: 'Hello' },
+          {
+            type: ContentTypes.IMAGE_FILE,
+            image_file: { file_id: 'file_123' },
+          },
+          { cachePoint: { type: 'default' } },
+        ],
+      },
+    ];
+
+    const result = stripBedrockCacheControl(messages);
+
+    const content = result[0].content as MessageContentComplex[];
+
+    expect(content.length).toBe(2);
+    expect(content[0]).toEqual({ type: ContentTypes.TEXT, text: 'Hello' });
+    expect(content[1]).toEqual({
+      type: ContentTypes.IMAGE_FILE,
+      image_file: { file_id: 'file_123' },
+    });
+  });
+
+  it('returns non-array input unchanged', () => {
+    const notArray = 'not an array';
+    /** @ts-expect-error - Testing invalid input */
+    const result = stripBedrockCacheControl(notArray);
+    expect(result).toBe('not an array');
+  });
+});
+
+describe('Multi-agent provider interoperability', () => {
+  it('strips Bedrock cache before applying Anthropic cache (single pass)', () => {
+    const messages: TestMsg[] = [
+      {
+        role: 'user',
+        content: [
+          { type: ContentTypes.TEXT, text: 'First message' },
+          { cachePoint: { type: 'default' } },
+        ],
+      },
+      {
+        role: 'assistant',
+        content: [
+          { type: ContentTypes.TEXT, text: 'Response' },
+          { cachePoint: { type: 'default' } },
+        ],
+      },
+    ];
+
+    /** @ts-expect-error - Testing cross-provider compatibility */
+    const result = addCacheControl(messages);
+
+    const firstContent = result[0].content as MessageContentComplex[];
+
+    expect(firstContent.some((b) => 'cachePoint' in b)).toBe(false);
+    expect('cache_control' in firstContent[0]).toBe(true);
+  });
+
+  it('strips Anthropic cache before applying Bedrock cache (single pass)', () => {
+    const messages: TestMsg[] = [
+      {
+        role: 'user',
+        content: [
+          {
+            type: ContentTypes.TEXT,
+            text: 'First message',
+            cache_control: { type: 'ephemeral' },
+          } as MessageContentComplex,
+        ],
+      },
+      {
+        role: 'assistant',
+        content: [
+          {
+            type: ContentTypes.TEXT,
+            text: 'Response',
+            cache_control: { type: 'ephemeral' },
+          } as MessageContentComplex,
+        ],
+      },
+    ];
+
+    const result = addBedrockCacheControl(messages);
+
+    const firstContent = result[0].content as MessageContentComplex[];
+    const secondContent = result[1].content as MessageContentComplex[];
+
+    expect('cache_control' in firstContent[0]).toBe(false);
+    expect('cache_control' in secondContent[0]).toBe(false);
+
+    expect(firstContent.some((b) => 'cachePoint' in b)).toBe(true);
+    expect(secondContent.some((b) => 'cachePoint' in b)).toBe(true);
+  });
+
+  it('strips Bedrock cache using separate function (backwards compat)', () => {
+    const messages: TestMsg[] = [
+      {
+        role: 'user',
+        content: [
+          { type: ContentTypes.TEXT, text: 'First message' },
+          { cachePoint: { type: 'default' } },
+        ],
+      },
+    ];
+
+    const stripped = stripBedrockCacheControl(messages);
+    const firstContent = stripped[0].content as MessageContentComplex[];
+
+    expect(firstContent.some((b) => 'cachePoint' in b)).toBe(false);
+    expect(firstContent.length).toBe(1);
+  });
+
+  it('strips Anthropic cache using separate function (backwards compat)', () => {
+    const messages: TestMsg[] = [
+      {
+        role: 'user',
+        content: [
+          {
+            type: ContentTypes.TEXT,
+            text: 'First message',
+            cache_control: { type: 'ephemeral' },
+          } as MessageContentComplex,
+        ],
+      },
+    ];
+
+    const stripped = stripAnthropicCacheControl(messages);
+    const firstContent = stripped[0].content as MessageContentComplex[];
+
+    expect('cache_control' in firstContent[0]).toBe(false);
+  });
+});
+
+describe('Multi-turn cache cleanup', () => {
+  it('strips stale Bedrock cache points from previous turns before applying new ones', () => {
+    const messages: TestMsg[] = [
+      {
+        role: 'user',
+        content: [
+          { type: ContentTypes.TEXT, text: 'Turn 1 message 1' },
+          { cachePoint: { type: 'default' } },
+        ],
+      },
+      {
+        role: 'assistant',
+        content: [
+          { type: ContentTypes.TEXT, text: 'Turn 1 response 1' },
+          { cachePoint: { type: 'default' } },
+        ],
+      },
+      {
+        role: 'user',
+        content: [{ type: ContentTypes.TEXT, text: 'Turn 2 message 2' }],
+      },
+      {
+        role: 'assistant',
+        content: [{ type: ContentTypes.TEXT, text: 'Turn 2 response 2' }],
+      },
+    ];
+
+    const result = addBedrockCacheControl(messages);
+
+    const cachePointCount = result.reduce((count, msg) => {
+      if (Array.isArray(msg.content)) {
+        return (
+          count +
+          msg.content.filter(
+            (block) => 'cachePoint' in block && !('type' in block)
+          ).length
+        );
+      }
+      return count;
+    }, 0);
+
+    expect(cachePointCount).toBe(2);
+
+    const lastContent = result[3].content as MessageContentComplex[];
+    const secondLastContent = result[2].content as MessageContentComplex[];
+
+    expect(lastContent.some((b) => 'cachePoint' in b)).toBe(true);
+    expect(secondLastContent.some((b) => 'cachePoint' in b)).toBe(true);
+
+    const firstContent = result[0].content as MessageContentComplex[];
+    const secondContent = result[1].content as MessageContentComplex[];
+
+    expect(firstContent.some((b) => 'cachePoint' in b)).toBe(false);
+    expect(secondContent.some((b) => 'cachePoint' in b)).toBe(false);
+  });
+
+  it('strips stale Anthropic cache_control from previous turns before applying new ones', () => {
+    const messages: TestMsg[] = [
+      {
+        role: 'user',
+        content: [
+          {
+            type: ContentTypes.TEXT,
+            text: 'Turn 1 message 1',
+            cache_control: { type: 'ephemeral' },
+          } as MessageContentComplex,
+        ],
+      },
+      {
+        role: 'assistant',
+        content: [{ type: ContentTypes.TEXT, text: 'Turn 1 response 1' }],
+      },
+      {
+        role: 'user',
+        content: [
+          {
+            type: ContentTypes.TEXT,
+            text: 'Turn 2 message 2',
+            cache_control: { type: 'ephemeral' },
+          } as MessageContentComplex,
+        ],
+      },
+      {
+        role: 'assistant',
+        content: [{ type: ContentTypes.TEXT, text: 'Turn 2 response 2' }],
+      },
+      {
+        role: 'user',
+        content: [{ type: ContentTypes.TEXT, text: 'Turn 3 message 3' }],
+      },
+    ];
+
+    /** @ts-expect-error - Testing cross-provider compatibility */
+    const result = addCacheControl(messages);
+
+    const cacheControlCount = result.reduce((count, msg) => {
+      if (Array.isArray(msg.content)) {
+        return (
+          count +
+          msg.content.filter(
+            (block) => 'cache_control' in block && 'type' in block
+          ).length
+        );
+      }
+      return count;
+    }, 0);
+
+    expect(cacheControlCount).toBe(2);
+
+    const lastContent = result[4].content as MessageContentComplex[];
+    const thirdContent = result[2].content as MessageContentComplex[];
+
+    expect('cache_control' in lastContent[0]).toBe(true);
+    expect('cache_control' in thirdContent[0]).toBe(true);
+
+    const firstContent = result[0].content as MessageContentComplex[];
+
+    expect('cache_control' in firstContent[0]).toBe(false);
+  });
 });

package/src/messages/cache.ts

@@ -9,6 +9,9 @@ type MessageWithContent = {
 
 /**
  * Anthropic API: Adds cache control to the appropriate user messages in the payload.
+ * Strips ALL existing cache control (both Anthropic and Bedrock formats) from all messages,
+ * then adds fresh cache control to the last 2 user messages in a single backward pass.
+ * This ensures we don't accumulate stale cache points across multiple turns.
  * @param messages - The array of message objects.
  * @returns - The updated array of message objects with cache control added.
  */
@@ -22,15 +25,26 @@ export function addCacheControl<T extends AnthropicMessage | BaseMessage>(
   const updatedMessages = [...messages];
   let userMessagesModified = 0;
 
-  for (
-    let i = updatedMessages.length - 1;
-    i >= 0 && userMessagesModified < 2;
-    i--
-  ) {
+  for (let i = updatedMessages.length - 1; i >= 0; i--) {
     const message = updatedMessages[i];
-    if ('getType' in message && message.getType() !== 'human') {
-      continue;
-    } else if ('role' in message && message.role !== 'user') {
+    const isUserMessage =
+      ('getType' in message && message.getType() === 'human') ||
+      ('role' in message && message.role === 'user');
+
+    if (Array.isArray(message.content)) {
+      message.content = message.content.filter(
+        (block) => !isCachePoint(block as MessageContentComplex)
+      ) as typeof message.content;
+
+      for (let j = 0; j < message.content.length; j++) {
+        const block = message.content[j] as Record<string, unknown>;
+        if ('cache_control' in block) {
+          delete block.cache_control;
+        }
+      }
+    }
+
+    if (userMessagesModified >= 2 || !isUserMessage) {
       continue;
     }
 
@@ -60,10 +74,77 @@ export function addCacheControl<T extends AnthropicMessage | BaseMessage>(
   return updatedMessages;
 }
 
+/**
+ * Checks if a content block is a cache point
+ */
+function isCachePoint(block: MessageContentComplex): boolean {
+  return 'cachePoint' in block && !('type' in block);
+}
+
+/**
+ * Removes all Anthropic cache_control fields from messages
+ * Used when switching from Anthropic to Bedrock provider
+ */
+export function stripAnthropicCacheControl<T extends MessageWithContent>(
+  messages: T[]
+): T[] {
+  if (!Array.isArray(messages)) {
+    return messages;
+  }
+
+  const updatedMessages = [...messages];
+
+  for (let i = 0; i < updatedMessages.length; i++) {
+    const message = updatedMessages[i];
+    const content = message.content;
+
+    if (Array.isArray(content)) {
+      for (let j = 0; j < content.length; j++) {
+        const block = content[j] as Record<string, unknown>;
+        if ('cache_control' in block) {
+          delete block.cache_control;
+        }
+      }
+    }
+  }
+
+  return updatedMessages;
+}
+
+/**
+ * Removes all Bedrock cachePoint blocks from messages
+ * Used when switching from Bedrock to Anthropic provider
+ */
+export function stripBedrockCacheControl<T extends MessageWithContent>(
+  messages: T[]
+): T[] {
+  if (!Array.isArray(messages)) {
+    return messages;
+  }
+
+  const updatedMessages = [...messages];
+
+  for (let i = 0; i < updatedMessages.length; i++) {
+    const message = updatedMessages[i];
+    const content = message.content;
+
+    if (Array.isArray(content)) {
+      message.content = content.filter(
+        (block) => !isCachePoint(block as MessageContentComplex)
+      ) as typeof content;
+    }
+  }
+
+  return updatedMessages;
+}
+
 /**
  * Adds Bedrock Converse API cache points to the last two messages.
  * Inserts `{ cachePoint: { type: 'default' } }` as a separate content block
  * immediately after the last text block in each targeted message.
+ * Strips ALL existing cache control (both Bedrock and Anthropic formats) from all messages,
+ * then adds fresh cache points to the last 2 messages in a single backward pass.
+ * This ensures we don't accumulate stale cache points across multiple turns.
  * @param messages - The array of message objects.
  * @returns - The updated array of message objects with cache points added.
  */
@@ -77,23 +158,32 @@ export function addBedrockCacheControl<
   const updatedMessages: T[] = messages.slice();
   let messagesModified = 0;
 
-  for (
-    let i = updatedMessages.length - 1;
-    i >= 0 && messagesModified < 2;
-    i--
-  ) {
+  for (let i = updatedMessages.length - 1; i >= 0; i--) {
     const message = updatedMessages[i];
-
-    if (
+    const isToolMessage =
       'getType' in message &&
       typeof message.getType === 'function' &&
-      message.getType() === 'tool'
-    ) {
-      continue;
-    }
+      message.getType() === 'tool';
 
     const content = message.content;
 
+    if (Array.isArray(content)) {
+      message.content = content.filter(
+        (block) => !isCachePoint(block)
+      ) as typeof content;
+
+      for (let j = 0; j < message.content.length; j++) {
+        const block = message.content[j] as Record<string, unknown>;
+        if ('cache_control' in block) {
+          delete block.cache_control;
+        }
+      }
+    }
+
+    if (messagesModified >= 2 || isToolMessage) {
+      continue;
+    }
+
     if (typeof content === 'string' && content === '') {
       continue;
     }
@@ -107,9 +197,9 @@ export function addBedrockCacheControl<
       continue;
     }
 
-    if (Array.isArray(content)) {
+    if (Array.isArray(message.content)) {
       let hasCacheableContent = false;
-      for (const block of content) {
+      for (const block of message.content) {
         if (block.type === ContentTypes.TEXT) {
           if (typeof block.text === 'string' && block.text !== '') {
             hasCacheableContent = true;
@@ -123,15 +213,15 @@ export function addBedrockCacheControl<
       }
 
       let inserted = false;
-      for (let j = content.length - 1; j >= 0; j--) {
-        const block = content[j] as MessageContentComplex;
+      for (let j = message.content.length - 1; j >= 0; j--) {
+        const block = message.content[j] as MessageContentComplex;
         const type = (block as { type?: string }).type;
         if (type === ContentTypes.TEXT || type === 'text') {
           const text = (block as { text?: string }).text;
           if (text === '' || text === undefined) {
             continue;
           }
-          content.splice(j + 1, 0, {
+          message.content.splice(j + 1, 0, {
             cachePoint: { type: 'default' },
           } as MessageContentComplex);
           inserted = true;
@@ -139,7 +229,7 @@ export function addBedrockCacheControl<
         }
       }
       if (!inserted) {
-        content.push({
+        message.content.push({
           cachePoint: { type: 'default' },
         } as MessageContentComplex);
       }