Explorar el Código

Revert "config: add setCacheKey in provider options (#4654)"

This reverts commit 9b6d03c497d33d136cd635e44ba9e543b59d9f62.
Aiden Cline hace 3 meses
padre
commit
16dbac6026

+ 0 - 4
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

+ 2 - 8
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
     }
 

+ 3 - 14
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),
     )