fix: simplify Gemini routing and ignore legacy quota_fallback #413
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -254,14 +254,10 @@ export const AntigravityConfigSchema = z.object({ | |
| max_rate_limit_wait_seconds: z.number().min(0).max(3600).default(300), | ||
|
|
||
| /** | ||
| * @deprecated Kept only for backward compatibility. | ||
| * This flag is ignored at runtime. | ||
| * Gemini requests always fall back between Antigravity and Gemini CLI quotas. | ||
| * | ||
| * @default false | ||
| */ | ||
| quota_fallback: z.boolean().default(false), | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,9 +2,6 @@ import { beforeAll, describe, expect, it, vi } from "vitest"; | |
| import type { HeaderStyle, ModelFamily } from "./accounts"; | ||
|
|
||
| type ResolveQuotaFallbackHeaderStyle = (input: { | ||
| family: ModelFamily; | ||
| headerStyle: HeaderStyle; | ||
| alternateStyle: HeaderStyle | null; | ||
|
|
@@ -16,8 +13,20 @@ type GetHeaderStyleFromUrl = ( | |
| cliFirst?: boolean, | ||
| ) => HeaderStyle; | ||
|
|
||
| type ResolveHeaderRoutingDecision = ( | ||
| urlString: string, | ||
| family: ModelFamily, | ||
| config: unknown, | ||
| ) => { | ||
| cliFirst: boolean; | ||
| preferredHeaderStyle: HeaderStyle; | ||
| explicitQuota: boolean; | ||
| allowQuotaFallback: boolean; | ||
| }; | ||
|
|
||
| let resolveQuotaFallbackHeaderStyle: ResolveQuotaFallbackHeaderStyle | undefined; | ||
| let getHeaderStyleFromUrl: GetHeaderStyleFromUrl | undefined; | ||
| let resolveHeaderRoutingDecision: ResolveHeaderRoutingDecision | undefined; | ||
|
|
||
| beforeAll(async () => { | ||
| vi.mock("@opencode-ai/plugin", () => ({ | ||
|
|
@@ -31,14 +40,14 @@ beforeAll(async () => { | |
| getHeaderStyleFromUrl = (__testExports as { | ||
| getHeaderStyleFromUrl?: GetHeaderStyleFromUrl; | ||
| }).getHeaderStyleFromUrl; | ||
| resolveHeaderRoutingDecision = (__testExports as { | ||
| resolveHeaderRoutingDecision?: ResolveHeaderRoutingDecision; | ||
| }).resolveHeaderRoutingDecision; | ||
| }); | ||
|
|
||
| describe("quota fallback direction", () => { | ||
| it("falls back from gemini-cli to antigravity when alternate quota is available", () => { | ||
| const result = resolveQuotaFallbackHeaderStyle?.({ | ||
| family: "gemini", | ||
| headerStyle: "gemini-cli", | ||
| alternateStyle: "antigravity", | ||
|
|
@@ -47,30 +56,24 @@ describe("quota fallback direction", () => { | |
| expect(result).toBe("antigravity"); | ||
| }); | ||
|
|
||
| it("falls back from antigravity to gemini-cli when alternate quota is available", () => { | ||
| const result = resolveQuotaFallbackHeaderStyle?.({ | ||
| family: "gemini", | ||
| headerStyle: "antigravity", | ||
| alternateStyle: "gemini-cli", | ||
| }); | ||
|
|
||
| expect(result).toBe("gemini-cli"); | ||
| }); | ||
|
|
||
| it("returns null when no alternate quota is available", () => { | ||
| const result = resolveQuotaFallbackHeaderStyle?.({ | ||
| family: "gemini", | ||
| headerStyle: "antigravity", | ||
| alternateStyle: null, | ||
| }); | ||
|
|
||
| expect(result).toBeNull(); | ||
| }); | ||
| }); | ||
|
|
||
|
|
@@ -115,3 +118,74 @@ describe("header style resolution", () => { | |
| expect(headerStyle).toBe("antigravity"); | ||
| }); | ||
| }); | ||
|
|
||
| describe("header routing decision", () => { | ||
| it("defaults to antigravity-first for unsuffixed Gemini when cli_first is disabled", () => { | ||
| const decision = resolveHeaderRoutingDecision?.( | ||
| "https://generativelanguage.googleapis.com/v1beta/models/gemini-3-flash:streamGenerateContent", | ||
| "gemini", | ||
| { | ||
| cli_first: false, | ||
| }, | ||
| ); | ||
|
|
||
| expect(decision).toMatchObject({ | ||
| cliFirst: false, | ||
| preferredHeaderStyle: "antigravity", | ||
| explicitQuota: false, | ||
| allowQuotaFallback: true, | ||
| }); | ||
| }); | ||
|
|
||
| it("uses gemini-cli-first for unsuffixed Gemini when cli_first is enabled", () => { | ||
| const decision = resolveHeaderRoutingDecision?.( | ||
| "https://generativelanguage.googleapis.com/v1beta/models/gemini-3-flash:streamGenerateContent", | ||
| "gemini", | ||
| { | ||
| cli_first: true, | ||
| }, | ||
| ); | ||
|
|
||
| expect(decision).toMatchObject({ | ||
| cliFirst: true, | ||
| preferredHeaderStyle: "gemini-cli", | ||
| explicitQuota: false, | ||
| allowQuotaFallback: true, | ||
| }); | ||
| }); | ||
|
|
||
| it("keeps explicit antigravity prefix as primary route while fallback remains available", () => { | ||
| const decision = resolveHeaderRoutingDecision?.( | ||
| "https://generativelanguage.googleapis.com/v1beta/models/antigravity-gemini-3-flash:streamGenerateContent", | ||
| "gemini", | ||
| { | ||
| cli_first: true, | ||
| }, | ||
| ); | ||
|
|
||
| expect(decision).toMatchObject({ | ||
| cliFirst: true, | ||
| preferredHeaderStyle: "antigravity", | ||
| explicitQuota: true, | ||
| allowQuotaFallback: true, | ||
| }); | ||
| }); | ||
|
|
||
| it("ignores legacy quota_fallback when deciding Gemini fallback availability", () => { | ||
| const decision = resolveHeaderRoutingDecision?.( | ||
| "https://generativelanguage.googleapis.com/v1beta/models/gemini-3-flash:streamGenerateContent", | ||
| "gemini", | ||
| { | ||
| cli_first: false, | ||
| quota_fallback: false, | ||
| }, | ||
| ); | ||
|
|
||
| expect(decision).toMatchObject({ | ||
| cliFirst: false, | ||
| preferredHeaderStyle: "antigravity", | ||
| explicitQuota: false, | ||
| allowQuotaFallback: true, | ||
| }); | ||
| }); | ||
| }); | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
description implies unidirectional fallback (only Antigravity → CLI) but fallback is now bidirectional. Consider clarifying: "Automatic fallback between Antigravity and Gemini CLI in both directions"
Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!
Prompt To Fix With AI