Skip to content

restrict amazon-bedrock provider to curated model allowlist #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lgarceau768 wants to merge 3 commits into
base: flex
Choose a base branch
from
Open

restrict amazon-bedrock provider to curated model allowlist #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a310f2f
restrict amazon-bedrock provider to curated model allowlist
lgarceau768 Apr 24, 2026
c082a13
fix: exempt config-added models from bedrock allowlist filter
lgarceau768 Apr 24, 2026
a79fec1
fix(bash): drain output fiber before scope closes to prevent data loss
lgarceau768 Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions packages/opencode/src/provider/provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1329,6 +1329,52 @@ const layer: Layer.Layer<
})
}

const BEDROCK_ALLOWED_MODELS = new Set([
// Anthropic / Claude
"us.anthropic.claude-sonnet-4-6",
"us.anthropic.claude-opus-4-6-v1",
"us.anthropic.claude-haiku-4-5-20251001-v1:0",
// Google Gemma (Bedrock)
"google.gemma-3-27b-it",
"google.gemma-3-12b-it",
"google.gemma-3-4b-it",
// OpenAI / GPT (Bedrock)
"openai.gpt-oss-safeguard-120b",
"openai.gpt-oss-safeguard-20b",
// Amazon Nova
"amazon.nova-2-lite-v1:0",
// Qwen
"qwen.qwen3-235b-a22b-2507-v1:0",
"qwen.qwen3-next-80b-a3b",
"qwen.qwen3-32b-v1:0",
"qwen.qwen3-coder-30b-a3b-v1:0",
// NVIDIA Nemotron
"nvidia.nemotron-nano-3-30b",
"nvidia.nemotron-nano-12b-v2",
"nvidia.nemotron-nano-9b-v2",
// Mistral
"mistral.mistral-large-3-675b-instruct",
"mistral.magistral-small-2509",
"mistral.ministral-3-14b-instruct",
"mistral.ministral-3-8b-instruct",
"mistral.voxtral-small-24b-2507",
// DeepSeek
"deepseek.r1-v1:0",
// Minimax
"minimax.minimax-m2",
// Moonshot / Kimi
"moonshotai.kimi-k2.5",
"moonshot.kimi-k2-thinking",
// ZAI / GLM
"zai.glm-4.7",
"zai.glm-4.7-flash",
// Writer / Palmyra
"writer.palmyra-x5-v1:0",
"writer.palmyra-x4-v1:0",
// Meta / Llama
"meta.llama3-1-8b-instruct-v1:0",
])

for (const [id, provider] of Object.entries(providers)) {
const providerID = ProviderID.make(id)
if (!isProviderAllowed(providerID)) {
Expand All @@ -1347,6 +1393,8 @@ const layer: Layer.Layer<
delete provider.models[modelID]
if (model.status === "alpha" && !Flag.OPENCODE_ENABLE_EXPERIMENTAL_MODELS) delete provider.models[modelID]
if (model.status === "deprecated") delete provider.models[modelID]
if (providerID === ProviderID.amazonBedrock && !BEDROCK_ALLOWED_MODELS.has(modelID) && !configProvider?.models?.[modelID])
delete provider.models[modelID]
if (
(configProvider?.blacklist && configProvider.blacklist.includes(modelID)) ||
(configProvider?.whitelist && !configProvider.whitelist.includes(modelID))
Expand Down
9 changes: 7 additions & 2 deletions packages/opencode/src/tool/bash.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { Shell } from "@/shell/shell"
import { BashArity } from "@/permission/arity"
import * as Truncate from "./truncate"
import { Plugin } from "@/plugin"
import { Effect, Stream } from "effect"
import { Effect, Fiber, Stream } from "effect"
import { ChildProcess } from "effect/unstable/process"
import { ChildProcessSpawner } from "effect/unstable/process/ChildProcessSpawner"

Expand Down Expand Up @@ -444,7 +444,7 @@ export const BashTool = Tool.define(
Effect.gen(function* () {
const handle = yield* spawner.spawn(cmd(input.shell, input.name, input.command, input.cwd, input.env))

yield* Effect.forkScoped(
const outputFiber = yield* Effect.forkScoped(
Stream.runForEach(Stream.decodeText(handle.all), (chunk) => {
const size = Buffer.byteLength(chunk, "utf-8")
list.push({ text: chunk, size })
Expand Down Expand Up @@ -517,6 +517,11 @@ export const BashTool = Tool.define(
yield* handle.kill({ forceKillAfter: "3 seconds" }).pipe(Effect.orDie)
}

// Drain any remaining buffered output before the scope closes.
// Without this, the stream consumer fiber can be interrupted before
// it processes chunks that were buffered when the process exited.
yield* Fiber.join(outputFiber).pipe(Effect.ignore)

return exit.kind === "exit" ? exit.code : null
}),
).pipe(Effect.orDie)
Expand Down
Loading