Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions packages/opencode/src/config/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,10 @@ export namespace Config {
}),
)
.optional(),
requestOptions: z
.record(z.string(), z.any())
.optional()
.describe("Default per-request model options applied to all models for this provider"),
options: z
.object({
apiKey: z.string().optional(),
Expand All @@ -857,6 +861,26 @@ export namespace Config {
.optional(),
})
.strict()
.transform((provider) => {
const store = provider.options?.store
const requestOptions = {
...(provider.requestOptions ?? {}),
...(typeof store === "boolean" && provider.requestOptions?.store === undefined ? { store } : {}),
}

const options =
provider.options == null
? undefined
: Object.fromEntries(Object.entries(provider.options).filter(([key]) => key !== "store"))

const hasRequestOptions = Object.keys(requestOptions).length > 0

return {
...provider,
options,
requestOptions: hasRequestOptions ? requestOptions : undefined,
}
})
.meta({
ref: "ProviderConfig",
})
Expand Down
2 changes: 2 additions & 0 deletions packages/opencode/src/provider/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,7 @@ export namespace Provider {
env: z.string().array(),
key: z.string().optional(),
options: z.record(z.string(), z.any()),
requestOptions: z.record(z.string(), z.any()).optional(),
models: z.record(z.string(), Model),
})
.meta({
Expand Down Expand Up @@ -725,6 +726,7 @@ export namespace Provider {
name: provider.name ?? existing?.name ?? providerID,
env: provider.env ?? existing?.env ?? [],
options: mergeDeep(existing?.options ?? {}, provider.options ?? {}),
requestOptions: mergeDeep(existing?.requestOptions ?? {}, provider.requestOptions ?? {}),
source: "config",
models: existing?.models ?? {},
}
Expand Down
8 changes: 7 additions & 1 deletion packages/opencode/src/provider/transform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -505,14 +505,20 @@ export namespace ProviderTransform {
model: Provider.Model
sessionID: string
providerOptions?: Record<string, any>
requestOptions?: Record<string, any>
}): Record<string, any> {
const result: Record<string, any> = {}

// openai and providers using openai package should set store to false by default.
if (input.model.providerID === "openai" || input.model.api.npm === "@ai-sdk/openai") {
const openai = input.model.providerID === "openai" || input.model.api.npm === "@ai-sdk/openai"
if (openai) {
result["store"] = false
}

if (openai && typeof input.requestOptions?.store === "boolean") {
result["store"] = input.requestOptions.store
}

if (input.model.api.npm === "@openrouter/ai-sdk-provider") {
result["usage"] = {
include: true,
Expand Down
1 change: 1 addition & 0 deletions packages/opencode/src/session/llm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ export namespace LLM {
model: input.model,
sessionID: input.sessionID,
providerOptions: provider.options,
requestOptions: provider.requestOptions,
})
const options: Record<string, any> = pipe(
base,
Expand Down