summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAiden Cline <[email protected]>2025-11-24 22:30:56 -0600
committerAiden Cline <[email protected]>2025-11-24 22:30:56 -0600
commit16dbac60267ef1fc1a19d1c5ddde82aafabf455d (patch)
tree1420de85efc581d9017f496815e20683fbef29c7
parent9b6d03c497d33d136cd635e44ba9e543b59d9f62 (diff)
downloadopencode-16dbac60267ef1fc1a19d1c5ddde82aafabf455d.tar.gz
opencode-16dbac60267ef1fc1a19d1c5ddde82aafabf455d.zip
Revert "config: add setCacheKey in provider options (#4654)"
This reverts commit 9b6d03c497d33d136cd635e44ba9e543b59d9f62.
-rw-r--r--packages/opencode/src/config/config.ts4
-rw-r--r--packages/opencode/src/provider/transform.ts10
-rw-r--r--packages/opencode/src/session/prompt.ts17
3 files changed, 5 insertions, 26 deletions
diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index 4fdbc0d2c..779a4e8e2 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -529,10 +529,6 @@ export namespace Config {
apiKey: z.string().optional(),
baseURL: z.string().optional(),
enterpriseUrl: z.string().optional().describe("GitHub Enterprise URL for copilot authentication"),
- setCacheKey: z
- .boolean()
- .optional()
- .describe("Enable promptCacheKey for this provider (default false)"),
timeout: z
.union([
z
diff --git a/packages/opencode/src/provider/transform.ts b/packages/opencode/src/provider/transform.ts
index 7faea89b3..6cf03fc06 100644
--- a/packages/opencode/src/provider/transform.ts
+++ b/packages/opencode/src/provider/transform.ts
@@ -128,13 +128,7 @@ export namespace ProviderTransform {
return undefined
}
- export function options(
- providerID: string,
- modelID: string,
- npm: string,
- sessionID: string,
- providerOptions?: Record<string, any>,
- ): Record<string, any> | undefined {
+ export function options(providerID: string, modelID: string, npm: string, sessionID: string): Record<string, any> {
const result: Record<string, any> = {}
// switch to providerID later, for now use this
@@ -144,7 +138,7 @@ export namespace ProviderTransform {
}
}
- if (providerID === "openai" || providerOptions?.setCacheKey) {
+ if (providerID === "openai") {
result["promptCacheKey"] = sessionID
}
diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts
index d1e60d577..741e3cc7e 100644
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -475,14 +475,13 @@ export namespace SessionPrompt {
tools: lastUser.tools,
processor,
})
- const provider = await Provider.getProvider(model.providerID)
const params = await Plugin.trigger(
"chat.params",
{
sessionID: sessionID,
agent: lastUser.agent,
model: model.info,
- provider,
+ provider: await Provider.getProvider(model.providerID),
message: lastUser,
},
{
@@ -492,9 +491,7 @@ export namespace SessionPrompt {
topP: agent.topP ?? ProviderTransform.topP(model.providerID, model.modelID),
options: pipe(
{},
- mergeDeep(
- ProviderTransform.options(model.providerID, model.modelID, model.npm ?? "", sessionID, provider?.options),
- ),
+ mergeDeep(ProviderTransform.options(model.providerID, model.modelID, model.npm ?? "", sessionID)),
mergeDeep(model.info.options),
mergeDeep(agent.options),
),
@@ -1415,15 +1412,7 @@ export namespace SessionPrompt {
(await Provider.getSmallModel(input.providerID)) ?? (await Provider.getModel(input.providerID, input.modelID))
const options = pipe(
{},
- mergeDeep(
- ProviderTransform.options(
- small.providerID,
- small.modelID,
- small.npm ?? "",
- input.session.id,
- provider?.options,
- ),
- ),
+ mergeDeep(ProviderTransform.options(small.providerID, small.modelID, small.npm ?? "", input.session.id)),
mergeDeep(ProviderTransform.smallOptions({ providerID: small.providerID, modelID: small.modelID })),
mergeDeep(small.info.options),
)