Skip to content

fix(bedrock): part-level cache points#14809

Merged
aayush-kapoor merged 1 commit into
vercel:mainfrom
heiwen:fix-bedrock-part-cachepoints
May 7, 2026
Merged

fix(bedrock): part-level cache points#14809
aayush-kapoor merged 1 commit into
vercel:mainfrom
heiwen:fix-bedrock-part-cachepoints

Conversation

@heiwen
Copy link
Copy Markdown
Contributor

@heiwen heiwen commented Apr 29, 2026

Background

Bedrock Converse supports prompt cache checkpoints inside messages[].content[], but @ai-sdk/amazon-bedrock only preserved providerOptions.bedrock.cachePoint from message-level provider options.

This meant cache points attached to individual user or assistant content parts were dropped during conversion to Bedrock messages. Requests still succeeded, but Bedrock did not create or read prompt cache entries.

Summary

This PR preserves part-level Bedrock cache points when converting AI SDK messages to Bedrock Converse messages.

It adds cache points immediately after the content part that specified providerOptions.bedrock.cachePoint, for both user and assistant message content. Existing message-level cache point behavior is unchanged.

Regression tests were added for user and assistant content parts to verify cache point placement.

Manual Verification

Ran the Amazon Bedrock provider checks locally:

  • pnpm --dir packages/amazon-bedrock type-check
  • pnpm --dir packages/amazon-bedrock test
  • pnpm check

Checklist

  • All commits are signed (PRs with unsigned commits cannot be merged)
  • Tests have been added / updated (for bug fixes / features)
  • Documentation has been added / updated (for bug fixes / features)
  • A patch changeset for relevant packages has been added (for bug fixes / features - run pnpm changeset in the project root)
  • I have reviewed this pull request (self-review)

Related Issues

Fixes #14808

@heiwen heiwen changed the title fix bedrock part-level cache points fix(bedrock): part-level cache points Apr 29, 2026
@heiwen heiwen force-pushed the fix-bedrock-part-cachepoints branch 3 times, most recently from 53ac2a5 to 4b05911 Compare April 30, 2026 01:33
@aayush-kapoor aayush-kapoor added the backport Admins only: add this label to a pull request in order to backport it to the prior version label Apr 30, 2026
@aayush-kapoor
Copy link
Copy Markdown
Collaborator

please fix the merge conflicts and i'll get this merged

@heiwen heiwen force-pushed the fix-bedrock-part-cachepoints branch from 4b05911 to b053241 Compare May 1, 2026 01:14
@heiwen
Copy link
Copy Markdown
Contributor Author

heiwen commented May 1, 2026

Merge conflicts solved.

@heiwen
Copy link
Copy Markdown
Contributor Author

heiwen commented May 4, 2026

Thanks for approving. Anything else needed before it can be merged?

@aayush-kapoor
Copy link
Copy Markdown
Collaborator

nope should be good

@heiwen
Copy link
Copy Markdown
Contributor Author

heiwen commented May 7, 2026

Any chance to get this merged soon :)

@aayush-kapoor aayush-kapoor merged commit 9c78e5d into vercel:main May 7, 2026
31 of 34 checks passed
github-actions Bot added a commit that referenced this pull request May 7, 2026
@github-actions github-actions Bot removed the backport Admins only: add this label to a pull request in order to backport it to the prior version label May 7, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 7, 2026

⚠️ Backport to release-v6.0 created but has conflicts: #15103

aayush-kapoor added a commit that referenced this pull request May 7, 2026
This is an automated backport of #14809 to the release-v6.0 branch. FYI
@heiwen
This backport has conflicts that need to be resolved manually.

### `git cherry-pick` output

```
Auto-merging packages/amazon-bedrock/src/convert-to-bedrock-chat-messages.test.ts
CONFLICT (content): Merge conflict in packages/amazon-bedrock/src/convert-to-bedrock-chat-messages.test.ts
Auto-merging packages/amazon-bedrock/src/convert-to-bedrock-chat-messages.ts
CONFLICT (content): Merge conflict in packages/amazon-bedrock/src/convert-to-bedrock-chat-messages.ts
error: could not apply 9c78e5d... fix(bedrock): part-level cache points (#14809)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
```

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Aayush Kapoor <aayushkapoor34@gmail.com>
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 7, 2026

🚀 Published in:

Package Version
@ai-sdk/amazon-bedrock 5.0.0-canary.54

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bug: Bedrock drops cache points on message content parts

2 participants