Skip to content

Commit a261a4a

Browse files
author
Xinwei Gao
committed
fix(antigravity): reject inherited discovery properties
1 parent 44e0f06 commit a261a4a

2 files changed

Lines changed: 36 additions & 7 deletions

File tree

‎src/providers/antigravity-models.ts‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,13 @@ function pickerModelIdForDiscoveredWireId(
6969
wireId: string,
7070
available: ReadonlyMap<string, Record<string, unknown>>,
7171
): string {
72-
const explicitPickerId = ANTIGRAVITY_PICKER_MODEL_BY_WIRE_ID[wireId];
72+
const explicitPickerId = Object.hasOwn(ANTIGRAVITY_PICKER_MODEL_BY_WIRE_ID, wireId)
73+
? ANTIGRAVITY_PICKER_MODEL_BY_WIRE_ID[wireId]
74+
: undefined;
7375
if (explicitPickerId) {
74-
const requiredWireIds = ANTIGRAVITY_WIRE_IDS_BY_PICKER_MODEL[explicitPickerId] ?? [];
76+
const requiredWireIds = Object.hasOwn(ANTIGRAVITY_WIRE_IDS_BY_PICKER_MODEL, explicitPickerId)
77+
? ANTIGRAVITY_WIRE_IDS_BY_PICKER_MODEL[explicitPickerId] ?? []
78+
: [];
7579
if (requiredWireIds.every(id => available.has(id))) return explicitPickerId;
7680
}
7781

@@ -257,6 +261,7 @@ export function parseAntigravityAvailableModels(
257261
if (!Array.isArray(modelIds)) return null;
258262
for (const id of modelIds) {
259263
if (!isValidModelDiscoveryModelId(id)
264+
|| !Object.hasOwn(models, id)
260265
|| !antigravityRecord(models[id])
261266
|| ids.length >= limit) return null;
262267
ids.push(id);
@@ -277,6 +282,7 @@ export function parseAntigravityAvailableModels(
277282
if (Array.isArray(flashTieredIds)) {
278283
for (const id of flashTieredIds) {
279284
if (!isValidModelDiscoveryModelId(id)
285+
|| !Object.hasOwn(models, id)
280286
|| !antigravityRecord(models[id])
281287
|| ids.length >= limit) return null;
282288
ids.push(id);
@@ -289,7 +295,10 @@ export function parseAntigravityAvailableModels(
289295
if (!info || available.has(wireId)) continue;
290296
// Legacy compatibility aliases are deliberately routed to newer wire ids for saved
291297
// selections. They are not safe as independently discovered picker rows.
292-
if (ANTIGRAVITY_MODEL_ALIASES[wireId] && ANTIGRAVITY_MODEL_ALIASES[wireId] !== wireId) continue;
298+
const alias = Object.hasOwn(ANTIGRAVITY_MODEL_ALIASES, wireId)
299+
? ANTIGRAVITY_MODEL_ALIASES[wireId]
300+
: undefined;
301+
if (alias && alias !== wireId) continue;
293302
available.set(wireId, info);
294303
}
295304

@@ -309,7 +318,9 @@ export function parseAntigravityAvailableModels(
309318
}
310319

311320
export function resolveAntigravityWireModelId(modelId: string): string {
312-
return ANTIGRAVITY_MODEL_ALIASES[modelId] ?? modelId;
321+
return Object.hasOwn(ANTIGRAVITY_MODEL_ALIASES, modelId)
322+
? ANTIGRAVITY_MODEL_ALIASES[modelId]
323+
: modelId;
313324
}
314325

315326
/**
@@ -323,7 +334,7 @@ export function isAntigravitySuffixModelId(modelId: string): boolean {
323334

324335
/** The reasoning tier a retired Flash id used to encode, if it is one. */
325336
export function retiredAntigravityFlashTier(modelId: string): string | undefined {
326-
return RETIRED_FLASH_TIERS[modelId];
337+
return Object.hasOwn(RETIRED_FLASH_TIERS, modelId) ? RETIRED_FLASH_TIERS[modelId] : undefined;
327338
}
328339

329340
/**
@@ -343,7 +354,7 @@ export function resolveAntigravityEffortWireModel(
343354
// Rule 0: retired Flash id — Google has taken the wire id offline, so route to the
344355
// current generation and carry the tier the retired id encoded. This runs BEFORE the
345356
// suffix check because those ids are aliases, and rule 1 would drop the tier.
346-
const retiredTier = RETIRED_FLASH_TIERS[modelId];
357+
const retiredTier = retiredAntigravityFlashTier(modelId);
347358
if (retiredTier) {
348359
return {
349360
wireModelId: GEMINI_FLASH_CURRENT,

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { describe, expect, test } from "bun:test";
22
import { createGoogleAdapter as createGoogleAdapterProduction } from "../src/adapters/google";
33
import { antigravitySessionId, isLikelyRealThoughtSignature } from "../src/adapters/google-antigravity-wire";
4-
import { ANTIGRAVITY_MODELS, ANTIGRAVITY_MODEL_EFFORTS, canonicalAntigravityUsageModel, parseAntigravityAvailableModels } from "../src/providers/antigravity-models";
4+
import { ANTIGRAVITY_MODELS, ANTIGRAVITY_MODEL_EFFORTS, canonicalAntigravityUsageModel, parseAntigravityAvailableModels, resolveAntigravityEffortWireModel, resolveAntigravityWireModelId } from "../src/providers/antigravity-models";
55
import { MODEL_DISCOVERY_MAX_MODEL_ID_LENGTH, MODEL_DISCOVERY_MAX_MODELS } from "../src/providers/model-discovery";
66
import type { AdapterEvent, OcxParsedRequest, OcxProviderConfig } from "../src/types";
77
import { withTestTranslatorBudget } from "./helpers/translator-budget";
@@ -193,6 +193,24 @@ describe("antigravity CCA envelope", () => {
193193
}
194194
});
195195

196+
test("ignores inherited CCA model and alias properties", () => {
197+
const inheritedModels = Object.create(null) as Record<string, unknown>;
198+
Object.defineProperty(inheritedModels, "__proto__", {
199+
value: { maxTokens: 1_048_576 },
200+
enumerable: true,
201+
});
202+
const models = Object.create(inheritedModels);
203+
204+
expect(parseAntigravityAvailableModels({
205+
models,
206+
agentModelSorts: [{ groups: [{ modelIds: ["__proto__"] }] }],
207+
})).toBeNull();
208+
expect(resolveAntigravityWireModelId("__proto__")).toBe("__proto__");
209+
expect(resolveAntigravityEffortWireModel("__proto__", "high")).toEqual({
210+
wireModelId: "__proto__",
211+
});
212+
});
213+
196214
test("rejects malformed and oversized CCA agent-model lists", () => {
197215
const payload = (modelIds: unknown[]) => ({
198216
models: Object.fromEntries(modelIds.map(id => [String(id), { maxTokens: 1_048_576 }])),

0 commit comments

Comments
 (0)