Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions apps/server/src/provider/acp/AntigravityAcpSupport.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ function makeModelRuntime(
selections.push(
`${configId}=${String(value)}${options?.allowUnlistedValue === true ? " (unlisted)" : ""}`,
);
if (failure) return yield* failure;
return { configOptions };
});
return {
Expand Down Expand Up @@ -155,24 +156,27 @@ describe("applyAntigravityAcpModelSelection", () => {
}),
);

it.effect.each(["gemini-removed", "Gemini saved", "gemini-saved[reasoning=high]"])(
"rejects unavailable or non-native model ID %s without selecting a fallback",
(model) =>
Effect.gen(function* () {
const { runtime, selections } = makeModelRuntime();
const error = yield* applyAntigravityAcpModelSelection({
runtime,
model,
mapError: (cause) => cause,
}).pipe(Effect.flip);

expect(error).toMatchObject({
_tag: "AcpRequestError",
code: -32602,
errorMessage: expect.stringContaining(`'${model}' is unavailable`),
});
expect(selections).toEqual([]);
}),
it.effect("sends an explicit model absent from cached choices to the provider", () =>
Effect.gen(function* () {
const { runtime, selections } = makeModelRuntime();
const model = yield* applyAntigravityAcpModelSelection({
runtime,
model: "gemini-new",
mapError: (cause) => cause,
});
expect(model).toBe("gemini-new");
expect(selections).toEqual(["model=gemini-new (unlisted)"]);

const failure = EffectAcpErrors.AcpRequestError.invalidParams("Provider rejected it.");
const rejecting = makeModelRuntime([modelConfig], failure);
const error = yield* applyAntigravityAcpModelSelection({
runtime: rejecting.runtime,
model: "gemini-removed",
mapError: (cause) => ({ cause }),
}).pipe(Effect.flip);
expect(error).toEqual({ cause: failure });
expect(rejecting.selections).toEqual(["model=gemini-removed (unlisted)"]);
}),
);

it.effect("accepts exact model IDs from grouped native options", () =>
Expand Down
31 changes: 11 additions & 20 deletions apps/server/src/provider/acp/AntigravityAcpSupport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -273,27 +273,18 @@ export const applyAntigravityAcpModelSelection = Effect.fn("applyAntigravityAcpM
});
const explicit = Boolean(input.model) && input.model !== ANTIGRAVITY_DEFAULT_MODEL;
if (resolved === undefined || (!explicit && resolved === current)) return current;
const options = antigravityModelOptions(configOptions);
const legacyFamily = options.some((option) => option.value === resolved)
? undefined
: legacyAntigravityFamily(configOptions, resolved);
if (legacyFamily !== undefined) {
yield* input.runtime
.setConfigOption("model", resolved, { allowUnlistedValue: true })
.pipe(Effect.mapError(input.mapError));
return legacyFamily;
}
if (!options.some((option) => option.value === resolved)) {
return yield* Effect.fail(
input.mapError(
EffectAcpErrors.AcpRequestError.invalidParams(
`Antigravity model '${resolved}' is unavailable for this Google account. Select an available model.`,
),
),
);
const listed = antigravityModelOptions(configOptions).some(
(option) => option.value === resolved,
);
if (listed) {
yield* input.runtime.setModel(resolved).pipe(Effect.mapError(input.mapError));
return resolved;
}
yield* input.runtime.setModel(resolved).pipe(Effect.mapError(input.mapError));
return resolved;
// A live session's choices go stale when the account gains models; let the agent decide.
yield* input.runtime
.setConfigOption("model", resolved, { allowUnlistedValue: true })
.pipe(Effect.mapError(input.mapError));
return legacyAntigravityFamily(configOptions, resolved) ?? resolved;
},
);

Expand Down
Loading