better amazon bedrock caching with anthropic models

thdxr · thdxr · commit ca48a4f0fb76 · 2025-06-29T19:27:07.000-04:00
diff --git a/packages/opencode/src/provider/provider.ts b/packages/opencode/src/provider/provider.ts
@@ -185,6 +185,7 @@ export namespace Provider {
           source,
           info,
           options,
+          getModel,
         }
         return
       }
diff --git a/packages/opencode/src/provider/transform.ts b/packages/opencode/src/provider/transform.ts
@@ -20,6 +20,19 @@ export namespace ProviderTransform {
         }
       }
     }
+    if (providerID === "amazon-bedrock" || modelID.includes("anthropic")) {
+      const system = msgs.filter((msg) => msg.role === "system").slice(0, 2)
+      const final = msgs.filter((msg) => msg.role !== "system").slice(-2)
+
+      for (const msg of unique([...system, ...final])) {
+        msg.providerMetadata = {
+          ...msg.providerMetadata,
+          bedrock: {
+            cachePoint: { type: "ephemeral" },
+          },
+        }
+      }
+    }
     return msgs
   }
 }
diff --git a/packages/opencode/src/session/index.ts b/packages/opencode/src/session/index.ts
@@ -882,8 +882,12 @@ export namespace Session {
       reasoning: 0,
       cache: {
         write: (metadata?.["anthropic"]?.["cacheCreationInputTokens"] ??
+          // @ts-expect-error
+          metadata?.["bedrock"]?.["usage"]?.["cacheWriteInputTokens"] ??
           0) as number,
         read: (metadata?.["anthropic"]?.["cacheReadInputTokens"] ??
+          // @ts-expect-error
+          metadata?.["bedrock"]?.["usage"]?.["cacheReadInputTokens"] ??
           0) as number,
       },
     }

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,7 @@ export namespace Provider {`
`185`	`185`	`source,`
`186`	`186`	`info,`
`187`	`187`	`options,`
	`188`	`+ getModel,`
`188`	`189`	`}`
`189`	`190`	`return`
`190`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,19 @@ export namespace ProviderTransform {`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
	`23`	`+ if (providerID === "amazon-bedrock" \|\| modelID.includes("anthropic")) {`
	`24`	`+ const system = msgs.filter((msg) => msg.role === "system").slice(0, 2)`
	`25`	`+ const final = msgs.filter((msg) => msg.role !== "system").slice(-2)`
	`26`	`+`
	`27`	`+ for (const msg of unique([...system, ...final])) {`
	`28`	`+ msg.providerMetadata = {`
	`29`	`+ ...msg.providerMetadata,`
	`30`	`+ bedrock: {`
	`31`	`+ cachePoint: { type: "ephemeral" },`
	`32`	`+ },`
	`33`	`+ }`
	`34`	`+ }`
	`35`	`+ }`
`23`	`36`	`return msgs`
`24`	`37`	`}`
`25`	`38`	`}`