Skip to content

Commit a3ab5e5

Browse files
committed
fix(antigravity): resolve effective model after acquiring turn permit
1 parent 470c9b9 commit a3ab5e5

2 files changed

Lines changed: 78 additions & 17 deletions

File tree

‎apps/server/src/provider/Layers/AntigravityAdapter.test.ts‎

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ it.layer(layer)("AntigravityAdapter", (it) => {
612612
input: "Follow-up prompt",
613613
modelSelection: { instanceId, model: nativeAlternative },
614614
})
615-
.pipe(Effect.forkChild);
615+
.pipe(Effect.forkChild({ startImmediately: true }));
616616

617617
expect(h.hasActivePrompt()).toBe(true);
618618
expect(h.calls.slice(marker)).toEqual([]);
@@ -645,6 +645,48 @@ it.layer(layer)("AntigravityAdapter", (it) => {
645645
}),
646646
);
647647

648+
it.effect("queued follow-up turn without explicit model inherits updated session model", () =>
649+
Effect.gen(function* () {
650+
const h = yield* makeHarness();
651+
yield* h.adapter.startSession({
652+
threadId,
653+
cwd: process.cwd(),
654+
runtimeMode: "approval-required",
655+
});
656+
const first = yield* h.adapter
657+
.sendTurn({
658+
threadId,
659+
input: "First prompt",
660+
modelSelection: { instanceId, model: nativeAlternative },
661+
})
662+
.pipe(Effect.forkChild);
663+
const initialPrompt = yield* h.nextPrompt;
664+
665+
const second = yield* h.adapter
666+
.sendTurn({
667+
threadId,
668+
input: "Second queued prompt without model",
669+
})
670+
.pipe(Effect.forkChild({ startImmediately: true }));
671+
672+
expect(h.hasActivePrompt()).toBe(true);
673+
674+
yield* Deferred.succeed(initialPrompt.result, { stopReason: "end_turn" });
675+
yield* Fiber.join(first);
676+
677+
const replacement = yield* h.nextPrompt;
678+
expect(replacement.content).toEqual([
679+
{ type: "text", text: "Second queued prompt without model" },
680+
{
681+
type: "text",
682+
text: expect.stringContaining(`Antigravity harness, as ${nativeAlternative}`),
683+
},
684+
]);
685+
yield* Deferred.succeed(replacement.result, { stopReason: "end_turn" });
686+
yield* Fiber.join(second);
687+
}),
688+
);
689+
648690
it.effect("rejects an unavailable steer model without cancelling current work", () =>
649691
Effect.gen(function* () {
650692
const h = yield* makeHarness();

‎apps/server/src/provider/Layers/AntigravityAdapter.ts‎

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,27 +1028,46 @@ export const makeAntigravityAdapter = Effect.fn("makeAntigravityAdapter")(functi
10281028
});
10291029
}).pipe(Effect.uninterruptible);
10301030

1031-
const requestedModel = input.modelSelection?.model ?? context.session.model;
1032-
const configOptions = yield* context.runtime.getConfigOptions;
1033-
const model = resolveAntigravityModel({
1034-
configOptions,
1035-
model: requestedModel,
1036-
defaultModel: yield* options.defaultModel ?? Effect.succeed(undefined),
1037-
});
1038-
const availableModels = antigravityModelOptions(configOptions);
1039-
if (model && !availableModels.some((option) => option.value === model)) {
1040-
return yield* mapAntigravityError(
1041-
input.threadId,
1042-
"session/prompt",
1043-
EffectAcpErrors.AcpRequestError.invalidParams(
1044-
`Antigravity model '${model}' is unavailable for this Google account. Select an available model.`,
1045-
),
1046-
);
1031+
if (input.modelSelection?.model) {
1032+
const configOptions = yield* context.runtime.getConfigOptions;
1033+
const explicitModel = resolveAntigravityModel({
1034+
configOptions,
1035+
model: input.modelSelection.model,
1036+
defaultModel: yield* options.defaultModel ?? Effect.succeed(undefined),
1037+
});
1038+
const availableModels = antigravityModelOptions(configOptions);
1039+
if (explicitModel && !availableModels.some((option) => option.value === explicitModel)) {
1040+
return yield* mapAntigravityError(
1041+
input.threadId,
1042+
"session/prompt",
1043+
EffectAcpErrors.AcpRequestError.invalidParams(
1044+
`Antigravity model '${explicitModel}' is unavailable for this Google account. Select an available model.`,
1045+
),
1046+
);
1047+
}
10471048
}
10481049

10491050
return yield* context.turnQueue
10501051
.withPermit(
10511052
Effect.gen(function* () {
1053+
const requestedModel = input.modelSelection?.model ?? context.session.model;
1054+
const configOptions = yield* context.runtime.getConfigOptions;
1055+
const model = resolveAntigravityModel({
1056+
configOptions,
1057+
model: requestedModel,
1058+
defaultModel: yield* options.defaultModel ?? Effect.succeed(undefined),
1059+
});
1060+
const availableModels = antigravityModelOptions(configOptions);
1061+
if (model && !availableModels.some((option) => option.value === model)) {
1062+
return yield* mapAntigravityError(
1063+
input.threadId,
1064+
"session/prompt",
1065+
EffectAcpErrors.AcpRequestError.invalidParams(
1066+
`Antigravity model '${model}' is unavailable for this Google account. Select an available model.`,
1067+
),
1068+
);
1069+
}
1070+
10521071
const launch = yield* context.promptLock.withPermit(
10531072
Effect.gen(function* () {
10541073
yield* requireSession(input.threadId);

0 commit comments

Comments
 (0)