@librechat/agents 3.0.12 → 3.0.14

package/dist/cjs/messages/cache.cjs

@@ -61,7 +61,15 @@ function addBedrockCacheControl(messages) {
     let messagesModified = 0;
     for (let i = updatedMessages.length - 1; i >= 0 && messagesModified < 2; i--) {
         const message = updatedMessages[i];
+        if ('getType' in message &&
+            typeof message.getType === 'function' &&
+            message.getType() === 'tool') {
+            continue;
+        }
         const content = message.content;
+        if (typeof content === 'string' && content === '') {
+            continue;
+        }
         if (typeof content === 'string') {
             message.content = [
                 { type: _enum.ContentTypes.TEXT, text: content },
@@ -71,11 +79,27 @@ function addBedrockCacheControl(messages) {
             continue;
         }
         if (Array.isArray(content)) {
+            let hasCacheableContent = false;
+            for (const block of content) {
+                if (block.type === _enum.ContentTypes.TEXT) {
+                    if (typeof block.text === 'string' && block.text !== '') {
+                        hasCacheableContent = true;
+                        break;
+                    }
+                }
+            }
+            if (!hasCacheableContent) {
+                continue;
+            }
             let inserted = false;
             for (let j = content.length - 1; j >= 0; j--) {
                 const block = 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, {
                         cachePoint: { type: 'default' },
                     });

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    const content = message.content;\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 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          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":";;;;AASA;;;;AAIG;AACG,SAAU,eAAe,CAC7B,QAAa,EAAA;AAEb,IAAA,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;AACnD,QAAA,OAAO,QAAQ;;AAGjB,IAAA,MAAM,eAAe,GAAG,CAAC,GAAG,QAAQ,CAAC;IACrC,IAAI,oBAAoB,GAAG,CAAC;IAE5B,KACE,IAAI,CAAC,GAAG,eAAe,CAAC,MAAM,GAAG,CAAC,EAClC,CAAC,IAAI,CAAC,IAAI,oBAAoB,GAAG,CAAC,EAClC,CAAC,EAAE,EACH;AACA,QAAA,MAAM,OAAO,GAAG,eAAe,CAAC,CAAC,CAAC;QAClC,IAAI,SAAS,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,KAAK,OAAO,EAAE;YACzD;;aACK,IAAI,MAAM,IAAI,OAAO,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE;YACvD;;AAGF,QAAA,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE;YACvC,OAAO,CAAC,OAAO,GAAG;AAChB,gBAAA;AACE,oBAAA,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,OAAO,CAAC,OAAO;AACrB,oBAAA,aAAa,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;AACrC,iBAAA;aACF;AACD,YAAA,oBAAoB,EAAE;;aACjB,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;AACzC,YAAA,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;gBACpD,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;gBACtC,IAAI,MAAM,IAAI,WAAW,IAAI,WAAW,CAAC,IAAI,KAAK,MAAM,EAAE;oBACvD,WAAwC,CAAC,aAAa,GAAG;AACxD,wBAAA,IAAI,EAAE,WAAW;qBAClB;AACD,oBAAA,oBAAoB,EAAE;oBACtB;;;;;AAMR,IAAA,OAAO,eAAe;AACxB;AAEA;;;;;;AAMG;AACG,SAAU,sBAAsB,CAEpC,QAAa,EAAA;AACb,IAAA,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;AACnD,QAAA,OAAO,QAAQ;;AAGjB,IAAA,MAAM,eAAe,GAAQ,QAAQ,CAAC,KAAK,EAAE;IAC7C,IAAI,gBAAgB,GAAG,CAAC;IAExB,KACE,IAAI,CAAC,GAAG,eAAe,CAAC,MAAM,GAAG,CAAC,EAClC,CAAC,IAAI,CAAC,IAAI,gBAAgB,GAAG,CAAC,EAC9B,CAAC,EAAE,EACH;AACA,QAAA,MAAM,OAAO,GAAG,eAAe,CAAC,CAAC,CAAC;AAClC,QAAA,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO;AAE/B,QAAA,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,OAAO,CAAC,OAAO,GAAG;gBAChB,EAAE,IAAI,EAAEA,kBAAY,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;AAC1C,gBAAA,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE;aACT;AAC5B,YAAA,gBAAgB,EAAE;YAClB;;AAGF,QAAA,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAC1B,IAAI,QAAQ,GAAG,KAAK;AACpB,YAAA,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;AAC5C,gBAAA,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAA0B;AACjD,gBAAA,MAAM,IAAI,GAAI,KAA2B,CAAC,IAAI;gBAC9C,IAAI,IAAI,KAAKA,kBAAY,CAAC,IAAI,IAAI,IAAI,KAAK,MAAM,EAAE;oBACjD,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;AACvB,wBAAA,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;AACP,qBAAA,CAAC;oBAC3B,QAAQ,GAAG,IAAI;oBACf;;;YAGJ,IAAI,CAAC,QAAQ,EAAE;gBACb,OAAO,CAAC,IAAI,CAAC;AACX,oBAAA,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;AACP,iBAAA,CAAC;;AAE7B,YAAA,gBAAgB,EAAE;;;AAItB,IAAA,OAAO,eAAe;AACxB;;;;;"}
+{"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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"}

package/dist/esm/messages/cache.mjs

@@ -59,7 +59,15 @@ function addBedrockCacheControl(messages) {
     let messagesModified = 0;
     for (let i = updatedMessages.length - 1; i >= 0 && messagesModified < 2; i--) {
         const message = updatedMessages[i];
+        if ('getType' in message &&
+            typeof message.getType === 'function' &&
+            message.getType() === 'tool') {
+            continue;
+        }
         const content = message.content;
+        if (typeof content === 'string' && content === '') {
+            continue;
+        }
         if (typeof content === 'string') {
             message.content = [
                 { type: ContentTypes.TEXT, text: content },
@@ -69,11 +77,27 @@ function addBedrockCacheControl(messages) {
             continue;
         }
         if (Array.isArray(content)) {
+            let hasCacheableContent = false;
+            for (const block of content) {
+                if (block.type === ContentTypes.TEXT) {
+                    if (typeof block.text === 'string' && block.text !== '') {
+                        hasCacheableContent = true;
+                        break;
+                    }
+                }
+            }
+            if (!hasCacheableContent) {
+                continue;
+            }
             let inserted = false;
             for (let j = content.length - 1; j >= 0; j--) {
                 const block = 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, {
                         cachePoint: { type: 'default' },
                     });

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    const content = message.content;\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 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          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":";;AASA;;;;AAIG;AACG,SAAU,eAAe,CAC7B,QAAa,EAAA;AAEb,IAAA,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;AACnD,QAAA,OAAO,QAAQ;;AAGjB,IAAA,MAAM,eAAe,GAAG,CAAC,GAAG,QAAQ,CAAC;IACrC,IAAI,oBAAoB,GAAG,CAAC;IAE5B,KACE,IAAI,CAAC,GAAG,eAAe,CAAC,MAAM,GAAG,CAAC,EAClC,CAAC,IAAI,CAAC,IAAI,oBAAoB,GAAG,CAAC,EAClC,CAAC,EAAE,EACH;AACA,QAAA,MAAM,OAAO,GAAG,eAAe,CAAC,CAAC,CAAC;QAClC,IAAI,SAAS,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,KAAK,OAAO,EAAE;YACzD;;aACK,IAAI,MAAM,IAAI,OAAO,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE;YACvD;;AAGF,QAAA,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE;YACvC,OAAO,CAAC,OAAO,GAAG;AAChB,gBAAA;AACE,oBAAA,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,OAAO,CAAC,OAAO;AACrB,oBAAA,aAAa,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;AACrC,iBAAA;aACF;AACD,YAAA,oBAAoB,EAAE;;aACjB,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;AACzC,YAAA,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;gBACpD,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;gBACtC,IAAI,MAAM,IAAI,WAAW,IAAI,WAAW,CAAC,IAAI,KAAK,MAAM,EAAE;oBACvD,WAAwC,CAAC,aAAa,GAAG;AACxD,wBAAA,IAAI,EAAE,WAAW;qBAClB;AACD,oBAAA,oBAAoB,EAAE;oBACtB;;;;;AAMR,IAAA,OAAO,eAAe;AACxB;AAEA;;;;;;AAMG;AACG,SAAU,sBAAsB,CAEpC,QAAa,EAAA;AACb,IAAA,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;AACnD,QAAA,OAAO,QAAQ;;AAGjB,IAAA,MAAM,eAAe,GAAQ,QAAQ,CAAC,KAAK,EAAE;IAC7C,IAAI,gBAAgB,GAAG,CAAC;IAExB,KACE,IAAI,CAAC,GAAG,eAAe,CAAC,MAAM,GAAG,CAAC,EAClC,CAAC,IAAI,CAAC,IAAI,gBAAgB,GAAG,CAAC,EAC9B,CAAC,EAAE,EACH;AACA,QAAA,MAAM,OAAO,GAAG,eAAe,CAAC,CAAC,CAAC;AAClC,QAAA,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO;AAE/B,QAAA,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,OAAO,CAAC,OAAO,GAAG;gBAChB,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;AAC1C,gBAAA,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE;aACT;AAC5B,YAAA,gBAAgB,EAAE;YAClB;;AAGF,QAAA,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAC1B,IAAI,QAAQ,GAAG,KAAK;AACpB,YAAA,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;AAC5C,gBAAA,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAA0B;AACjD,gBAAA,MAAM,IAAI,GAAI,KAA2B,CAAC,IAAI;gBAC9C,IAAI,IAAI,KAAK,YAAY,CAAC,IAAI,IAAI,IAAI,KAAK,MAAM,EAAE;oBACjD,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;AACvB,wBAAA,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;AACP,qBAAA,CAAC;oBAC3B,QAAQ,GAAG,IAAI;oBACf;;;YAGJ,IAAI,CAAC,QAAQ,EAAE;gBACb,OAAO,CAAC,IAAI,CAAC;AACX,oBAAA,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;AACP,iBAAA,CAAC;;AAE7B,YAAA,gBAAgB,EAAE;;;AAItB,IAAA,OAAO,eAAe;AACxB;;;;"}
+{"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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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@librechat/agents",
-  "version": "3.0.12",
+  "version": "3.0.14",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/esm/main.mjs",
   "types": "./dist/types/index.d.ts",
@@ -51,7 +51,7 @@
     "caching": "node -r dotenv/config --loader ./tsconfig-paths-bootstrap.mjs --experimental-specifier-resolution=node ./src/scripts/caching.ts --name 'Jo' --location 'New York, NY'",
     "thinking": "node -r dotenv/config --loader ./tsconfig-paths-bootstrap.mjs --experimental-specifier-resolution=node ./src/scripts/thinking.ts --name 'Jo' --location 'New York, NY'",
     "memory": "node -r dotenv/config --loader ./tsconfig-paths-bootstrap.mjs --experimental-specifier-resolution=node ./src/scripts/memory.ts --provider 'openAI' --name 'Jo' --location 'New York, NY'",
-    "tool-test": "node -r dotenv/config --loader ./tsconfig-paths-bootstrap.mjs --experimental-specifier-resolution=node ./src/scripts/tools.ts --provider 'openrouter' --name 'Jo' --location 'New York, NY'",
+    "tool": "node -r dotenv/config --loader ./tsconfig-paths-bootstrap.mjs --experimental-specifier-resolution=node ./src/scripts/tools.ts --provider 'bedrock' --name 'Jo' --location 'New York, NY'",
     "search": "node -r dotenv/config --loader ./tsconfig-paths-bootstrap.mjs --experimental-specifier-resolution=node ./src/scripts/search.ts --provider 'bedrock' --name 'Jo' --location 'New York, NY'",
     "ant_web_search": "node -r dotenv/config --loader ./tsconfig-paths-bootstrap.mjs --experimental-specifier-resolution=node ./src/scripts/ant_web_search.ts --name 'Jo' --location 'New York, NY'",
     "abort": "node -r dotenv/config --loader ./tsconfig-paths-bootstrap.mjs --experimental-specifier-resolution=node ./src/scripts/abort.ts --provider 'openAI' --name 'Jo' --location 'New York, NY'",
@@ -94,7 +94,7 @@
   },
   "dependencies": {
     "@langchain/anthropic": "^0.3.26",
-    "@langchain/aws": "^0.1.12",
+    "@langchain/aws": "^0.1.15",
     "@langchain/core": "^0.3.79",
     "@langchain/deepseek": "^0.0.2",
     "@langchain/google-genai": "^0.2.13",

package/src/messages/cache.test.ts

@@ -330,7 +330,7 @@ describe('addBedrockCacheControl (Bedrock cache checkpoints)', () => {
     expect(second[2]).toEqual({ cachePoint: { type: 'default' } });
   });
 
-  it('appends cachePoint when content is an empty array', () => {
+  it('skips adding cachePoint when content is an empty array', () => {
     const messages: TestMsg[] = [
       { role: 'user', content: [] },
       { role: 'assistant', content: [] },
@@ -346,8 +346,21 @@ describe('addBedrockCacheControl (Bedrock cache checkpoints)', () => {
     expect(first.length).toBe(0);
 
     expect(Array.isArray(second)).toBe(true);
-    expect(second.length).toBe(1);
-    expect(second[0]).toEqual({ cachePoint: { type: 'default' } });
+    expect(second.length).toBe(0);
+    expect(second[0]).not.toEqual({ cachePoint: { type: 'default' } });
+  });
+
+  it('skips adding cachePoint when content is an empty string', () => {
+    const messages: TestMsg[] = [
+      { role: 'user', content: '' },
+      { role: 'assistant', content: '' },
+      { role: 'user', content: 'ignored because only last two are modified' },
+    ];
+
+    const result = addBedrockCacheControl(messages);
+
+    expect(result[0].content).toBe('');
+    expect(result[1].content).toBe('');
   });
 
   /** (I don't think this will ever occur in actual use, but its the only branch left uncovered so I'm covering it */

package/src/messages/cache.ts

@@ -83,8 +83,21 @@ export function addBedrockCacheControl<
     i--
   ) {
     const message = updatedMessages[i];
+
+    if (
+      'getType' in message &&
+      typeof message.getType === 'function' &&
+      message.getType() === 'tool'
+    ) {
+      continue;
+    }
+
     const content = message.content;
 
+    if (typeof content === 'string' && content === '') {
+      continue;
+    }
+
     if (typeof content === 'string') {
       message.content = [
         { type: ContentTypes.TEXT, text: content },
@@ -95,11 +108,29 @@ export function addBedrockCacheControl<
     }
 
     if (Array.isArray(content)) {
+      let hasCacheableContent = false;
+      for (const block of content) {
+        if (block.type === ContentTypes.TEXT) {
+          if (typeof block.text === 'string' && block.text !== '') {
+            hasCacheableContent = true;
+            break;
+          }
+        }
+      }
+
+      if (!hasCacheableContent) {
+        continue;
+      }
+
       let inserted = false;
       for (let j = content.length - 1; j >= 0; j--) {
         const block = 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, {
             cachePoint: { type: 'default' },
           } as MessageContentComplex);

package/src/scripts/search.ts

@@ -10,7 +10,7 @@ import { createSearchTool } from '@/tools/search';
 
 import { getArgs } from '@/scripts/args';
 import { Run } from '@/run';
-import { GraphEvents, Callback } from '@/common';
+import { GraphEvents, Callback, Providers } from '@/common';
 import { getLLMConfig } from '@/utils/llmConfig';
 
 const conversationHistory: BaseMessage[] = [];
@@ -72,6 +72,10 @@ async function testStandardStreaming(): Promise<void> {
 
   const llmConfig = getLLMConfig(provider);
 
+  if (llmConfig.provider === Providers.BEDROCK) {
+    (llmConfig as t.BedrockAnthropicInput).promptCache = true;
+  }
+
   const run = await Run.create<t.IState>({
     runId: 'test-run-id',
     graphConfig: {

package/src/scripts/tools.ts

@@ -2,15 +2,16 @@
 // src/scripts/cli.ts
 import { config } from 'dotenv';
 config();
+
 import { HumanMessage, BaseMessage } from '@langchain/core/messages';
 import type * as t from '@/types';
 import { ChatModelStreamHandler, createContentAggregator } from '@/stream';
 import { ToolEndHandler, ModelEndHandler } from '@/events';
-
+import { GraphEvents, Providers } from '@/common';
+import { getLLMConfig } from '@/utils/llmConfig';
+import { Calculator } from '@/tools/Calculator';
 import { getArgs } from '@/scripts/args';
 import { Run } from '@/run';
-import { GraphEvents, Callback } from '@/common';
-import { getLLMConfig } from '@/utils/llmConfig';
 
 const conversationHistory: BaseMessage[] = [];
 async function testStandardStreaming(): Promise<void> {
@@ -89,12 +90,16 @@ async function testStandardStreaming(): Promise<void> {
 
   const llmConfig = getLLMConfig(provider);
 
+  if (llmConfig.provider === Providers.BEDROCK) {
+    (llmConfig as t.BedrockAnthropicInput).promptCache = true;
+  }
+
   const run = await Run.create<t.IState>({
     runId: 'test-run-id',
     graphConfig: {
       type: 'standard',
       llmConfig,
-      tools: [],
+      tools: [new Calculator()],
       instructions:
         'You are a friendly AI assistant. Always address the user by their name.',
       additional_instructions: `The user's name is ${userName} and they are located in ${location}.`,
@@ -114,13 +119,9 @@ async function testStandardStreaming(): Promise<void> {
     version: 'v2' as const,
   };
 
-  console.log('Test 1: Weather query (content parts test)');
+  console.log('Test 1: Calculation query');
 
-  const userMessage = `
-  Make a search for the weather in ${location} today, which is ${currentDate}.
-  Make sure to always refer to me by name, which is ${userName}.
-  After giving me a thorough summary, tell me a joke about the weather forecast we went over.
-  `;
+  const userMessage = `What is 1123123 + 123123 / 20348?`;
 
   conversationHistory.push(new HumanMessage(userMessage));