Skip to content

Commit 77a6e04

Browse files
committed
fix(antigravity): harden discovered model mappings
1 parent 0be660a commit 77a6e04

4 files changed

Lines changed: 105 additions & 3 deletions

File tree

‎src/codex/catalog/provider-fetch.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1361,7 +1361,6 @@ async function fetchProviderModelsWithAuth(
13611361
return observed(models, "degraded");
13621362
}
13631363
if (antigravity) {
1364-
registerAntigravityDiscoveredWireModels(prov.baseUrl, antigravity);
13651364
const live = antigravity.map(model => applyProviderConfigHints(name, prov, {
13661365
id: model.id,
13671366
provider: name,
@@ -1375,6 +1374,7 @@ async function fetchProviderModelsWithAuth(
13751374
if (!setCached(name, forCache, Date.now(), cacheGeneration)) {
13761375
return observed(withConfiguredRetention(configured), "degraded");
13771376
}
1377+
registerAntigravityDiscoveredWireModels(prov.baseUrl, antigravity);
13781378
markProviderDiscoveryOk(name, live.length);
13791379
return observed(withConfiguredRetention(forCache, { warnDrops: true }), "authoritative");
13801380
}

‎src/providers/antigravity-models.ts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,11 @@ export function parseAntigravityAvailableModels(
368368
|| !antigravityRecord(models[id])
369369
|| ids.length >= limit) return null;
370370
const baseId = id.endsWith("-tiered") ? id.slice(0, -"-tiered".length) : id;
371-
if (ids.some(agentId => agentId === baseId || agentId.startsWith(`${baseId}-`))) continue;
371+
if (ids.some(agentId =>
372+
agentId === id
373+
|| agentId === baseId
374+
|| ANTIGRAVITY_DISCOVERY_EFFORTS.some(effort => agentId === `${baseId}-${effort}`)
375+
)) continue;
372376
ids.push(id);
373377
}
374378
}
@@ -445,7 +449,13 @@ export function resolveAntigravityEffortWireModel(
445449
): { wireModelId: string; thinkingLevel?: string } {
446450
const discoveredWireModelId = discoveredAntigravityWireModelId(modelId, baseUrl);
447451
if (discoveredWireModelId && (discoveredWireModelId !== modelId || isAntigravitySuffixModelId(modelId))) {
448-
return { wireModelId: discoveredWireModelId };
452+
const defaultLevel = ANTIGRAVITY_THINKING_LEVEL_MODELS[modelId];
453+
return {
454+
wireModelId: discoveredWireModelId,
455+
...(defaultLevel
456+
? { thinkingLevel: effort ? resolveAntigravityThinkingLevel(effort) ?? defaultLevel : defaultLevel }
457+
: {}),
458+
};
449459
}
450460

451461
// Rule 0: retired Flash id — Google has taken the wire id offline, so route to the

‎tests/google-antigravity-wire.test.ts‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,17 @@ describe("antigravity CCA envelope", () => {
168168
agentModelSorts: [{ groups: [{ modelIds: [] }] }],
169169
tieredModelIds: { flash: ["gemini-3.7-flash-tiered"] },
170170
})?.map(model => model.id)).toEqual(["gemini-3.7-flash"]);
171+
expect(parseAntigravityAvailableModels({
172+
models: {
173+
"gemini-3.7-flash-image": { maxTokens: 1_048_576 },
174+
"gemini-3.7-flash-tiered": { maxTokens: 1_048_576 },
175+
},
176+
agentModelSorts: [{ groups: [{ modelIds: ["gemini-3.7-flash-image"] }] }],
177+
tieredModelIds: { flash: ["gemini-3.7-flash-tiered"] },
178+
})?.map(model => model.id)).toEqual([
179+
"gemini-3.7-flash-image",
180+
"gemini-3.7-flash",
181+
]);
171182
expect(parseAntigravityAvailableModels({
172183
models: { "-tiered": { maxTokens: 1_048_576 } },
173184
agentModelSorts: [{ groups: [{ modelIds: ["-tiered"] }] }],
@@ -248,6 +259,34 @@ describe("antigravity CCA envelope", () => {
248259
expect(JSON.parse(req.body).model).toBe("gemini-3-flash-agent");
249260
});
250261

262+
test("preserves thinkingLevel for a display-derived tiered Flash model", async () => {
263+
const payload = {
264+
models: {
265+
"gemini-3.7-flash-tiered": { displayName: "Gemini 3.7 Flash", maxTokens: 1_048_576 },
266+
},
267+
agentModelSorts: [{ groups: [{ modelIds: [] }] }],
268+
tieredModelIds: { flash: ["gemini-3.7-flash-tiered"] },
269+
};
270+
const rows = parseAntigravityAvailableModels(payload)!;
271+
expect(rows).toEqual([{
272+
id: "gemini-3.7-flash",
273+
wireModelId: "gemini-3.7-flash-tiered",
274+
contextWindow: 1_048_576,
275+
}]);
276+
277+
const baseUrl = "https://cca-tiered-discovery.example";
278+
registerAntigravityDiscoveredWireModels(baseUrl, rows);
279+
expect(resolveAntigravityEffortWireModel("gemini-3.7-flash", "high", baseUrl))
280+
.toEqual({ wireModelId: "gemini-3.7-flash-tiered", thinkingLevel: "high" });
281+
282+
const req = await createGoogleAdapter({ ...effortProvider, baseUrl }).buildRequest(
283+
parsedWithEffort("gemini-3.7-flash", "high"),
284+
);
285+
const envelope = JSON.parse(req.body);
286+
expect(envelope.model).toBe("gemini-3.7-flash-tiered");
287+
expect(envelope.request.generationConfig.thinkingConfig).toEqual({ thinkingLevel: "high" });
288+
});
289+
251290
test("keeps unknown discovered tier IDs directly routable", async () => {
252291
for (const modelId of ["future-flash-tiered", "future-flash-low"]) {
253292
const req = await createGoogleAdapter(effortProvider).buildRequest(parsedWithEffort(modelId, "high"));

‎tests/google-models-listing.test.ts‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { join } from "node:path";
55
import { buildCatalogEntries, gatherRoutedModels as gatherRoutedModelsDirect } from "../src/codex/catalog";
66
import { buildModelsRequest } from "../src/oauth";
77
import { clearModelCache, getStaleCached } from "../src/codex/model-cache";
8+
import { resolveAntigravityWireModelId } from "../src/providers/antigravity-models";
89
import type { OcxConfig, OcxProviderConfig } from "../src/types";
910
import { withStubbedProviderFetch } from "./helpers/catalog-provider-fetch";
1011

@@ -213,6 +214,58 @@ describe("Antigravity live model discovery", () => {
213214
}
214215
});
215216

217+
test("does not register wire mappings from a stale CCA discovery", async () => {
218+
const home = mkdtempSync(join(tmpdir(), "ocx-antigravity-stale-discovery-"));
219+
process.env.OPENCODEX_HOME = home;
220+
writeFileSync(join(home, "auth.json"), JSON.stringify({
221+
"google-antigravity": {
222+
activeAccountId: "active",
223+
accounts: [{
224+
id: "active",
225+
credential: {
226+
access: "access-token",
227+
refresh: "refresh-token",
228+
expires: Date.now() + 3_600_000,
229+
projectId: "project-id",
230+
},
231+
}],
232+
},
233+
}));
234+
let releaseResponse!: () => void;
235+
let markFetchStarted!: () => void;
236+
const responseGate = new Promise<void>(resolve => { releaseResponse = resolve; });
237+
const fetchStarted = new Promise<void>(resolve => { markFetchStarted = resolve; });
238+
const baseUrl = "https://cca-stale-discovery.example";
239+
globalThis.fetch = (async () => {
240+
markFetchStarted();
241+
await responseGate;
242+
return Response.json({
243+
models: { "stale-wire-model": { displayName: "Stale Model" } },
244+
agentModelSorts: [{ groups: [{ modelIds: ["stale-wire-model"] }] }],
245+
});
246+
}) as typeof fetch;
247+
248+
try {
249+
const pending = gatherRoutedModels(configWith("google-antigravity", {
250+
adapter: "google",
251+
authMode: "oauth",
252+
baseUrl,
253+
project: "configured-project",
254+
liveModels: true,
255+
models: ["configured-only"],
256+
}));
257+
await fetchStarted;
258+
clearModelCache("google-antigravity");
259+
releaseResponse();
260+
261+
expect((await pending).filter(model => model.provider === "google-antigravity").map(model => model.id))
262+
.toEqual(["configured-only"]);
263+
expect(resolveAntigravityWireModelId("stale-model", baseUrl)).toBe("stale-model");
264+
} finally {
265+
rmSync(home, { recursive: true, force: true });
266+
}
267+
});
268+
216269
test("uses the configured key for a custom CCA provider", async () => {
217270
const seen: { headers: Record<string, string> }[] = [];
218271
globalThis.fetch = (async (_input: RequestInfo | URL, init?: RequestInit) => {

0 commit comments

Comments
 (0)