Skip to content
This repository was archived by the owner on Jul 6, 2026. It is now read-only.

Commit 2668829

Browse files
committed
fix(core): evict Bedrock SDK cache on expired STS credentials
Bedrock STS-vended credentials expire ~60min into a session. The AI SDK caches LanguageModelV3 instances indefinitely, so once credentials rotate on disk the cached model still carries the original (now-expired) token. Fix: on any stream error matching AWS expired-credential signatures (ExpiredTokenException, InvalidClientTokenId, 'security token...expired'), evict both the language and SDK cache entries for that model and retry the request once with a freshly-constructed SDK. Two eviction hooks added: - AISDK.Service.evict(model) — clears languages + sdks maps in aisdk.ts - Provider.Service.evictLanguage(model) — clears s.models in provider.ts The catch is wired in LLM.stream() via Stream.catchCause, so it handles both the native and AI SDK runtime paths. Closes anomalyco#30940
1 parent c939aa0 commit 2668829

5 files changed

Lines changed: 73 additions & 19 deletions

File tree

‎packages/core/src/aisdk.ts‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ function initError(providerID: ProviderV2.ID) {
118118

119119
export interface Interface {
120120
readonly language: (model: ModelV2.Info) => Effect.Effect<LanguageModelV3, InitError>
121+
readonly evict: (model: ModelV2.Info) => Effect.Effect<void>
121122
}
122123

123124
export class Service extends Context.Service<Service, Interface>()("@opencode/v2/AISDK") {}
@@ -129,9 +130,23 @@ export const layer = Layer.effect(
129130
const languages = new Map<string, LanguageModelV3>()
130131
const sdks = new Map<string, SDK>()
131132

133+
function buildLanguageKey(model: ModelV2.Info) {
134+
return `${model.providerID}/${model.id}/${model.request.variant ?? "default"}`
135+
}
136+
137+
function buildSdkKey(model: ModelV2.Info, options: Record<string, any>) {
138+
return JSON.stringify({ providerID: model.providerID, api: model.api, options })
139+
}
140+
132141
return Service.of({
142+
evict: Effect.fn("AISDK.evict")(function* (model) {
143+
if (model.api.type !== "aisdk") return
144+
languages.delete(buildLanguageKey(model))
145+
const options = prepareOptions(model, model.api.package)
146+
sdks.delete(buildSdkKey(model, options))
147+
}),
133148
language: Effect.fn("AISDK.language")(function* (model) {
134-
const key = `${model.providerID}/${model.id}/${model.request.variant ?? "default"}`
149+
const key = buildLanguageKey(model)
135150
const existing = languages.get(key)
136151
if (existing) return existing
137152
if (model.api.type !== "aisdk")
@@ -141,11 +156,7 @@ export const layer = Layer.effect(
141156
})
142157

143158
const options = prepareOptions(model, model.api.package)
144-
const sdkKey = JSON.stringify({
145-
providerID: model.providerID,
146-
api: model.api,
147-
options,
148-
})
159+
const sdkKey = buildSdkKey(model, options)
149160
const sdk =
150161
sdks.get(sdkKey) ??
151162
(yield* plugin

‎packages/opencode/src/provider/error.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,4 +185,20 @@ export function parseAPICallError(input: { providerID: ProviderV2.ID; error: API
185185
}
186186
}
187187

188+
// AWS STS credential expiry patterns — surfaced as 401/403 with these message signatures.
189+
// The security token error comes from Bedrock when STS-vended credentials have been cached
190+
// past their TTL by the AI SDK. The InvalidClientTokenId and ExpiredTokenException codes
191+
// are the canonical AWS error codes for the same condition.
192+
const EXPIRED_CREDENTIALS_PATTERNS = [
193+
/the security token included in the request is expired/i,
194+
/ExpiredTokenException/,
195+
/InvalidClientTokenId/,
196+
]
197+
198+
export function isExpiredCredentials(error: unknown): boolean {
199+
if (!(error instanceof APICallError)) return false
200+
const msg = error.message + (error.responseBody ?? "")
201+
return EXPIRED_CREDENTIALS_PATTERNS.some((p) => p.test(msg))
202+
}
203+
188204
export * as ProviderError from "./error"

‎packages/opencode/src/provider/provider.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1101,6 +1101,7 @@ export interface Interface {
11011101
readonly getProvider: (providerID: ProviderV2.ID) => Effect.Effect<Info>
11021102
readonly getModel: (providerID: ProviderV2.ID, modelID: ModelV2.ID) => Effect.Effect<Model, ModelNotFoundError>
11031103
readonly getLanguage: (model: Model) => Effect.Effect<LanguageModelV3, ModelNotFoundError>
1104+
readonly evictLanguage: (model: Model) => Effect.Effect<void>
11041105
readonly closest: (
11051106
providerID: ProviderV2.ID,
11061107
query: string[],
@@ -1915,7 +1916,12 @@ export const layer = Layer.effect(
19151916
}
19161917
})
19171918

1918-
return Service.of({ list, getProvider, getModel, getLanguage, closest, getSmallModel, defaultModel })
1919+
const evictLanguage = Effect.fn("Provider.evictLanguage")(function* (model: Model) {
1920+
const s = yield* InstanceState.get(state)
1921+
s.models.delete(`${model.providerID}/${model.id}`)
1922+
})
1923+
1924+
return Service.of({ list, getProvider, getModel, getLanguage, evictLanguage, closest, getSmallModel, defaultModel })
19191925
}),
19201926
)
19211927

‎packages/opencode/src/session/llm.ts‎

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ import { PermissionV1 } from "@opencode-ai/core/v1/permission"
44
import { Provider } from "@/provider/provider"
55
import { SessionV1 } from "@opencode-ai/core/v1/session"
66
import { serviceUse } from "@opencode-ai/core/effect/service-use"
7-
import { Context, Effect, Layer } from "effect"
7+
import { Cause, Context, Effect, Layer } from "effect"
88
import * as Stream from "effect/Stream"
99
import { streamText, wrapLanguageModel, type ModelMessage, type Tool } from "ai"
1010
import type { LLMEvent } from "@opencode-ai/llm"
1111
import { LLMClient, RequestExecutor, WebSocketExecutor } from "@opencode-ai/llm/route"
1212
import type { LLMClientService } from "@opencode-ai/llm/route"
1313
import { GitLabWorkflowLanguageModel } from "gitlab-ai-provider"
1414
import { ProviderTransform } from "@/provider/transform"
15+
import { ProviderError } from "@/provider/error"
1516
import { Config } from "@/config/config"
1617
import type { Agent } from "@/agent/agent"
1718
import type { MessageV2 } from "./message-v2"
@@ -354,6 +355,19 @@ const live: Layer.Layer<
354355
}
355356
})
356357

358+
type RunResult = Effect.Success<ReturnType<typeof run>>
359+
360+
function toAISDKStream(result: RunResult) {
361+
if (result.type === "native") return result.stream
362+
const state = LLMAISDK.adapterState()
363+
return Stream.fromAsyncIterable(result.result.fullStream, (e: unknown) =>
364+
e instanceof Error ? e : new Error(String(e)),
365+
).pipe(
366+
Stream.mapEffect((event) => LLMAISDK.toLLMEvents(state, event)),
367+
Stream.flatMap((events) => Stream.fromIterable(events)),
368+
)
369+
}
370+
357371
const stream: Interface["stream"] = (input) =>
358372
Stream.scoped(
359373
Stream.unwrap(
@@ -365,16 +379,18 @@ const live: Layer.Layer<
365379

366380
const result = yield* run({ ...input, abort: ctrl.signal })
367381

368-
if (result.type === "native") return result.stream
369-
370-
// Adapter seam: both runtimes expose the same LLMEvent stream. Native
371-
// already returns one; AI SDK streams are converted here.
372-
const state = LLMAISDK.adapterState()
373-
return Stream.fromAsyncIterable(result.result.fullStream, (e) =>
374-
e instanceof Error ? e : new Error(String(e)),
375-
).pipe(
376-
Stream.mapEffect((event) => LLMAISDK.toLLMEvents(state, event)),
377-
Stream.flatMap((events) => Stream.fromIterable(events)),
382+
return toAISDKStream(result).pipe(
383+
Stream.catchCause((cause) => {
384+
const err = Cause.squash(cause)
385+
if (!ProviderError.isExpiredCredentials(err)) return Stream.failCause(cause)
386+
return Stream.unwrap(
387+
Effect.gen(function* () {
388+
yield* provider.evictLanguage(input.model)
389+
const retried = yield* run({ ...input, abort: ctrl.signal })
390+
return toAISDKStream(retried)
391+
}),
392+
)
393+
}),
378394
)
379395
}),
380396
),
@@ -384,7 +400,11 @@ const live: Layer.Layer<
384400
}),
385401
)
386402

387-
export const layer = live.pipe(Layer.provide(Permission.defaultLayer), Layer.provide(EventV2Bridge.defaultLayer))
403+
export const layer = live.pipe(
404+
Layer.provide(Permission.defaultLayer),
405+
Layer.provide(EventV2Bridge.defaultLayer),
406+
Layer.provide(AISDK.defaultLayer),
407+
)
388408

389409
export const defaultLayer = Layer.suspend(() =>
390410
layer.pipe(

‎packages/opencode/test/fake/provider.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ export namespace ProviderTest {
6565
getLanguage: Effect.fn("TestProvider.getLanguage")(() =>
6666
Effect.die(new Error("ProviderTest.getLanguage not configured")),
6767
),
68+
evictLanguage: Effect.fn("TestProvider.evictLanguage")(() => Effect.void),
6869
closest: Effect.fn("TestProvider.closest")((providerID) =>
6970
Effect.succeed(providerID === row.id ? { providerID: row.id, modelID: mdl.id } : undefined),
7071
),

0 commit comments

Comments
 (0)