Skip to content

Commit 4c3dab5

Browse files
committed
fix(google): scope direct Gemini rename opt-out
1 parent 257b791 commit 4c3dab5

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
@@ -388,7 +388,9 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
388388
parsed.modelId,
389389
mapReasoningEffort(provider, parsed.modelId, parsed.options.reasoning),
390390
).wireModelId
391-
: resolveDirectGeminiWireModelId(parsed.modelId, provider.directGeminiWireRenames !== false);
391+
: provider.googleMode === "vertex"
392+
? parsed.modelId
393+
: resolveDirectGeminiWireModelId(parsed.modelId, provider.directGeminiWireRenames !== false);
392394
const { systemInstruction, contents } = messagesToGeminiFormat(parsed, routedModelId);
393395
const tools = toolsToGeminiFormat(parsed);
394396

‎tests/config.test.ts‎

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

792+
test("direct Gemini wire rename opt-out is a boolean and round-trips", () => {
793+
const base = {
794+
port: 12345,
795+
providers: {
796+
google: {
797+
adapter: "google",
798+
baseUrl: "https://generativelanguage.googleapis.com",
799+
},
800+
},
801+
defaultProvider: "google",
802+
};
803+
writeConfig({
804+
...base,
805+
providers: {
806+
google: { ...base.providers.google, directGeminiWireRenames: false },
807+
},
808+
});
809+
const config = loadConfig();
810+
expect(config.providers.google.directGeminiWireRenames).toBe(false);
811+
saveConfig(config);
812+
expect(loadConfig().providers.google.directGeminiWireRenames).toBe(false);
813+
814+
writeConfig({
815+
...base,
816+
providers: {
817+
google: { ...base.providers.google, directGeminiWireRenames: "false" },
818+
},
819+
});
820+
expect(readConfigDiagnostics().source).toBe("fallback");
821+
expect(readConfigDiagnostics().error).toContain("directGeminiWireRenames");
822+
});
823+
792824
test("accepts a relative responsesPath", () => {
793825
writeResponsesPathConfig("/responses");
794826

‎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)