Skip to content
Merged
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
57 changes: 56 additions & 1 deletion apps/server/src/mcp/OrchestratorMcpService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4361,6 +4361,7 @@ describe("OrchestratorMcpService provider resolution", () => {
() =>
Effect.gen(function* () {
const peerId = ProviderInstanceId.make("codex-subscription-2");
const antigravityId = ProviderInstanceId.make("antigravity");
const driver = ProviderDriverKind.make("codex");
const inherited = {
instanceId: codexInstanceId,
Expand Down Expand Up @@ -4408,6 +4409,33 @@ describe("OrchestratorMcpService provider resolution", () => {
target: { providerInstanceId: peerId, options: { reasoningEffort: "max" } },
expected: { instanceId: peerId, model: inherited.model, options: override },
},
{
name: "Antigravity model with a thinking suffix",
target: { providerInstanceId: antigravityId, model: "gemini-4-neon-high" },
expected: {
instanceId: antigravityId,
model: "gemini-4-neon",
options: [{ id: "thought_level", value: "high" }],
},
},
{
name: "explicit Antigravity thinking overrides the suffix",
target: {
providerInstanceId: antigravityId,
model: "gemini-4-neon-high",
options: { thought_level: "medium" },
},
expected: {
instanceId: antigravityId,
model: "gemini-4-neon",
options: [{ id: "thought_level", value: "medium" }],
},
},
{
name: "clear Antigravity suffix options",
target: { providerInstanceId: antigravityId, model: "gemini-4-neon-high", options: {} },
expected: { instanceId: antigravityId, model: "gemini-4-neon", options: [] },
},
{
name: "old Ultracode effort level",
target: { model: "ultracode-model", options: { effort: "ultracode" } },
Expand Down Expand Up @@ -4495,8 +4523,35 @@ describe("OrchestratorMcpService provider resolution", () => {
],
},
providerSnapshot({ instanceId: peerId, driver, model: inherited.model }),
{
...providerSnapshot({
instanceId: antigravityId,
driver: ProviderDriverKind.make("antigravity"),
}),
models: [
{
slug: "gemini-4-neon",
name: "Gemini 4 Neon",
isCustom: false,
capabilities: {
optionDescriptors: [
{
id: "thought_level",
role: "reasoning",
label: "Thinking",
type: "select",
options: [
{ id: "medium", label: "Medium" },
{ id: "high", label: "High" },
],
},
],
},
},
],
},
]),
adapterRegistryLayer([codexInstanceId, peerId]),
adapterRegistryLayer([codexInstanceId, peerId, antigravityId]),
Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
Layer.mock(SecretRequests.SecretRequests)({}),
Layer.mock(RemoteDelegation.RemoteDelegation)({}),
Expand Down
31 changes: 27 additions & 4 deletions apps/server/src/mcp/OrchestratorMcpService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,23 @@ const advertisedModel = (provider: ServerProvider, model: string) =>
candidate.aliases?.some((alias) => alias.toLowerCase() === model.toLowerCase()),
);

/** Antigravity 1.3 IDs append the thinking level (`gemini-3.8-flash-high`); the agent still accepts them. */
function antigravitySuffixedModel(provider: ServerProvider, model: string) {
if (provider.driver !== "antigravity" || advertisedModel(provider, model)) return;
const separator = model.lastIndexOf("-");
if (separator === -1) return;
const family = model.slice(0, separator);
const value = model.slice(separator + 1);
const thinking = provider.models
.find((candidate) => candidate.slug === family)
?.capabilities?.optionDescriptors?.find(
(descriptor) => descriptor.type === "select" && descriptor.role === "reasoning",
);
if (thinking?.type === "select" && thinking.options.some((choice) => choice.id === value)) {
return { model: family, thinking: { id: thinking.id, value } };
}
}

/** A folder's own provider config can add models that only its workspace snapshot lists. */
export const withWorkspaceModels = (
providers: ReadonlyArray<ServerProvider>,
Expand Down Expand Up @@ -1690,7 +1707,10 @@ const make = Effect.gen(function* () {

const inheritedSelection = input.parent.thread.modelSelection;
const requestedModel = input.target?.model;
const antigravityTarget =
requestedModel === undefined ? undefined : antigravitySuffixedModel(provider, requestedModel);
const model =
antigravityTarget?.model ??
requestedModel ??
(instanceId === inheritedSelection.instanceId
? inheritedSelection.model
Expand All @@ -1701,7 +1721,7 @@ const make = Effect.gen(function* () {
`Provider ${instanceId} has no model available for inheritance.`,
);
}
if (requestedModel !== undefined) yield* requireAdvertisedModel(provider, requestedModel);
if (requestedModel !== undefined) yield* requireAdvertisedModel(provider, model);
const advertised = advertisedModel(provider, model);
const descriptors = advertised?.capabilities?.optionDescriptors;
const requestedOptions = withLegacyUltracodeEffort(descriptors, input.target?.options);
Expand All @@ -1725,14 +1745,17 @@ const make = Effect.gen(function* () {
descriptors,
)
: undefined;
if (requestedOptions !== undefined) {
if (requestedOptions !== undefined || antigravityTarget !== undefined) {
const selections = new Map(
(requestedOptions.length === 0 ? [] : (options ?? [])).map((selection) => [
(requestedOptions?.length === 0 ? [] : (options ?? [])).map((selection) => [
selection.id,
selection,
]),
);
for (const selection of requestedOptions) {
if (antigravityTarget !== undefined && requestedOptions?.length !== 0) {
selections.set(antigravityTarget.thinking.id, antigravityTarget.thinking);
}
for (const selection of requestedOptions ?? []) {
selections.set(selection.id, selection);
}
options = [...selections.values()];
Expand Down
Loading