Skip to content

Commit 6556f3e

Browse files
fix(server): Antigravity marks the selected ACP 1.4 model as default
Co-authored-by: Cursor <[email protected]>
1 parent 99e96e4 commit 6556f3e

4 files changed

Lines changed: 59 additions & 1 deletion

File tree

‎apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ export interface AntigravityAdapterV2Options {
7878
cwd: string,
7979
) => Effect.Effect<void>;
8080
readonly onSessionEvent?: AcpAdapterV2Flavor["onSessionEvent"];
81+
readonly onModelSelected?: (modelId: string) => Effect.Effect<void>;
8182
readonly nativeLogging?: Parameters<typeof makeAcpAdapterV2>[0]["nativeLogging"];
8283
readonly continuationRequests?: Parameters<typeof makeAcpAdapterV2>[0]["continuationRequests"];
8384
}
@@ -176,14 +177,18 @@ export function makeAntigravityAcpAdapterFlavor(
176177
modelSelection,
177178
}) {
178179
const defaultModel = yield* options.defaultModel;
179-
return yield* applyAntigravityAcpModelSelection({
180+
const selected = yield* applyAntigravityAcpModelSelection({
180181
runtime,
181182
models: startResult.sessionSetupResult.models,
182183
model:
183184
modelSelection.model === ANTIGRAVITY_DEFAULT_MODEL ? undefined : modelSelection.model,
184185
defaultModel,
185186
mapError: (cause) => cause,
186187
});
188+
if (selected !== undefined && options.onModelSelected) {
189+
yield* options.onModelSelected(selected);
190+
}
191+
return selected;
187192
}),
188193
sessionModeForPolicy: (policy) => antigravityPermissionMode(policy.runtimeMode),
189194
clientFileSystem: {

‎apps/server/src/provider/AntigravityProvider.test.ts‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,31 @@ it.layer(layerTest)("Antigravity provider snapshots", (it) => {
388388
),
389389
);
390390

391+
it.effect("defaults to the concrete model a grouped session selected", () =>
392+
Effect.scoped(
393+
Effect.gen(function* () {
394+
const harness = yield* makeHarness();
395+
yield* harness.initialize;
396+
yield* harness.provider.onSessionStarted({
397+
...started,
398+
sessionSetupResult: antigravity143Session,
399+
});
400+
yield* harness.provider.onModelSelected("claude-sonnet-5-5-low");
401+
yield* harness.provider.onConfigOptionsUpdated(
402+
antigravity143Session.configOptions.map((option) =>
403+
option.id === "model"
404+
? { ...option, currentValue: "claude-sonnet-5-5" }
405+
: { ...option, currentValue: "low" },
406+
),
407+
);
408+
const models = (yield* harness.provider.snapshot.getSnapshot).models;
409+
expect(models.filter((model) => model.isDefault).map((model) => model.slug)).toEqual([
410+
"claude-sonnet-5-5-low",
411+
]);
412+
}),
413+
),
414+
);
415+
391416
it.effect("lists models added by config updates to ungrouped sessions", () =>
392417
Effect.scoped(
393418
Effect.gen(function* () {

‎apps/server/src/provider/AntigravityProvider.ts‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,32 @@ export const makeAntigravityProvider = Effect.fn("makeAntigravityProvider")(func
338338
});
339339
});
340340

341+
// Grouped config updates name only the family and thinking level.
342+
const onModelSelected = Effect.fn("AntigravityProvider.onModelSelected")(function* (
343+
modelId: string,
344+
) {
345+
yield* SubscriptionRef.update(metadata, (state) => {
346+
const grouped = state.groupedModels;
347+
if (
348+
state.draft.auth.status !== "authenticated" ||
349+
!grouped ||
350+
grouped.currentModelId === modelId ||
351+
!grouped.availableModels.some((model) => model.modelId === modelId)
352+
) {
353+
return state;
354+
}
355+
const groupedModels = { ...grouped, currentModelId: modelId };
356+
return {
357+
...state,
358+
groupedModels,
359+
draft: {
360+
...state.draft,
361+
models: buildAntigravityModelsFromSession({ models: groupedModels }),
362+
},
363+
};
364+
});
365+
});
366+
341367
const onAvailableCommands = Effect.fn("AntigravityProvider.onAvailableCommands")(function* (
342368
commands: ReadonlyArray<EffectAcpSchema.AvailableCommand>,
343369
cwd?: string,
@@ -433,6 +459,7 @@ export const makeAntigravityProvider = Effect.fn("makeAntigravityProvider")(func
433459
snapshot: { ...managed, getSnapshot },
434460
onSessionStarted,
435461
onConfigOptionsUpdated,
462+
onModelSelected,
436463
onAvailableCommands,
437464
onSignedOut: clearAccountMetadata(),
438465
onAuthRequired: clearAccountMetadata(),

‎apps/server/src/provider/Drivers/AntigravityDriver.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,7 @@ export const AntigravityDriver: ProviderDriver<
428428
? provider.onAvailableCommands(event.availableCommands)
429429
: Effect.void;
430430
},
431+
onModelSelected: provider.onModelSelected,
431432
continuationRequests,
432433
nativeLogging: (threadId) =>
433434
makeNativeLogger({

0 commit comments

Comments
 (0)