Skip to content

Commit 04f7351

Browse files
committed
fix(google): scope direct Gemini rename opt-out
1 parent db8ad67 commit 04f7351

3 files changed

Lines changed: 47 additions & 1 deletion

File tree

‎src/adapters/google.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,9 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
370370
parsed.modelId,
371371
mapReasoningEffort(provider, parsed.modelId, parsed.options.reasoning),
372372
).wireModelId
373-
: resolveDirectGeminiWireModelId(parsed.modelId, provider.directGeminiWireRenames !== false);
373+
: provider.googleMode === "vertex"
374+
? parsed.modelId
375+
: resolveDirectGeminiWireModelId(parsed.modelId, provider.directGeminiWireRenames !== false);
374376
const { systemInstruction, contents } = messagesToGeminiFormat(parsed, routedModelId);
375377
const tools = toolsToGeminiFormat(parsed);
376378

‎tests/config.test.ts‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -776,6 +776,38 @@ describe("opencodex config defaults", () => {
776776
expect(readConfigDiagnostics().error).toContain("responsesSnapshotRepair");
777777
});
778778

779+
test("direct Gemini wire rename opt-out is a boolean and round-trips", () => {
780+
const base = {
781+
port: 12345,
782+
providers: {
783+
google: {
784+
adapter: "google",
785+
baseUrl: "https://generativelanguage.googleapis.com",
786+
},
787+
},
788+
defaultProvider: "google",
789+
};
790+
writeConfig({
791+
...base,
792+
providers: {
793+
google: { ...base.providers.google, directGeminiWireRenames: false },
794+
},
795+
});
796+
const config = loadConfig();
797+
expect(config.providers.google.directGeminiWireRenames).toBe(false);
798+
saveConfig(config);
799+
expect(loadConfig().providers.google.directGeminiWireRenames).toBe(false);
800+
801+
writeConfig({
802+
...base,
803+
providers: {
804+
google: { ...base.providers.google, directGeminiWireRenames: "false" },
805+
},
806+
});
807+
expect(readConfigDiagnostics().source).toBe("fallback");
808+
expect(readConfigDiagnostics().error).toContain("directGeminiWireRenames");
809+
});
810+
779811
test("accepts a relative responsesPath", () => {
780812
writeResponsesPathConfig("/responses");
781813

‎tests/google-adapter.test.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,4 +303,16 @@ describe("google adapter — direct -tiered wire renames", () => {
303303
expect(url).toContain(`/v1beta/models/${modelId}:generateContent`);
304304
}
305305
});
306+
307+
test("directGeminiWireRenames does not affect Vertex requests", async () => {
308+
const vertexProvider = { ...provider, googleMode: "vertex" as const };
309+
for (const modelId of ["gemini-3.7-flash", "gemini-3.6-flash"]) {
310+
const parsed = renamedParsed(modelId);
311+
const defaultRequest = await createGoogleAdapter(vertexProvider).buildRequest(parsed);
312+
const optOutRequest = await createGoogleAdapter({ ...vertexProvider, directGeminiWireRenames: false })
313+
.buildRequest(parsed);
314+
expect(optOutRequest.url).toBe(defaultRequest.url);
315+
expect(optOutRequest.body).toBe(defaultRequest.body);
316+
}
317+
});
306318
});

0 commit comments

Comments
 (0)